Extend value_match to extract an asserted value from a full value

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 25fe612b5db0e674278a1eca592ef12b7510f6a5..fc71756e2a8741f3909193d5ccf75ba113512ad5 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -12,12 +12,13 @@
 #include <ac/string.h>
 #include <ac/ctype.h>
 #include <ac/socket.h>
+#include <ac/errno.h>
 
 #include "lutil.h"
 #include "ldap_pvt.h"
 #include "slap.h"
 
-#define MAXARGS        200
+#define MAXARGS        500
 
 /*
  * defaults for various global variables
@@ -85,16 +86,21 @@ read_config( const char *fname )
 
        if ( (fp = fopen( fname, "r" )) == NULL ) {
                ldap_syslog = 1;
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "config", LDAP_LEVEL_ENTRY, "read_config: "
+                       "could not open config file \"%s\": %s (%d)\n",
+                   fname, strerror(errno), errno ));
+#else
                Debug( LDAP_DEBUG_ANY,
-                   "could not open config file \"%s\" - absolute path?\n",
-                   fname, 0, 0 );
-               perror( fname );
+                   "could not open config file \"%s\": %s (%d)\n",
+                   fname, strerror(errno), errno );
+#endif
                return 1;
        }
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "config", LDAP_LEVEL_ENTRY,
-                  "read_config: reading config file %s\n", fname ));
+               "read_config: reading config file %s\n", fname ));
 #else
        Debug( LDAP_DEBUG_CONFIG, "reading config file %s\n", fname, 0, 0 );
 #endif
@@ -1991,13 +1997,6 @@ read_config( const char *fname )
 #endif /*SLAPD_MODULES*/
 
 #ifdef HAVE_TLS
-               } else if ( !strcasecmp( cargv[0], "TLSProtocol" ) ) {
-                       rc = ldap_pvt_tls_set_option( NULL,
-                                                     LDAP_OPT_X_TLS_PROTOCOL,
-                                                     cargv[1] );
-                       if ( rc )
-                               return rc;
-
                } else if ( !strcasecmp( cargv[0], "TLSRandFile" ) ) {
                        rc = ldap_pvt_tls_set_option( NULL,
                                                      LDAP_OPT_X_TLS_RANDOM_FILE,
@@ -2228,7 +2227,9 @@ fp_getline( FILE *fp, int *lineno )
        }
 
        while ( fgets( buf, sizeof(buf), fp ) != NULL ) {
+               /* trim off \r\n or \n */
                if ( (p = strchr( buf, '\n' )) != NULL ) {
+                       if( p > buf && p[-1] == '\r' ) --p;
                        *p = '\0';
                }
                if ( ! isspace( (unsigned char) buf[0] ) ) {