Misc. cleanup, remove lint, remove unused deprecated functions, etc.

diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c
index 955e4453b9ed8d3442ff099b744ff20d0ab21d92..5d534a853385f3b6072cb9a38af167248a4fbde6 100644 (file)
--- a/servers/slapd/back-bdb/idl.c
+++ b/servers/slapd/back-bdb/idl.c
@@ -263,8 +263,8 @@ bdb_idl_fetch_key(
        data.flags = DB_DBT_USERMEM;
        /* fetch it */
        rc = db->get( db, tid, key, &data, bdb->bi_db_opflags );
-
 #endif
+
        if( rc == DB_NOTFOUND ) {
                return rc;
 

diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c
index a69e66f85e450638110605642b8c246714b75cf0..adf07c75666507556d2a18f484ace23714c198a7 100644 (file)
--- a/servers/slapd/back-bdb/index.c
+++ b/servers/slapd/back-bdb/index.c
@@ -71,7 +71,6 @@ int bdb_index_is_indexed(
        Backend *be,
        AttributeDescription *desc )
 {
-       int rc;
        slap_mask_t mask;
        char *dbname;
        struct berval prefix;
@@ -82,7 +81,7 @@ int bdb_index_is_indexed(
                return LDAP_INAPPROPRIATE_MATCHING;
        }
 
-       return LDAP_SUCCESS;
+       return LDAP_SUCCESS;
 }
 
 int bdb_index_param(

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index c6abc86deaa7c1e565e15b3fa82a8158156305ed..48b2ebac55b30d56cdff9a064a5afe1d7b9b5209 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -391,6 +391,7 @@ bdb_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
+               LDAP_CONTROL_SUBENTRIES,
                NULL
        };
 

diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index 9359fe084c2c9b35208b5b29f95269953c5662db..03b8692a9c6a05ce85c030e937dedde391d70b1c 100644 (file)
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -165,7 +165,8 @@ idl_fetch(
        Datum   data;
        ID_BLOCK        *idl;
        ID_BLOCK        **tmp;
-       int     i, nids;
+       int     nids;
+       unsigned i;
 
        idl = idl_fetch_one( be, db, key );
 

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index fc8e85059ed8f97fc064f676d34d7e156db6669d..9257ebaabcd0f90fea8ff7962159a30a5c88bea5 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -68,7 +68,6 @@ int index_is_indexed(
        Backend *be,
        AttributeDescription *desc )
 {
-       int rc;
        slap_mask_t mask;
        char *dbname;
        struct berval prefix;
@@ -79,7 +78,7 @@ int index_is_indexed(
                return LDAP_INAPPROPRIATE_MATCHING;
        }
 
-       return LDAP_SUCCESS;
+       return LDAP_SUCCESS;
 }
 
 int index_param(

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 7442953c7d19dc774b3a320dc9ee712a1f286664..eb3efa04aa98d9246f3a996d053349d54ceec276 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -77,7 +77,7 @@ read_config( const char *fname )
        int rc;
        struct berval vals[2];
 
-       static int lastmod = ON;
+       static int lastmod = 1;
        static BackendInfo *bi = NULL;
        static BackendDB        *be = NULL;
 
@@ -1996,13 +1996,13 @@ read_config( const char *fname )
                                if ( be ) {
                                        be->be_flags &= ~SLAP_BFLAG_NOLASTMOD;
                                } else {
-                                       lastmod = ON;
+                                       lastmod = 1;
                                }
                        } else {
                                if ( be ) {
                                        be->be_flags |= SLAP_BFLAG_NOLASTMOD;
                                } else {
-                                       lastmod = OFF;
+                                       lastmod = 0;
                                }
                        }
 

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index de3ae7dbac2de9706811fba8ab8bf926f854c907..a3924851284bc9e96c2a768e6fb89a421808f226 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -735,7 +735,7 @@ dnExtractRdn(
 }
 
 /*
- * FIXME: should be replaced by dnExtractRdn() (together with dn_rdn)
+ * FIXME: should be replaced by dnExtractRdn()
  */
 int 
 dn_rdnlen(
@@ -768,60 +768,6 @@ dn_rdnlen(
        return p - dn_in->bv_val;
 }
 
-/*
- * FIXME: should be replaced by dnExtractRdn() (together with dn_rdnlen)
- */
-char * dn_rdn(
-       Backend *be,
-       struct berval   *dn_in )
-{
-       struct berval   rdn;
-
-       assert( dn_in );
-
-       if ( dn_in == NULL ) {
-               return NULL;
-       }
-
-       if ( !dn_in->bv_len ) {
-               return NULL;
-       }
-
-       if ( be != NULL && be_issuffix( be, dn_in->bv_val ) ) {
-               return NULL;
-       }
-
-       if ( dnExtractRdn( dn_in, &rdn ) != LDAP_SUCCESS ) {
-               return NULL;
-       }
-
-       return rdn.bv_val;
-}
-
-/*
- * dn_issuffix - tells whether suffix is a suffix of dn.
- * Both dn and suffix must be normalized.
- *     deprecated in favor of dnIsSuffix()
- */
-int
-dn_issuffix(
-       const char      *dn,
-       const char      *suffix
-)
-{
-       struct berval   bvdn, bvsuffix;
-
-       assert( dn );
-       assert( suffix );
-
-       bvdn.bv_val = (char *) dn;
-       bvdn.bv_len = strlen( dn );
-       bvsuffix.bv_val = (char *) suffix;
-       bvsuffix.bv_len = strlen( suffix );
-
-       return dnIsSuffix( &bvdn, &bvsuffix );
-}
-
 /* rdn_attr_type:
  *
  * Given a string (i.e. an rdn) of the form:

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index a754f3b339cfbef82d23d9ea61c6846f95c5262c..fb8c2aae439b1d8c1b0bb2fac4c2317d5f5b871f 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -401,9 +401,7 @@ LDAP_SLAPD_F (int) rdnValidate LDAP_P(( struct berval * rdn ));
 LDAP_SLAPD_F (char *) dn_validate LDAP_P(( char *dn ));
 LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn ));
 LDAP_SLAPD_F (char *) dn_parent LDAP_P(( Backend *be, const char *dn ));
-LDAP_SLAPD_F (char *) dn_rdn LDAP_P(( Backend *be, struct berval *dn ));
 LDAP_SLAPD_F (int) dn_rdnlen LDAP_P(( Backend *be, struct berval *dn ));
-LDAP_SLAPD_F (int) dn_issuffix LDAP_P(( const char *dn, const char *suffix ));
 LDAP_SLAPD_F (char *) rdn_attr_value LDAP_P(( const char * rdn ));
 LDAP_SLAPD_F (char *) rdn_attr_type LDAP_P(( const char * rdn ));
 LDAP_SLAPD_F (int) rdn_attrs LDAP_P(( const char * rdn,
@@ -1067,7 +1065,6 @@ LDAP_SLAPD_F (int) do_extended LDAP_P((Connection *conn, Operation *op));
 
 LDAP_SLAPD_V (ber_socket_t)    dtblsize;
 
-
 LDAP_END_DECL
 
 #endif /* _proto_slap */

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 43c2871bf38808f3edd32fb183b96a9541ca2036..b9c1b5b9e16d8a7a8b5bccba7f2f91507d815c53 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -190,6 +190,7 @@ static AttributeTypeSchemaCheckFN rootDseAttribute;
 static AttributeTypeSchemaCheckFN aliasAttribute;
 static AttributeTypeSchemaCheckFN referralAttribute;
 static AttributeTypeSchemaCheckFN subentryAttribute;
+static AttributeTypeSchemaCheckFN administrativeRoleAttribute;
 static AttributeTypeSchemaCheckFN dynamicAttribute;
 
 static struct slap_schema_ad_map {
@@ -357,7 +358,7 @@ static struct slap_schema_ad_map {
                        "EQUALITY objectIdentifierMatch "
                        "USAGE directoryOperation "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
-               NULL, 0, NULL, NULL, NULL,
+               administrativeRoleAttribute, 0, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_administrativeRole) },
        { "subtreeSpecification", "( 2.5.18.6 NAME 'subtreeSpecification' "
                        "SINGLE-VALUE "
@@ -944,6 +945,28 @@ static int subentryAttribute (
        return LDAP_SUCCESS;
 }
 
+static int administrativeRoleAttribute (
+       Backend *be,
+       Entry *e,
+       Attribute *attr,
+       const char** text,
+       char *textbuf, size_t textlen )
+{
+       *text = textbuf;
+
+       if( !SLAP_SUBENTRIES(be) ) {
+               snprintf( textbuf, textlen,
+                       "attribute \"%s\" not supported in context",
+                       attr->a_desc->ad_cname.bv_val );
+               return LDAP_OBJECT_CLASS_VIOLATION;
+       }
+
+       snprintf( textbuf, textlen,
+               "attribute \"%s\" not supported!",
+               attr->a_desc->ad_cname.bv_val );
+       return LDAP_OBJECT_CLASS_VIOLATION;
+}
+
 static int dynamicAttribute (
        Backend *be,
        Entry *e,

diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h
index 72be10f3cac0de9771f5d1c099e0e42c4ad50fa4..2478790080bb84034750c9840dd88468de335239 100644 (file)
--- a/servers/slapd/sets.h
+++ b/servers/slapd/sets.h
@@ -4,6 +4,13 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
+#ifndef SLAP_SETS_H_
+#define SLAP_SETS_H_
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
 /* this routine needs to return the bervals instead of
  * plain strings, since syntax is not known.  It should
  * also return the syntax or some "comparison cookie"
@@ -20,3 +27,6 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
        void *cookie, struct berval *filter,
        char *user, char *this, BerVarray *results);
 
+LDAP_END_DECL
+
+#endif
\ No newline at end of file

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index cda6b28613db2bad9fd74914f2b427d7797f9e1b..293aa269c68c211be33c67ba1935f74e42c0a937 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -69,10 +69,6 @@ LDAP_BEGIN_DECL
  */
 #define SLAP_MOD_SOFTADD       0x1000
 
-#define ON     (1)
-#define OFF    (-1)
-#define UNDEFINED (0)
-
 #define MAXREMATCHES (10)
 
 #define SLAP_MAX_WORKER_THREADS                (32)
@@ -343,7 +339,7 @@ typedef int slap_mr_filter_func LDAP_P((
 
 typedef struct slap_matching_rule {
        LDAPMatchingRule                smr_mrule;
-       ber_len_t                       smr_oidlen;
+       ber_len_t                               smr_oidlen;
        slap_mask_t                             smr_usage;
 
 #define SLAP_MR_HIDE                   0x8000U
@@ -433,11 +429,11 @@ typedef struct slap_attribute_type {
 
        struct slap_attribute_type      *sat_next;
 
-#define sat_oid                        sat_atype.at_oid
-#define sat_names              sat_atype.at_names
-#define sat_desc               sat_atype.at_desc
+#define sat_oid                                sat_atype.at_oid
+#define sat_names                      sat_atype.at_names
+#define sat_desc                       sat_atype.at_desc
 #define sat_obsolete           sat_atype.at_obsolete
-#define sat_sup_oid            sat_atype.at_sup_oid
+#define sat_sup_oid                    sat_atype.at_sup_oid
 #define sat_equality_oid       sat_atype.at_equality_oid
 #define sat_ordering_oid       sat_atype.at_ordering_oid
 #define sat_substr_oid         sat_atype.at_substr_oid
@@ -445,7 +441,7 @@ typedef struct slap_attribute_type {
 #define sat_single_value       sat_atype.at_single_value
 #define sat_collective         sat_atype.at_collective
 #define sat_no_user_mod                sat_atype.at_no_user_mod
-#define sat_usage              sat_atype.at_usage
+#define sat_usage                      sat_atype.at_usage
 #define sat_extensions         sat_atype.at_extensions
 
        struct slap_attr_desc           *sat_ad;
@@ -1357,9 +1353,6 @@ struct slap_backend_info {
 #define o_tls_ssf              o_authz.sai_tls_ssf
 #define o_sasl_ssf             o_authz.sai_sasl_ssf
 
-struct slap_op;
-struct slap_conn;
-
 typedef void (slap_response)( struct slap_conn *, struct slap_op *,
        ber_tag_t, ber_int_t, ber_int_t, const char *, const char *,
        BerVarray, const char *, struct berval *,

diff --git a/servers/slapd/slapd.dsp b/servers/slapd/slapd.dsp
index ef53909efcaabdea9fee60b937c24d27a74f43c8..8f004daab4e441f8151ac1bbd7eaca6d3cad6909 100644 (file)
--- a/servers/slapd/slapd.dsp
+++ b/servers/slapd/slapd.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 advapi32.lib sasl.lib libdb32.lib hs_regex.lib libsasl.lib rpcrt4.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\Release"
+# ADD LINK32 advapi32.lib rpcrt4.lib sasl.lib libdb40.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\Release"
 
 !ELSEIF  "$(CFG)" == "slapd - Win32 Debug"
 
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 advapi32.lib libdb32.lib hs_regex.lib libsasl.lib rpcrt4.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug"
+# ADD LINK32 advapi32.lib rpcrt4.lib libdb40d.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug"
 
 !ELSEIF  "$(CFG)" == "slapd - Win32 Single Debug"
 

diff --git a/servers/slapd/tools/slapadd.dsp b/servers/slapd/tools/slapadd.dsp
index 7cd2e2598165d22dcb0ea53ac7008dbc180ce6c3..5ea8cd547b5067fdcf2a2485754752a99fb79b55 100644 (file)
--- a/servers/slapd/tools/slapadd.dsp
+++ b/servers/slapd/tools/slapadd.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 sasl.lib libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
+# ADD LINK32 sasl.lib libdb40.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
 
 !ELSEIF  "$(CFG)" == "slapadd - Win32 Debug"
 
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
+# ADD LINK32 libdb40d.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
 
 !ELSEIF  "$(CFG)" == "slapadd - Win32 Single Debug"
 

diff --git a/servers/slapd/tools/slapcat.dsp b/servers/slapd/tools/slapcat.dsp
index 1c3ca8f54f73bf1c01b66ae364518ce1dac7febb..ace03cb2da690ba23d471485625fc2a54f11c7df 100644 (file)
--- a/servers/slapd/tools/slapcat.dsp
+++ b/servers/slapd/tools/slapcat.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 sasl.lib libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
+# ADD LINK32 sasl.lib libdb40.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
 
 !ELSEIF  "$(CFG)" == "slapcat - Win32 Debug"
 
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
+# ADD LINK32 libdb40d.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
 
 !ELSEIF  "$(CFG)" == "slapcat - Win32 Single Debug"
 

diff --git a/servers/slapd/tools/slapindex.dsp b/servers/slapd/tools/slapindex.dsp
index 71fe5edf2cbbe26589167e5225ba70f3ee141c2d..fd61b1a31bb847fa71f04f13c1271faecdd52dd9 100644 (file)
--- a/servers/slapd/tools/slapindex.dsp
+++ b/servers/slapd/tools/slapindex.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 sasl.lib libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
+# ADD LINK32 sasl.lib libdb40.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
 
 !ELSEIF  "$(CFG)" == "slapindex - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
+# ADD LINK32 libdb40d.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
 
 !ELSEIF  "$(CFG)" == "slapindex - Win32 Single Debug"