Fix lint in previous commit

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index dfd6fab945c8aa74129a22eb7b24de7cc23f2dfb..93a9934344dd21e6a82a9817c35da4e66d3a1856 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -260,11 +260,11 @@ read_config( const char *fname )
                        if ( cargc < 2 ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-                                          "%s: line %d: missing max in \"sockbuf_max_incoming <bytes\" line\n",
+                                          "%s: line %d: missing max in \"sockbuf_max_incoming <bytes>\" line\n",
                                           fname, lineno ));
 #else
                                Debug( LDAP_DEBUG_ANY,
-                                          "%s: line %d: missing max in \"sockbuf_max_incoming <bytes\" line\n",
+                                          "%s: line %d: missing max in \"sockbuf_max_incoming <bytes>\" line\n",
                                    fname, lineno, 0 );
 #endif
 
@@ -1055,7 +1055,7 @@ read_config( const char *fname )
 
                        tmp_be = select_backend( &nalias, 0, 0 );
                        free( nalias.bv_val );
-                       if ( tmp_be != be ) {
+                       if ( tmp_be && tmp_be != be ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "config", LDAP_LEVEL_INFO,
                                        "%s: line %d: suffixAlias served by a preceeding "
@@ -1092,7 +1092,7 @@ read_config( const char *fname )
 
                        tmp_be = select_backend( &naliased, 0, 0 );
                        free( naliased.bv_val );
-                       if ( tmp_be != be ) {
+                       if ( tmp_be && tmp_be != be ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "config", LDAP_LEVEL_INFO,
                                        "%s: line %d: suffixAlias derefs to a different backend "
@@ -1687,6 +1687,15 @@ read_config( const char *fname )
                                return( 1 );
                        }
                        if ( strcasecmp( cargv[1], "off" ) == 0 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+                                       "%s: line %d: schema checking disabled! your mileage may vary!\n",
+                                       fname, lineno ));
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: schema checking disabled! your mileage may vary!\n",
+                                   fname, lineno, 0 );
+#endif
                                global_schemacheck = 0;
                        } else {
                                global_schemacheck = 1;