Use AC_STRERROR_R

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index a0cd1380dbff630f260137c6e0e088eac12f9545..0fdef6bc8702a406b0c7d725b848d8f71a4d4421 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -65,7 +65,8 @@ static struct sockaddr_in     bind_addr;
 #endif
 
 typedef int (MainFunc) LDAP_P(( int argc, char *argv[] ));
-extern MainFunc slapadd, slapcat, slapdn, slapindex, slappasswd, slaptest;
+extern MainFunc slapadd, slapcat, slapdn, slapindex, slappasswd,
+       slaptest, slapauth, slapacl;
 
 static struct {
        char *name;
@@ -77,6 +78,14 @@ static struct {
        {"slapindex", slapindex},
        {"slappasswd", slappasswd},
        {"slaptest", slaptest},
+       {"slapauth", slapauth},
+       {"slapacl", slapacl},
+       /* NOTE: new tools must be added in chronological order,
+        * not in alphabetical order, because for backwards
+        * compatibility name[4] is used to identify the
+        * tools; so name[4]=='a' must refer to "slapadd" and
+        * not to "slapauth".  Alphabetical order can be used
+        * for tools whose name[4] is not used yet */
        {NULL, NULL}
 };
 
@@ -123,6 +132,8 @@ static int   cnvt_str2int( char *, STRDISP_P, int );
 static int check = CHECK_NONE;
 static int version = 0;
 
+void *slap_tls_ctx;
+
 static void
 usage( char *name )
 {
@@ -131,7 +142,8 @@ usage( char *name )
        fprintf( stderr,
                "\t-4\t\tIPv4 only\n"
                "\t-6\t\tIPv6 only\n"
-               "\t-T {acdipt}\tRun in Tool mode\n"
+               "\t-T {add|auth|cat|dn|index|passwd|test}\n"
+               "\t\t\tRun in Tool mode\n"
                "\t-c cookie\tSync cookie of consumer\n"
                "\t-d level\tDebug level" "\n"
                "\t-f filename\tConfiguration file\n"
@@ -185,7 +197,7 @@ int main( int argc, char **argv )
        char        *serverName;
        int         serverMode = SLAP_SERVER_MODE;
 
-       struct berval cookie = { 0, NULL };
+       struct berval cookie = BER_BVNULL;
        struct sync_cookie *scp = NULL;
        struct sync_cookie *scp_entry = NULL;
 
@@ -195,8 +207,10 @@ int main( int argc, char **argv )
                leakfile = stderr;
        }
 #endif
+       char    *serverNamePrefix = "";
+       size_t  l;
 
-       sl_mem_init();
+       slap_sl_mem_init();
 
        serverName = lutil_progname( "slapd", argc, argv );
 
@@ -384,12 +398,28 @@ int main( int argc, char **argv )
                        break;
 
                case 'T':
-                       for (i=0; tools[i].name; i++) {
-                               if ( optarg[0] == tools[i].name[4] ) {
-                                       rc = tools[i].func(argc, argv);
-                                       MAIN_RETURN(rc);
+                       /* try full option string first */
+                       for ( i = 0; tools[i].name; i++ ) {
+                               if ( strcmp( optarg, &tools[i].name[4] ) == 0 ) {
+                                       rc = tools[i].func( argc, argv );
+                                       MAIN_RETURN( rc );
+                               }
+                       }
+
+                       /* try bits of option string (backward compatibility for single char) */
+                       l = strlen( optarg );
+                       for ( i = 0; tools[i].name; i++ ) {
+                               if ( strncmp( optarg, &tools[i].name[4], l ) == 0 ) {
+                                       rc = tools[i].func( argc, argv );
+                                       MAIN_RETURN( rc );
                                }
                        }
+                       
+                       /* issue error */
+                       serverName = optarg;
+                       serverNamePrefix = "slap";
+                       fprintf( stderr, "program name \"%s%s\" unrecognized; "
+                                       "aborting...\n", serverNamePrefix, serverName );
                        /* FALLTHRU */
                default:
                        usage( argv[0] );
@@ -594,18 +624,32 @@ int main( int argc, char **argv )
                goto destroy;
        }
 
-       rc = ldap_pvt_tls_init_def_ctx();
-       if( rc != 0) {
+       {
+               void *def_ctx = NULL;
+
+               /* Save existing default ctx, if any */
+               ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &def_ctx );
+
+               /* Force new ctx to be created */
+               ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, NULL );
+
+               rc = ldap_pvt_tls_init_def_ctx();
+               if( rc != 0) {
 #ifdef NEW_LOGGING
-               LDAP_LOG( SLAPD, CRIT, "main: tls init def ctx failed: %d\n", rc, 0, 0 );
+                       LDAP_LOG( SLAPD, CRIT, "main: tls init def ctx failed: %d\n", rc, 0, 0 );
 #else
-               Debug( LDAP_DEBUG_ANY,
-                   "main: TLS init def ctx failed: %d\n",
-                   rc, 0, 0 );
+                       Debug( LDAP_DEBUG_ANY,
+                           "main: TLS init def ctx failed: %d\n",
+                           rc, 0, 0 );
 #endif
-               rc = 1;
-               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
-               goto destroy;
+                       rc = 1;
+                       SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+                       goto destroy;
+               }
+               /* Retrieve slapd's own ctx */
+               ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &slap_tls_ctx );
+               /* Restore previous ctx */
+               ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, def_ctx );
        }
 #endif