[dovecot-cvs] dovecot/src/auth auth-request-handler.c, 1.12.2.9, 1.12.2.10

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	auth-request-handler.c 
Log Message:
code cleanup



Index: auth-request-handler.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request-handler.c,v
retrieving revision 1.12.2.9
retrieving revision 1.12.2.10
diff -u -d -r1.12.2.9 -r1.12.2.10
--- auth-request-handler.c	19 Jan 2007 15:19:29 -0000	1.12.2.9
+++ auth-request-handler.c	26 Jan 2007 00:31:29 -0000	1.12.2.10
@@ -114,13 +114,12 @@
 	unsigned int src, dest;
 	bool seen_pass = FALSE;
 
-	extra_fields = request->extra_fields == NULL ? NULL :
-		auth_stream_reply_export(request->extra_fields);
+	if (auth_stream_is_empty(request->extra_fields))
+		return NULL;
 
-	if (!request->proxy) {
-		if (auth_stream_is_empty(request->extra_fields))
-			return NULL;
+	extra_fields = auth_stream_reply_export(request->extra_fields);
 
+	if (!request->proxy) {
 		/* we only wish to remove all fields prefixed with "userdb_" */
 		if (strstr(extra_fields, "userdb_") == NULL)
 			return extra_fields;