dovecot-2.0: script-login: When not using "-d" parameter, don't ...

dovecot at dovecot.org dovecot at dovecot.org
Fri Jun 3 18:54:33 EEST 2011


details:   http://hg.dovecot.org/dovecot-2.0/rev/a2d57b43ccb2
changeset: 12840:a2d57b43ccb2
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jun 03 18:54:27 2011 +0300
description:
script-login: When not using "-d" parameter, don't do unnecessary config lookup.

diffstat:

 src/util/script-login.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (23 lines):

diff -r 5b03ca65f4ed -r a2d57b43ccb2 src/util/script-login.c
--- a/src/util/script-login.c	Fri Jun 03 18:11:00 2011 +0300
+++ b/src/util/script-login.c	Fri Jun 03 18:54:27 2011 +0300
@@ -114,13 +114,13 @@
 	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");


More information about the dovecot-cvs mailing list