svn commit: samba r12246 - in trunk/source/passdb: .

[jra at samba.org]

Author: jra
Date: 2005-12-14 20:39:45 +0000 (Wed, 14 Dec 2005)
New Revision: 12246

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12246

Log:
eDirectory returns LDAP_UNWILLING_TO_PERFORM if the
account is disabled. If we get this we can't check
the password so have to tell the client the account
was disabled.
Jeremy.

Modified:
   trunk/source/passdb/pdb_nds.c


Changeset:
Modified: trunk/source/passdb/pdb_nds.c
===================================================================
--- trunk/source/passdb/pdb_nds.c	2005-12-14 20:39:42 UTC (rev 12245)
+++ trunk/source/passdb/pdb_nds.c	2005-12-14 20:39:45 UTC (rev 12246)
@@ -824,6 +824,15 @@
 					case LDAP_INVALID_CREDENTIALS:
 						nt_status = NT_STATUS_WRONG_PASSWORD;
 						break;
+					case LDAP_UNWILLING_TO_PERFORM:
+						/* eDir returns this if the account was disabled. */
+						/* The problem is we don't know if the given
+						   password was correct for this account or
+						   not. We have to return more info than we
+						   should and tell the client NT_STATUS_ACCOUNT_DISABLED
+						   so they don't think the password was bad. JRA. */
+						nt_status = NT_STATUS_ACCOUNT_DISABLED;
+						break;
 					default:
 						break;
 				}