From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 24 Nov 2008 14:04:12 +0000 (+0100)
Subject: s3:libads/ldap.c: return an error instead of crashing when no realm is given
X-Git-Tag: samba-4.0.0alpha6~480^2~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26461a72da5a646fcc6023bb4f82c66e17a8529b;p=thirdparty%2Fsamba.git

s3:libads/ldap.c: return an error instead of crashing when no realm is given

The bug was triggered by "net ads info -S 127.8.7.6" (where 127.8.7.6 doesn't ex
and "disable netbios = yes".

metze

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index f55cfa784a3..932e42e0766 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -301,11 +301,11 @@ static NTSTATUS ads_find_dc(ADS_STRUCT *ads)
 			if ( use_own_domain )
 				c_realm = lp_workgroup();
 		}
+	}
 
-		if ( !c_realm || !*c_realm ) {
-			DEBUG(0,("ads_find_dc: no realm or workgroup!  Don't know what to do\n"));
-			return NT_STATUS_INVALID_PARAMETER; /* rather need MISSING_PARAMETER ... */
-		}
+	if ( !c_realm || !*c_realm ) {
+		DEBUG(0,("ads_find_dc: no realm or workgroup!  Don't know what to do\n"));
+		return NT_STATUS_INVALID_PARAMETER; /* rather need MISSING_PARAMETER ... */
 	}
 
 	realm = c_realm;