s/tls/starttls/

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 9a84f3dc07680165cbe6907f826b8c0a0433a7b5..6b732977305142dae53ed2792dcec2d918c3ee4a 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -966,7 +966,7 @@ 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 host=<hostname>[:port] [starttls=yes|critical]
 .B [suffix=<suffix> [...]]
 .B bindmethod=simple|sasl [binddn=<simple DN>] [credentials=<simple password>]
 .B [saslmech=<SASL mech>] [secprops=<properties>] [realm=<realm>]

diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index 4c3a285347fcd652a4a507ae1504ccca581650d5..4f0ee3b53f9de0f2544a7ec300a95b1b26efb0cb 100644 (file)
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -462,9 +462,16 @@ parse_replica_line(
        } else if ( !strncasecmp( cargv[ i ], 
                        SUFFIXSTR, sizeof( SUFFIXSTR ) - 1 ) ) {
            /* ignore it */ ;
+       } else if ( !strncasecmp( cargv[i], STARTTLSSTR, sizeof(STARTTLSSTR)-1 )) {
+           val = cargv[ i ] + sizeof( STARTTLSSTR );
+               if( !strcasecmp( val, CRITICALSTR ) ) {
+                       ri->ri_tls = TLS_CRITICAL;
+               } else {
+                       ri->ri_tls = TLS_ON;
+               }
        } else if ( !strncasecmp( cargv[ i ], TLSSTR, sizeof( TLSSTR ) - 1 ) ) {
            val = cargv[ i ] + sizeof( TLSSTR );
-               if( !strcasecmp( val, TLSCRITICALSTR ) ) {
+               if( !strcasecmp( val, CRITICALSTR ) ) {
                        ri->ri_tls = TLS_CRITICAL;
                } else {
                        ri->ri_tls = TLS_ON;

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 43f310dc623d0c0cf0274160840de94716264a49..54b7df03aae68e98e9bc12c528154eea9ba167ce 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -143,8 +143,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 )