ITS#6003, #5916 fix ldap_back_entry_get_rw, no deref here

[openldap] / tests / progs / slapd-tester.c

diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index d24d3b9e4ee4248dfa454270fc1bcdf3b6117174..5534228c6b736b9352305c6da5c29db874cdc9f4 100644 (file)
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2007 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -140,7 +140,7 @@ main( int argc, char **argv )
        int             sextra_args = 0;
        char            scmd[MAXPATHLEN];
        /* static so that its address can be used in initializer below. */
-       static char     sloops[] = "18446744073709551615UL";
+       static char     sloops[LDAP_PVT_INTTYPE_CHARS(unsigned long)];
        /* read */
        char            *rfile = NULL;
        char            *rreqs[MAXREQS];
@@ -150,14 +150,14 @@ main( int argc, char **argv )
        int             ranum;
        int             rextra_args = 0;
        char            rcmd[MAXPATHLEN];
-       static char     rloops[] = "18446744073709551615UL";
+       static char     rloops[LDAP_PVT_INTTYPE_CHARS(unsigned long)];
        /* addel */
        char            *afiles[MAXREQS];
        int             anum = 0;
        char            *aargs[MAXARGS];
        int             aanum;
        char            acmd[MAXPATHLEN];
-       static char     aloops[] = "18446744073709551615UL";
+       static char     aloops[LDAP_PVT_INTTYPE_CHARS(unsigned long)];
        /* modrdn */
        char            *nfile = NULL;
        char            *nreqs[MAXREQS];
@@ -165,7 +165,7 @@ main( int argc, char **argv )
        char            *nargs[MAXARGS];
        int             nanum;
        char            ncmd[MAXPATHLEN];
-       static char     nloops[] = "18446744073709551615UL";
+       static char     nloops[LDAP_PVT_INTTYPE_CHARS(unsigned long)];
        /* modify */
        char            *mfile = NULL;
        char            *mreqs[MAXREQS];
@@ -174,7 +174,7 @@ main( int argc, char **argv )
        char            *margs[MAXARGS];
        int             manum;
        char            mcmd[MAXPATHLEN];
-       static char     mloops[] = "18446744073709551615UL";
+       static char     mloops[LDAP_PVT_INTTYPE_CHARS(unsigned long)];
        /* bind */
        char            *bfile = NULL;
        char            *breqs[MAXREQS];
@@ -184,7 +184,7 @@ main( int argc, char **argv )
        char            *bargs[MAXARGS];
        int             banum;
        char            bcmd[MAXPATHLEN];
-       static char     bloops[] = "18446744073709551615UL";
+       static char     bloops[LDAP_PVT_INTTYPE_CHARS(unsigned long)];
        char            **bargs_extra = NULL;
 
        char            *friendlyOpt = NULL;
@@ -896,12 +896,13 @@ main( int argc, char **argv )
                                bargs[banum - 3] = manager ? manager : "";
                                bargs[banum - 1] = passwd ? passwd : "";
 
-                               bargs[banum - 2] = "-b";
-                               bargs[banum - 1] = breqs[jj];
-                               bargs[banum + 0] = "-f";
-                               bargs[banum + 1] = bcreds[jj];
-                               bargs[banum + 2] = "-a";
-                               bargs[banum + 3] = battrs[jj];
+                               bargs[banum + 0] = "-b";
+                               bargs[banum + 1] = breqs[jj];
+                               bargs[banum + 2] = "-f";
+                               bargs[banum + 3] = bcreds[jj];
+                               bargs[banum + 4] = "-a";
+                               bargs[banum + 5] = battrs[jj];
+                               bargs[banum + 6] = NULL;
 
                        } else {
                                bargs[banum - 3] = breqs[jj];
@@ -1077,6 +1078,13 @@ fork_child( char *prog, char **args )
 #endif
                execvp( prog, args );
                tester_perror( "execvp", NULL );
+               { int i;
+                       for (i=0; args[i]; i++);
+                       fprintf(stderr,"%d args\n", i);
+                       for (i=0; args[i]; i++)
+                               fprintf(stderr,"%d %s\n", i, args[i]);
+               }
+
                exit( EXIT_FAILURE );
                break;