rework few members of slap_bindconf; silence few warnings

[openldap] / servers / slapd / schema_check.c

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 9648849c2166afe8583362d73d8be62b1f98f013..0cc2b886ed6c90c8dcc05a32d933dd389be5e77e 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -112,7 +112,7 @@ entry_schema_check(
        }
 
        /* it's a REALLY bad idea to disable schema checks */
-       if( !SLAPD_GLOBAL(schemachecking) ) return LDAP_SUCCESS;
+       if( !global_schemacheck ) return LDAP_SUCCESS;
 
        /* find the structural object class attribute */
        asc = attr_find( e->e_attrs, ad_structuralObjectClass );
@@ -384,7 +384,7 @@ entry_schema_check(
                                                        }
                                                }
                                        }
-                               } else if ( SLAPD_GLOBAL(disallows) & SLAP_DISALLOW_AUX_WO_CR ) {
+                               } else if ( global_disallows & SLAP_DISALLOW_AUX_WO_CR ) {
                                        k = -1;
                                } else {
                                        k = 0;  
@@ -424,6 +424,7 @@ entry_schema_check(
        }
 
        if( extensible ) {
+               *text = NULL;
                return LDAP_SUCCESS;
        }
 
@@ -471,6 +472,7 @@ entry_schema_check(
                }
        }
 
+       *text = NULL;
        return LDAP_SUCCESS;
 }
 
@@ -684,6 +686,8 @@ int structural_class(
                return LDAP_OBJECT_CLASS_VIOLATION;
        }
 
+       *text = NULL;
+
        return LDAP_SUCCESS;
 }