← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/deliver/deliver.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/deliver/deliver.c
345
345
        const char *config_path = DEFAULT_CONFIG_FILE;
346
346
        const char *mailbox = "INBOX";
347
347
        const char *auth_socket, *env_tz;
348
 
        const char *home, *destination, *user, *mail_env, *str;
 
348
        const char *home, *destination, *user, *mail_env;
349
349
        const struct var_expand_table *table;
350
350
        enum mail_storage_flags flags;
351
351
        enum mail_storage_lock_method lock_method;
480
480
                mail_env = expand_mail_env(mail_env, table);
481
481
        }
482
482
 
483
 
        str = getenv("POP3_UIDL_FORMAT");
484
 
        if (str != NULL && (str = strchr(str, '%')) != NULL &&
485
 
            str != NULL && var_get_key(str + 1) == 'm')
486
 
                flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5;
487
 
 
488
 
        if (getenv("MAIL_PLUGIN_DIR") == NULL)
 
483
        if (getenv("MAIL_PLUGINS") == NULL)
489
484
                modules = NULL;
490
485
        else {
491
 
                if (getenv("MAIL_PLUGIN_DIR") == NULL) {
492
 
                        i_fatal("MAIL_PLUGINS given but "
493
 
                                "MAIL_PLUGIN_DIR was not");
494
 
                }
495
 
                modules = module_dir_load(getenv("MAIL_PLUGIN_DIR"),
496
 
                                          getenv("MAIL_PLUGINS"), TRUE);
 
486
                const char *plugin_dir = getenv("MAIL_PLUGIN_DIR");
 
487
 
 
488
                if (plugin_dir == NULL)
 
489
                        plugin_dir = MODULEDIR"/lda";
 
490
                modules = module_dir_load(plugin_dir, getenv("MAIL_PLUGINS"),
 
491
                                          TRUE);
497
492
        }
498
493
 
499
494
        /* FIXME: how should we handle namespaces? */