amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-03 14:12:21 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 1219e8fa67b77e630542e3726e865fc1bb663c61

Browse Source 
Monotone-Revision: 8068894585ba2c44a0ab1631775f93f547ce5ff6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-04-02T20:51:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-04-02 20:51:46 +00:00
parent 9e45431cd0
commit f12689a73c
5 changed files with 136 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SOPE/sope-patchset-r1632.diff
+62
View File
@@ -1,3 +1,65 @@
Index: sope-ldap/NGLdap/NGLdapConnection.m
===================================================================
--- sope-ldap/NGLdap/NGLdapConnection.m (revision 1632)
+++ sope-ldap/NGLdap/NGLdapConnection.m (working copy)
@@ -219,6 +219,29 @@
return e;
}
+/* encryption */
+
+- (BOOL)useSSL
+{
+ BOOL rc;
+ int option;
+
+ if (self->handle != NULL) {
+ option = LDAP_OPT_X_TLS_HARD;
+ rc = (ldap_set_option(self->handle, LDAP_OPT_X_TLS, &option) == LDAP_SUCCESS);
+ }
+ else
+ rc = NO;
+
+ return rc;
+}
+
+- (BOOL)startTLS
+{
+ return (self->handle != NULL
+ && ldap_start_tls_s(self->handle, NULL, NULL) == LDAP_SUCCESS);
+}
+
/* binding */
- (BOOL)isBound {
Index: sope-ldap/NGLdap/ChangeLog
===================================================================
--- sope-ldap/NGLdap/ChangeLog (revision 1632)
+++ sope-ldap/NGLdap/ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2009-04-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
+
+ * NGLdapConnection.m (useSSL,startTLS): new method enabling
+ encryption on the LDAP connection.
+
2007-11-21 Helge Hess <helge.hess@opengroupware.org>
* NGLdapConnection.m: replaced some -cString calls with -UTF8String
Index: sope-ldap/NGLdap/NGLdapConnection.h
===================================================================
--- sope-ldap/NGLdap/NGLdapConnection.h (revision 1632)
+++ sope-ldap/NGLdap/NGLdapConnection.h (working copy)
@@ -53,6 +53,10 @@
- (NSString *)hostName;
- (int)port;
+/* encryption */
+- (BOOL)useSSL;
+- (BOOL)startTLS;
+
/* binding */
- (BOOL)isBound;
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
===================================================================
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1632)