svn commit: samba r5955 - in branches/SAMBA_3_0/source/utils: .

[jerry at samba.org]

Author: jerry
Date: 2005-03-22 16:35:15 +0000 (Tue, 22 Mar 2005)
New Revision: 5955

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

Log:
BUG 2517: use the realm from smb.conf for 'net ads info' when 'disable netbios = yes'
Modified:
   branches/SAMBA_3_0/source/utils/net_ads.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_ads.c	2005-03-22 15:45:38 UTC (rev 5954)
+++ branches/SAMBA_3_0/source/utils/net_ads.c	2005-03-22 16:35:15 UTC (rev 5955)
@@ -94,8 +94,13 @@
 {
 	ADS_STRUCT *ads;
 
-	ads = ads_init(NULL, opt_target_workgroup, opt_host);
+	/* if netbios is disabled we have to default to the realm from smb.conf */
 
+	if ( lp_disable_netbios() && *lp_realm() )
+		ads = ads_init(lp_realm(), opt_target_workgroup, opt_host);
+	else
+		ads = ads_init(NULL, opt_target_workgroup, opt_host);
+
 	if (ads) {
 		ads->auth.flags |= ADS_AUTH_NO_BIND;
 	}