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

[abartlet at samba.org]

Author: abartlet
Date: 2005-07-21 08:34:54 +0000 (Thu, 21 Jul 2005)
New Revision: 8670

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

Log:
Remove GUID code from SAMR, it is handled lower down now.  I notice
this code also does string SIDs, but I'm not quite sure where that
fits in.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2005-07-21 08:32:07 UTC (rev 8669)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2005-07-21 08:34:54 UTC (rev 8670)
@@ -2025,8 +2025,7 @@
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	} else if (ret == 0) {
 		struct ldb_message *msg;
-		struct GUID guid;
-		const char *guidstr, *basedn, *sidstr;
+		const char *basedn, *sidstr;
 
 		sidstr = dom_sid_string(mem_ctx, r->in.sid);
 		NT_STATUS_HAVE_NO_MEMORY(sidstr);
@@ -2052,13 +2051,6 @@
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
 
-		/* a new GUID */
-		guid = GUID_random();
-		guidstr = GUID_string(mem_ctx, &guid);
-		if (!guidstr) {
-			return NT_STATUS_NO_MEMORY;
-		}
-
 		/* TODO: Hmmm. This feels wrong. How do I find the base dn to
 		 * put the ForeignSecurityPrincipals? d_state->domain_dn does
 		 * not work, this is wrong for the Builtin domain, there's no
@@ -2090,8 +2082,6 @@
 				     "foreignSecurityPrincipal");
 		samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg,
 				     "objectSid", sidstr);
-		samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg,
-				     "objectGUID", guidstr);
 		
 		/* create the alias */
 		ret = samdb_add(d_state->sam_ctx, mem_ctx, msg);