some code cleanups

[sope] / sope-ldap / NGLdap / NGLdapConnection.m

diff --git a/sope-ldap/NGLdap/NGLdapConnection.m b/sope-ldap/NGLdap/NGLdapConnection.m
index 3cb3d4e07f459fc3e3aa444deb944b4b674f945f..6634ade955341cc4b8ff24cd809909e67e00b694 100644 (file)
--- a/sope-ldap/NGLdap/NGLdapConnection.m
+++ b/sope-ldap/NGLdap/NGLdapConnection.m
@@ -1,20 +1,20 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
@@ -943,6 +943,11 @@ static void freeMods(LDAPMod **mods) {
   if (LDAPDebugEnabled)
     [self logWithFormat:@"check pwd of login '%@' on %@", _login, _baseDN];
   
+  if ([_pwd length] == 0) {
+    if (LDAPDebugEnabled) [self logWithFormat:@"  no password provided."];
+    return NO;
+  }
+  
   if (self->handle == NULL) {
     if (![self _reinit]) {
       NSLog(@"%s: _reinit failed...:", __PRETTY_FUNCTION__);
@@ -970,8 +975,10 @@ static void freeMods(LDAPMod **mods) {
   */
 
   didBind = NO;
-  NS_DURING
+  NS_DURING {
+    /* Note: beware: do _not_ use empty passwords! (unauthenticated binds) */
     didBind = [self bindWithMethod:@"simple" binddn:strDN credentials:_pwd];
+  }
   NS_HANDLER
     didBind = NO;
   NS_ENDHANDLER;
@@ -999,6 +1006,10 @@ static void freeMods(LDAPMod **mods) {
     NSLog(@"LDAP: check pwd of login '%@' on %@,%i,%@ ...",
           _login, _hostName, _port, _baseDN);
   }
+  if ([_pwd length] == 0) {
+    if (LDAPDebugEnabled) [self logWithFormat:@"  no password provided."];
+    return NO;
+  }
   
   if ((ldap = [[self alloc] initWithHostName:_hostName port:_port]) == nil) {
     if (LDAPDebugEnabled)