summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-10-03 17:33:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:04:50 -0500
commit3d081be06b1d2b57d7125b98ee0d6c7ef3fe552e (patch)
tree51f7f86246b13f0334a24c2e8ccf4af58406df5a /source3
parent75a29f80eb86386c7a320b3ce4d417803ec8910f (diff)
downloadsamba-3d081be06b1d2b57d7125b98ee0d6c7ef3fe552e.tar.gz
samba-3d081be06b1d2b57d7125b98ee0d6c7ef3fe552e.tar.bz2
samba-3d081be06b1d2b57d7125b98ee0d6c7ef3fe552e.zip
r10688: Fix from Volker for bugid #3068 - winbindd crash with
alt_names. Jeremy. (This used to be commit 35dda6920c9e318726473b6bc9d8495cf8f7b7cc)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd_misc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c
index 83c4c0f6ee..4afc525b30 100644
--- a/source3/nsswitch/winbindd_misc.c
+++ b/source3/nsswitch/winbindd_misc.c
@@ -127,7 +127,8 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
if (num_domains > 0)
extra_data = talloc_asprintf(state->mem_ctx, "%s\\%s\\%s",
- names[0], alt_names[0],
+ names[0],
+ alt_names[0] ? alt_names[0] : names[0],
sid_string_static(&sids[0]));
for (i=1; i<num_domains; i++)