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
66af4cfd
Commit
66af4cfd
authored
Sep 22, 2020
by
Quanah Gibson-Mount
Browse files
ITS#8618 - Remove deprecated -h and -p options to client tools
parent
2dace701
Changes
92
Hide whitespace changes
Inline
Side-by-side
clients/tools/common.c
View file @
66af4cfd
...
...
@@ -71,8 +71,6 @@ char *prog = NULL;
/* connection */
char
*
ldapuri
=
NULL
;
char
*
ldaphost
=
NULL
;
int
ldapport
=
0
;
int
use_tls
=
0
;
int
protocol
=
-
1
;
int
version
=
0
;
...
...
@@ -350,7 +348,6 @@ N_(" [!]sessiontracking[=<username>]\n")
N_
(
" abandon, cancel, ignore (SIGINT sends abandon/cancel,
\n
"
" or ignores response; if critical, doesn't wait for SIGINT.
\n
"
" not really controls)
\n
"
)
N_
(
" -h host LDAP server
\n
"
),
N_
(
" -H URI LDAP Uniform Resource Identifier(s)
\n
"
),
N_
(
" -I use SASL Interactive mode
\n
"
),
N_
(
" -n show what would be done but don't actually do it
\n
"
),
...
...
@@ -359,7 +356,6 @@ N_(" -O props SASL security properties\n"),
N_
(
" -o <opt>[=<optparam>] any libldap ldap.conf options, plus
\n
"
),
N_
(
" ldif_wrap=<width> (in columns, or
\"
no
\"
for no wrapping)
\n
"
),
N_
(
" nettimeout=<timeout> (in seconds, or
\"
none
\"
or
\"
max
\"
)
\n
"
),
N_
(
" -p port port on LDAP server
\n
"
),
N_
(
" -Q use SASL Quiet mode
\n
"
),
N_
(
" -R realm SASL realm
\n
"
),
N_
(
" -U authcid SASL authentication identity
\n
"
),
...
...
@@ -778,13 +774,6 @@ tool_args( int argc, char **argv )
}
infile
=
optarg
;
break
;
case
'h'
:
/* ldap host */
if
(
ldaphost
!=
NULL
)
{
fprintf
(
stderr
,
"%s: -h previously specified
\n
"
,
prog
);
exit
(
EXIT_FAILURE
);
}
ldaphost
=
optarg
;
break
;
case
'H'
:
/* ldap URI */
if
(
ldapuri
!=
NULL
)
{
fprintf
(
stderr
,
"%s: -H previously specified
\n
"
,
prog
);
...
...
@@ -898,18 +887,6 @@ tool_args( int argc, char **argv )
exit
(
EXIT_FAILURE
);
#endif
break
;
case
'p'
:
if
(
ldapport
)
{
fprintf
(
stderr
,
"%s: -p previously specified
\n
"
,
prog
);
exit
(
EXIT_FAILURE
);
}
ival
=
strtol
(
optarg
,
&
next
,
10
);
if
(
next
==
NULL
||
next
[
0
]
!=
'\0'
)
{
fprintf
(
stderr
,
"%s: unable to parse port number
\"
%s
\"\n
"
,
prog
,
optarg
);
exit
(
EXIT_FAILURE
);
}
ldapport
=
ival
;
break
;
case
'P'
:
ival
=
strtol
(
optarg
,
&
next
,
10
);
if
(
next
==
NULL
||
next
[
0
]
!=
'\0'
)
{
...
...
@@ -1144,22 +1121,6 @@ tool_args( int argc, char **argv )
#endif
}
if
(
ldapuri
==
NULL
)
{
if
(
ldapport
&&
(
ldaphost
==
NULL
))
{
fprintf
(
stderr
,
"%s: -p without -h is invalid.
\n
"
,
prog
);
exit
(
EXIT_FAILURE
);
}
}
else
{
if
(
ldaphost
!=
NULL
)
{
fprintf
(
stderr
,
"%s: -H incompatible with -h
\n
"
,
prog
);
exit
(
EXIT_FAILURE
);
}
if
(
ldapport
)
{
fprintf
(
stderr
,
"%s: -H incompatible with -p
\n
"
,
prog
);
exit
(
EXIT_FAILURE
);
}
}
if
(
protocol
==
LDAP_VERSION2
)
{
if
(
assertctl
||
authzid
||
manageDIT
||
manageDSAit
||
#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
...
...
@@ -1230,19 +1191,7 @@ tool_conn_setup( int dont, void (*private_setup)( LDAP * ) )
if
(
!
dont
)
{
int
rc
;
if
(
(
ldaphost
!=
NULL
||
ldapport
)
&&
(
ldapuri
==
NULL
)
)
{
/* construct URL */
LDAPURLDesc
url
;
memset
(
&
url
,
0
,
sizeof
(
url
));
url
.
lud_scheme
=
"ldap"
;
url
.
lud_host
=
ldaphost
;
url
.
lud_port
=
ldapport
;
url
.
lud_scope
=
LDAP_SCOPE_DEFAULT
;
ldapuri
=
ldap_url_desc2str
(
&
url
);
}
else
if
(
ldapuri
!=
NULL
)
{
if
(
ldapuri
!=
NULL
)
{
LDAPURLDesc
*
ludlist
,
**
ludp
;
char
**
urls
=
NULL
;
int
nurls
=
0
;
...
...
clients/tools/common.h
View file @
66af4cfd
...
...
@@ -61,8 +61,6 @@ extern char *prog;
/* connection */
extern
char
*
ldapuri
;
extern
char
*
ldaphost
;
extern
int
ldapport
;
extern
int
use_tls
;
extern
int
protocol
;
extern
int
version
;
...
...
doc/man/man1/ldapcompare.1
View file @
66af4cfd
...
...
@@ -31,10 +31,6 @@ ldapcompare \- LDAP compare tool
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-P \ { 2 \||\| 3 }]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -143,14 +139,6 @@ Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify an alternate TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-P \ { 2 \||\| 3 }
Specify the LDAP protocol version to use.
.TP
...
...
doc/man/man1/ldapdelete.1
View file @
66af4cfd
...
...
@@ -37,10 +37,6 @@ ldapdelete \- LDAP delete entry tool
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-P \ { 2 \||\| 3 }]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -149,14 +145,6 @@ Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify an alternate TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-P \ { 2 \||\| 3 }
Specify the LDAP protocol version to use.
.TP
...
...
doc/man/man1/ldapexop.1
View file @
66af4cfd
...
...
@@ -42,10 +42,6 @@ ldapexop
[\c
.BI \-H \ URI\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
[\c
.BI \-o \ opt \fR[= optparam \fR]]
...
...
@@ -160,14 +156,6 @@ Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
.TP
.BI \-h \ ldaphost
Specify the host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify the TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]
Specify general extensions. \'!\' indicates criticality.
.nf
...
...
doc/man/man1/ldapmodify.1
View file @
66af4cfd
...
...
@@ -37,10 +37,6 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-P \ { 2 \||\| 3 }]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -97,10 +93,6 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-P \ { 2 \||\| 3 }]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -212,14 +204,6 @@ Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify an alternate TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-P \ { 2 \||\| 3 }
Specify the LDAP protocol version to use.
.TP
...
...
doc/man/man1/ldapmodrdn.1
View file @
66af4cfd
...
...
@@ -37,10 +37,6 @@ ldapmodrdn \- LDAP rename entry tool
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-P \ { 2 \||\| 3 }]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -143,14 +139,6 @@ Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify an alternate TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-P \ { 2 \||\| 3 }
Specify the LDAP protocol version to use.
.TP
...
...
doc/man/man1/ldappasswd.1
View file @
66af4cfd
...
...
@@ -39,10 +39,6 @@ ldappasswd \- change the password of an LDAP entry
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
[\c
.BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -148,14 +144,6 @@ Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify an alternate TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]
.TP
.BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]
...
...
doc/man/man1/ldapsearch.1
View file @
66af4cfd
...
...
@@ -57,10 +57,6 @@ ldapsearch \- LDAP search tool
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-P \ { 2 \||\| 3 }]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -279,14 +275,6 @@ DNS SRV records, according to RFC 2782. The DN must be a non-empty
sequence of AVAs whose attribute type is "dc" (domain component),
and must be escaped according to RFC 2396.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify an alternate TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-P \ { 2 \||\| 3 }
Specify the LDAP protocol version to use.
.TP
...
...
doc/man/man1/ldapwhoami.1
View file @
66af4cfd
...
...
@@ -27,10 +27,6 @@ ldapwhoami \- LDAP who am i? tool
[\c
.BI \-H \ ldapuri\fR]
[\c
.BI \-h \ ldaphost\fR]
[\c
.BI \-p \ ldapport\fR]
[\c
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
[\c
.BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
...
...
@@ -103,14 +99,6 @@ Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.
Deprecated in favor of \fB\-H\fP.
.TP
.BI \-p \ ldapport
Specify an alternate TCP port where the ldap server is listening.
Deprecated in favor of \fB\-H\fP.
.TP
.BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]
.TP
.BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]
...
...
tests/data/regressions/its4184/its4184
View file @
66af4cfd
...
...
@@ -44,7 +44,7 @@ KILLPIDS="$PID"
sleep
1
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
1
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
1
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -70,7 +70,7 @@ echo ""
for
S
in
1 2
;
do
FILE
=
"
${
ITSDIR
}
/mods.ldif"
echo
"
${
S
}
) Applying
`
basename
${
FILE
}
`
..."
$LDAPMODIFY
-v
-D
"
$USER
"
-w
$PASS
-
h
$LOCALHOST
-p
$PORT
1
\
$LDAPMODIFY
-v
-D
"
$USER
"
-w
$PASS
-
H
$URI
1
\
-f
"
${
FILE
}
"
>
$TESTOUT
2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
tests/data/regressions/its4326/its4326
View file @
66af4cfd
...
...
@@ -53,7 +53,7 @@ sleep 1
echo
"Using ldapsearch to check that slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
1
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
1
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -83,7 +83,7 @@ sleep 1
echo
"Using ldapsearch to check that proxy slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
2
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -100,7 +100,7 @@ if test $RC != 0 ; then
fi
echo
"Searching the proxy..."
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
@@ -110,7 +110,7 @@ if test $RC != 0 ; then
fi
echo
"Re-searching the proxy..."
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
@@ -127,7 +127,7 @@ sleep $SLEEP
KILLPIDS
=
"
$PROXYPID
"
echo
"Searching the proxy..."
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
case
$RC
in
...
...
@@ -147,7 +147,7 @@ case $RC in
esac
echo
"Re-searching the proxy..."
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
case
$RC
in
...
...
@@ -179,7 +179,7 @@ sleep 1
echo
"Using ldapsearch to check that slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
1
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
1
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -196,7 +196,7 @@ if test $RC != 0 ; then
fi
echo
"Searching the proxy..."
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
@@ -206,7 +206,7 @@ if test $RC != 0 ; then
fi
echo
"Re-searching the proxy..."
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
tests/data/regressions/its4336/its4336
View file @
66af4cfd
...
...
@@ -58,7 +58,7 @@ sleep 1
echo
"Using ldapsearch to check that slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
1
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
1
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -88,7 +88,7 @@ sleep 1
echo
"Using ldapsearch to check that chain slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
2
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -111,7 +111,7 @@ echo "
set to 0/0, which internally means 0 instead of unlimited, the
underlying back-ldap search timed out.
"
$LDAPSEARCH
-b
"cn=success w/ delay,ou=RetCodes,
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"cn=success w/ delay,ou=RetCodes,
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
@@ -121,7 +121,7 @@ if test $RC != 0 ; then
fi
echo
"Re-searching the chain..."
$LDAPSEARCH
-b
"cn=success w/ delay,ou=RetCodes,
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-b
"cn=success w/ delay,ou=RetCodes,
$BASEDN
"
-
H
$URI
2
\
'(objectClass=*)'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
tests/data/regressions/its4448/its4448
View file @
66af4cfd
...
...
@@ -61,7 +61,7 @@ sleep 1
echo
"Using ldapsearch to check that slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
1
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
1
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -77,7 +77,7 @@ if test $RC != 0 ; then
fi
echo
"Using ldapadd to populate the database..."
$LDAPADD
-D
"
$MANAGERDN
"
-
h
$LOCALHOST
-p
$PORT
1
-w
$PASSWD
<
\
$LDAPADD
-D
"
$MANAGERDN
"
-
H
$URI
1
-w
$PASSWD
<
\
$LDIFORDERED
>
$TESTOUT
2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
@@ -87,7 +87,7 @@ if test $RC != 0 ; then
fi
echo
"Using ldapadd to add the referral..."
$LDAPADD
-D
"
$MANAGERDN
"
-
h
$LOCALHOST
-p
$PORT
1
-w
$PASSWD
<<
EOMODS
\
$LDAPADD
-D
"
$MANAGERDN
"
-
H
$URI
1
-w
$PASSWD
<<
EOMODS
\
>
$TESTOUT
2>&1
dn: cn=Meta,dc=example,dc=com
objectClass: referral
...
...
@@ -117,7 +117,7 @@ sleep 1
echo
"Using ldapsearch to check that slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
2
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -133,7 +133,7 @@ if test $RC != 0 ; then
fi
echo
"Using ldapadd to populate the database..."
$LDAPADD
-D
"
$METAMANAGERDN
"
-
h
$LOCALHOST
-p
$PORT
2
-w
$PASSWD
<
\
$LDAPADD
-D
"
$METAMANAGERDN
"
-
H
$URI
2
-w
$PASSWD
<
\
$LDIFMETA
>>
$TESTOUT
2>&1
RC
=
$?
if
test
$RC
!=
0
;
then
...
...
@@ -156,7 +156,7 @@ sleep 1
echo
"Using ldapsearch to check that slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
3
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
3
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -269,7 +269,7 @@ $METABASEDN
>
$TESTDIR
/
$DATADIR
/do_search.0
echo
"Using tester for concurrent server access..."
$SLAPDTESTER
-P
"
$PROGDIR
"
-d
"
$TESTDIR
/
$DATADIR
"
-
h
$LOCALHOST
-p
$PORT
3
\
$SLAPDTESTER
-P
"
$PROGDIR
"
-d
"
$TESTDIR
/
$DATADIR
"
-
H
$URI
3
\
-D
"cn=Manager,
$METABASEDN
"
-w
$PASSWD
-l
$TESTLOOPS
-r
20
-FF
RC
=
$?
...
...
@@ -280,7 +280,7 @@ if test $RC != 0 ; then
fi
echo
"Using ldapsearch to retrieve all the entries..."
$LDAPSEARCH
-S
""
-b
"
$METABASEDN
"
-
h
$LOCALHOST
-p
$PORT
3
\
$LDAPSEARCH
-S
""
-b
"
$METABASEDN
"
-
H
$URI
3
\
'(objectClass=*)'
>
$SEARCHOUT
2>&1
RC
=
$?
...
...
tests/data/regressions/its6794/its6794
View file @
66af4cfd
...
...
@@ -45,7 +45,7 @@ sleep 1
echo
"Using ldapsearch to retrieve all the entries..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
1
>
$SEARCHOUT
2>&1
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
1
>
$SEARCHOUT
2>&1
RC
=
$?
if
test
$RC
=
0
;
then
break
...
...
tests/data/regressions/its8427/its8427
View file @
66af4cfd
...
...
@@ -295,7 +295,7 @@ fi
echo
"Waiting
$SLEEP1
seconds for syncrepl to receive changes..."
sleep
$SLEEP1
$LDAPWHOAMI
-
h
$LOCALHOST
-p
$PORT
2
\
$LDAPWHOAMI
-
H
$URI
2
\
-D
"cn=Babs,ou=Information Technology DivisioN,ou=People,
$BASEDN
"
\
-w
bjensen
RC
=
$?
...
...
tests/data/regressions/its8427/its8427-2
View file @
66af4cfd
...
...
@@ -65,7 +65,7 @@ sleep 1
echo
"Using ldapsearch to check that slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
1
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
1
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -98,7 +98,7 @@ sleep 1
echo
"Using ldapsearch to check that proxy slapd is running..."
for
i
in
0 1 2 3 4 5
;
do
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
h
$LOCALHOST
-p
$PORT
3
\
$LDAPSEARCH
-s
base
-b
"
$MONITOR
"
-
H
$URI
3
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
...
...
@@ -115,7 +115,7 @@ if test $RC != 0 ; then
fi
echo
"Configuring proxy..."
$LDAPMODIFY
-D
cn
=
config
-
h
$LOCALHOST
-p
$PORT
3
-y
$CONFIGPWF
\
$LDAPMODIFY
-D
cn
=
config
-
H
$URI
3
-y
$CONFIGPWF
\
>
$TESTOUT
2>&1
<<
EOF
dn: olcDatabase={2}ldap,cn=config
changetype: add
...
...
@@ -133,7 +133,7 @@ if test $RC != 0 ; then
fi
echo
"Privileged WhoAmI (proxy uses plain ldap://)..."
$LDAPWHOAMI
-
h
$LOCALHOST
-p
$PORT
3
-D
"
$MANAGERDN
"
-w
$PASSWD
$LDAPWHOAMI
-
H
$URI
3
-D
"
$MANAGERDN
"
-w
$PASSWD
RC
=
$?
if
test
$RC
!=
0
;
then
echo
"ldapwhoami failed (
$RC
)!"
...
...
@@ -142,7 +142,7 @@ if test $RC != 0 ; then
fi
echo
"WhoAmI (proxy uses plain ldap://)..."
$LDAPWHOAMI
-
h
$LOCALHOST
-p
$PORT
3
-D
"
$BABSDN
"
-w
bjensen
$LDAPWHOAMI
-
H
$URI
3
-D
"
$BABSDN
"
-w
bjensen
RC
=
$?
if
test
$RC
!=
0
;
then
echo
"ldapwhoami failed (
$RC
)!"
...
...
@@ -152,7 +152,7 @@ fi
echo
"Searching (proxy uses plain ldap://)..."
echo
"# Searching (proxy uses plain ldap://)..."
>
$SEARCHOUT
$LDAPSEARCH
-b
"
$BASEDN
"
-
h
$LOCALHOST
-p
$PORT
3
\
$LDAPSEARCH
-b
"
$BASEDN
"
-
H
$URI
3
\
-D
"
$BABSDN
"
-w
bjensen
\
'(objectClass=*)'
>>
$SEARCHOUT
2>&1
RC
=
$?
...
...
@@ -177,7 +177,7 @@ if test $? != 0 ; then
fi
echo
"Reconfiguring database to only allow TLS binds..."
$LDAPMODIFY
-D
cn
=
config
-
h
$LOCALHOST
-p
$PORT
1
-y
$CONFIGPWF
\
$LDAPMODIFY
-D
cn
=
config
-
H
$URI
1
-y
$CONFIGPWF
\
>
$TESTOUT
2>&1
<<
EOF
dn: olcDatabase={1}
$BACKEND
,cn=config
changetype: modify
...
...
@@ -193,7 +193,7 @@ if test $RC != 0 ; then
fi
echo
"Re-configuring proxy to use ldaps:// on privileged connections only..."
$LDAPMODIFY
-D
cn
=
config
-
h
$LOCALHOST
-p
$PORT
3
-y
$CONFIGPWF
\
$LDAPMODIFY
-D
cn
=
config
-
H
$URI
3
-y
$CONFIGPWF
\
>
$TESTOUT
2>&1
<<
EOF
dn: olcDatabase={2}ldap,cn=config
changetype: delete
...
...
@@ -215,7 +215,7 @@ if test $RC != 0 ; then
fi
echo
"Privileged WhoAmI (proxy uses ldaps://)..."