[dovecot-cvs] dovecot/src/auth passdb-checkpassword.c, 1.18.2.8, 1.18.2.9

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	passdb-checkpassword.c 
Log Message:
Handle vpopmail's nonstandard exit codes.



Index: passdb-checkpassword.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-checkpassword.c,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
diff -u -d -r1.18.2.8 -r1.18.2.9
--- passdb-checkpassword.c	2 Nov 2006 21:34:47 -0000	1.18.2.8
+++ passdb-checkpassword.c	18 Nov 2006 22:17:25 -0000	1.18.2.9
@@ -101,9 +101,23 @@
 		return;
 
 	switch (request->exit_status) {
+	/* vpopmail exit codes: */
+	case 3:		/* password fail / vpopmail user not found */
+	case 12: 	/* null user name given */
+	case 13:	/* null password given */
+	case 15:	/* user has no password */
+	case 20:	/* invalid user/domain characters */
+	case 21:	/* system user not found */
+	case 22:	/* system user shadow entry not found */
+	case 23:	/* system password fail */
+
+	/* standard checkpassword exit codes: */
 	case 1:
+		/* (1 is additionally defined in vpopmail for
+		   "pop/smtp/webmal/ imap/access denied") */
 		auth_request_log_info(request->request, "checkpassword",
-				      "Password not accepted");
+				      "Login failed (status=%d)",
+				      request->exit_status);
 		checkpassword_request_finish(request,
 					     PASSDB_RESULT_PASSWORD_MISMATCH);
 		break;