X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=8951f40664229f103fa8e1c54acede67ce3d63bc;hb=9b4bf8a973c8cfea809be9a4b658f785a6b16f2f;hp=c83f13148a75203b902a68ead92381e1773e07ea;hpb=8f82e9f77281a2f653257093b416ceaa165a3202;p=openldap

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index c83f13148a..8951f40664 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -15,10 +15,12 @@
 #include <ac/socket.h>
 #include <ac/errno.h>
 
-#include "lutil.h"
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
+#include "lutil.h"
 
 #define ARGS_STEP	512
 
@@ -61,6 +63,9 @@ struct berval global_schemandn = { 0, NULL };
 ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT;
 ber_len_t sockbuf_max_incoming_auth= SLAP_SB_MAX_INCOMING_AUTH;
 
+int	slap_conn_max_pending = SLAP_CONN_MAX_PENDING_DEFAULT;
+int	slap_conn_max_pending_auth = SLAP_CONN_MAX_PENDING_AUTH;
+
 char   *slapd_pid_file  = NULL;
 char   *slapd_args_file = NULL;
 
@@ -330,6 +335,80 @@ read_config( const char *fname, int depth )
 
 			sockbuf_max_incoming_auth = max;
 
+		/* set conn pending max */
+		} else if ( strcasecmp( cargv[0], "conn_max_pending" ) == 0 ) {
+			long max;
+			if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( CONFIG, CRIT, 
+				   "%s: line %d: missing max in \"conn_max_pending "
+				   "<requests>\" line\n", fname, lineno, 0 );
+#else
+				Debug( LDAP_DEBUG_ANY,
+					   "%s: line %d: missing max in \"conn_max_pending <requests>\" line\n",
+				    fname, lineno, 0 );
+#endif
+
+				return( 1 );
+			}
+
+			max = atol( cargv[1] );
+
+			if( max < 0 ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( CONFIG, CRIT, 
+					   "%s: line %d: invalid max value (%ld) in "
+					   "\"conn_max_pending <requests>\" line.\n",
+					   fname, lineno, max );
+#else
+				Debug( LDAP_DEBUG_ANY,
+					"%s: line %d: invalid max value (%ld) in "
+					"\"conn_max_pending <requests>\" line.\n",
+				    fname, lineno, max );
+#endif
+
+				return( 1 );
+			}
+
+			slap_conn_max_pending = max;
+
+		/* set conn pending max authenticated */
+		} else if ( strcasecmp( cargv[0], "conn_max_pending_auth" ) == 0 ) {
+			long max;
+			if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( CONFIG, CRIT, 
+				   "%s: line %d: missing max in \"conn_max_pending_auth "
+				   "<requests>\" line\n", fname, lineno, 0 );
+#else
+				Debug( LDAP_DEBUG_ANY,
+					   "%s: line %d: missing max in \"conn_max_pending_auth <requests>\" line\n",
+				    fname, lineno, 0 );
+#endif
+
+				return( 1 );
+			}
+
+			max = atol( cargv[1] );
+
+			if( max < 0 ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( CONFIG, CRIT, 
+					   "%s: line %d: invalid max value (%ld) in "
+					   "\"conn_max_pending_auth <requests>\" line.\n",
+					   fname, lineno, max );
+#else
+				Debug( LDAP_DEBUG_ANY,
+					"%s: line %d: invalid max value (%ld) in "
+					"\"conn_max_pending_auth <requests>\" line.\n",
+				    fname, lineno, max );
+#endif
+
+				return( 1 );
+			}
+
+			slap_conn_max_pending_auth = max;
+
 		/* default search base */
 		} else if ( strcasecmp( cargv[0], "defaultSearchBase" ) == 0 ) {
 			if ( cargc < 2 ) {
@@ -1502,7 +1581,19 @@ read_config( const char *fname, int depth )
 
 		/* specify an objectclass */
 		} else if ( strcasecmp( cargv[0], "objectclass" ) == 0 ) {
-			if ( *cargv[1] == '('  /*')'*/) {
+			if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( CONFIG, INFO, 
+					"%s: line %d: illegal objectclass format.\n",
+					fname, lineno , 0 );
+#else
+				Debug( LDAP_DEBUG_ANY,
+				       "%s: line %d: illegal objectclass format.\n",
+				       fname, lineno, 0 );
+#endif
+				return( 1 );
+
+			} else if ( *cargv[1] == '('  /*')'*/) {
 				char * p;
 				p = strchr(saveline,'(' /*')'*/);
 				rc = parse_oc( fname, lineno, p, cargv );
@@ -1532,7 +1623,19 @@ read_config( const char *fname, int depth )
 		} else if (( strcasecmp( cargv[0], "attributetype" ) == 0 )
 			|| ( strcasecmp( cargv[0], "attribute" ) == 0 ))
 		{
-			if ( *cargv[1] == '(' /*')'*/) {
+			if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( CONFIG, INFO, "%s: line %d: "
+					"illegal attribute type format.\n",
+					fname, lineno , 0 );
+#else
+				Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+					"illegal attribute type format.\n",
+					fname, lineno, 0 );
+#endif
+				return( 1 );
+
+			} else if ( *cargv[1] == '(' /*')'*/) {
 				char * p;
 				p = strchr(saveline,'(' /*')'*/);
 				rc = parse_at( fname, lineno, p, cargv );
@@ -2542,5 +2645,7 @@ config_destroy( )
 		free ( slapd_args_file );
 	if ( slapd_pid_file )
 		free ( slapd_pid_file );
+	if ( default_passwd_hash )
+		free( default_passwd_hash );
 	acl_destroy( global_acl, NULL );
 }