From e15136af9e208072137cb58fd6a0de894ce10505 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 13 Jan 2006 00:55:30 +0000 Subject: r12882: Allow the netbios name to be specified at all times. Andrew Bartlett (This used to be commit f4f4dcf217314980aa114d61a1546d2c18b55baa) --- source4/libnet/libnet_join.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); -- cgit