Mercurial > dovecot > original-hg > dovecot-1.2
diff src/master/login-process.c @ 4388:af61031c746f HEAD
Settings parser nowadays returns "" instead of NULL when it reads an empty
value from config file (due to some good reason I unfortunately didn't write
to commit message and can't remember anymore). Fixed a lot of existing
checks which checked for empty strings with NULL instead of "" checks.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 16 Jun 2006 21:13:43 +0300 |
| parents | 3e542f308cb5 |
| children | 9d9e72374164 |
line wrap: on
line diff
--- a/src/master/login-process.c Fri Jun 16 16:28:17 2006 +0300 +++ b/src/master/login-process.c Fri Jun 16 21:13:43 2006 +0300 @@ -408,12 +408,12 @@ env_put("DOVECOT_MASTER=1"); if (!set->ssl_disable) { - const char *ssl_key_password = NULL; + const char *ssl_key_password; - ssl_key_password = set->ssl_key_password != NULL ? + ssl_key_password = *set->ssl_key_password != '\0' ? set->ssl_key_password : ssl_manual_key_password; - if (set->ssl_ca_file != NULL) { + if (*set->ssl_ca_file != '\0') { env_put(t_strconcat("SSL_CA_FILE=", set->ssl_ca_file, NULL)); } @@ -424,7 +424,7 @@ env_put(t_strconcat("SSL_KEY_PASSWORD=", ssl_key_password, NULL)); env_put("SSL_PARAM_FILE="SSL_PARAMETERS_FILENAME); - if (set->ssl_cipher_list != NULL) { + if (*set->ssl_cipher_list != '\0') { env_put(t_strconcat("SSL_CIPHER_LIST=", set->ssl_cipher_list, NULL)); }