Extend value_match to extract an asserted value from a full value

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index ebf130a0be1e142397c4dfa58a99a6a57522b3b1..66e90f79c660fad84871d89cfb8eed97023c34de 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -17,6 +17,7 @@
 
 #include "slap.h"
 #include "lutil.h"
+#include "ldif.h"
 
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
@@ -399,8 +400,30 @@ int main( int argc, char **argv )
 
 #ifdef HAVE_TLS
        rc = ldap_pvt_tls_init();
+       if( rc != 0) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                          "main: tls init failed: %d\n", rc ));
+#else
+               Debug( LDAP_DEBUG_ANY,
+                   "main: TLS init failed: %d\n",
+                   0, 0, 0 );
+#endif
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+               goto destroy;
+       }
 
-       if (rc || ldap_pvt_tls_init_def_ctx() != 0) {
+       rc = ldap_pvt_tls_init_def_ctx();
+       if( rc != 0) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                          "main: tls init def ctx failed: %d\n", rc ));
+#else
+               Debug( LDAP_DEBUG_ANY,
+                   "main: TLS init def ctx failed: %d\n",
+                   0, 0, 0 );
+#endif
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
                goto destroy;