slapd: delete unused entry_schema_check(oldattrs) parameter

Unused since 2001 2ae02fc19be7fdca8f8c69c97eb3d3fb948429cc

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index 383024706d2d90b6e7c8bdb4042dbc6426345248..0e1aae7d47d2b3dc2037747e25afeac483ddb64d 100644 (file)
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -1236,7 +1236,7 @@ apply_modify_to_entry(
                        entry->e_ocflags = 0;
                }
                /* check that the entry still obeys the schema */
-               rc = entry_schema_check( op, entry, NULL, 0, 0, NULL,
+               rc = entry_schema_check( op, entry, 0, 0, NULL,
                          &rs->sr_text, textbuf, SLAP_TEXT_BUFLEN );
        }
 
@@ -1408,7 +1408,7 @@ ldif_back_add( Operation *op, SlapReply *rs )
 
        Debug( LDAP_DEBUG_TRACE, "ldif_back_add: \"%s\"\n", e->e_dn );
 
-       rc = entry_schema_check( op, e, NULL, 0, 1, NULL,
+       rc = entry_schema_check( op, e, 0, 1, NULL,
                &rs->sr_text, textbuf, sizeof( textbuf ) );
        if ( rc != LDAP_SUCCESS )
                goto send_res;

diff --git a/servers/slapd/back-mdb/add.c b/servers/slapd/back-mdb/add.c
index b2233756003348f6892ade6ef8698887f0e81eca..b23c6b10d2ded1002d5f88c475040eb8eb6d721f 100644 (file)
--- a/servers/slapd/back-mdb/add.c
+++ b/servers/slapd/back-mdb/add.c
@@ -51,7 +51,7 @@ mdb_add(Operation *op, SlapReply *rs )
        ctrls[num_ctrls] = 0;
 
        /* check entry's schema */
-       rs->sr_err = entry_schema_check( op, op->ora_e, NULL,
+       rs->sr_err = entry_schema_check( op, op->ora_e,
                get_relax(op), 1, NULL, &rs->sr_text, textbuf, textlen );
        if ( rs->sr_err != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,

diff --git a/servers/slapd/back-mdb/modify.c b/servers/slapd/back-mdb/modify.c
index d1a2a7324fe3f742ea9a51a83b1b58b80854e2fb..5b301408d737c899c5c8919db7ea10f115cb3be4 100644 (file)
--- a/servers/slapd/back-mdb/modify.c
+++ b/servers/slapd/back-mdb/modify.c
@@ -409,7 +409,7 @@ do_del:
 
        /* check that the entry still obeys the schema */
        ap = NULL;
-       rc = entry_schema_check( op, e, save_attrs, get_relax(op), 0, &ap,
+       rc = entry_schema_check( op, e, get_relax(op), 0, &ap,
                text, textbuf, textlen );
        if ( rc != LDAP_SUCCESS || op->o_noop ) {
                attrs_free( e->e_attrs );

diff --git a/servers/slapd/back-monitor/log.c b/servers/slapd/back-monitor/log.c
index bc3c4db17e5708df5a7d17da1079cc819aea2abc..e5b6d17cbc94e1356298c6b96b50d9be050c45ee 100644 (file)
--- a/servers/slapd/back-monitor/log.c
+++ b/servers/slapd/back-monitor/log.c
@@ -181,7 +181,7 @@ monitor_subsys_log_modify(
                }
 
                /* check that the entry still obeys the schema */
-               rc = entry_schema_check( op, e, save_attrs, 0, 0, NULL,
+               rc = entry_schema_check( op, e, 0, 0, NULL,
                        &text, textbuf, sizeof( textbuf ) );
                if ( rc != LDAP_SUCCESS ) {
                        rs->sr_err = rc;

diff --git a/servers/slapd/back-sql/add.c b/servers/slapd/back-sql/add.c
index 9375827d82230d3c0d17abb88595df2460566c88..fac37712c40022a096e7c6b1e970a7752d307360 100644 (file)
--- a/servers/slapd/back-sql/add.c
+++ b/servers/slapd/back-sql/add.c
@@ -973,7 +973,7 @@ backsql_add( Operation *op, SlapReply *rs )
        if ( BACKSQL_CHECK_SCHEMA( bi ) ) {
                char            textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' };
 
-               rs->sr_err = entry_schema_check( op, op->ora_e, NULL, 0, 1, NULL,
+               rs->sr_err = entry_schema_check( op, op->ora_e, 0, 1, NULL,
                        &rs->sr_text, textbuf, sizeof( textbuf ) );
                if ( rs->sr_err != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE, "   backsql_add(\"%s\"): "

diff --git a/servers/slapd/back-sql/modify.c b/servers/slapd/back-sql/modify.c
index e7919f638817b2ecb4c8cc094f8e5b43ecdafaa8..d34a45a1314d9c64836baa918c7af6fb6b43af6c 100644 (file)
--- a/servers/slapd/back-sql/modify.c
+++ b/servers/slapd/back-sql/modify.c
@@ -144,7 +144,7 @@ backsql_modify( Operation *op, SlapReply *rs )
                        goto do_transact;
                }
 
-               rs->sr_err = entry_schema_check( op, &m, NULL, 0, 0, NULL,
+               rs->sr_err = entry_schema_check( op, &m, 0, 0, NULL,
                        &rs->sr_text, textbuf, sizeof( textbuf ) );
                if ( rs->sr_err != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE, "   backsql_modify(\"%s\"): "

diff --git a/servers/slapd/back-sql/modrdn.c b/servers/slapd/back-sql/modrdn.c
index 636892aeacaec6d017231e5925947527b5eeb01d..4d57dba1d3680165cfa9c5408136fc84db6f2223 100644 (file)
--- a/servers/slapd/back-sql/modrdn.c
+++ b/servers/slapd/back-sql/modrdn.c
@@ -428,7 +428,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 
                e_id = bsi.bsi_base_id;
 
-               rs->sr_err = entry_schema_check( op, &r, NULL, 0, 0, NULL,
+               rs->sr_err = entry_schema_check( op, &r, 0, 0, NULL,
                        &rs->sr_text, textbuf, sizeof( textbuf ) );
                if ( rs->sr_err != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(\"%s\"): "

diff --git a/servers/slapd/back-wt/add.c b/servers/slapd/back-wt/add.c
index 5613be2befda47e37c304734f9e7f9a95ef6c0b0..f3962f6cdabcdf3da433f82ad6acb752d6a2bae6 100644 (file)
--- a/servers/slapd/back-wt/add.c
+++ b/servers/slapd/back-wt/add.c
@@ -50,7 +50,7 @@ wt_add( Operation *op, SlapReply *rs )
 
        /* check entry's schema */
        rs->sr_err = entry_schema_check(
-               op, op->ora_e, NULL,
+               op, op->ora_e,
                get_relax(op), 1, NULL, &rs->sr_text, textbuf, textlen );
     if ( rs->sr_err != LDAP_SUCCESS ) {
         Debug( LDAP_DEBUG_TRACE,

diff --git a/servers/slapd/back-wt/modify.c b/servers/slapd/back-wt/modify.c
index 12bfd03e09352c1070545039a9ece19fded21175..91f292b7c4480a9def064d72c1502575067dc580 100644 (file)
--- a/servers/slapd/back-wt/modify.c
+++ b/servers/slapd/back-wt/modify.c
@@ -302,7 +302,7 @@ int wt_modify_internal(
 
        /* check that the entry still obeys the schema */
        ap = NULL;
-       rc = entry_schema_check( op, e, save_attrs, get_relax(op), 0, &ap,
+       rc = entry_schema_check( op, e, get_relax(op), 0, &ap,
                text, textbuf, textlen );
        if ( rc != LDAP_SUCCESS || op->o_noop ) {
                attrs_free( e->e_attrs );

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 1c4f86867556a192ebd45938bd5f4cf67195e009..c554b02ed1be5b224d41baf72fac15b25573e329 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -6038,7 +6038,7 @@ config_back_add( Operation *op, SlapReply *rs )
        {
                char textbuf[SLAP_TEXT_BUFLEN];
                size_t textlen = sizeof textbuf;
-               rs->sr_err = entry_schema_check(op, op->ora_e, NULL, 0, 1, NULL,
+               rs->sr_err = entry_schema_check(op, op->ora_e, 0, 1, NULL,
                        &rs->sr_text, textbuf, sizeof( textbuf ) );
                if ( rs->sr_err != LDAP_SUCCESS )
                        goto out;
@@ -6336,7 +6336,7 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs,
        
        if ( rc == LDAP_SUCCESS) {
                /* check that the entry still obeys the schema */
-               rc = entry_schema_check(op, e, NULL, 0, 0, NULL,
+               rc = entry_schema_check(op, e, 0, 0, NULL,
                        &rs->sr_text, ca->cr_msg, sizeof(ca->cr_msg) );
        }
        if ( rc ) goto out_noop;

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index b553ace8602b2be0da2f8a636af5dec90002033c..44a4a0c3636ebe72d49c659b21549523b283324b 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1801,7 +1801,6 @@ LDAP_SLAPD_F( int ) structural_class(
 LDAP_SLAPD_F( int ) entry_schema_check(
        Operation *op,
        Entry *e,
-       Attribute *attrs,
        int manage,
        int add,
        Attribute **socp,

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index df8392f1bee994c9880edd769a31c62bf1260363..ad78bcbcedd59d13109f33c9530685eb5f310ec8 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -46,7 +46,6 @@ int
 entry_schema_check( 
        Operation *op,
        Entry *e,
-       Attribute *oldattrs,
        int manage,
        int add,
        Attribute **socp,

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 73900a825c1bdf4ddaae54284865943ce0e95de4..8f471d27d105373607b15679e44887a0d5a50ac1 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -1192,7 +1192,7 @@ slap_tool_entry_check(
        op->o_bd = be;
 
        if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
-               int rc = entry_schema_check( op, e, NULL, manage, 1, NULL,
+               int rc = entry_schema_check( op, e, manage, 1, NULL,
                        text, textbuf, textlen );
 
                if( rc != LDAP_SUCCESS ) {

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index de2e16ef0742c7ce3ffb0dd697e5115c9bf4c96b..7e2724587fe7287e3885aff3adf5e6458684292b 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -3157,7 +3157,7 @@ int slapi_entry_schema_check( Slapi_PBlock *pb, Slapi_Entry *e )
 
        pb->pb_op->o_bd = select_backend( &e->e_nname, 0 );
        if ( pb->pb_op->o_bd != NULL ) {
-               rc = entry_schema_check( pb->pb_op, e, NULL, 0, 0, NULL,
+               rc = entry_schema_check( pb->pb_op, e, 0, 0, NULL,
                        &text, textbuf, textlen );
        }
        pb->pb_op->o_bd = be_orig;

diff --git a/servers/slapd/slapschema.c b/servers/slapd/slapschema.c
index 044c665204f3ab2f854ac8fda6045b0ca4da25c3..d144576a99bce9e24792208927b300121f64cba4 100644 (file)
--- a/servers/slapd/slapschema.c
+++ b/servers/slapd/slapschema.c
@@ -143,7 +143,7 @@ slapschema( int argc, char **argv )
                        printf( "# id=%08lx\n", (long) id );
                }
 
-               rc = entry_schema_check( op, e, NULL, 0, 0, NULL,
+               rc = entry_schema_check( op, e, 0, 0, NULL,
                        &text, textbuf, textlen );
                if ( rc != LDAP_SUCCESS ) {
                        fprintf( ldiffp->fp, "# (%d) %s%s%s\n",