summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-01-02 22:14:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:52 -0500
commit3063738c240260ebca63d037a69d2c02603db4b5 (patch)
tree6f24ea1ee4fd281fd151b791d37caea7da31001f /source3
parentb2317c097954844af4a0596fea507f0139d14465 (diff)
downloadsamba-3063738c240260ebca63d037a69d2c02603db4b5.tar.gz
samba-3063738c240260ebca63d037a69d2c02603db4b5.tar.bz2
samba-3063738c240260ebca63d037a69d2c02603db4b5.zip
r20489: Missed patch ofthe forest_name patch for lookupname
(This used to be commit 25c4ebb55f425816e033491138f1216125de6edb)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd_cm.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index f743d7a555..3f61da12dc 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -1480,7 +1480,8 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
char *domain_name = NULL;
char *dns_name = NULL;
- DOM_SID *dom_sid = NULL;
+ char *forest_name = NULL;
+ DOM_SID *dom_sid = NULL;
ZERO_STRUCT( ctr );
@@ -1545,7 +1546,7 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
to determine that the DC is active directory */
result = rpccli_lsa_query_info_policy2(cli, mem_ctx, &pol,
12, &domain_name,
- &dns_name, NULL,
+ &dns_name, &forest_name,
NULL, &dom_sid);
}
@@ -1558,6 +1559,9 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
if (dns_name)
fstrcpy(domain->alt_name, dns_name);
+ if ( forest_name )
+ fstrcpy(domain->forest_name, forest_name);
+
if (dom_sid)
sid_copy(&domain->sid, dom_sid);
} else {
@@ -1584,10 +1588,10 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
}
done:
- DEBUG(5, ("set_dc_type_and_flags: domain %s is %snative mode.\n",
+ DEBUG(5, ("set_dc_type_and_flags: domain %s is %sin native mode.\n",
domain->name, domain->native_mode ? "" : "NOT "));
- DEBUG(5,("set_dc_type_and_flags: domain %s is %sactive directory.\n",
+ DEBUG(5,("set_dc_type_and_flags: domain %s is %srunning active directory.\n",
domain->name, domain->active_directory ? "" : "NOT "));
cli_rpc_pipe_close(cli);