nss-pam-ldapd commit: r1872 - debian/nss-pam-ldapd/trunk/debian

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Fri Dec 21 22:00:30 2012
New Revision: 1872
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1872&view=revision

Log:
remove compatibility code that converted nss-ldapd.conf to nslcd.conf for 
upgrading from pre-0.7 versions of nss-ldapd (thanks Dominik George)

Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog
   debian/nss-pam-ldapd/trunk/debian/nslcd.config
   debian/nss-pam-ldapd/trunk/debian/nslcd.postinst

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Thu Dec 20 23:21:05 2012        
(r1871)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Fri Dec 21 22:00:30 2012        
(r1872)
@@ -1,3 +1,10 @@
+nss-pam-ldapd (0.8.12-2) UNRELEASED; urgency=low
+
+  * remove compatibility code that converted nss-ldapd.conf to nslcd.conf
+    for upgrading from pre-0.7 versions of nss-ldapd (thanks Dominik George)
+
+ -- Arthur de Jong <adejong@debian.org>  Fri, 21 Dec 2012 22:00:00 +0100
+
 nss-pam-ldapd (0.8.12-1) experimental; urgency=low
 
   * new upstream release

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.config
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.config      Thu Dec 20 23:21:05 
2012        (r1871)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.config      Fri Dec 21 22:00:30 
2012        (r1872)
@@ -3,10 +3,6 @@
 set -e
 
 CONFFILE="/etc/nslcd.conf"
-OCONFFILE="/etc/nss-ldapd.conf"
-
-# fall back to old configfile if new one isn't present but old one is
-[ ! -f "$CONFFILE" ] && [ -f "$OCONFFILE" ] && CONFFILE="$OCONFFILE"
 
 # source debconf library.
 . /usr/share/debconf/confmodule

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.postinst
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Thu Dec 20 23:21:05 
2012        (r1871)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Fri Dec 21 22:00:30 
2012        (r1872)
@@ -3,7 +3,6 @@
 set -e
 
 CONFFILE="/etc/nslcd.conf"
-OCONFFILE="/etc/nss-ldapd.conf"
 
 # set an option in the configuration file to the specified value
 cfg_set()
@@ -84,16 +83,8 @@
 {
   if [ ! -e "$CONFFILE" ]
   then
-    # check if the file with the old name exists
-    if [ -e "$OCONFFILE" ]
-    then
-      # copy the existing file
-      cp -p $OCONFFILE $CONFFILE
-      # fix reference to manual page
-      sed -i 's/nss-ldapd/nslcd/' $CONFFILE
-    else
-      # create a simple configuration file from this template
-      cat > "$CONFFILE" << EOM
+    # create a simple configuration file from this template
+    cat > "$CONFFILE" << EOM
 # $CONFFILE
 # nslcd configuration file. See nslcd.conf(5)
 # for details.
@@ -126,10 +117,9 @@
 #scope sub
 
 EOM
-      # fix permissions
-      chmod 640 "$CONFFILE"
-      chown root:nslcd "$CONFFILE"
-    fi
+    # fix permissions
+    chmod 640 "$CONFFILE"
+    chown root:nslcd "$CONFFILE"
   fi
   # we're done
   return 0
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/