svn commit: samba r11221 - in branches/SAMBA_4_0/source/rpc_server/samr: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-20 10:29:41 +0000 (Thu, 20 Oct 2005)
New Revision: 11221

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

Log:
I don't quite know how I tested this before, but clearly I didn't.
The samdb_set_password_sid helper function now works.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c	2005-10-20 10:28:16 UTC (rev 11220)
+++ branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c	2005-10-20 10:29:41 UTC (rev 11221)
@@ -836,13 +836,14 @@
 	NTSTATUS nt_status;
 	struct ldb_dn *user_dn;
 	struct ldb_message *msg;
-	int count;
 	int ret;
 
 	user_dn = samdb_search_dn(ctx, mem_ctx, NULL, 
-				  "((objectSid=%s)(objectClass=user))", 
+				  "(&(objectSid=%s)(objectClass=user))", 
 				  ldap_encode_ndr_dom_sid(mem_ctx, user_sid));
-	if (count != 1) {
+	if (!user_dn) {
+		DEBUG(3, ("samdb_set_password_sid: SID %s not found in samdb, returning NO_SUCH_USER\n",
+			  dom_sid_string(mem_ctx, user_sid)));
 		return NT_STATUS_NO_SUCH_USER;
 	}