summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd/proto-slap.h
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2008-12-02 15:29:31 +0000
committerRich Megginson <rmeggins@redhat.com>2008-12-02 15:29:31 +0000
commitda60a75c5fabda105b941751f6b0115ff734f3f9 (patch)
treed994a5046bdba6d3297fc250d7a13bd5fb4ec116 /ldap/servers/slapd/proto-slap.h
parent76bb2234d64962399a6070651eede8f85f0d7f23 (diff)
downloadds-da60a75c5fabda105b941751f6b0115ff734f3f9.tar.gz
ds-da60a75c5fabda105b941751f6b0115ff734f3f9.tar.xz
ds-da60a75c5fabda105b941751f6b0115ff734f3f9.zip
Resolves: bug 469261
Bug Description: Support server-to-server SASL - console chaining, server cleanup Reviewed by: nkinder (Thanks!) Fix Description: There are two sets of diffs here. The first set adds tls, gssapi, and digest to the chaining database (aka database link) panels in the console. I had to add support for revert to some of the code to make the Reset button work without having to retrieve the values from the server each time. We already store the original values locally in the _origModel - I added code to allow the use of that in the Reset button. The second set of diffs is for the server. 1) I had to add support for "SIMPLE" for bindMechanism - this translates to LDAP_SASL_SIMPLE for the actual mechanism. This value is NULL, so I had to add handling for NULL values in the cb config code (slapi_ch_* work fine with NULL values). 2) Added some more debugging/tracing code 3) The server to server SSL code would only work if the server were configured to be an SSL server. But for the server to be an SSL client, it only needs NSS initialized and to have the CA cert. It also needs to configured some of the SSL settings and install the correct policy. I changed the server code to do this. Platforms tested: RHEL5 Flag Day: no Doc impact: Yes
Diffstat (limited to 'ldap/servers/slapd/proto-slap.h')
-rw-r--r--ldap/servers/slapd/proto-slap.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 6f8a3da6..e088f7d1 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -899,9 +899,6 @@ void do_search( Slapi_PBlock *pb );
/*
* ssl.c
*/
-int slapd_SSL_client_init();
-int slapd_SSL_client_bind_s( LDAP* ld, char* DN, char* pw, int use_SSL, int LDAPv);
-int slapd_sasl_ext_client_bind( LDAP* ld, int **msgid);
int slapd_nss_init(int init_ssl, int config_available);
int slapd_ssl_init();
int slapd_ssl_init2(PRFileDesc **fd, int startTLS);