From 8cac68562a491235b0c45e440cc2695dc1504a3e Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 23 Jun 2011 13:34:50 +0000 Subject: [PATCH 1/3] Fix for bug #1260 Monotone-Parent: a7450cb20f9b7540324748f847e35d9eb3e1ba15 Monotone-Revision: b02226d59c16236b8e8eab6e22a7346f679f2ee7 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-06-23T13:34:50 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/NSString+Utilities.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index 19f372307..afc9d553a 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -21,7 +21,9 @@ * Boston, MA 02111-1307, USA. */ +#ifndef __OpenBSD__ #include +#endif #import #import From ca901e9b2ff903c80f8086a76532cc7649297527 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 23 Jun 2011 18:50:43 +0000 Subject: [PATCH 2/3] small sanity check Monotone-Parent: b02226d59c16236b8e8eab6e22a7346f679f2ee7 Monotone-Revision: dc5ddbbb3305b9f0cb8fe2e2044f0a2673ef24ca Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-06-23T18:50:43 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SOGoRootPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js index e335ed67f..f69ab0622 100644 --- a/UI/WebServerResources/SOGoRootPage.js +++ b/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")); From e0f6982de2e5ed406f499ac305fc565dcf2eac6f Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 23 Jun 2011 19:09:01 +0000 Subject: [PATCH 3/3] one more sanity check Monotone-Parent: dc5ddbbb3305b9f0cb8fe2e2044f0a2673ef24ca Monotone-Revision: 94b9cd9ca57eca41ee588c8d41da668682bdb1d0 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-06-23T19:09:01 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/LDAPSource.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 3ca5cce34..7e966fa46 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/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];