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
Simon
OpenLDAP
Commits
78cfaa3c
Commit
78cfaa3c
authored
Apr 28, 2020
by
Ryan Tandy
Browse files
Fix minor issues in test077 script
parent
7dfbcfa1
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/scripts/test077-sasl-gssapi
View file @
78cfaa3c
...
...
@@ -17,8 +17,8 @@ echo "running defines.sh"
.
$SRCDIR
/scripts/defines.sh
if
test
$WITH_SASL
=
no
;
then
echo
"SASL support not available, test skipped"
exit
0
echo
"SASL support not available, test skipped"
exit
0
fi
CONFDIR
=
$TESTDIR
/slapd.d
...
...
@@ -66,22 +66,23 @@ echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT
$SLAPD
-F
$CONFDIR
-h
"
$URI1
$SURI2
"
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
read
foo
echo
PID
$PID
read
foo
fi
KILLPIDS
=
"
$PID
"
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
""
-H
$URI1
\
'objectclass=*'
>
/dev/null 2>&1
RC
=
$?
if
test
$RC
=
0
;
then
break
fi
echo
"Waiting 5 seconds for slapd to start..."
sleep
5
RC
=
$?
if
test
$RC
=
0
;
then
break
fi
echo
"Waiting 5 seconds for slapd to start..."
sleep
5
done
if
test
$RC
!=
0
;
then
...
...
@@ -135,7 +136,7 @@ else
fi
if
test
$WITH_TLS
=
no
;
then
echo
"SASL/GSSAPI: TLS support not available, skipping TLS part."
echo
"SASL/GSSAPI: TLS support not available, skipping TLS part."
else
echo
-n
"Using ldapwhoami with SASL/GSSAPI with start-tls: "
$LDAPSASLWHOAMI
-N
-Y
GSSAPI
-H
$URI1
-ZZ
-o
tls_reqcert
=
allow
\
...
...
@@ -167,9 +168,9 @@ else
fi
if
test
$WITH_TLS
=
no
;
then
echo
"TLS support not available, skipping channel-binding test"
echo
"TLS support not available, skipping channel-binding test"
elif
test
$HAVE_SASL_GSS_CBIND
=
no
;
then
echo
"SASL has no channel-binding support in GSSAPI, test skipped"
echo
"SASL has no channel-binding support in GSSAPI, test skipped"
else
echo
"Testing SASL/GSSAPI with SASL_CBINDING..."
...
...
@@ -194,7 +195,7 @@ EOF
# The gnutls implementation of "tls-unique" seems broken
if
test
$icb
=
"tls-unique"
-o
$acb
=
"tls-unique"
;
then
if
test
$WITH_TLS_TYPE
=
=
gnutls
;
then
if
test
$WITH_TLS_TYPE
=
gnutls
;
then
continue
fi
fi
...
...
@@ -211,7 +212,7 @@ EOF
fi
echo
-n
"Using ldapwhoami with SASL/GSSAPI and SASL_CBINDING "
echo
-n
e
"(client:
${
icb
}
,
\t
server:
${
acb
}
): "
echo
-n
"(client:
${
icb
}
,
server:
${
acb
}
): "
$LDAPSASLWHOAMI
-N
-Y
GSSAPI
-H
$URI1
-ZZ
-o
tls_reqcert
=
allow
\
-o
tls_cacert
=
$TESTDIR
/tls/ca/certs/testsuiteCA.crt
\
...
...
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