merge of '62a7456859ae701daeb595d318eaba439c816312'

and '94b9cd9ca57eca41ee588c8d41da668682bdb1d0'

Monotone-Parent: 62a7456859ae701daeb595d318eaba439c816312
Monotone-Parent: 94b9cd9ca57eca41ee588c8d41da668682bdb1d0
Monotone-Revision: c0fdc871e5cf2faadbed16ce1c4275647d0928b4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-06-23T20:04:46
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/LDAPSource.m

@@ -488,7 +488,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
 
   didBind = NO;
 
-  if ([_login length] > 0)
+  if ([_login length] > 0 && [_pwd length] > 0)
     {
       bindConnection = [[NGLdapConnection alloc] initWithHostName: hostname
 						 port: port];

SoObjects/SOGo/NSString+Utilities.m

@@ -21,7 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __OpenBSD__ 
 #include <crypt.h>
+#endif
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCharacterSet.h>

UI/WebServerResources/SOGoRootPage.js

@@ -61,7 +61,7 @@ function onLoginClick(event) {
     var password = $("password").value;
     var language = $("language");
 
-    if (userName.length > 0) {
+    if (userName.length > 0 && password.length > 0) {
         this.disabled = true;
         startAnimation($("animation"));