Rework test suite to use run script.

[openldap] / servers / slurpd / slurp.h

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 54b7df03aae68e98e9bc12c528154eea9ba167ce..806c72f9214be005a6c2d1cf3bc56d1017808196 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -43,6 +43,7 @@
 #include "ldif.h"
 
 #ifdef HAVE_WINSOCK
+       /* should be moved to portable.h.nt */
 #define ftruncate(a,b) _chsize(a,b)
 #define truncate(a,b) _lclose( _lcreat(a, 0))
 #define S_IRGRP 0
@@ -64,9 +65,6 @@
 /* slurpd dump file - contents of rq struct are written here (debugging) */
 #define        SLURPD_DUMPFILE                 LDAP_TMPDIR LDAP_DIRSEP "slurpd.dump"
 
-/* default srvtab file.  Can be overridden */
-#define        SRVTAB                          "/etc/srvtab"
-
 /* Amount of time to sleep if no more work to do */
 #define        DEFAULT_NO_WORK_INTERVAL        3
 
@@ -84,11 +82,6 @@
 #define TLS_ON                 1
 #define TLS_CRITICAL   2
 
-/* We support simple (plaintext password) and SASL authentication */
-#define        AUTH_SIMPLE     1
-#define        AUTH_KERBEROS   2
-#define        AUTH_SASL 3
-
 /* Rejection records are prefaced with this string */
 #define        ERROR_STR       "ERROR"
 
@@ -117,8 +110,10 @@
 #define        T_MODOPREPLACE          9
 #define        T_MODOPDELETESTR        "delete"
 #define        T_MODOPDELETE           10
+#define        T_MODOPINCREMENTSTR     "increment"
+#define        T_MODOPINCREMENT        11
 #define        T_MODSEPSTR             "-"
-#define        T_MODSEP                11
+#define        T_MODSEP                12
 
 #define        T_NEWRDNSTR             "newrdn"
 #define        T_DELOLDRDNSTR  "deleteoldrdn"
@@ -128,6 +123,7 @@
 
 /* Config file keywords */
 #define        HOSTSTR                 "host"
+#define        URISTR                  "uri"
 #define        ATTRSTR                 "attr"
 #define        SUFFIXSTR               "suffix"
 #define        BINDDNSTR               "binddn"
@@ -214,6 +210,7 @@ struct ri {
     /* Private data */
     char       *ri_hostname;           /* canonical hostname of replica */
     int                ri_port;                /* port where slave slapd running */
+    char       *ri_uri;                /* e.g. "ldaps://ldap-1.example.com:636" */
     LDAP       *ri_ldp;                /* LDAP struct for this replica */
     int                ri_tls;                 /* TLS: 0=no, 1=yes, 2=critical */
     int                ri_bind_method;         /* AUTH_SIMPLE or AUTH_KERBEROS */
@@ -235,7 +232,6 @@ struct ri {
     int (*ri_process) LDAP_P(( Ri * ));        /* process the next repl entry */
     void (*ri_wake)   LDAP_P(( Ri * ));        /* wake up a sleeping thread */
 };
-    
 
 
 
@@ -244,12 +240,10 @@ struct ri {
  * be considered private to routines in re.c, and to routines in ri.c.
  */
 typedef struct mi {
-    
     /* Private data */
     char       *mi_type;               /* attr or type */
     char       *mi_val;                /* value */
     int                mi_len;                 /* length of mi_val */
-
 } Mi;
 
 
@@ -261,7 +255,6 @@ typedef struct mi {
  */
 typedef struct re Re;
 struct re {
-
     /* Private data */
     ldap_pvt_thread_mutex_t
                re_mutex;               /* mutex for this Re */