From: Bdale Garbee <bdale@gag.com>
Date: Wed, 11 Mar 2009 16:51:27 +0000 (-0600)
Subject: fix ldap config file path, closes: #430826
X-Git-Tag: debian/1.7.0-1~19
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=967553e62abaf289ff0b9e353a0945be3aa4d82d;p=debian%2Fsudo

fix ldap config file path, closes: #430826
---

diff --git a/debian/changelog b/debian/changelog
index e0be9d4..8530024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sudo (1.6.9p17-3) unstable; urgency=low
+
+  * fix ldap config file path for sudo-ldap package, closes: #430826
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 11 Mar 2009 10:44:21 -0600
+
 sudo (1.6.9p17-2) unstable; urgency=high
 
   * patch from upstream to fix privilege escalation with certain 
diff --git a/debian/postinst b/debian/postinst
index 2229c83..b89a8a5 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -63,4 +63,10 @@ if ($gid != 27) {
 print "Creating group 'sudo' with gid = $gid\n";
 system("groupadd -g $gid sudo");
 
+# create symlink to ease transition to new path for ldap config
+# if old config file exists and new one doesn't
+if (-e "/etc/ldap/ldap.conf" && ! -e "/etc/sudo-ldap.conf") {
+  system("ln -s ldap/ldap.conf /etc/sudo-ldap.conf");
+}
+
 print "";
diff --git a/debian/rules b/debian/rules
index fd9c2b3..71c59f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ config-stamp:
 		--disable-root-mailer --disable-setresuid \
 		--with-sendmail=/usr/sbin/sendmail \
 		--mandir=/usr/share/man --libexecdir=/usr/lib/sudo \
-		--with-ldap-conf-file=/etc/sudo-ldap.conf \
 		--with-secure-path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
 
 	# LDAP version
@@ -40,7 +39,7 @@ config-stamp:
 		--with-passprompt="[sudo] password for %p: " \
 		--disable-root-mailer --disable-setresuid \
 		--with-sendmail=/usr/sbin/sendmail \
-		--with-ldap-conf-file=/etc/ldap/ldap.conf \
+		--with-ldap-conf-file=/etc/sudo-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"