diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-11-13 11:53:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:24 -0500 |
| commit | 3994f382263dbc199127b76c8e354b991da11188 (patch) | |
| tree | 020098e789b203b6fa4ef9d0fa8b203978947236 | |
| parent | 32cf16f3cfaf52414c324c0a333ff29cb9a326aa (diff) | |
| download | samba-3994f382263dbc199127b76c8e354b991da11188.tar.gz samba-3994f382263dbc199127b76c8e354b991da11188.tar.bz2 samba-3994f382263dbc199127b76c8e354b991da11188.zip | |
r11707: alt_names[i] might be NULL for i>0 also...
Volker
(This used to be commit c8b67c2448b09b3386a5b35ed279c134d7a3ba32)
| -rw-r--r-- | source3/nsswitch/winbindd_misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c index 4afc525b30..ec8bacc474 100644 --- a/source3/nsswitch/winbindd_misc.c +++ b/source3/nsswitch/winbindd_misc.c @@ -134,7 +134,8 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain * for (i=1; i<num_domains; i++) extra_data = talloc_asprintf(state->mem_ctx, "%s\n%s\\%s\\%s", extra_data, - names[i], alt_names[i], + names[i], + alt_names[i] ? alt_names[i] : names[i], sid_string_static(&sids[i])); /* This is a bit excessive, but the extra data sooner or later will be |