X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fslurp.h;h=f97d8b8ab9919728a98f17f0d0d19749244d773c;hb=3eb53370201fd41923f82b18226d504aec376362;hp=f1f54b35c04623e67f1cc19f2f1dc3fcfa8eaace;hpb=27ebe8534ae213895cd222dca47564f1d82e22cd;p=openldap

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index f1f54b35c0..f97d8b8ab9 100644
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -1,6 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -10,13 +22,17 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 /* slurp.h - Standalone Ldap Update Replication Daemon (slurpd) */
 
 #ifndef _SLURPD_H_
 #define _SLURPD_H_
 
-#ifndef LDAP_SYSLOG
+#if !defined(HAVE_WINSOCK) && !defined(LDAP_SYSLOG)
 #define LDAP_SYSLOG 1
 #endif
 
@@ -38,6 +54,16 @@
 #include "ldap_defaults.h"
 #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
+#define S_IWGRP 0
+#endif
+
+#undef SERVICE_NAME
+#define SERVICE_NAME	OPENLDAP_PACKAGE "-slurpd"
 
 /* Default directory for slurpd's private copy of replication logs */
 #define	DEFAULT_SLURPD_REPLICA_DIR	LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"
@@ -51,9 +77,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
 
@@ -66,9 +89,10 @@
 /* Maximum line length we can read from replication log */
 #define	REPLBUFLEN			256
 
-/* We support simple (plaintext password) and kerberos authentication */
-#define	AUTH_SIMPLE	1
-#define	AUTH_KERBEROS	2
+/* TLS flags */
+#define TLS_OFF			0
+#define TLS_ON			1
+#define TLS_CRITICAL	2
 
 /* Rejection records are prefaced with this string */
 #define	ERROR_STR	"ERROR"
@@ -98,8 +122,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"
@@ -109,27 +135,41 @@
 
 /* Config file keywords */
 #define	HOSTSTR			"host"
+#define	URISTR			"uri"
+#define	ATTRSTR			"attr"
+#define	SUFFIXSTR		"suffix"
 #define	BINDDNSTR		"binddn"
 #define	BINDMETHSTR		"bindmethod"
 #define	KERBEROSSTR		"kerberos"
 #define	SIMPLESTR		"simple"
+#define	SASLSTR			"sasl"
 #define	CREDSTR			"credentials"
-#define BINDPSTR		"bindprincipal"
+#define	OLDAUTHCSTR		"bindprincipal"
+#define	AUTHCSTR		"authcID"
+#define	AUTHZSTR		"authzID"
 #define	SRVTABSTR		"srvtab"
+#define	SASLMECHSTR		"saslmech"
+#define	REALMSTR		"realm"
+#define	SECPROPSSTR		"secprops"
+#define STARTTLSSTR		"starttls"
+#define TLSSTR			"tls"
+#define CRITICALSTR		"critical"
 
 #define	REPLICA_SLEEP_TIME	( 10 )
 
 /* Enumeration of various types of bind failures */
-#define BIND_OK 			0
-#define BIND_ERR_BADLDP			1
-#define	BIND_ERR_OPEN			2
-#define	BIND_ERR_BAD_ATYPE		3
+#define BIND_OK 					0
+#define BIND_ERR_BADLDP				1
+#define	BIND_ERR_OPEN				2
+#define	BIND_ERR_BAD_ATYPE			3
 #define	BIND_ERR_SIMPLE_FAILED		4
 #define	BIND_ERR_KERBEROS_FAILED	5
-#define	BIND_ERR_BADRI			6
-#define	BIND_ERR_VERSION		7
-#define	BIND_ERR_REFERRALS		8
-#define	BIND_ERR_MANAGEDSAIT	9
+#define	BIND_ERR_BADRI				6
+#define	BIND_ERR_VERSION			7
+#define	BIND_ERR_REFERRALS			8
+#define	BIND_ERR_MANAGEDSAIT		9
+#define	BIND_ERR_SASL_FAILED		10
+#define	BIND_ERR_TLS_FAILED			11
 
 /* Return codes for do_ldap() */
 #define	DO_LDAP_OK			0
@@ -179,16 +219,21 @@ typedef struct rh {
  */
 typedef struct ri Ri;
 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 */
     char	*ri_bind_dn;		/* DN to bind as when replicating */
-    char	*ri_password;		/* Password for AUTH_SIMPLE */
-    char	*ri_principal;		/* principal for kerberos bind */
+    char	*ri_password;		/* Password for any method */
+    char	*ri_secprops;		/* SASL security properties */
+    char	*ri_realm;			/* realm for any mechanism */
+    char	*ri_authcId;		/* authentication ID for any mechanism */
+    char	*ri_authzId;		/* authorization ID for any mechanism */
     char	*ri_srvtab;		/* srvtab file for kerberos bind */
+    char	*ri_saslmech;		/* SASL mechanism to use */
     struct re	*ri_curr;		/* current repl entry being processed */
     struct stel	*ri_stel;		/* pointer to Stel for this replica */
     unsigned long
@@ -199,7 +244,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 */
 };
-    
 
 
 
@@ -208,12 +252,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;
 
 
@@ -225,12 +267,11 @@ typedef struct mi {
  */
 typedef struct re Re;
 struct re {
-
     /* Private data */
     ldap_pvt_thread_mutex_t
 		re_mutex;		/* mutex for this Re */
     int		re_refcnt;		/* ref count, 0 = done */
-    char	*re_timestamp;		/* timestamp of this re */
+    time_t	re_timestamp;		/* timestamp of this re */
     int		re_seq;			/* sequence number */
     Rh    	*re_replicas;		/* array of replica info */
     char	*re_dn;			/* dn of entry being modified */
@@ -300,7 +341,7 @@ struct rq {
 typedef struct stel {
     char	*hostname;		/* host name of replica */
     int		port;			/* port number of replica */
-    char	last[ 64 ];		/* timestamp of last successful repl */
+    time_t	last;			/* timestamp of last successful repl */
     int		seq;			/* Sequence number of last repl */
 } Stel;