X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=ec599721838d9b991d8b65e63296881f625ffc71;hb=8558b8808e7e8deba617908eed99a8213f1bc405;hp=5a58e83baf97f648fe75967ffc9ce6c62d9bc585;hpb=f5e6d1db410c11b26dfe5ef2e5563f51e136c830;p=openldap

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 5a58e83baf..ec59972183 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1257,16 +1257,18 @@ read_config( const char *fname, int depth )
 				} else if( strcasecmp( cargv[i], "bind_anon_dn" ) == 0 ) {
 					allows |= SLAP_ALLOW_BIND_ANON_DN;
 
+				} else if( strcasecmp( cargv[i], "update_anon" ) == 0 ) {
+					allows |= SLAP_ALLOW_UPDATE_ANON;
+
 				} else if( strcasecmp( cargv[i], "none" ) != 0 ) {
 #ifdef NEW_LOGGING
-					LDAP_LOG( CONFIG, CRIT, 
-						   "%s: line %d: unknown feature %s in "
-						   "\"allow <features>\" line.\n",
-						   fname, lineno, cargv[1] );
+					LDAP_LOG( CONFIG, CRIT, "%s: line %d: "
+						"unknown feature %s in \"allow <features>\" line.\n",
+						fname, lineno, cargv[1] );
 #else
-					Debug( LDAP_DEBUG_ANY,
-		    "%s: line %d: unknown feature %s in \"allow <features>\" line\n",
-					    fname, lineno, cargv[i] );
+					Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+						"unknown feature %s in \"allow <features>\" line\n",
+						fname, lineno, cargv[i] );
 #endif
 
 					return( 1 );
@@ -1317,9 +1319,6 @@ read_config( const char *fname, int depth )
 				} else if( strcasecmp( cargv[i], "bind_simple" ) == 0 ) {
 					disallows |= SLAP_DISALLOW_BIND_SIMPLE;
 
-				} else if( strcasecmp( cargv[i], "bind_simple_unprotected" ) == 0 ) {
-					disallows |= SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED;
-
 				} else if( strcasecmp( cargv[i], "bind_krbv4" ) == 0 ) {
 					disallows |= SLAP_DISALLOW_BIND_KRBV4;
 
@@ -1480,6 +1479,12 @@ read_config( const char *fname, int depth )
 					set->sss_update_sasl =
 						atoi( &cargv[i][sizeof("update_sasl")] );
 
+				} else if( strncasecmp( cargv[i], "simple_bind=",
+					sizeof("simple_bind") ) == 0 )
+				{
+					set->sss_simple_bind =
+						atoi( &cargv[i][sizeof("simple_bind")] );
+
 				} else {
 #ifdef NEW_LOGGING
 					LDAP_LOG( CONFIG, CRIT, 
@@ -1574,9 +1579,9 @@ read_config( const char *fname, int depth )
 
 		/* specify an objectclass */
 		} else if ( strcasecmp( cargv[0], "objectclass" ) == 0 ) {
-			if ( *cargv[1] == '(' ) {
+			if ( *cargv[1] == '('  /*')'*/) {
 				char * p;
-				p = strchr(saveline,'(');
+				p = strchr(saveline,'(' /*')'*/);
 				rc = parse_oc( fname, lineno, p, cargv );
 				if( rc ) return rc;
 
@@ -1592,13 +1597,21 @@ read_config( const char *fname, int depth )
 #endif
 			}
 
+#ifdef SLAP_EXTENDED_SCHEMA
+		} else if ( strcasecmp( cargv[0], "ditcontentrule" ) == 0 ) {
+			char * p;
+			p = strchr(saveline,'(' /*')'*/);
+			rc = parse_cr( fname, lineno, p, cargv );
+			if( rc ) return rc;
+#endif
+
 		/* specify an attribute type */
 		} else if (( strcasecmp( cargv[0], "attributetype" ) == 0 )
 			|| ( strcasecmp( cargv[0], "attribute" ) == 0 ))
 		{
-			if ( *cargv[1] == '(' ) {
+			if ( *cargv[1] == '(' /*')'*/) {
 				char * p;
-				p = strchr(saveline,'(');
+				p = strchr(saveline,'(' /*')'*/);
 				rc = parse_at( fname, lineno, p, cargv );
 				if( rc ) return rc;