svn commit: samba r11199 - in branches/SAMBA_4_0/source/auth/gensec: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-20 03:38:01 +0000 (Thu, 20 Oct 2005)
New Revision: 11199

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

Log:
Push an objectSid into the schannel state database, to match the new header.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/gensec/schannel_state.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/schannel_state.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/schannel_state.c	2005-10-20 03:34:49 UTC (rev 11198)
+++ branches/SAMBA_4_0/source/auth/gensec/schannel_state.c	2005-10-20 03:38:01 UTC (rev 11199)
@@ -71,7 +71,6 @@
 	struct ldb_val val, seed;
 	char *f;
 	char *sct;
-	char *rid;
 	int ret;
 
 	ldb = schannel_db_connect(mem_ctx);
@@ -93,13 +92,6 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	rid = talloc_asprintf(mem_ctx, "%u", (unsigned int)creds->rid);
-
-	if (rid == NULL) {
-		talloc_free(ldb);
-		return NT_STATUS_NO_MEMORY;
-	}
-
 	msg = ldb_msg_new(ldb);
 	if (msg == NULL) {
 		talloc_free(ldb);
@@ -126,7 +118,7 @@
 	ldb_msg_add_string(msg, "accountName", creds->account_name);
 	ldb_msg_add_string(msg, "computerName", creds->computer_name);
 	ldb_msg_add_string(msg, "flatname", creds->domain);
-	ldb_msg_add_string(msg, "rid", rid);
+	samdb_msg_add_dom_sid(ldb, mem_ctx, msg, "objectSid", creds->sid);
 
 	ldb_delete(ldb, msg->dn);
 
@@ -209,7 +201,7 @@
 
 	(*creds)->domain = talloc_reference(*creds, ldb_msg_find_string(res[0], "flatname", NULL));
 
-	(*creds)->rid = ldb_msg_find_uint(res[0], "rid", 0);
+	(*creds)->sid = samdb_result_dom_sid(*creds, res[0], "objectSid");
 
 	talloc_free(ldb);