Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
d2ac9a3f
Commit
d2ac9a3f
authored
Jan 28, 1999
by
Kurt Zeilenga
Browse files
Port fixed ndn handling to 1.1. will likely NOT fix ITS#29 or ITS#53
parent
1a8ebbd1
Changes
3
Hide whitespace changes
Inline
Side-by-side
servers/slapd/back-ldbm/add.c
View file @
d2ac9a3f
...
...
@@ -20,22 +20,19 @@ ldbm_back_add(
)
{
struct
ldbminfo
*
li
=
(
struct
ldbminfo
*
)
be
->
be_private
;
char
*
dn
=
NULL
,
*
pdn
;
char
*
pdn
;
Entry
*
p
=
NULL
;
int
rootlock
=
0
;
int
rc
=
-
1
;
dn
=
dn_normalize
(
ch_strdup
(
e
->
e_dn
)
);
Debug
(
LDAP_DEBUG_ARGS
,
"==> ldbm_back_add: %s
\n
"
,
dn
,
0
,
0
);
Debug
(
LDAP_DEBUG_ARGS
,
"==> ldbm_back_add: %s
\n
"
,
e
->
e_ndn
,
0
,
0
);
/* nobody else can add until we lock our parent */
pthread_mutex_lock
(
&
li
->
li_add_mutex
);
if
(
(
dn2id
(
be
,
dn
)
)
!=
NOID
)
{
if
(
(
dn2id
(
be
,
e
->
e_n
dn
)
)
!=
NOID
)
{
pthread_mutex_unlock
(
&
li
->
li_add_mutex
);
entry_free
(
e
);
free
(
dn
);
send_ldap_result
(
conn
,
op
,
LDAP_ALREADY_EXISTS
,
""
,
""
);
return
(
-
1
);
}
...
...
@@ -47,7 +44,6 @@ ldbm_back_add(
0
,
0
,
0
);
entry_free
(
e
);
free
(
dn
);
send_ldap_result
(
conn
,
op
,
LDAP_OBJECT_CLASS_VIOLATION
,
""
,
""
);
return
(
-
1
);
...
...
@@ -59,7 +55,7 @@ ldbm_back_add(
* add the entry.
*/
if
(
(
pdn
=
dn_parent
(
be
,
dn
))
!=
NULL
)
{
if
(
(
pdn
=
dn_parent
(
be
,
e
->
e_n
dn
))
!=
NULL
)
{
char
*
matched
=
NULL
;
/* get parent with writer lock */
...
...
@@ -75,7 +71,6 @@ ldbm_back_add(
}
entry_free
(
e
);
free
(
dn
);
free
(
pdn
);
return
-
1
;
}
...
...
@@ -101,7 +96,6 @@ ldbm_back_add(
cache_return_entry_w
(
&
li
->
li_cache
,
p
);
entry_free
(
e
);
free
(
dn
);
return
-
1
;
}
...
...
@@ -115,7 +109,6 @@ ldbm_back_add(
""
,
""
);
entry_free
(
e
);
free
(
dn
);
return
-
1
;
}
...
...
@@ -144,7 +137,6 @@ ldbm_back_add(
0
,
0
,
0
);
entry_free
(
e
);
free
(
dn
);
send_ldap_result
(
conn
,
op
,
LDAP_OPERATIONS_ERROR
,
""
,
""
);
return
(
-
1
);
...
...
@@ -173,7 +165,6 @@ ldbm_back_add(
entry_rdwr_unlock
(
e
,
1
);;
entry_free
(
e
);
free
(
dn
);
send_ldap_result
(
conn
,
op
,
LDAP_ALREADY_EXISTS
,
""
,
""
);
return
(
-
1
);
...
...
@@ -206,7 +197,7 @@ ldbm_back_add(
}
/* dn2id index */
if
(
dn2id_add
(
be
,
dn
,
e
->
e_id
)
!=
0
)
{
if
(
dn2id_add
(
be
,
e
->
e_n
dn
,
e
->
e_id
)
!=
0
)
{
Debug
(
LDAP_DEBUG_TRACE
,
"dn2id_add failed
\n
"
,
0
,
0
,
0
);
send_ldap_result
(
conn
,
op
,
LDAP_OPERATIONS_ERROR
,
""
,
""
);
...
...
@@ -218,7 +209,7 @@ ldbm_back_add(
if
(
id2entry_add
(
be
,
e
)
!=
0
)
{
Debug
(
LDAP_DEBUG_TRACE
,
"id2entry_add failed
\n
"
,
0
,
0
,
0
);
(
void
)
dn2id_delete
(
be
,
dn
);
(
void
)
dn2id_delete
(
be
,
e
->
e_n
dn
);
send_ldap_result
(
conn
,
op
,
LDAP_OPERATIONS_ERROR
,
""
,
""
);
goto
return_results
;
...
...
@@ -228,9 +219,6 @@ ldbm_back_add(
rc
=
0
;
return_results:
;
if
(
dn
!=
NULL
)
free
(
dn
);
if
(
p
!=
NULL
)
{
/* free parent and writer lock */
cache_return_entry_w
(
&
li
->
li_cache
,
p
);
...
...
servers/slapd/back-ldbm/delete.c
View file @
d2ac9a3f
...
...
@@ -69,7 +69,7 @@ ldbm_back_delete(
e
->
e_rdwr
.
readers_reading
,
e
->
e_rdwr
.
writer_writing
,
0
);
/* delete from parent's id2children entry */
if
(
(
pdn
=
dn_parent
(
be
,
dn
))
!=
NULL
)
{
if
(
(
pdn
=
dn_parent
(
be
,
e
->
e_n
dn
))
!=
NULL
)
{
if
(
(
p
=
dn2entry_w
(
be
,
pdn
,
&
matched
))
==
NULL
)
{
Debug
(
LDAP_DEBUG_TRACE
,
"parent does not exist
\n
"
,
0
,
0
,
0
);
...
...
@@ -114,7 +114,7 @@ ldbm_back_delete(
}
/* delete from dn2id mapping */
if
(
dn2id_delete
(
be
,
e
->
e_dn
)
!=
0
)
{
if
(
dn2id_delete
(
be
,
e
->
e_
n
dn
)
!=
0
)
{
Debug
(
LDAP_DEBUG_ARGS
,
"<=- ldbm_back_delete: operations error %s
\n
"
,
dn
,
0
,
0
);
...
...
servers/slapd/back-ldbm/modrdn.c
View file @
d2ac9a3f
...
...
@@ -51,7 +51,7 @@ ldbm_back_modrdn(
}
#endif
if
(
(
pdn
=
dn_parent
(
be
,
dn
))
!=
NULL
)
{
if
(
(
pdn
=
dn_parent
(
be
,
e
->
e_n
dn
))
!=
NULL
)
{
/* parent + rdn + separator(s) + null */
if
(
(
p
=
dn2entry_w
(
be
,
pdn
,
&
matched
))
==
NULL
)
{
Debug
(
LDAP_DEBUG_TRACE
,
"parent does not exist
\n
"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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