From: Timo Sirainen Date: Fri, 3 Jun 2011 15:54:27 +0000 (+0300) Subject: script-login: When not using "-d" parameter, don't do unnecessary config lookup. X-Git-Tag: 2.0.14~53 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49d3d898eaf4e61858b73d8030180442d9ec14d9;p=thirdparty%2Fdovecot%2Fcore.git script-login: When not using "-d" parameter, don't do unnecessary config lookup. --- diff --git a/src/util/script-login.c b/src/util/script-login.c index 38e8c67b0e..b62fe0ea52 100644 --- a/src/util/script-login.c +++ b/src/util/script-login.c @@ -114,13 +114,13 @@ static void client_connected(struct master_service_connection *conn) master_service_init_log(master_service, t_strdup_printf("script-login(%s): ", input.username)); - service_ctx = mail_storage_service_init(master_service, NULL, flags); - if (mail_storage_service_lookup(service_ctx, &input, &user, &error) <= 0) - i_fatal("%s", error); - mail_storage_service_restrict_setenv(service_ctx, user); - - if (drop_to_userdb_privileges) + if (drop_to_userdb_privileges) { + service_ctx = mail_storage_service_init(master_service, NULL, flags); + if (mail_storage_service_lookup(service_ctx, &input, &user, &error) <= 0) + i_fatal("%s", error); + mail_storage_service_restrict_setenv(service_ctx, user); restrict_access_by_env(getenv("HOME"), TRUE); + } if (dup2(fd, STDIN_FILENO) < 0) i_fatal("dup2() failed: %m");