r20065: make it possible to get the dns domain name and netbios domain name

of the join account

metze
(This used to be commit 45da80888f18f0fe10d1aeb9089a695125b184e1)

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 1102d8c55bee4e4ff4395de7c253b554bcdf18f9..3369dd5638ab440b2dd9a74bc47fea7ef39d277a 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -43,6 +43,8 @@ struct test_join {
        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 @@ struct test_join *torture_create_testuser(const char *username,
 
        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 @@ _PUBLIC_ struct test_join *torture_join_domain(const char *machine_name,
        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,6 +511,16 @@ const struct dom_sid *torture_join_user_sid(struct test_join *join)
        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;