svn commit: samba r20065 - in branches/SAMBA_4_0/source/torture/rpc: .

metze at samba.org metze at samba.org
Thu Dec 7 15:27:19 GMT 2006


Author: metze
Date: 2006-12-07 15:27:18 +0000 (Thu, 07 Dec 2006)
New Revision: 20065

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

Log:
make it possible to get the dns domain name and netbios domain name
of the join account

metze
Modified:
   branches/SAMBA_4_0/source/torture/rpc/testjoin.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/testjoin.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/testjoin.c	2006-12-07 15:24:23 UTC (rev 20064)
+++ branches/SAMBA_4_0/source/torture/rpc/testjoin.c	2006-12-07 15:27:18 UTC (rev 20065)
@@ -43,6 +43,8 @@
 	struct policy_handle user_handle;
 	struct libnet_JoinDomain *libnet_r;
 	struct dom_sid *dom_sid;
+	const char *dom_netbios_name;
+	const char *dom_dns_name;
 	struct dom_sid *user_sid;
 };
 
@@ -166,6 +168,8 @@
 
 	talloc_steal(join, l.out.sid);
 	join->dom_sid = l.out.sid;
+	join->dom_netbios_name = talloc_strdup(join, domain);
+	if (!join->dom_netbios_name) goto failed;
 
 	o.in.connect_handle = &handle;
 	o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -338,6 +342,10 @@
 	tj->user_handle = *libnet_r->out.user_handle;
 	tj->dom_sid = libnet_r->out.domain_sid;
 	talloc_steal(tj, libnet_r->out.domain_sid);
+	tj->dom_netbios_name	= libnet_r->out.domain_name;
+	talloc_steal(tj, libnet_r->out.domain_name);
+	tj->dom_dns_name	= libnet_r->out.realm;
+	talloc_steal(tj, libnet_r->out.realm);
 
 	ZERO_STRUCT(u);
 	s.in.user_handle = &tj->user_handle;
@@ -503,7 +511,17 @@
 	return join->user_sid;
 }
 
+const char *torture_join_dom_netbios_name(struct test_join *join)
+{
+	return join->dom_netbios_name;
+}
 
+const char *torture_join_dom_dns_name(struct test_join *join)
+{
+	return join->dom_dns_name;
+}
+
+
 struct test_join_ads_dc {
 	struct test_join *join;
 };



More information about the samba-cvs mailing list