X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fprogs%2Fslapd-common.h;h=d36c7e13c05cc4aef80b343ea4af9f9350b3e9aa;hb=59e9ff6243465640956b58ad1756a3ede53eca7c;hp=7ecb203501ac662f4fbd01730ea1590df479f52b;hpb=d490fd9f794be8866605998e7eff5add81f13ac9;p=openldap

diff --git a/tests/progs/slapd-common.h b/tests/progs/slapd-common.h
index 7ecb203501..d36c7e13c0 100644
--- a/tests/progs/slapd-common.h
+++ b/tests/progs/slapd-common.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2015 The OpenLDAP Foundation.
+ * Copyright 1999-2018 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@ typedef enum {
 	TESTER_LAST
 } tester_t;
 
-extern void tester_init( const char *pname, tester_t ptype );
+extern struct tester_conn_args * tester_init( const char *pname, tester_t ptype );
 extern char * tester_uri( char *uri, char *host, int port );
 extern void tester_error( const char *msg );
 extern void tester_perror( const char *fname, const char *msg );
@@ -39,6 +39,53 @@ extern void tester_ldap_error( LDAP *ld, const char *fname, const char *msg );
 extern int tester_ignore_str2errlist( const char *err );
 extern int tester_ignore_err( int err );
 
+struct tester_conn_args {
+	char *uri, *host;
+	int port;
+
+	int outerloops;
+	int loops;
+	int retries;
+	int delay;
+
+	int chaserefs;
+
+	int authmethod;
+
+	char *binddn;
+	struct berval pass;
+
+#ifdef HAVE_CYRUS_SASL
+	char *mech;
+	char *realm;
+	char *authz_id;
+	char *authc_id;
+	char *secprops;
+	void *defaults;
+#endif
+};
+
+#define TESTER_INIT_ONLY (1 << 0)
+#define TESTER_COMMON_OPTS "CD:d:H:h:L:l:i:O:p:R:U:X:Y:r:t:w:x"
+#define TESTER_COMMON_HELP \
+	"[-C] " \
+	"[-D <dn> [-w <passwd>]] " \
+	"[-d <level>] " \
+	"[-H uri | -h <host> [-p port]] " \
+	"[-i <ignore>] " \
+	"[-l <loops>] " \
+	"[-L <outerloops>] " \
+	"[-r <maxretries>] " \
+	"[-t <delay>] " \
+	"[-O <SASL secprops>] " \
+	"[-R <SASL realm>] " \
+	"[-U <SASL authcid> [-X <SASL authzid>]] " \
+	"[-x | -Y <SASL mech>] "
+
+extern int tester_config_opt( struct tester_conn_args *config, char opt, char *optarg );
+extern void tester_config_finish( struct tester_conn_args *config );
+extern void tester_init_ld( LDAP **ldp, struct tester_conn_args *conf, int flags );
+
 extern pid_t		pid;
 
 #endif /* SLAPD_COMMON_H */