Merge remote branch 'origin/mdb.master'

[openldap] / clients / tools / common.h

diff --git a/clients/tools/common.h b/clients/tools/common.h
index 9f917843f55f19ce5b7ffc96c4189b1371fdbc8f..27492ff6af07cb542b2535c470a45c817e4863cb 100644 (file)
--- a/clients/tools/common.h
+++ b/clients/tools/common.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@ typedef enum tool_type_t {
 
        TOOL_WHOAMI     = TOOL_EXOP | 0x100U,
        TOOL_PASSWD     = TOOL_EXOP | 0x200U,
+       TOOL_VC         = TOOL_EXOP | 0x400U,
 
        TOOL_WRITE      = (TOOL_ADD|TOOL_DELETE|TOOL_MODIFY|TOOL_MODRDN),
        TOOL_READ       = (TOOL_SEARCH|TOOL_COMPARE),
@@ -55,6 +56,7 @@ extern int            dont;
 extern int             referrals;
 extern int             verbose;
 extern int             ldif;
+extern ber_len_t       ldif_wrap;
 extern char            *prog;
 
 /* connection */
@@ -93,6 +95,12 @@ extern struct berval pr_cookie;
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
 extern int             chaining;
 #endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+extern ber_int_t       vlvPos;
+extern ber_int_t       vlvCount;
+extern struct berval   *vlvContext;
+
+/* options */
+extern struct timeval  nettimeout;
 
 /* Defined in common.c, set in main() */
 extern const char      __Version[];
@@ -111,6 +119,7 @@ LDAP *tool_conn_setup LDAP_P(( int dont, void (*private_setup)( LDAP * ) ));
 void tool_bind LDAP_P(( LDAP * ));
 void tool_unbind LDAP_P(( LDAP * ));
 void tool_destroy LDAP_P(( void ));
+void tool_exit LDAP_P(( LDAP *ld, int status )) LDAP_GCCATTR((noreturn));
 void tool_server_controls LDAP_P(( LDAP *, LDAPControl *, int ));
 int tool_check_abandon LDAP_P(( LDAP *ld, int msgid ));
 void tool_perror LDAP_P((