Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
openldap
OpenLDAP
Commits
42fc772c
Commit
42fc772c
authored
Sep 22, 2021
by
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
Changes
15
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
servers/slapd/back-ldif/ldif.c
View file @
42fc772c
...
...
@@ -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
;
...
...
servers/slapd/back-mdb/add.c
View file @
42fc772c
...
...
@@ -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
,
...
...
servers/slapd/back-mdb/modify.c
View file @
42fc772c
...
...
@@ -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
);
...
...
servers/slapd/back-monitor/log.c
View file @
42fc772c
...
...
@@ -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
;
...
...
servers/slapd/back-sql/add.c
View file @
42fc772c
...
...
@@ -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
\"
): "
...
...
servers/slapd/back-sql/modify.c
View file @
42fc772c
...
...
@@ -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
\"
): "
...
...
servers/slapd/back-sql/modrdn.c
View file @
42fc772c
...
...
@@ -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
\"
): "
...
...
servers/slapd/back-wt/add.c
View file @
42fc772c
...
...
@@ -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
,
...
...
servers/slapd/back-wt/modify.c
View file @
42fc772c
...
...
@@ -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
);
...
...
servers/slapd/bconfig.c
View file @
42fc772c
...
...
@@ -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
;
...
...
servers/slapd/proto-slap.h
View file @
42fc772c
...
...
@@ -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
,
...
...
servers/slapd/schema_check.c
View file @
42fc772c
...
...
@@ -46,7 +46,6 @@ int
entry_schema_check
(
Operation
*
op
,
Entry
*
e
,
Attribute
*
oldattrs
,
int
manage
,
int
add
,
Attribute
**
socp
,
...
...
servers/slapd/slapcommon.c
View file @
42fc772c
...
...
@@ -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
)
{
...
...
servers/slapd/slapi/slapi_utils.c
View file @
42fc772c
...
...
@@ -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
;
...
...
servers/slapd/slapschema.c
View file @
42fc772c
...
...
@@ -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
"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment