Author: nhosoi
Update of /cvs/dirsec/ldapserver In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10406
Modified Files: Makefile.am configure.ac Log Message: Resolves: #468248 Summary: LDAPI: when nsslapd-ldapiautodnsuffix doesn't exist - Bind is incorrect Description: - introducing --enable-auto-dn-suffix option to configure (disabled by default) - building the auto-dn-suffix code only when the option is set
Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- Makefile.am 22 Oct 2008 20:24:36 -0000 1.75 +++ Makefile.am 23 Oct 2008 22:42:54 -0000 1.76 @@ -1028,6 +1028,9 @@ if enable_autobind enable_autobind = 1 endif +if enable_auto_dn_suffix + enable_auto_dn_suffix = 1 +endif
ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \ ldap/servers/slapd/auth.c \ @@ -1137,6 +1140,7 @@ -e 's,@enable_bitwise@,$(enable_bitwise),g' \ -e 's,@enable_dna@,$(enable_dna),g' \ -e 's,@enable_autobind@,$(enable_autobind),g' \ + -e 's,@enable_auto_dn_suffix@,$(enable_auto_dn_suffix),g' \ -e 's,@ECHO_N@,$(ECHO_N),g' \ -e 's,@ECHO_C@,$(ECHO_C),g' \ -e 's,@brand@,$(brand),g' \ @@ -1186,6 +1190,7 @@ -e 's,@enable_bitwise@,$(enable_bitwise),g' \ -e 's,@enable_dna@,$(enable_dna),g' \ -e 's,@enable_autobind@,$(enable_autobind),g' \ + -e 's,@enable_auto_dn_suffix@,$(enable_auto_dn_suffix),g' \ -e 's,@ECHO_N@,$(ECHO_N),g' \ -e 's,@ECHO_C@,$(ECHO_C),g' \ -e 's,@brand@,$(brand),g' \
Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- configure.ac 22 Oct 2008 20:24:36 -0000 1.53 +++ configure.ac 23 Oct 2008 22:42:54 -0000 1.54 @@ -137,6 +137,21 @@ fi AM_CONDITIONAL(enable_autobind,test "$enable_autobind" = "yes")
+if test -z "$enable_auto_dn_suffix" ; then + enable_auto_dn_suffix=no # if not set on cmdline, set default +fi +AC_MSG_CHECKING(for --enable-auto-dn-suffix) +AC_ARG_ENABLE(autobind, + AS_HELP_STRING([--enable-auto-dn-suffix], + [enable auto bind with auto dn suffix over unix domain socket (LDAPI) support (default: no)])) +if test "$enable_ldapi" = yes -a "$enable_autobind" = yes -a "$enable_auto_dn_suffix" = "yes"; then + AC_MSG_RESULT(yes) + AC_DEFINE([ENABLE_AUTO_DN_SUFFIX], [1], [enable ldapi auto bind with auto dn suffix support in the server]) +else + AC_MSG_RESULT(no) +fi +AM_CONDITIONAL(enable_auto_dn_suffix,test "$enable_auto_dn_suffix" = "yes") + if test -z "$enable_bitwise" ; then enable_bitwise=yes # if not set on cmdline, set default fi
389-commits@lists.fedoraproject.org