Mercurial > dovecot > original-hg > dovecot-1.2
comparison 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 |
comparison
equal
deleted
inserted
replaced
4387:670dd15edbf3 | 4388:af61031c746f |
---|---|
406 0, 0, NULL); | 406 0, 0, NULL); |
407 | 407 |
408 env_put("DOVECOT_MASTER=1"); | 408 env_put("DOVECOT_MASTER=1"); |
409 | 409 |
410 if (!set->ssl_disable) { | 410 if (!set->ssl_disable) { |
411 const char *ssl_key_password = NULL; | 411 const char *ssl_key_password; |
412 | 412 |
413 ssl_key_password = set->ssl_key_password != NULL ? | 413 ssl_key_password = *set->ssl_key_password != '\0' ? |
414 set->ssl_key_password : ssl_manual_key_password; | 414 set->ssl_key_password : ssl_manual_key_password; |
415 | 415 |
416 if (set->ssl_ca_file != NULL) { | 416 if (*set->ssl_ca_file != '\0') { |
417 env_put(t_strconcat("SSL_CA_FILE=", | 417 env_put(t_strconcat("SSL_CA_FILE=", |
418 set->ssl_ca_file, NULL)); | 418 set->ssl_ca_file, NULL)); |
419 } | 419 } |
420 env_put(t_strconcat("SSL_CERT_FILE=", | 420 env_put(t_strconcat("SSL_CERT_FILE=", |
421 set->ssl_cert_file, NULL)); | 421 set->ssl_cert_file, NULL)); |
422 env_put(t_strconcat("SSL_KEY_FILE=", | 422 env_put(t_strconcat("SSL_KEY_FILE=", |
423 set->ssl_key_file, NULL)); | 423 set->ssl_key_file, NULL)); |
424 env_put(t_strconcat("SSL_KEY_PASSWORD=", | 424 env_put(t_strconcat("SSL_KEY_PASSWORD=", |
425 ssl_key_password, NULL)); | 425 ssl_key_password, NULL)); |
426 env_put("SSL_PARAM_FILE="SSL_PARAMETERS_FILENAME); | 426 env_put("SSL_PARAM_FILE="SSL_PARAMETERS_FILENAME); |
427 if (set->ssl_cipher_list != NULL) { | 427 if (*set->ssl_cipher_list != '\0') { |
428 env_put(t_strconcat("SSL_CIPHER_LIST=", | 428 env_put(t_strconcat("SSL_CIPHER_LIST=", |
429 set->ssl_cipher_list, NULL)); | 429 set->ssl_cipher_list, NULL)); |
430 } | 430 } |
431 if (set->ssl_verify_client_cert) | 431 if (set->ssl_verify_client_cert) |
432 env_put("SSL_VERIFY_CLIENT_CERT=1"); | 432 env_put("SSL_VERIFY_CLIENT_CERT=1"); |