summaryrefslogtreecommitdiff
path: root/source4/libnet
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-03-19 08:11:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:07 -0500
commita25443dbebbe63da502fb2f36908eac9ac7605b9 (patch)
tree938e46b98944e5193b510960dd55296adc6a20b3 /source4/libnet
parent439056c1db31ff9b272febb4f5e178a7ef22225c (diff)
downloadsamba-a25443dbebbe63da502fb2f36908eac9ac7605b9.tar.gz
samba-a25443dbebbe63da502fb2f36908eac9ac7605b9.tar.bz2
samba-a25443dbebbe63da502fb2f36908eac9ac7605b9.zip
r5900: Use flatname to specify the netbios domain name (matches what win2k3
uses for trusted domain records) in the secrets join records. Andrew Bartlett (This used to be commit a6c502832c4ef471bd423b795f210abf3bb96ca5)
Diffstat (limited to 'source4/libnet')
-rw-r--r--source4/libnet/libnet_join.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 2a9311b663..f8acac8fb2 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -375,14 +375,14 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
/* search for the secret record */
ret = samdb_search(ldb,
mem_ctx, base_dn, &msgs, attrs,
- "(&(cn=%s)(objectclass=primaryDomain))",
+ "(&(flatname=%s)(objectclass=primaryDomain))",
r->generic.in.domain_name);
if (ret == 0) {
- msg->dn = talloc_asprintf(mem_ctx, "cn=%s,%s",
+ msg->dn = talloc_asprintf(mem_ctx, "flatname=%s,%s",
r->generic.in.domain_name,
base_dn);
- samdb_msg_add_string(ldb, mem_ctx, msg, "cn", r->generic.in.domain_name);
+ samdb_msg_add_string(ldb, mem_ctx, msg, "flatname", r->generic.in.domain_name);
samdb_msg_add_string(ldb, mem_ctx, msg, "objectClass", "primaryDomain");
samdb_msg_add_string(ldb, mem_ctx, msg, "secret", r2.generic.out.join_password);