[dovecot-cvs] dovecot/src/auth auth-request.c,1.58.2.26,1.58.2.27

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv15535

Modified Files:
      Tag: branch_1_0
	auth-request.c 
Log Message:
proxy and nologin was broken in last changes.



Index: auth-request.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request.c,v
retrieving revision 1.58.2.26
retrieving revision 1.58.2.27
diff -u -d -r1.58.2.26 -r1.58.2.27
--- auth-request.c	17 Feb 2007 11:21:33 -0000	1.58.2.26
+++ auth-request.c	19 Feb 2007 20:00:18 -0000	1.58.2.27
@@ -923,18 +923,20 @@
 		request->no_password = TRUE;
 	} else if (strcmp(name, "allow_nets") == 0) {
 		auth_request_validate_networks(request, value);
-	} else if (strcmp(name, "nologin") == 0) {
-		/* user can't actually login - don't keep this
-		   reply for master */
-		request->no_login = TRUE;
-		value = NULL;
-	} else if (strcmp(name, "proxy") == 0) {
-		/* we're proxying authentication for this user. send
-		   password back if using plaintext authentication. */
-		request->proxy = TRUE;
-		request->no_login = TRUE;
-		value = NULL;
 	} else {
+		if (strcmp(name, "nologin") == 0) {
+			/* user can't actually login - don't keep this
+			   reply for master */
+			request->no_login = TRUE;
+			value = NULL;
+		} else if (strcmp(name, "proxy") == 0) {
+			/* we're proxying authentication for this user. send
+			   password back if using plaintext authentication. */
+			request->proxy = TRUE;
+			request->no_login = TRUE;
+			value = NULL;
+		}
+
 		if (request->extra_fields == NULL)
 			request->extra_fields = auth_stream_reply_init(request);
 		auth_stream_reply_add(request->extra_fields, name, value);