Commit f9b2a8a1 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

ITS#3557: {SSHA} not default due to missing include

parent aefb2726
This diff is collapsed.
......@@ -813,13 +813,16 @@ AC_CHECK_HEADERS( \
winsock2.h \
)
dnl ----------------------------------------------------------------
dnl Checks for libraries
AC_CHECK_FUNCS( sigaction sigset )
dnl HP-UX requires -lV3
dnl this is not needed on newer versions of HP-UX
AC_CHECK_LIB(V3, sigset)
if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
AC_CHECK_LIB(V3, sigset)
fi
dnl The following is INTENTIONALLY scripted out because shell does not
dnl support variable names with the '@' character, which is what
......@@ -2477,9 +2480,7 @@ AC_CHECK_FUNCS( \
setsid \
setuid \
seteuid \
sigaction \
signal \
sigset \
strdup \
strpbrk \
strrchr \
......
......@@ -27,6 +27,7 @@
#include <lber_pvt.h>
#include <lutil.h>
#include <lutil_sha1.h>
static const char *defhash[] = {
#ifdef LUTIL_SHA1_BYTES
......
......@@ -33,6 +33,7 @@
#include <ldap.h>
#include <lutil.h>
#include <lutil_sha1.h>
#include "ldap_defaults.h"
......@@ -57,7 +58,12 @@ usage(const char *s)
int
slappasswd( int argc, char *argv[] )
{
#ifdef LUTIL_SHA1_BYTES
char *scheme = "{SSHA}";
#else
char *scheme = "{SMD5}";
#endif
char *newpw = NULL;
char *pwfile = NULL;
const char *text;
......
......@@ -23,8 +23,6 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.3.pid
argsfile ./testrun/slapd.3.args
# password-hash {md5}
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
......
......@@ -23,8 +23,6 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
# password-hash {md5}
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
......
......@@ -22,8 +22,6 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
# password-hash {md5}
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
......
......@@ -22,8 +22,6 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
# password-hash {md5}
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
......
......@@ -139,6 +139,15 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Logging end state with ldapsearch..."
echo "" >> $TESTOUT
echo "++ Initial search" >> $TESTOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 \
-D "$MANAGERDN" -w $PASSWD \
-b "$BASEDN" \
'objectclass=*' >> $TESTOUT 2>&1
test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo ">>>>> Test succeeded"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment