Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nadezhda Ivanova
OpenLDAP
Commits
8a43ee82
Commit
8a43ee82
authored
Dec 11, 2002
by
Kurt Zeilenga
Browse files
reflect latest changes from HEAD
parent
c000d4f6
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
8a43ee82
...
...
@@ -2,6 +2,10 @@ OpenLDAP 2.1 Change Log
OpenLDAP 2.1.10 Engineering
Fixed slapd empty values return filter control bug (ITS#2219)
Fixed slapd empty oid control bug
Fixed ldapsearch empty baseObject bug
Fixed slapd acl/group value_find_ex() bug (ITS#2227)
Fixed slapd NameAndOptionalUID bug
OpenLDAP 2.1.9 Release
Fixed back-bdb moddn newSuperior bug
...
...
clients/tools/ldapdelete.c
View file @
8a43ee82
...
...
@@ -98,7 +98,8 @@ main( int argc, char **argv )
{
char
buf
[
4096
];
FILE
*
fp
;
int
i
,
rc
,
authmethod
,
referrals
,
want_bindpw
,
version
,
debug
,
manageDSAit
,
noop
,
crit
;
int
i
,
rc
,
retval
,
authmethod
,
referrals
,
want_bindpw
;
int
version
,
debug
,
manageDSAit
,
noop
,
crit
;
char
*
pw_file
;
char
*
control
,
*
cvalue
;
...
...
@@ -730,14 +731,17 @@ main( int argc, char **argv )
}
}
rc
=
0
;
retval
=
rc
=
0
;
if
(
fp
==
NULL
)
{
for
(
;
optind
<
argc
;
++
optind
)
{
rc
=
dodelete
(
ld
,
argv
[
optind
]
);
/* Stop on error and no -c option */
if
(
rc
!=
0
&&
contoper
==
0
)
break
;
if
(
rc
!=
0
)
{
retval
=
rc
;
if
(
contoper
==
0
)
break
;
}
}
}
else
{
while
((
rc
==
0
||
contoper
)
&&
fgets
(
buf
,
sizeof
(
buf
),
fp
)
!=
NULL
)
{
...
...
@@ -745,13 +749,15 @@ main( int argc, char **argv )
if
(
*
buf
!=
'\0'
)
{
rc
=
dodelete
(
ld
,
buf
);
if
(
rc
!=
0
)
retval
=
rc
;
}
}
}
ldap_unbind
(
ld
);
return
(
r
c
);
return
(
r
etval
);
}
...
...
clients/tools/ldapmodrdn.c
View file @
8a43ee82
...
...
@@ -111,7 +111,8 @@ main(int argc, char **argv)
{
char
*
infile
,
*
entrydn
=
NULL
,
*
rdn
=
NULL
,
buf
[
4096
];
FILE
*
fp
;
int
rc
,
i
,
remove
,
havedn
,
authmethod
,
version
,
want_bindpw
,
debug
,
manageDSAit
,
noop
,
crit
;
int
rc
,
retval
,
i
,
remove
,
havedn
,
authmethod
,
version
;
int
want_bindpw
,
debug
,
manageDSAit
,
noop
,
crit
;
int
referrals
;
char
*
newSuperior
=
NULL
;
char
*
pw_file
=
NULL
;
...
...
@@ -765,9 +766,9 @@ main(int argc, char **argv)
}
}
rc
=
0
;
retval
=
rc
=
0
;
if
(
havedn
)
r
c
=
domodrdn
(
ld
,
entrydn
,
rdn
,
newSuperior
,
remove
);
r
etval
=
domodrdn
(
ld
,
entrydn
,
rdn
,
newSuperior
,
remove
);
else
while
((
rc
==
0
||
contoper
)
&&
fgets
(
buf
,
sizeof
(
buf
),
fp
)
!=
NULL
)
{
if
(
*
buf
!=
'\0'
)
{
/* blank lines optional, skip */
buf
[
strlen
(
buf
)
-
1
]
=
'\0'
;
/* remove nl */
...
...
@@ -778,6 +779,8 @@ main(int argc, char **argv)
return
(
EXIT_FAILURE
);
}
rc
=
domodrdn
(
ld
,
entrydn
,
rdn
,
newSuperior
,
remove
);
if
(
rc
!=
0
)
retval
=
rc
;
havedn
=
0
;
}
else
if
(
!
havedn
)
{
/* don't have DN yet */
if
((
entrydn
=
strdup
(
buf
))
==
NULL
)
{
...
...
@@ -791,8 +794,7 @@ main(int argc, char **argv)
ldap_unbind
(
ld
);
/* UNREACHABLE */
return
(
rc
);
return
(
retval
);
}
static
int
domodrdn
(
...
...
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