Add ldap "flavor" for debian, controlled by the SUDO_FLAVOR environment

variable.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0d7af27e4d28e99292323c4c13500c08c70cee1c..777f50f6a2912da51f06db47999d255b115d8a7d 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -62,10 +62,11 @@ DOCS =      sudo.man visudo.man sudoers.man sudoers.ldap.man sudoers.man \
 @DEV@          $(srcdir)/sudo_plugin.man.in $(srcdir)/sudo_plugin.cat \
 @DEV@          $(srcdir)/HISTORY $(srcdir)/LICENSE
 
-OTHER_DOCS= $(top_srcdir)/ChangeLog $(top_srcdir)/README* \
+OTHER_DOCS= $(top_srcdir)/ChangeLog $(top_srcdir)/README \
            $(top_srcdir)/WHATSNEW $(srcdir)/HISTORY $(srcdir)/LICENSE \
-           $(srcdir)/TROUBLESHOOTING $(srcdir)/UPGRADE $(srcdir)/sample.* \
-           $(srcdir)/schema.*
+           $(srcdir)/TROUBLESHOOTING $(srcdir)/UPGRADE $(srcdir)/sample.*
+
+OTHER_DOCS_LDAP= $(top_srcdir)/README.LDAP $(srcdir)/schema.*
 
 VERSION = @PACKAGE_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -149,6 +150,7 @@ install-includes:
 
 install-doc: install-dirs
        for f in $(OTHER_DOCS); do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done
+       @LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done
        $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
        @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
        ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)

diff --git a/mkpkg b/mkpkg
index cb78e8d7612a5d532676f2e91379d27f84fd1141..d48dc77cb80e536e00b98cff6a734c3453eab789 100755 (executable)
--- a/mkpkg
+++ b/mkpkg
@@ -3,7 +3,6 @@
 # Build a binary package using polypkg
 # Usage: mkpkg
 #
-# TODO: add flavors (e.g. LDAP)
 
 IFS=
 
@@ -147,14 +146,16 @@ case "$platform" in
     deb[456].*)
        # XXX - create sudo group like debian does
        #       debian now has a %sudo entry in its sample sudoers
-       # XXX - debian has separate ldap and non-ldap packages
        # Note, must indent with tabs, not spaces due to IFS trickery
-       configure_opts="
+       if test "${SUDO_FLAVOR:-vanilla}" == "ldap"; then
+           configure_opts="--with-ldap
+               --with-ldap-conf-file=/etc/sudo-ldap.conf"
+       fi
+       configure_opts="$configure_opts
                --prefix=/usr
                --with-all-insults
                --with-exempt=sudo
                --with-pam
-               --with-ldap
                --with-fqdn
                --with-logging=syslog
                --with-logfac=authpriv
@@ -167,7 +168,6 @@ case "$platform" in
                --disable-root-mailer
                --disable-setresuid
                --with-sendmail=/usr/sbin/sendmail
-               --with-ldap-conf-file=/etc/ldap/ldap.conf
                --mandir=/usr/share/man
                --libexecdir=/usr/lib/sudo
                --with-secure-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"

diff --git a/sudo.pp b/sudo.pp
index d4ace8fac7e797dd5751e8962340de11dadbea71..14de2f2b0109d4c728f47e388ae6220d9032fca0 100644 (file)
--- a/sudo.pp
+++ b/sudo.pp
@@ -1,5 +1,9 @@
 %set
-  name="sudo"
+  if test -n "$SUDO_FLAVOR"; then
+    name="sudo-$SUDO_FLAVOR"
+  else
+    name="sudo"
+  fi
   summary="Provide limited super-user priveleges to specific users"
   description="Sudo is a program designed to allow a sysadmin to give \
 limited root privileges to users and log root activity.  \
@@ -150,6 +154,14 @@ still allow people to get their work done."
   # installs it 0640 when sudo requires 0440
   chmod %{sudoers_mode} %{sudoersdir}/sudoers
 
+  # create symlink to ease transition to new path for ldap config
+  # if old config file exists and new one doesn't
+  if test X"%{SUDO_FLAVOR}" = X"ldap"; then
+    if test -r /etc/ldap/ldap.conf -a ! -r /etc/sudo-ldap.conf; then
+      ln -s /etc/ldap/ldap.conf /etc/sudo-ldap.conf
+    fi
+  fi
+
   # Debian uses a sudo group in its default sudoers file
   perl -e '
     exit 0 if getgrnam("sudo");