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 1a11a0b011dc35f71094d9a9d02dcd7a1743a52b..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
@@ -23,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 
 static char * oc_check_required(
        Entry *e,
@@ -425,6 +424,7 @@ entry_schema_check(
        }
 
        if( extensible ) {
+               *text = NULL;
                return LDAP_SUCCESS;
        }
 
@@ -472,6 +472,7 @@ entry_schema_check(
                }
        }
 
+       *text = NULL;
        return LDAP_SUCCESS;
 }
 
@@ -685,6 +686,8 @@ int structural_class(
                return LDAP_OBJECT_CLASS_VIOLATION;
        }
 
+       *text = NULL;
+
        return LDAP_SUCCESS;
 }