[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3191-g8fc213f

[Michael Adam]

The branch, v3-2-test has been updated
       via  8fc213fcd4c5a6ddaa0d44965bcd0ca1afbbbc84 (commit)
      from  4c82a8dd2f6fae1ea1722108c7f64e6a1286df15 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 8fc213fcd4c5a6ddaa0d44965bcd0ca1afbbbc84
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 24 15:07:56 2008 +0100

    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 exist)
    and "disable netbios = yes".
    
    metze
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit e2a60d2e1fd7455f08e73f8d1c513ca240c0f0af)

-----------------------------------------------------------------------

Summary of changes:
 source/libads/ldap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index fa27415..a834773 100644
--- a/source/libads/ldap.c
+++ b/source/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;


-- 
Samba Shared Repository