[dovecot-cvs] dovecot/src/auth auth-request.c, 1.58.2.2, 1.58.2.3 passdb-pam.c, 1.37.2.3, 1.37.2.4

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	auth-request.c passdb-pam.c 
Log Message:
Fixes to handling PAM password expiring. Patch by Vaidas Pilkauskas



Index: auth-request.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request.c,v
retrieving revision 1.58.2.2
retrieving revision 1.58.2.3
diff -u -d -r1.58.2.2 -r1.58.2.3
--- auth-request.c	11 Jun 2006 12:51:36 -0000	1.58.2.2
+++ auth-request.c	16 Jun 2006 09:59:32 -0000	1.58.2.3
@@ -318,7 +318,9 @@
 			}
 		}
 	} else if (*result == PASSDB_RESULT_PASS_EXPIRED) {
-		auth_stream_reply_add(request->extra_fields, "reason",
+	        if (request->extra_fields == NULL)
+		        request->extra_fields = auth_stream_reply_init(request);
+	        auth_stream_reply_add(request->extra_fields, "reason",
 				      "Password expired");
 	} else if (request->passdb->next != NULL &&
 		   *result != PASSDB_RESULT_USER_DISABLED) {

Index: passdb-pam.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-pam.c,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -u -d -r1.37.2.3 -r1.37.2.4
--- passdb-pam.c	11 Jun 2006 21:55:40 -0000	1.37.2.3
+++ passdb-pam.c	16 Jun 2006 09:59:32 -0000	1.37.2.4
@@ -273,6 +273,7 @@
 			case PAM_USER_UNKNOWN:
 				result = PASSDB_RESULT_USER_UNKNOWN;
 				break;
+			case PAM_NEW_AUTHTOK_REQD:
 			case PAM_ACCT_EXPIRED:
 				result = PASSDB_RESULT_PASS_EXPIRED;
 				break;