add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / slapcommon.c

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 4944272d911a73c9924d788d1c29a7e1848a16d9..857d4228486e6f55b6fc5a44dbf527c9bc1da705 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -69,6 +69,10 @@ usage( int tool, const char *progname )
        case SLAPINDEX:
                options = "\t[-n databasenumber | -b suffix]\n";
                break;
+
+       case SLAPAUTH:
+               options = "\t[-U authcID] [-X authzID] ID [...]\n";
+               break;
        }
 
        if ( options != NULL ) {
@@ -94,7 +98,7 @@ slap_tool_init(
 {
        char *options;
        char *conffile = SLAPD_DEFAULT_CONFIGFILE;
-       struct berval base = { 0, NULL };
+       struct berval base = BER_BVNULL;
        char *subtree = NULL;
        char *ldiffile  = NULL;
        int rc, i, dbnum;
@@ -102,7 +106,7 @@ slap_tool_init(
        int truncatemode = 0;
 
 #ifdef CSRIMALLOC
-       leakfilename = malloc( strlen( progname ) + sizeof(".leak") );
+       leakfilename = malloc( strlen( progname ) + STRLEOF( ".leak" ) - 1 );
        sprintf( leakfilename, "%s.leak", progname );
        if( ( leakfile = fopen( leakfilename, "w" )) == NULL ) {
                leakfile = stderr;
@@ -125,6 +129,10 @@ slap_tool_init(
                options = "d:f:v";
                break;
 
+       case SLAPAUTH:
+               options = "d:f:U:vX:";
+               break;
+
        case SLAPINDEX:
                options = "b:cd:f:n:v";
                mode |= SLAP_TOOL_READMAIN;
@@ -140,8 +148,7 @@ slap_tool_init(
        while ( (i = getopt( argc, argv, options )) != EOF ) {
                switch ( i ) {
                case 'b':
-                       base.bv_val = strdup( optarg );
-                       base.bv_len = strlen( base.bv_val );
+                       ber_str2bv( optarg, 0, 1, &base );
                        break;
 
                case 'c':       /* enable continue mode */
@@ -210,6 +217,10 @@ slap_tool_init(
                        mode |= SLAP_TRUNCATE_MODE;
                        break;
 
+               case 'U':
+                       ber_str2bv( optarg, 0, 0, &authcID );
+                       break;
+
                case 'u':       /* dry run */
                        dryrun++;
                        break;
@@ -227,6 +238,10 @@ slap_tool_init(
                        update_ctxcsn = SLAP_TOOL_CTXCSN_BATCH;
                        break;
 
+               case 'X':
+                       ber_str2bv( optarg, 0, 0, &authzID );
+                       break;
+
                default:
                        usage( tool, progname );
                        break;
@@ -257,6 +272,12 @@ slap_tool_init(
                }
                break;
 
+       case SLAPAUTH:
+               if ( argc == optind && BER_BVISNULL( &authcID ) ) {
+                       usage( tool, progname );
+               }
+               break;
+
        case SLAPTEST:
                if ( argc != optind ) {
                        usage( tool, progname );
@@ -350,21 +371,24 @@ slap_tool_init(
        case SLAPTEST:
                return;
 
+       case SLAPAUTH:
+               be = NULL;
+               goto startup;
+
        default:
                break;
        }
 
        if( subtree ) {
                struct berval val;
-               val.bv_val = subtree;
-               val.bv_len = strlen( subtree );
+               ber_str2bv( subtree, 0, 0, &val );
                rc = dnNormalize( 0, NULL, NULL, &val, &sub_ndn, NULL );
                if( rc != LDAP_SUCCESS ) {
                        fprintf( stderr, "Invalid subtree DN '%s'\n", optarg );
                        exit( EXIT_FAILURE );
                }
 
-               if( base.bv_val == NULL && dbnum == -1 )
+               if ( BER_BVISNULL( &base ) && dbnum == -1 )
                        base = val;
                else
                        free( subtree );
@@ -444,6 +468,8 @@ slap_tool_init(
                be = &backends[dbnum];
        }
 
+startup:;
+
 #ifdef CSRIMALLOC
        mal_leaktrace(1);
 #endif