svn commit: samba r12258 - in branches/SAMBA_3_0_RELEASE/source: passdb rpc_server

[jerry at samba.org]

Author: jerry
Date: 2005-12-15 17:53:59 +0000 (Thu, 15 Dec 2005)
New Revision: 12258

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

Log:
Merging from SAMBA_3_0

* fixing alias description initialization
* deal with LDAP_UNWILLING_TO_PERFORM from eDirectory



Modified:
   branches/SAMBA_3_0_RELEASE/source/passdb/pdb_nds.c
   branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/passdb/pdb_nds.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/passdb/pdb_nds.c	2005-12-15 17:45:19 UTC (rev 12257)
+++ branches/SAMBA_3_0_RELEASE/source/passdb/pdb_nds.c	2005-12-15 17:53:59 UTC (rev 12258)
@@ -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;
 				}

Modified: branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c	2005-12-15 17:45:19 UTC (rev 12257)
+++ branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c	2005-12-15 17:53:59 UTC (rev 12258)
@@ -4431,6 +4431,8 @@
 					ctr->alias.info3.description.string, 
 					sizeof(info.acct_desc)-1 );
 			}
+			else
+				fstrcpy( info.acct_desc, "" );
 			break;
 		default:
 			return NT_STATUS_INVALID_INFO_CLASS;