add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 56267449fd3fd3e148e1e7086e24e82e65438647..91887448df8db77dc31acd81f6001455b05c5f52 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -79,6 +79,12 @@ static struct {
        {"slappasswd", slappasswd},
        {"slaptest", slaptest},
        {"slapauth", slapauth},
+       /* 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}
 };
 
@@ -199,6 +205,7 @@ int main( int argc, char **argv )
        }
 #endif
        char    *serverNamePrefix = "";
+       size_t  l;
 
        sl_mem_init();
 
@@ -211,8 +218,6 @@ int main( int argc, char **argv )
                                MAIN_RETURN(rc);
                        }
                }
-
-               goto unrecognized_server_name;
        }
 
 #ifdef HAVE_NT_SERVICE_MANAGER
@@ -390,15 +395,26 @@ int main( int argc, char **argv )
                        break;
 
                case 'T':
-                       for (i=0; tools[i].name; i++) {
+                       /* 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);
+                                       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";
-unrecognized_server_name:;
                        fprintf( stderr, "program name \"%s%s\" unrecognized; "
                                        "aborting...\n", serverNamePrefix, serverName );
                        /* FALLTHRU */