← Back to branch summary

~ubuntu-branches/ubuntu/edgy/dovecot/edgy-security

« back to all changes in this revision

Viewing changes to src/master/login-process.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-06-30 15:13:37 UTC
  • mfrom: (1.10.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060630151337-l772crcoe5hfd4hw
Tags: 1.0.rc1-1ubuntu1
Merge from debian unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/master/login-process.c
408
408
        env_put("DOVECOT_MASTER=1");
409
409
 
410
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
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
417
                        env_put(t_strconcat("SSL_CA_FILE=",
418
418
                                            set->ssl_ca_file, NULL));
419
419
                }
424
424
                env_put(t_strconcat("SSL_KEY_PASSWORD=",
425
425
                                    ssl_key_password, NULL));
426
426
                env_put("SSL_PARAM_FILE="SSL_PARAMETERS_FILENAME);
427
 
                if (set->ssl_cipher_list != NULL) {
 
427
                if (*set->ssl_cipher_list != '\0') {
428
428
                        env_put(t_strconcat("SSL_CIPHER_LIST=",
429
429
                                            set->ssl_cipher_list, NULL));
430
430
                }