[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-134-g0c03232

[Andrew Tridgell]

The branch, master has been updated
       via  0c0323225948c33152357bf4202f17fc53aeccf4 (commit)
       via  78a5a5e665022c6625b18e2e99090f26e4edd2e9 (commit)
      from  c0efa5192956cfa7b53da54851409ec5cac07b8d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0c0323225948c33152357bf4202f17fc53aeccf4
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Sep 10 13:51:08 2009 +1000

    s4/drs: correctly fill in the GUID of DRS objects

commit 78a5a5e665022c6625b18e2e99090f26e4edd2e9
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Sep 10 13:50:46 2009 +1000

    s4: fix spelling

-----------------------------------------------------------------------

Summary of changes:
 source4/rpc_server/drsuapi/getncchanges.c |    2 +-
 source4/rpc_server/drsuapi/updaterefs.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index 6e65e31..17bc3ca 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -86,7 +86,7 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
 	obj->object.identifier = talloc(obj, struct drsuapi_DsReplicaObjectIdentifier);
 	obj_dn = ldb_msg_find_attr_as_dn(sam_ctx, obj, msg, "distinguishedName");
 	obj->object.identifier->dn = ldb_dn_get_linearized(obj_dn);
-	obj->object.identifier->guid = GUID_zero();
+	obj->object.identifier->guid = samdb_result_guid(msg, "objectGUID");
 	ZERO_STRUCT(obj->object.identifier->sid);
 
 	obj->object.attribute_ctr.num_attributes = obj->meta_data_ctr->count;
diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c
index 2090dd5..a7712de 100644
--- a/source4/rpc_server/drsuapi/updaterefs.c
+++ b/source4/rpc_server/drsuapi/updaterefs.c
@@ -234,7 +234,7 @@ WERROR dcesrv_drsuapi_DsReplicaUpdateRefs(struct dcesrv_call_state *dce_call, TA
 	}
 
 	req = &r->in.req.req1;
-	DEBUG(4,("DrReplicUpdateRefs for host '%s' with GUID %s options 0x%08x nc=%s\n",
+	DEBUG(4,("DsReplicaUpdateRefs for host '%s' with GUID %s options 0x%08x nc=%s\n",
 		 req->dest_dsa_dns_name, GUID_string(mem_ctx, &req->dest_dsa_guid),
 		 req->options,
 		 drs_ObjectIdentifier_to_string(mem_ctx, req->naming_context)));


-- 
Samba Shared Repository