diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-13 00:55:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:50:57 -0500 |
| commit | e15136af9e208072137cb58fd6a0de894ce10505 (patch) | |
| tree | 90a58a5e82b5d45556de2f09a68daa626ef474bb /source4 | |
| parent | 7d90b3f802f1d3e0dd177901ebdda0bd756eae38 (diff) | |
| download | samba-e15136af9e208072137cb58fd6a0de894ce10505.tar.gz samba-e15136af9e208072137cb58fd6a0de894ce10505.tar.bz2 samba-e15136af9e208072137cb58fd6a0de894ce10505.zip | |
r12882: Allow the netbios name to be specified at all times.
Andrew Bartlett
(This used to be commit f4f4dcf217314980aa114d61a1546d2c18b55baa)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libnet/libnet_join.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 7a897b1280..65d264d0f3 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -1158,7 +1158,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, return NT_STATUS_INVALID_PARAMETER; } - if ((r->in.netbios_name != NULL) && (r->in.level != LIBNET_JOIN_AUTOMATIC)) { + if (r->in.netbios_name != NULL) netbios_name = r->in.netbios_name; } else { netbios_name = talloc_reference(tmp_mem, lp_netbios_name()); |