Commit 42fc772c authored by Howard Chu's avatar Howard Chu
Browse files

slapd: delete unused entry_schema_check(oldattrs) parameter

Unused since 2001 2ae02fc1
parent b70538de
Pipeline #3568 passed with stage
in 50 minutes and 7 seconds
...@@ -1236,7 +1236,7 @@ apply_modify_to_entry( ...@@ -1236,7 +1236,7 @@ apply_modify_to_entry(
entry->e_ocflags = 0; entry->e_ocflags = 0;
} }
/* check that the entry still obeys the schema */ /* 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 ); &rs->sr_text, textbuf, SLAP_TEXT_BUFLEN );
} }
...@@ -1408,7 +1408,7 @@ ldif_back_add( Operation *op, SlapReply *rs ) ...@@ -1408,7 +1408,7 @@ ldif_back_add( Operation *op, SlapReply *rs )
Debug( LDAP_DEBUG_TRACE, "ldif_back_add: \"%s\"\n", e->e_dn ); 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 ) ); &rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rc != LDAP_SUCCESS ) if ( rc != LDAP_SUCCESS )
goto send_res; goto send_res;
......
...@@ -51,7 +51,7 @@ mdb_add(Operation *op, SlapReply *rs ) ...@@ -51,7 +51,7 @@ mdb_add(Operation *op, SlapReply *rs )
ctrls[num_ctrls] = 0; ctrls[num_ctrls] = 0;
/* check entry's schema */ /* 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 ); get_relax(op), 1, NULL, &rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
......
...@@ -409,7 +409,7 @@ do_del: ...@@ -409,7 +409,7 @@ do_del:
/* check that the entry still obeys the schema */ /* check that the entry still obeys the schema */
ap = NULL; 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 ); text, textbuf, textlen );
if ( rc != LDAP_SUCCESS || op->o_noop ) { if ( rc != LDAP_SUCCESS || op->o_noop ) {
attrs_free( e->e_attrs ); attrs_free( e->e_attrs );
......
...@@ -181,7 +181,7 @@ monitor_subsys_log_modify( ...@@ -181,7 +181,7 @@ monitor_subsys_log_modify(
} }
/* check that the entry still obeys the schema */ /* 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 ) ); &text, textbuf, sizeof( textbuf ) );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
rs->sr_err = rc; rs->sr_err = rc;
......
...@@ -973,7 +973,7 @@ backsql_add( Operation *op, SlapReply *rs ) ...@@ -973,7 +973,7 @@ backsql_add( Operation *op, SlapReply *rs )
if ( BACKSQL_CHECK_SCHEMA( bi ) ) { if ( BACKSQL_CHECK_SCHEMA( bi ) ) {
char textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' }; 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 ) ); &rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, " backsql_add(\"%s\"): " Debug( LDAP_DEBUG_TRACE, " backsql_add(\"%s\"): "
......
...@@ -144,7 +144,7 @@ backsql_modify( Operation *op, SlapReply *rs ) ...@@ -144,7 +144,7 @@ backsql_modify( Operation *op, SlapReply *rs )
goto do_transact; 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 ) ); &rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, " backsql_modify(\"%s\"): " Debug( LDAP_DEBUG_TRACE, " backsql_modify(\"%s\"): "
......
...@@ -428,7 +428,7 @@ backsql_modrdn( Operation *op, SlapReply *rs ) ...@@ -428,7 +428,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
e_id = bsi.bsi_base_id; 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 ) ); &rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, " backsql_modrdn(\"%s\"): " Debug( LDAP_DEBUG_TRACE, " backsql_modrdn(\"%s\"): "
......
...@@ -50,7 +50,7 @@ wt_add( Operation *op, SlapReply *rs ) ...@@ -50,7 +50,7 @@ wt_add( Operation *op, SlapReply *rs )
/* check entry's schema */ /* check entry's schema */
rs->sr_err = entry_schema_check( 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 ); get_relax(op), 1, NULL, &rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
......
...@@ -302,7 +302,7 @@ int wt_modify_internal( ...@@ -302,7 +302,7 @@ int wt_modify_internal(
/* check that the entry still obeys the schema */ /* check that the entry still obeys the schema */
ap = NULL; 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 ); text, textbuf, textlen );
if ( rc != LDAP_SUCCESS || op->o_noop ) { if ( rc != LDAP_SUCCESS || op->o_noop ) {
attrs_free( e->e_attrs ); attrs_free( e->e_attrs );
......
...@@ -6038,7 +6038,7 @@ config_back_add( Operation *op, SlapReply *rs ) ...@@ -6038,7 +6038,7 @@ config_back_add( Operation *op, SlapReply *rs )
{ {
char textbuf[SLAP_TEXT_BUFLEN]; char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf; 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 ) ); &rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rs->sr_err != LDAP_SUCCESS ) if ( rs->sr_err != LDAP_SUCCESS )
goto out; goto out;
...@@ -6336,7 +6336,7 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs, ...@@ -6336,7 +6336,7 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs,
if ( rc == LDAP_SUCCESS) { if ( rc == LDAP_SUCCESS) {
/* check that the entry still obeys the schema */ /* 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) ); &rs->sr_text, ca->cr_msg, sizeof(ca->cr_msg) );
} }
if ( rc ) goto out_noop; if ( rc ) goto out_noop;
......
...@@ -1801,7 +1801,6 @@ LDAP_SLAPD_F( int ) structural_class( ...@@ -1801,7 +1801,6 @@ LDAP_SLAPD_F( int ) structural_class(
LDAP_SLAPD_F( int ) entry_schema_check( LDAP_SLAPD_F( int ) entry_schema_check(
Operation *op, Operation *op,
Entry *e, Entry *e,
Attribute *attrs,
int manage, int manage,
int add, int add,
Attribute **socp, Attribute **socp,
......
...@@ -46,7 +46,6 @@ int ...@@ -46,7 +46,6 @@ int
entry_schema_check( entry_schema_check(
Operation *op, Operation *op,
Entry *e, Entry *e,
Attribute *oldattrs,
int manage, int manage,
int add, int add,
Attribute **socp, Attribute **socp,
......
...@@ -1192,7 +1192,7 @@ slap_tool_entry_check( ...@@ -1192,7 +1192,7 @@ slap_tool_entry_check(
op->o_bd = be; op->o_bd = be;
if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) { 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 ); text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) {
......
...@@ -3157,7 +3157,7 @@ int slapi_entry_schema_check( Slapi_PBlock *pb, Slapi_Entry *e ) ...@@ -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 ); pb->pb_op->o_bd = select_backend( &e->e_nname, 0 );
if ( pb->pb_op->o_bd != NULL ) { 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 ); &text, textbuf, textlen );
} }
pb->pb_op->o_bd = be_orig; pb->pb_op->o_bd = be_orig;
......
...@@ -143,7 +143,7 @@ slapschema( int argc, char **argv ) ...@@ -143,7 +143,7 @@ slapschema( int argc, char **argv )
printf( "# id=%08lx\n", (long) id ); 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 ); &text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
fprintf( ldiffp->fp, "# (%d) %s%s%s\n", fprintf( ldiffp->fp, "# (%d) %s%s%s\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment