diff options
| author | Günther Deschner <gd@samba.org> | 2008-05-16 12:16:04 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-05-16 12:16:04 +0200 |
| commit | 6b2af349cfb7b434fd0e8b1ae6f15b49688d326d (patch) | |
| tree | f21e253437205485a90b14326af06225b55d9777 /source3 | |
| parent | 0b25870b547efdd954ac343c1a753d853a75ba67 (diff) | |
| download | samba-6b2af349cfb7b434fd0e8b1ae6f15b49688d326d.tar.gz samba-6b2af349cfb7b434fd0e8b1ae6f15b49688d326d.tar.bz2 samba-6b2af349cfb7b434fd0e8b1ae6f15b49688d326d.zip | |
libnetjoin: for informational reasons, report forest_name.
Guenther
(This used to be commit 452a9ea4af19d3aebc35929edaf4e5adf8c1fd11)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libnet/libnet_join.c | 1 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/libnet_join.h | 2 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/ndr_libnet_join.c | 2 | ||||
| -rw-r--r-- | source3/librpc/idl/libnet_join.idl | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 4cfdd50473..6426dc3079 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -689,6 +689,7 @@ static NTSTATUS libnet_join_lookup_dc_rpc(TALLOC_CTX *mem_ctx, r->out.domain_is_ad = true; r->out.netbios_domain_name = info->dns.name.string; r->out.dns_domain_name = info->dns.dns_domain.string; + r->out.forest_name = info->dns.dns_forest.string; r->out.domain_sid = info->dns.sid; } diff --git a/source3/librpc/gen_ndr/libnet_join.h b/source3/librpc/gen_ndr/libnet_join.h index e5ec438bb5..f4c44e4e2e 100644 --- a/source3/librpc/gen_ndr/libnet_join.h +++ b/source3/librpc/gen_ndr/libnet_join.h @@ -35,6 +35,7 @@ struct libnet_JoinCtx { const char * account_name; const char * netbios_domain_name; const char * dns_domain_name; + const char * forest_name; const char * dn; struct dom_sid *domain_sid;/* [ref] */ uint8_t modified_config; @@ -66,6 +67,7 @@ struct libnet_UnjoinCtx { struct { const char * netbios_domain_name; const char * dns_domain_name; + const char * forest_name; uint8_t modified_config; const char * error_string; uint8_t disabled_machine_account; diff --git a/source3/librpc/gen_ndr/ndr_libnet_join.c b/source3/librpc/gen_ndr/ndr_libnet_join.c index 753859f0ed..a9241f61e1 100644 --- a/source3/librpc/gen_ndr/ndr_libnet_join.c +++ b/source3/librpc/gen_ndr/ndr_libnet_join.c @@ -50,6 +50,7 @@ _PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print *ndr, const char *name, ndr_print_string(ndr, "account_name", r->out.account_name); ndr_print_string(ndr, "netbios_domain_name", r->out.netbios_domain_name); ndr_print_string(ndr, "dns_domain_name", r->out.dns_domain_name); + ndr_print_string(ndr, "forest_name", r->out.forest_name); ndr_print_string(ndr, "dn", r->out.dn); ndr_print_ptr(ndr, "domain_sid", r->out.domain_sid); ndr->depth++; @@ -104,6 +105,7 @@ _PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print *ndr, const char *name ndr->depth++; ndr_print_string(ndr, "netbios_domain_name", r->out.netbios_domain_name); ndr_print_string(ndr, "dns_domain_name", r->out.dns_domain_name); + ndr_print_string(ndr, "forest_name", r->out.forest_name); ndr_print_uint8(ndr, "modified_config", r->out.modified_config); ndr_print_string(ndr, "error_string", r->out.error_string); ndr_print_uint8(ndr, "disabled_machine_account", r->out.disabled_machine_account); diff --git a/source3/librpc/idl/libnet_join.idl b/source3/librpc/idl/libnet_join.idl index 7f6e346455..5af6b05433 100644 --- a/source3/librpc/idl/libnet_join.idl +++ b/source3/librpc/idl/libnet_join.idl @@ -35,6 +35,7 @@ interface libnetjoin [out] string account_name, [out] string netbios_domain_name, [out] string dns_domain_name, + [out] string forest_name, [out] string dn, [out] dom_sid *domain_sid, [out] boolean8 modified_config, @@ -58,6 +59,7 @@ interface libnetjoin [in,noprint] messaging_context *msg_ctx, [out] string netbios_domain_name, [out] string dns_domain_name, + [out] string forest_name, [out] boolean8 modified_config, [out] string error_string, [out] boolean8 disabled_machine_account, |