From: Howard Chu Date: Wed, 22 Sep 2021 19:51:50 +0000 (+0100) Subject: slapd: delete unused entry_schema_check(oldattrs) parameter X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42fc772c23060aeefecd4cec2b9aadad69993f2a;p=thirdparty%2Fopenldap.git 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 383024706d..0e1aae7d47 100644 --- 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 b223375600..b23c6b10d2 100644 --- 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 d1a2a7324f..5b301408d7 100644 --- 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 bc3c4db17e..e5b6d17cbc 100644 --- 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 9375827d82..fac37712c4 100644 --- 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 e7919f6388..d34a45a131 100644 --- 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 636892aeac..4d57dba1d3 100644 --- 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 5613be2bef..f3962f6cda 100644 --- 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 12bfd03e09..91f292b7c4 100644 --- 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 1c4f868675..c554b02ed1 100644 --- 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 b553ace860..44a4a0c363 100644 --- 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 df8392f1be..ad78bcbced 100644 --- 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 73900a825c..8f471d27d1 100644 --- 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 de2e16ef07..7e2724587f 100644 --- 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 044c665204..d144576a99 100644 --- 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",