svn commit: samba r12882 - in branches/SAMBA_4_0/source/libnet: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-01-13 00:55:30 +0000 (Fri, 13 Jan 2006)
New Revision: 12882

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12882

Log:
Allow the netbios name to be specified at all times.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libnet/libnet_join.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_join.c	2006-01-13 00:54:53 UTC (rev 12881)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c	2006-01-13 00:55:30 UTC (rev 12882)
@@ -1158,7 +1158,7 @@
 		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());