Merged config patches from HEAD:

ITS#2594 replica uri
	replica-pidfile, replica-argsfile

doc/man/man5/slapd.conf.5

@@ -529,6 +529,19 @@ Specify the referral to pass back when
 cannot find a local database to handle a request.
 If specified multiple times, each url is provided.
 .TP
+.B replica-argsfile
+The ( absolute ) name of a file that will hold the 
+.B slurpd
+server's command line options
+if started without the debugging command line option.
+.TP
+.B replica-pidfile
+The ( absolute ) name of a file that will hold the 
+.B slurpd
+server's process ID ( see
+.BR getpid (2)
+) if started without the debugging command line option.
+.TP
 .B require <conditions>
 Specify a set of conditions (separated by white space) to
 require (default none).
@@ -940,7 +953,8 @@ This option puts the database into "read-only" mode.  Any attempts to
 modify the database will return an "unwilling to perform" error.  By
 default, readonly is off.
 .HP
-.B replica host=<hostname>[:port] [tls=yes|critical]
+.B replica uri=ldap[s]://<hostname>[:port]|host=<hostname>[:port]
+.B [tls=yes|critical]
 .B [suffix=<suffix> [...]]
 .B bindmethod=simple|sasl [binddn=<simple DN>] [credentials=<simple password>]
 .B [saslmech=<SASL mech>] [secprops=<properties>] [realm=<realm>]
@@ -953,7 +967,14 @@ Administrator's Guide" for detailed information on setting up a replicated
 directory service. Zero or more
 .B suffix
 instances can be used to select the subtrees that will be replicated
-(defaults to all the database). A
+(defaults to all the database). 
+.B host
+is deprecated in favor of the
+.B uri
+option.
+.B uri
+allows the replica LDAP server to be specified as an LDAP URI. 
+A
 .B bindmethod
 of
 .B simple

servers/slurpd/ch_malloc.c

@@ -109,6 +109,25 @@ ch_calloc(
 	return( new );
 }
 
+/*
+ * Just like strdup, except we check the returned value and exit
+ * if anything goes wrong.
+ */
+char *
+ch_strdup(
+    const char *string
+)
+{
+	char	*new;
+
+	if ( (new = ber_strdup( string )) == NULL ) {
+		fprintf( stderr, "ch_strdup: duplication of \"%s\" failed\n",
+				string );
+		exit( EXIT_FAILURE );
+	}
+
+	return( new );
+}
 
 /*
  * Just like free, except we check to see if p is null.

servers/slurpd/config.c

@@ -48,7 +48,8 @@ char	**cargv;
 /* current config file line # */
 static int	lineno;
 
-
+char *slurpd_pid_file = NULL;
+char *slurpd_args_file = NULL;
 
 /*
  * Read the slapd config file, looking only for config options we're
@@ -153,6 +154,41 @@ slurpd_read_config(
 		
 	    free( savefname );
 	    lineno = savelineno - 1;
+
+	} else if ( strcasecmp( cargv[0], "replica-pidfile" ) == 0 ) {
+		if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( CONFIG, CRIT, 
+				"%s: line %d missing file name in \"replica-pidfile <file>\" "
+				"line.\n", fname, lineno, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY,
+	    "%s: line %d: missing file name in \"replica-pidfile <file>\" line\n",
+				fname, lineno, 0 );
+#endif
+
+			return( 1 );
+		}
+
+		slurpd_pid_file = ch_strdup( cargv[1] );
+
+	} else if ( strcasecmp( cargv[0], "replica-argsfile" ) == 0 ) {
+		if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( CONFIG, CRIT, 
+				   "%s: %d: missing file name in "
+				   "\"argsfile <file>\" line.\n",
+				   fname, lineno, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY,
+	    "%s: line %d: missing file name in \"argsfile <file>\" line\n",
+			    fname, lineno, 0 );
+#endif
+
+			return( 1 );
+		}
+
+		slurpd_args_file = ch_strdup( cargv[1] );
 	}
     }
     fclose( fp );

servers/slurpd/ldap_op.c

@@ -777,7 +777,31 @@ retry:
 	}
 	ri->ri_ldp = NULL;
     }
+    
+	if ( ri->ri_uri != NULL ) { /* new URI style */
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ARGS, 
+			"do_bind: Initializing session to %s\n", 
+		    ri->ri_uri, 0, 0);
+#else
+	    Debug( LDAP_DEBUG_ARGS, "Initializing session to %s\n",
+		    ri->ri_uri, 0, 0 );
+#endif
 
+		ldrc = ldap_initialize( &(ri->ri_ldp), ri->ri_uri);
+
+		if (ldrc != LDAP_SUCCESS) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"do_bind: ldap_initalize (0, %s) failed: %s\n",
+			ri->ri_uri, ldap_err2string(ldrc), 0 );
+#else
+		Debug( LDAP_DEBUG_ANY, "Error: ldap_initialize(0, %s) failed: %s\n",
+			ri->ri_uri, ldap_err2string(ldrc), 0 );
+#endif
+		return( BIND_ERR_OPEN );		
+		}
+	} else { /* old HOST style */
 #ifdef NEW_LOGGING
 	LDAP_LOG ( OPERATION, ARGS, 
 		"do_bind: Initializing session to %s:%d\n", 
@@ -798,6 +822,7 @@ retry:
 			ri->ri_hostname, ri->ri_port, sys_errlist[ errno ] );
 #endif
 		return( BIND_ERR_OPEN );
+    }
     }
 
 	{	/* set version 3 */

servers/slurpd/main.c

@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <ac/stdlib.h>
+#include <ac/unistd.h>
 
 #include "slurp.h"
 #include "globals.h"
@@ -176,6 +177,35 @@ int main( int argc, char **argv )
 	goto stop;
     }
 
+
+    if ( slurpd_pid_file != NULL ) {
+	FILE *fp = fopen( slurpd_pid_file, "w" );
+
+	if( fp != NULL ) {
+		fprintf( fp, "%d\n", (int) getpid() );
+		fclose( fp );
+
+	} else {
+		free(slurpd_pid_file);
+		slurpd_pid_file = NULL;
+	}
+    }
+
+    if ( slurpd_args_file != NULL ) {
+	FILE *fp = fopen( slurpd_args_file, "w" );
+
+	if( fp != NULL ) {
+		for ( i = 0; i < argc; i++ ) {
+			fprintf( fp, "%s ", argv[i] );
+		}
+		fprintf( fp, "\n" );
+		fclose( fp );
+	} else {
+		free(slurpd_args_file);
+		slurpd_args_file = NULL;
+	}
+    }
+
     /*
      * Detach from the controlling terminal
      * unless the -d flag is given or in one-shot mode.
@@ -262,6 +292,15 @@ stop:
 #else
     Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
 #endif
+
+    if ( slurpd_pid_file != NULL ) {
+	unlink( slurpd_pid_file );
+    }
+    if ( slurpd_args_file != NULL ) {
+	unlink( slurpd_args_file );
+    }
+
+
 	MAIN_RETURN(rc);
 #endif /* !NO_THREADS */
 }

servers/slurpd/proto-slurp.h

@@ -21,17 +21,22 @@ int doargs	LDAP_P((int argc, char **argv, struct globals *g));
 #define ch_malloc malloc
 #define ch_realloc realloc
 #define ch_calloc calloc
+#define ch_strdup strdup
 #define ch_free free
 #else
 void *ch_malloc	LDAP_P((ber_len_t size));
 void *ch_realloc	LDAP_P((void *block, ber_len_t size));
 void *ch_calloc	LDAP_P((ber_len_t nelem, ber_len_t size));
+char *ch_strdup LDAP_P((const char *str));
 void ch_free	LDAP_P((void *p));
 #endif
 
 /* config.c */
 int slurpd_read_config	LDAP_P((char *fname));
 
+char *slurpd_pid_file;
+char *slurpd_args_file;
+
 /* ch_malloc.c */
 void ch_free LDAP_P(( void *p ));
 

servers/slurpd/ri.c

@@ -212,6 +212,7 @@ Ri_init(
 
     /* Initialize private data */
     (*ri)->ri_hostname = NULL;
+    (*ri)->ri_uri = NULL;
     (*ri)->ri_ldp = NULL;
     (*ri)->ri_bind_dn = NULL;
     (*ri)->ri_password = NULL;

servers/slurpd/slurp.h

@@ -128,6 +128,7 @@
 
 /* Config file keywords */
 #define	HOSTSTR			"host"
+#define	URISTR			"uri"
 #define	ATTRSTR			"attr"
 #define	SUFFIXSTR		"suffix"
 #define	BINDDNSTR		"binddn"
@@ -143,8 +144,9 @@
 #define	SASLMECHSTR		"saslmech"
 #define	REALMSTR		"realm"
 #define	SECPROPSSTR		"secprops"
+#define STARTTLSSTR		"starttls"
 #define TLSSTR			"tls"
-#define TLSCRITICALSTR	"critical"
+#define CRITICALSTR		"critical"
 
 #define	REPLICA_SLEEP_TIME	( 10 )
 
@@ -213,6 +215,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 */