first attempt at splitting installation into three packages

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@838 ef36b2f9-881f-0410-afb5-c4e39611909c
author: Arthur de Jong <arthur@arthurdejong.org> 2009-04-19 21:59:10 +0200
committer: Arthur de Jong <arthur@arthurdejong.org> 2009-04-19 21:59:10 +0200
commit: c77f52a547a3691b375b33ee86225d2f5b854205 (patch)
tree: 39459bb222572b7dc109bb065a01111f47151bc3 /debian
parent: bc01b71ebbe80e3d0544f9e8c429d546380421f6 (diff)
31 files changed, 710 insertions, 664 deletions
diff --git a/debian/control b/debian/control
index 5c6d616..13922fa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,25 @@ Section: admin
 Priority: extra
 Maintainer: Arthur de Jong <adejong@debian.org>
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 7), libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0), docbook2x, docbook-xml
+Build-Depends: debhelper (>= 7), libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0), docbook2x, docbook-xml, libpam0g-dev
 Homepage: http://ch.tudelft.nl/~arthur/nss-ldapd
 Vcs-Svn: http://arthurenhella.demon.nl/svn/nss-ldapd/nss-ldapd/
 Vcs-Browser: http://arthurenhella.demon.nl/viewcvs/nss-ldapd/nss-ldapd/
 
-Package: libnss-ldapd
+Package: nslcd
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
-Recommends: nscd, libpam-ldap
+Recommends: nscd, libnss-ldapd, libpam-ldapd
+Description: Daemon for NSS and PAM lookups using LDAP
+ This package provides a daemon for retrieving account information from
+ LDAP.
+ .
+ TODO: come up with a better name for the package-set as a whole
+
+Package: libnss-ldapd
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, nslcd
+Recommends: libpam-ldapd | libpam-ldap
 Conflicts: libnss-ldap
 Provides: libnss-ldap
 Description: NSS module for using LDAP as a naming service
@@ -23,3 +33,13 @@ Description: NSS module for using LDAP as a naming service
  This is a fork from libnss-ldap implementing structural design changes
  to fix, amongst other things, problems related to host name lookups and
  name lookups during booting.
+
+Package: libpam-ldapd
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, nslcd
+Recommends: libnss-ldapd | libnss-ldap
+Conflicts: libpam-ldap
+Provides: libpam-ldap
+Description: PAM module for using LDAP as an authentication service
+ This package provides a Pluggable Authentication Module that allows
+ your LDAP server to validate user passwords.
diff --git a/debian/libnss-ldapd.config b/debian/libnss-ldapd.config
index 9121104..4fc68bb 100644
--- a/debian/libnss-ldapd.config
+++ b/debian/libnss-ldapd.config
@@ -7,208 +7,25 @@ CONFFILE="/etc/nss-ldapd.conf"
 # source debconf library.
 . /usr/share/debconf/confmodule
 db_version 2.0
-db_capb backup
 
 # set title
 db_title "Configuring libnss-ldapd"
 
-#
-# This is the fist part of the script. In this part an attempt
-# is made to get or guess the current configuration. This information
-# is used later on to prompt the user and to provide a sensible
-# default.
-#
-
-# check the system (non-LDAP configuration files) for some
-# reasonable defaults
-parsesys()
-{
-  # guess domain based on system information
-  db_get libnss-ldapd/ldap-base
-  if [ -z "$RET" ]
-  then
-    domain=`hostname --domain` || true
-    [ -z "$domain" ] && domain=`hostname --nis | grep '\.'` || true
-    [ -z "$domain" ] && domain=`hostname --fqdn | sed -n 's/^[^.]*\.//p'` || true
-    [ -z "$domain" ] && domain=`sed -n 's/^ *\(domain\|search\) *\([^ ]*\) *$/\2/p' /etc/resolv.conf | head -n 1` || true
-    db_get libnss-ldapd/ldap-base
-    searchbase="$RET"
-    # if the ldap-base value doesn't seem to be preseeded, try to use the
-    # domain name to build the default base
-    if [ -n "$domain" ]
-    then
-      searchbase=`echo "$domain" | sed 's/^/dc=/;s/\./,dc=/'` || true
-      db_set libnss-ldapd/ldap-base "$searchbase"
-    fi
-  fi
-  # guess ldap server
-  db_get libnss-ldapd/ldap-uris
-  if [ -z "$RET" ]
-  then
-    server=`getent hosts ldap` || true
-    [ -z "$server" ] && server=`getent hosts dirhost` || true
-    if [ -n "$domain" ] && [ -z "$server" ]
-    then
-      server=`getent hosts ldap."$domain"` || true
-      [ -z "$server" ] && server=`getent hosts dirhost."$domain"` || true
-    fi
-    if [ -n "$server" ]
-    then
-      # extract ip address from host entry and quote ipv6 address
-      ip=`echo $server | sed 's/[[:space:]].*//;s/^\(.*:.*\)$/[\1]/'`
-      db_set libnss-ldapd/ldap-uris "ldap://$ip/"
-    fi
-  fi
-  # we're done
-  return 0
-}
-
-# parse a LDAP-like configuration file
-parsecfg()
-{
-  cfgfile="$1"
-  # check existance
-  [ -f "$cfgfile" ] || return 0
-  # find uri/host/port combo
-  db_get libnss-ldapd/ldap-uris
-  if [ -z "$RET" ]
-  then
-    uris=`sed -n 's/^uri[[:space:]]*//ip' "$cfgfile" | tr '\n' ' '`
-    if [ -z "$uris" ]
-    then
-      hosts=`sed -n 's/^host[[:space:]]*//ip' "$cfgfile"`
-      port=`sed -n 's/^port[[:space:]]*//ip' "$cfgfile" | tail -n 1`
-      for host in $hosts
-      do
-        if [ -z "$port" ] || (echo "$host" | grep -q ':' )
-        then
-          uris="$uris ldap://$host/"
-        else
-          uris="$uris ldap://$host:$port/"
-        fi
-      done
-    fi
-    [ -n "$uris" ] && db_set libnss-ldapd/ldap-uris "$uris"
-  fi
-  # find base config
-  db_get libnss-ldapd/ldap-base
-  if [ -z "$RET" ]
-  then
-    searchbase=`sed -n 's/^base[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\1/ip' "$cfgfile" | tail -n 1`
-    [ -n "$searchbase" ] && db_set libnss-ldapd/ldap-base "$searchbase"
-  fi
-  # find binddn
-  db_get libnss-ldapd/ldap-binddn
-  if [ -z "$RET" ]
-  then
-    binddn=`sed -n 's/^binddn[[:space:]]*//ip' "$cfgfile" | tail -n 1`
-    db_set libnss-ldapd/ldap-binddn "$binddn"
-  fi
-  # find bindpw
-  db_get libnss-ldapd/ldap-bindpw
-  if [ -z "$RET" ]
-  then
-    bindpw=`sed -n 's/^bindpw[[:space:]]*//ip' "$cfgfile" | tail -n 1`
-    db_set libnss-ldapd/ldap-bindpw "$bindpw"
-  fi
-  # we're done
-  return 0
-}
-
 # parse /etc/nsswitch.conf and see which services have ldap specified
-parsensswitch()
-{
-  db_get libnss-ldapd/nsswitch
-  if [ -z "$RET" ]
-  then
-    # find name services that currently use LDAP
-    configured=`sed -n 's/^\([a-z]*\):.*[[:space:]]ldap\([[:space:]].*\)\?/\1/p' /etc/nsswitch.conf`
-    # separate by commas
-    configured=`echo $configured | sed 's/ /, /g'`
-    # store configured services
-    db_set libnss-ldapd/nsswitch "$configured"
-  fi
-  # we're done
-  return 0
-}
-
-# fill our defaults with the current configuration if available
-# and fall back to guessing the config from some other system files
-if [ -f "$CONFFILE" ]
+db_get libnss-ldapd/nsswitch
+if [ -z "$RET" ]
 then
-  # clear settings to pick up valus from configfile
-  db_set libnss-ldapd/ldap-uris ""
-  db_set libnss-ldapd/ldap-base ""
-  db_set libnss-ldapd/ldap-binddn ""
-  db_set libnss-ldapd/ldap-bindpw ""
-  db_set libnss-ldapd/nsswitch ""
-  # parse current configuration
-  parsecfg "$CONFFILE"
-else
-  # first match wins
-  parsecfg /etc/libnss-ldap.conf
-  parsecfg /etc/pam_ldap.conf
-  parsecfg /etc/ldap/ldap.conf
-  parsesys
-  # fallback default values
-  db_get libnss-ldapd/ldap-uris
-  [ -z "$RET" ] && db_set libnss-ldapd/ldap-uris "ldap://127.0.0.1/"
-  db_get libnss-ldapd/ldap-base
-  [ -z "$RET" ] && db_set libnss-ldapd/ldap-base "dc=example,dc=net/"
+  # find name services that currently use LDAP
+  configured=`sed -n 's/^\([a-z]*\):.*[[:space:]]ldap\([[:space:]].*\)\?/\1/p' /etc/nsswitch.conf`
+  # separate by commas
+  configured=`echo $configured | sed 's/ /, /g'`
+  # store configured services
+  db_set libnss-ldapd/nsswitch "$configured"
 fi
 
-# check /etc/nsswitch.conf
-parsensswitch
-
-#
-# This is the second part of the script. In this part the configurable
-# settings will be presented to the user for approval. The postinst
-# will finaly perform the actual modifications.
-#
-
-state="server"
-while [ "$state" != "done" ]
-do
-  case "$state" in
-  server)
-    # ask about server configuration
-    db_input high libnss-ldapd/ldap-uris || true
-    db_input high libnss-ldapd/ldap-base || true
-    # ask the questions, go to the next question or exit
-    state="binddn"
-    db_go || exit 1
-    # TODO: add error checking on options
-    ;;
-  binddn)
-    # ask for login information
-    db_input medium libnss-ldapd/ldap-binddn || true
-    # ask the question, go to the next question or back
-    state="bindpw"
-    db_go || state="server"
-    ;;
-  bindpw)
-    # only ask question if we have a binddn
-    db_get libnss-ldapd/ldap-binddn
-    if [ -n "$RET" ]
-    then
-      # ask for login information
-      db_input medium libnss-ldapd/ldap-bindpw || true
-    else
-      # clear password
-      db_set libnss-ldapd/ldap-bindpw ""
-    fi
-    # ask the question, go to the next question or back
-    state="nsswitch"
-    db_go || state="binddn"
-    ;;
-  nsswitch)
-    # ask for which nsswitch options to configure
-    db_capb multiselect
-    db_input high libnss-ldapd/nsswitch || true
-    state="done"
-    db_go || state="bindpw"
-    ;;
-  esac
-done
+# ask for which nsswitch options to configure
+db_capb multiselect
+db_input high libnss-ldapd/nsswitch || true
+db_go || true
 
 exit 0
diff --git a/debian/libnss-ldapd.install b/debian/libnss-ldapd.install
new file mode 100644
index 0000000..1560868
--- /dev/null
+++ b/debian/libnss-ldapd.install
@@ -0,0 +1 @@
+lib/libnss_ldap.so*
diff --git a/debian/libnss-ldapd.postinst b/debian/libnss-ldapd.postinst
index 56b2a3e..34c55be 100644
--- a/debian/libnss-ldapd.postinst
+++ b/debian/libnss-ldapd.postinst
@@ -2,82 +2,6 @@
 
 set -e
 
-CONFFILE="/etc/nss-ldapd.conf"
-
-# set an option in the configuration file to the specified value
-cfg_set()
-{
-  parameter="$1"
-  value="$2"
-  # make matching of spaces better in parameter
-  # this is complicated becase of the "base [map] dn" keyword
-  param_re=`echo "$parameter" | sed 's#^#[[:space:]]*#;s#[[:space:]][[:space:]]*#[[:space:]][[:space:]]*#g'`
-  # lines to not match
-  nomatch_re="^$param_re[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)"
-  # check if the parameter is defined
-  line=`sed -n '/'"$nomatch_re"'/n;/^'"$param_re"'[[:space:]]/p' "$CONFFILE" | head -n 1`
-  if [ -z "$line" ]
-  then
-    # check if the parameter is commented out
-    param_re="#$param_re"
-    nomatch_re="^$param_re[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)"
-    line=`sed -n '/'"$nomatch_re"'/n;/^'"$param_re"'[[:space:]]/p' "$CONFFILE" | head -n 1`
-  fi
-  # decide what to do
-  if [ -z "$line" ]
-  then
-    # just append a new line
-    echo "$parameter $value" >> $CONFFILE
-  else
-    # escape line to replace
-    replace=`echo "$line" | sed 's#\\\#\\\\\\\#g;s#\([.*+?^$|]\)#\\\\\1#g'`
-    # escape value (parameter doesn't have any special stuff)
-    value=`echo "$value" | sed 's#\\\#\\\\\\\#g;s#|#\\\|#g;s#&#\\\&#g'`
-    # replace the first occurrence of the line
-    sed -i '1,\|^'"$replace"'$| s|^'"$replace"'$|'"$parameter"' '"$value"'|i' "$CONFFILE"
-  fi
-  # we're done
-  return 0
-}
-
-# disable an option in the configuration file by commenting it out
-cfg_disable()
-{
-  parameter="$1"
-  # make matching of spaces better in parameter
-  param_re=`echo "$parameter" | sed 's#^#[[:space:]]*#;s#[[:space:]][[:space:]]*#[[:space:]][[:space:]]*#g'`
-  # lines to not match
-  nomatch_re="^$param_re[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)"
-  # comment out the option
-  sed -i '/'"$nomatch_re"'/n;s/^'"$param_re"'[[:space:]].*$/#&/i' "$CONFFILE"
-  # we're done
-  return 0
-}
-
-# set the list of uris
-cfg_uris()
-{
-  uris="$1"
-  # escape all uri directives
-  sed -i 's/^uri /_uri_ /i' $CONFFILE
-  # set the uri options
-  echo "$uris" | sed 's/  */\n/g' | while read uri
-  do
-    if grep -qi '^_uri_ ' $CONFFILE
-    then
-      # escape uri for use in regexp replacement
-      uri=`echo "$uri" | sed 's#\\\#\\\\\\\#g;s#|#\\\|#g;s#&#\\\&#g'`
-      # replace the first occurrence of _uri_
-      sed -i '1,/^_uri_ / s|^_uri_ .*$|uri '"$uri"'|i' "$CONFFILE"
-    else
-      # append new uri
-      echo "uri $uri" >> $CONFFILE
-    fi
-  done
-  # comment out the remaining escaped uris
-  sed -i 's/^_uri_ /#uri /' $CONFFILE
-}
-
 # editing nsswitch.conf seems to be ok
 # http://lists.debian.org/debian-devel/2007/02/msg00076.html
 
@@ -125,107 +49,11 @@ nss_disable()
   return 0
 }
 
-# create a default configuration file if nothing exists yet
-create_config()
-{
-  if [ ! -e "$CONFFILE" ]
-  then
-    # create a simple configuration file from this template
-    cat > "$CONFFILE" << EOM
-# $CONFFILE
-# nss-ldapd configuration file. See nss-ldapd.conf(5)
-# for details.
-
-# The user and group nslcd should run as.
-uid nslcd
-gid nslcd
-
-# The location at which the LDAP server(s) should be reachable.
-uri ldap://localhost/
-
-# The search base that will be used for all queries.
-base dc=example,dc=net
-
-# The LDAP protocol version to use.
-#ldap_version 3
-
-# The DN to bind with for normal lookups.
-#binddn cn=annonymous,dc=example,dc=net
-#bindpw secret
-
-# The search scope.
-#scope sub
-
-EOM
-    # fix permissions
-    chmod 640 "$CONFFILE"
-    chown root:nslcd "$CONFFILE"
-  fi
-  # we're done
-  return 0
-}
-
 # real functions begin here
 if [ "$1" = "configure" ]
 then
   # get configuration data from debconf
   . /usr/share/debconf/confmodule
-  # check if the nslcd user exists
-  if getent passwd nslcd >/dev/null
-  then
-    :
-  else
-    # create nslcd user and group
-    adduser --system --group --home /var/run/nslcd/ \
-            --gecos "nss-ldapd name service LDAP connection daemon" \
-            --no-create-home \
-            nslcd
-    # add uid/gid options to the config file if it exists
-    # (this is when we're upgrading)
-    if [ -f "$CONFFILE" ]
-    then
-      echo "Adding uid and gid options to $CONFFILE..." >&2
-      echo "# automatically added on upgrade of libnss-ldapd package" >> "$CONFFILE"
-      cfg_set uid nslcd
-      cfg_set gid nslcd
-    fi
-  fi
-  # create a default configuration
-  create_config
-  # set server uri
-  db_get libnss-ldapd/ldap-uris
-  cfg_uris "$RET"
-  # set search base
-  db_get libnss-ldapd/ldap-base
-  cfg_set base "$RET"
-  # set bind dn/pw
-  db_get libnss-ldapd/ldap-binddn
-  if [ -n "$RET" ]
-  then
-    cfg_set binddn "$RET"
-    db_get libnss-ldapd/ldap-bindpw
-    if [ -n "$RET" ]
-    then
-      cfg_set bindpw "$RET"
-    else
-      # no bindpw set
-      if grep -i -q "^bindpw " $CONFFILE
-      then
-        cfg_set bindpw "*removed*"
-        cfg_disable bindpw
-      fi
-    fi
-  else
-    # no binddn/pw, disable options
-    cfg_disable binddn
-    if grep -i -q "^bindpw " $CONFFILE
-    then
-      cfg_set bindpw "*removed*"
-      cfg_disable bindpw
-    fi
-  fi
-  # remove password from database
-  db_set libnss-ldapd/ldap-bindpw ""
   # modify /etc/nsswitch.conf
   db_get libnss-ldapd/nsswitch
   enablenss=`echo "$RET" | sed 's/,//g'`
@@ -240,16 +68,6 @@ then
   done
   # we're done
   db_stop
-  # fix permissions of configfile if upgrading from an old version
-  if dpkg --compare-versions "$2" lt-nl "0.6.7.1"
-  then
-    echo "Fixing permissions of $CONFFILE"
-    chmod 640 "$CONFFILE"
-    chown root:nslcd "$CONFFILE"
-  fi
-  # TODO: create backups of /etc/nsswitch.conf and configfile
-  #       (probably store orig in tmpfile and if diff install it
-  #       as backup)
   # restart nscd to pick up changes in nsswitch.conf
   # (other processes will have to be restarted manually)
   if [ -x /etc/init.d/nscd ] && [ `pidof -s nscd` ]
diff --git a/debian/libnss-ldapd.postrm b/debian/libnss-ldapd.postrm
index 6fa4004..e4ccb49 100644
--- a/debian/libnss-ldapd.postrm
+++ b/debian/libnss-ldapd.postrm
@@ -2,17 +2,6 @@
 
 set -e
 
-CONFFILE="/etc/nss-ldapd.conf"
-
-# remove /var/run/nslcd directory
-rm -rf /var/run/nslcd
-
-# remove our configuration file (not a conffile) on purge manually
-if [ "$1" = "purge" ]
-then
-  rm -f "$CONFFILE"
-fi
-
 # call ldconfig to signal the removal of our NSS library
 if [ "$1" = "remove" ]
 then
diff --git a/debian/libnss-ldapd.templates b/debian/libnss-ldapd.templates
index 2db0077..b0d2a43 100644
--- a/debian/libnss-ldapd.templates
+++ b/debian/libnss-ldapd.templates
@@ -1,37 +1,3 @@
-Template: libnss-ldapd/ldap-uris
-Type: string
-_Description: LDAP server Uniform Resource Identifier:
- Please enter the URI of the LDAP server used. This is a string in the form
- ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The
- port number is optional.
- .
- When useing the ldap or ldaps schemes it is usually a good idea to use an IP
- address; this reduces the risk of failure when name services are unavailable.
- .
- Multiple URIs can be be specified by separating them with spaces.
-
-Template: libnss-ldapd/ldap-base
-Type: string
-_Description: LDAP server search base:
- Please enter the distinguished name of the LDAP search base.  Many sites
- use the components of their domain names for this purpose.  For example,
- the domain "example.net" would use "dc=example,dc=net" as the
- distinguished name of the search base.
-
-Template: libnss-ldapd/ldap-binddn
-Type: string
-_Description: LDAP database user:
- If the LDAP database requires a login for normal lookups, enter
- the name of the account that will be used here. Leave empty
- otherwise.
- .
- This value should be specified as a DN (distinguished name).
-
-Template: libnss-ldapd/ldap-bindpw
-Type: password
-_Description: LDAP user password:
- Enter the password that will be used to log in to the LDAP database.
-
 Template: libnss-ldapd/nsswitch
 Type: multiselect
 Choices: aliases, ethers, group, hosts, netgroup, networks, passwd, protocols, rpc, services, shadow
diff --git a/debian/libpam-ldapd.install b/debian/libpam-ldapd.install
new file mode 100644
index 0000000..b2a2b05
--- /dev/null
+++ b/debian/libpam-ldapd.install
@@ -0,0 +1 @@
+./lib/security
diff --git a/debian/nslcd.config b/debian/nslcd.config
new file mode 100644
index 0000000..a1da587
--- /dev/null
+++ b/debian/nslcd.config
@@ -0,0 +1,186 @@
+#!/bin/sh
+
+set -e
+
+CONFFILE="/etc/nss-ldapd.conf"
+
+# source debconf library.
+. /usr/share/debconf/confmodule
+db_version 2.0
+db_capb backup
+
+# set title
+db_title "Configuring libnss-ldapd"
+
+#
+# This is the fist part of the script. In this part an attempt
+# is made to get or guess the current configuration. This information
+# is used later on to prompt the user and to provide a sensible
+# default.
+#
+
+# check the system (non-LDAP configuration files) for some
+# reasonable defaults
+parsesys()
+{
+  # guess domain based on system information
+  db_get libnss-ldapd/ldap-base
+  if [ -z "$RET" ]
+  then
+    domain=`hostname --domain` || true
+    [ -z "$domain" ] && domain=`hostname --nis | grep '\.'` || true
+    [ -z "$domain" ] && domain=`hostname --fqdn | sed -n 's/^[^.]*\.//p'` || true
+    [ -z "$domain" ] && domain=`sed -n 's/^ *\(domain\|search\) *\([^ ]*\) *$/\2/p' /etc/resolv.conf | head -n 1` || true
+    db_get libnss-ldapd/ldap-base
+    searchbase="$RET"
+    # if the ldap-base value doesn't seem to be preseeded, try to use the
+    # domain name to build the default base
+    if [ -n "$domain" ]
+    then
+      searchbase=`echo "$domain" | sed 's/^/dc=/;s/\./,dc=/'` || true
+      db_set libnss-ldapd/ldap-base "$searchbase"
+    fi
+  fi
+  # guess ldap server
+  db_get libnss-ldapd/ldap-uris
+  if [ -z "$RET" ]
+  then
+    server=`getent hosts ldap` || true
+    [ -z "$server" ] && server=`getent hosts dirhost` || true
+    if [ -n "$domain" ] && [ -z "$server" ]
+    then
+      server=`getent hosts ldap."$domain"` || true
+      [ -z "$server" ] && server=`getent hosts dirhost."$domain"` || true
+    fi
+    if [ -n "$server" ]
+    then
+      # extract ip address from host entry and quote ipv6 address
+      ip=`echo $server | sed 's/[[:space:]].*//;s/^\(.*:.*\)$/[\1]/'`
+      db_set libnss-ldapd/ldap-uris "ldap://$ip/"
+    fi
+  fi
+  # we're done
+  return 0
+}
+
+# parse a LDAP-like configuration file
+parsecfg()
+{
+  cfgfile="$1"
+  # check existance
+  [ -f "$cfgfile" ] || return 0
+  # find uri/host/port combo
+  db_get libnss-ldapd/ldap-uris
+  if [ -z "$RET" ]
+  then
+    uris=`sed -n 's/^uri[[:space:]]*//ip' "$cfgfile" | tr '\n' ' '`
+    if [ -z "$uris" ]
+    then
+      hosts=`sed -n 's/^host[[:space:]]*//ip' "$cfgfile"`
+      port=`sed -n 's/^port[[:space:]]*//ip' "$cfgfile" | tail -n 1`
+      for host in $hosts
+      do
+        if [ -z "$port" ] || (echo "$host" | grep -q ':' )
+        then
+          uris="$uris ldap://$host/"
+        else
+          uris="$uris ldap://$host:$port/"
+        fi
+      done
+    fi
+    [ -n "$uris" ] && db_set libnss-ldapd/ldap-uris "$uris"
+  fi
+  # find base config
+  db_get libnss-ldapd/ldap-base
+  if [ -z "$RET" ]
+  then
+    searchbase=`sed -n 's/^base[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\1/ip' "$cfgfile" | tail -n 1`
+    [ -n "$searchbase" ] && db_set libnss-ldapd/ldap-base "$searchbase"
+  fi
+  # find binddn
+  db_get libnss-ldapd/ldap-binddn
+  if [ -z "$RET" ]
+  then
+    binddn=`sed -n 's/^binddn[[:space:]]*//ip' "$cfgfile" | tail -n 1`
+    db_set libnss-ldapd/ldap-binddn "$binddn"
+  fi
+  # find bindpw
+  db_get libnss-ldapd/ldap-bindpw
+  if [ -z "$RET" ]
+  then
+    bindpw=`sed -n 's/^bindpw[[:space:]]*//ip' "$cfgfile" | tail -n 1`
+    db_set libnss-ldapd/ldap-bindpw "$bindpw"
+  fi
+  # we're done
+  return 0
+}
+
+# fill our defaults with the current configuration if available
+# and fall back to guessing the config from some other system files
+if [ -f "$CONFFILE" ]
+then
+  # clear settings to pick up valus from configfile
+  db_set libnss-ldapd/ldap-uris ""
+  db_set libnss-ldapd/ldap-base ""
+  db_set libnss-ldapd/ldap-binddn ""
+  db_set libnss-ldapd/ldap-bindpw ""
+  # parse current configuration
+  parsecfg "$CONFFILE"
+else
+  # first match wins
+  parsecfg /etc/libnss-ldap.conf
+  parsecfg /etc/pam_ldap.conf
+  parsecfg /etc/ldap/ldap.conf
+  parsesys
+  # fallback default values
+  db_get libnss-ldapd/ldap-uris
+  [ -z "$RET" ] && db_set libnss-ldapd/ldap-uris "ldap://127.0.0.1/"
+  db_get libnss-ldapd/ldap-base
+  [ -z "$RET" ] && db_set libnss-ldapd/ldap-base "dc=example,dc=net/"
+fi
+
+#
+# This is the second part of the script. In this part the configurable
+# settings will be presented to the user for approval. The postinst
+# will finaly perform the actual modifications.
+#
+
+state="server"
+while [ "$state" != "done" ]
+do
+  case "$state" in
+  server)
+    # ask about server configuration
+    db_input high libnss-ldapd/ldap-uris || true
+    db_input high libnss-ldapd/ldap-base || true
+    # ask the questions, go to the next question or exit
+    state="binddn"
+    db_go || exit 1
+    # TODO: add error checking on options
+    ;;
+  binddn)
+    # ask for login information
+    db_input medium libnss-ldapd/ldap-binddn || true
+    # ask the question, go to the next question or back
+    state="bindpw"
+    db_go || state="server"
+    ;;
+  bindpw)
+    # only ask question if we have a binddn
+    db_get libnss-ldapd/ldap-binddn
+    if [ -n "$RET" ]
+    then
+      # ask for login information
+      db_input medium libnss-ldapd/ldap-bindpw || true
+    else
+      # clear password
+      db_set libnss-ldapd/ldap-bindpw ""
+    fi
+    # ask the question, go to the next question or back
+    state="done"
+    db_go || state="binddn"
+    ;;
+  esac
+done
+
+exit 0
diff --git a/debian/libnss-ldapd.docs b/debian/nslcd.docs
index 9a58ad6..9a58ad6 100644
--- a/debian/libnss-ldapd.docs
+++ b/debian/nslcd.docs
diff --git a/debian/libnss-ldapd.examples b/debian/nslcd.examples
index c482e9a..c482e9a 100644
--- a/debian/libnss-ldapd.examples
+++ b/debian/nslcd.examples
diff --git a/debian/libnss-ldapd.nslcd.init b/debian/nslcd.init
index 8deeac3..8deeac3 100644
--- a/debian/libnss-ldapd.nslcd.init
+++ b/debian/nslcd.init
diff --git a/debian/nslcd.install b/debian/nslcd.install
new file mode 100644
index 0000000..f3557ac
--- /dev/null
+++ b/debian/nslcd.install
@@ -0,0 +1,3 @@
+etc
+usr/sbin
+usr/share/man
diff --git a/debian/nslcd.postinst b/debian/nslcd.postinst
new file mode 100644
index 0000000..429c40c
--- /dev/null
+++ b/debian/nslcd.postinst
@@ -0,0 +1,195 @@
+#!/bin/sh
+
+set -e
+
+CONFFILE="/etc/nss-ldapd.conf"
+
+# set an option in the configuration file to the specified value
+cfg_set()
+{
+  parameter="$1"
+  value="$2"
+  # make matching of spaces better in parameter
+  # this is complicated becase of the "base [map] dn" keyword
+  param_re=`echo "$parameter" | sed 's#^#[[:space:]]*#;s#[[:space:]][[:space:]]*#[[:space:]][[:space:]]*#g'`
+  # lines to not match
+  nomatch_re="^$param_re[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)"
+  # check if the parameter is defined
+  line=`sed -n '/'"$nomatch_re"'/n;/^'"$param_re"'[[:space:]]/p' "$CONFFILE" | head -n 1`
+  if [ -z "$line" ]
+  then
+    # check if the parameter is commented out
+    param_re="#$param_re"
+    nomatch_re="^$param_re[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)"
+    line=`sed -n '/'"$nomatch_re"'/n;/^'"$param_re"'[[:space:]]/p' "$CONFFILE" | head -n 1`
+  fi
+  # decide what to do
+  if [ -z "$line" ]
+  then
+    # just append a new line
+    echo "$parameter $value" >> $CONFFILE
+  else
+    # escape line to replace
+    replace=`echo "$line" | sed 's#\\\#\\\\\\\#g;s#\([.*+?^$|]\)#\\\\\1#g'`
+    # escape value (parameter doesn't have any special stuff)
+    value=`echo "$value" | sed 's#\\\#\\\\\\\#g;s#|#\\\|#g;s#&#\\\&#g'`
+    # replace the first occurrence of the line
+    sed -i '1,\|^'"$replace"'$| s|^'"$replace"'$|'"$parameter"' '"$value"'|i' "$CONFFILE"
+  fi
+  # we're done
+  return 0
+}
+
+# disable an option in the configuration file by commenting it out
+cfg_disable()
+{
+  parameter="$1"
+  # make matching of spaces better in parameter
+  param_re=`echo "$parameter" | sed 's#^#[[:space:]]*#;s#[[:space:]][[:space:]]*#[[:space:]][[:space:]]*#g'`
+  # lines to not match
+  nomatch_re="^$param_re[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)"
+  # comment out the option
+  sed -i '/'"$nomatch_re"'/n;s/^'"$param_re"'[[:space:]].*$/#&/i' "$CONFFILE"
+  # we're done
+  return 0
+}
+
+# set the list of uris
+cfg_uris()
+{
+  uris="$1"
+  # escape all uri directives
+  sed -i 's/^uri /_uri_ /i' $CONFFILE
+  # set the uri options
+  echo "$uris" | sed 's/  */\n/g' | while read uri
+  do
+    if grep -qi '^_uri_ ' $CONFFILE
+    then
+      # escape uri for use in regexp replacement
+      uri=`echo "$uri" | sed 's#\\\#\\\\\\\#g;s#|#\\\|#g;s#&#\\\&#g'`
+      # replace the first occurrence of _uri_
+      sed -i '1,/^_uri_ / s|^_uri_ .*$|uri '"$uri"'|i' "$CONFFILE"
+    else
+      # append new uri
+      echo "uri $uri" >> $CONFFILE
+    fi
+  done
+  # comment out the remaining escaped uris
+  sed -i 's/^_uri_ /#uri /' $CONFFILE
+}
+
+# create a default configuration file if nothing exists yet
+create_config()
+{
+  if [ ! -e "$CONFFILE" ]
+  then
+    # create a simple configuration file from this template
+    cat > "$CONFFILE" << EOM
+# $CONFFILE
+# nss-ldapd configuration file. See nss-ldapd.conf(5)
+# for details.
+
+# The user and group nslcd should run as.
+uid nslcd
+gid nslcd
+
+# The location at which the LDAP server(s) should be reachable.
+uri ldap://localhost/
+
+# The search base that will be used for all queries.
+base dc=example,dc=net
+
+# The LDAP protocol version to use.
+#ldap_version 3
+
+# The DN to bind with for normal lookups.
+#binddn cn=annonymous,dc=example,dc=net
+#bindpw secret
+
+# The search scope.
+#scope sub
+
+EOM
+    # fix permissions
+    chmod 640 "$CONFFILE"
+    chown root:nslcd "$CONFFILE"
+  fi
+  # we're done
+  return 0
+}
+
+# real functions begin here
+if [ "$1" = "configure" ]
+then
+  # get configuration data from debconf
+  . /usr/share/debconf/confmodule
+  # check if the nslcd user exists
+  if getent passwd nslcd >/dev/null
+  then
+    :
+  else
+    # create nslcd user and group
+    adduser --system --group --home /var/run/nslcd/ \
+            --gecos "nss-ldapd name service LDAP connection daemon" \
+            --no-create-home \
+            nslcd
+    # add uid/gid options to the config file if it exists
+    # (this is when we're upgrading)
+    if [ -f "$CONFFILE" ]
+    then
+      echo "Adding uid and gid options to $CONFFILE..." >&2
+      echo "# automatically added on upgrade of libnss-ldapd package" >> "$CONFFILE"
+      cfg_set uid nslcd
+      cfg_set gid nslcd
+    fi
+  fi
+  # create a default configuration
+  create_config
+  # set server uri
+  db_get libnss-ldapd/ldap-uris
+  cfg_uris "$RET"
+  # set search base
+  db_get libnss-ldapd/ldap-base
+  cfg_set base "$RET"
+  # set bind dn/pw
+  db_get libnss-ldapd/ldap-binddn
+  if [ -n "$RET" ]
+  then
+    cfg_set binddn "$RET"
+    db_get libnss-ldapd/ldap-bindpw
+    if [ -n "$RET" ]
+    then
+      cfg_set bindpw "$RET"
+    else
+      # no bindpw set
+      if grep -i -q "^bindpw " $CONFFILE
+      then
+        cfg_set bindpw "*removed*"
+        cfg_disable bindpw
+      fi
+    fi
+  else
+    # no binddn/pw, disable options
+    cfg_disable binddn
+    if grep -i -q "^bindpw " $CONFFILE
+    then
+      cfg_set bindpw "*removed*"
+      cfg_disable bindpw
+    fi
+  fi
+  # remove password from database
+  db_set libnss-ldapd/ldap-bindpw ""
+  # we're done
+  db_stop
+  # fix permissions of configfile if upgrading from an old version
+  if dpkg --compare-versions "$2" lt-nl "0.6.7.1"
+  then
+    echo "Fixing permissions of $CONFFILE"
+    chmod 640 "$CONFFILE"
+    chown root:nslcd "$CONFFILE"
+  fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/nslcd.postrm b/debian/nslcd.postrm
new file mode 100644
index 0000000..66fe1bb
--- /dev/null
+++ b/debian/nslcd.postrm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+CONFFILE="/etc/nss-ldapd.conf"
+
+# remove /var/run/nslcd directory
+rm -rf /var/run/nslcd
+
+# remove our configuration file (not a conffile) on purge manually
+if [ "$1" = "purge" ]
+then
+  rm -f "$CONFFILE"
+fi
+
+#DEBHELPER#
diff --git a/debian/nslcd.templates b/debian/nslcd.templates
new file mode 100644
index 0000000..b014353
--- /dev/null
+++ b/debian/nslcd.templates
@@ -0,0 +1,33 @@
+Template: libnss-ldapd/ldap-uris
+Type: string
+_Description: LDAP server Uniform Resource Identifier:
+ Please enter the URI of the LDAP server used. This is a string in the form
+ ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The
+ port number is optional.
+ .
+ When useing the ldap or ldaps schemes it is usually a good idea to use an IP
+ address; this reduces the risk of failure when name services are unavailable.
+ .
+ Multiple URIs can be be specified by separating them with spaces.
+
+Template: libnss-ldapd/ldap-base
+Type: string
+_Description: LDAP server search base:
+ Please enter the distinguished name of the LDAP search base.  Many sites
+ use the components of their domain names for this purpose.  For example,
+ the domain "example.net" would use "dc=example,dc=net" as the
+ distinguished name of the search base.
+
+Template: libnss-ldapd/ldap-binddn
+Type: string
+_Description: LDAP database user:
+ If the LDAP database requires a login for normal lookups, enter
+ the name of the account that will be used here. Leave empty
+ otherwise.
+ .
+ This value should be specified as a DN (distinguished name).
+
+Template: libnss-ldapd/ldap-bindpw
+Type: password
+_Description: LDAP user password:
+ Enter the password that will be used to log in to the LDAP database.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 79c2430..43c08ac 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1,2 @@
+[type: gettext/rfc822deb] nslcd.templates
 [type: gettext/rfc822deb] libnss-ldapd.templates
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 13bff91..e5cb53c 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 211-4\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2004-11-02 20:49+0100\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -32,7 +32,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
@@ -47,20 +47,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 #, fuzzy
 msgid "LDAP server search base:"
 msgstr "adreça de l'ordinador del servidor d'LDAP"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -74,14 +74,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 #, fuzzy
 msgid "LDAP database user:"
 msgstr "usuari de la base de dades sense privilegis"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -89,19 +89,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Introduïu la contrasenya que s'utilitzarà per a l'accés autenticat a la base "
@@ -109,13 +109,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -123,7 +123,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 30e722a..ee974d3 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2005-07-10 16:33+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
@@ -54,20 +54,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 #, fuzzy
 msgid "LDAP server search base:"
 msgstr "Adresa počítače s LDAP serverem"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -81,14 +81,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 #, fuzzy
 msgid "LDAP database user:"
 msgstr "Neprivilegovaný databázový uživatel"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -96,31 +96,31 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -128,7 +128,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/da.po b/debian/po/da.po
index 8692376..750bf77 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2008-08-06 11:34+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -18,25 +18,26 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
-msgstr "LDAP-server ensartet ressourceidentifikator (Uniform Resource Identifier):"
+msgstr ""
+"LDAP-server ensartet ressourceidentifikator (Uniform Resource Identifier):"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
 "port number is optional."
 msgstr ""
-"Angiv URIen for den anvendte LDAP-server. Dette er en streng af typen "
-"ldap://<værtsnavn eller IP>:<port>/ . ldaps:// eller ldapi:// kan også "
-"bruges. Portnummeret er valgfrit."
+"Angiv URIen for den anvendte LDAP-server. Dette er en streng af typen ldap://"
+"<værtsnavn eller IP>:<port>/ . ldaps:// eller ldapi:// kan også bruges. "
+"Portnummeret er valgfrit."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -47,19 +48,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr "Flere URIer kan angives ved at adskille dem med mellemrum."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "LDAP-server søgebase:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -67,19 +68,18 @@ msgid ""
 "name of the search base."
 msgstr ""
 "Angiv det særlige navn på LDAP-søgebasen. Mange sites bruger komponenterne "
-"fra deres domænenavne til dette formål. Eksempelvis ville domænet "
-"\"eksempel.dk\" bruge \"dc=eksempel,dc=dk\" som det særlige navn på "
-"søgebasen."
+"fra deres domænenavne til dette formål. Eksempelvis ville domænet \"eksempel."
+"dk\" bruge \"dc=eksempel,dc=dk\" som det særlige navn på søgebasen."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "LDAP databasebruger:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -89,32 +89,32 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Denne værdi bør angives som et DN (særligt navn - distinguished name)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "LDAP-bruger adgangskode:"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "Angiv adgangskoden som vil blive brugt til at logge på til "
-"LDAP-databasen."
+msgstr ""
+"Angiv adgangskoden som vil blive brugt til at logge på til LDAP-databasen."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Navneservices at indstille:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -124,12 +124,12 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
 "review these changes."
 msgstr ""
-"Du kan vælge de services som skal aktiveres eller slås fra for "
-"LDAP-opslag. De nye LDAP-opslag vil blive tilføjet som sidste "
-"mulighed. Sørg for at gennemgå ændringerne."
+"Du kan vælge de services som skal aktiveres eller slås fra for LDAP-opslag. "
+"De nye LDAP-opslag vil blive tilføjet som sidste mulighed. Sørg for at "
+"gennemgå ændringerne."
diff --git a/debian/po/de.po b/debian/po/de.po
index 9df00b8..e3baaee 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.5\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2008-01-27 21:02+0100\n"
 "Last-Translator: Erik Schanze <eriks@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr "URI (Uniform Resource Identifier) des LDAP-Servers:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -41,7 +41,7 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr "Mehrere URIs können, durch Leerzeichen getrennt, eingegeben werden."
 
@@ -60,14 +60,14 @@ msgstr "Mehrere URIs können, durch Leerzeichen getrennt, eingegeben werden."
 #  ddtp-prioritize: 56
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Suchbasis des LDAP-Servers:"
 
 #
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -83,13 +83,13 @@ msgstr ""
 #  ddtp-prioritize: 56
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "LDAP-Datenbank-Benutzer:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -100,32 +100,32 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Dieser Wert sollte als ein DN (distinguished name) eingegeben werden."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Passwort des LDAP-Benutzers:"
 
 #
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Namensauflösungsdienste, die eingerichtet werden sollen:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -135,7 +135,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/es.po b/debian/po/es.po
index b18796e..ed47c0d 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2008-02-03 20:20-0500\n"
 "Last-Translator: Rudy Godoy Guillén <rudy@stone-head.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr "Identificador de recurso uniforme del servidor LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -61,7 +61,7 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -72,20 +72,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr "Se puede especificar múltiples URIs separandolos con espacios."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Base de búsqueda en servidor LDAP:"
 
 #
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -99,13 +99,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "Usuario de base de datos LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -115,19 +115,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Debe ingresar el valor en forma de DN (nombre distintivo)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Contraseña de usuario LDAP:"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Introduzca la contraseña que se utilizará para acceder a la base de datos "
@@ -135,13 +135,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Indique los servicios a configurar:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -151,7 +151,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 035c8c7..fbf75eb 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2007-10-13 12:31+0200\n"
 "Last-Translator: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr "Adresse du serveur LDAP :"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -47,20 +47,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 "Des adresses multiples peuvent être indiquées, séparées par des espaces."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Base de recherche du serveur LDAP :"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -74,13 +74,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "Utilisateur de la base LDAP :"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -91,19 +91,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Cette valeur doit être un nom distingué (« DN »)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Mot de passe de l'utilisateur LDAP :"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
@@ -111,13 +111,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Services de nom à configurer :"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -127,7 +127,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 87ac6e5..95bf248 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2007-10-14 16:31+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr "LDAP サーバの Uniform Resource Identifier:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -53,19 +53,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr "スペースで区切って、複数の URI を指定できます。"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "LDAP サーバの検索ベース:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -78,13 +78,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "LDAP データベースユーザ:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -94,31 +94,31 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "この値は DN (識別名) として指定すべきです。"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "LDAP ユーザパスワード:"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "設定する名前サービス:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -128,7 +128,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 68054b9..d59389a 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2008-02-26 17:12+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr "URI (Uniform Resource Identifier) van de LDAP-server:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -44,7 +44,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -55,19 +55,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr "U kunt meerdere URI's opgeven door ze te scheiden met spaties."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "LDAP-server zoekbasis:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -81,13 +81,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "LDAP-databasegebruiker:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -98,19 +98,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Deze waarde dient opgegeven te worden als een DN (distinguished name)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Wachtwoord van de LDAP-gebruiker:"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Voer het wachtwoord in dat gebruikt zal worden om op de LDAP-database aan te "
@@ -118,13 +118,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Te configureren naamdiensten:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -134,7 +134,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index bce88dd..e260686 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2007-08-19 14:06+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr "Uniform Resource Identifier (URI) do servidor LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -47,19 +47,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr "Podem ser especificados múltiplos URIs, separando-os com espaços."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Base de busca do servidor LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -73,13 +73,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "Utilizador da base de dados LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -90,32 +90,32 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Este valor deve ser especificado como um nome distinto (DN)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Password de utilizador LDAP:"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Indique a password que vai ser usada para autenticação na base de dados LDAP."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Nomes de serviços para configurar:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -125,7 +125,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index ff0e70f..67f46fc 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_203-1\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2003-03-08 11:39+0300\n"
 "Last-Translator: Andr� Lu�s Lopes <andrelop@ig.com.br>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
@@ -54,20 +54,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 #, fuzzy
 msgid "LDAP server search base:"
 msgstr "Endere�o da m�quina servidora LDAP."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -81,14 +81,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 #, fuzzy
 msgid "LDAP database user:"
 msgstr "Usu�rio n�o previlegiado da base de dados."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -96,32 +96,32 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -129,7 +129,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 69fe107..5d7806c 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_211-4\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2003-11-19 15:00+0500\n"
 "Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
 "Language-Team: russian <debian-russian@lists.debian.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
@@ -48,13 +48,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 #, fuzzy
 msgid "LDAP server search base:"
 msgstr "�������� ����� ������� LDAP"
@@ -62,7 +62,7 @@ msgstr "�������� ����� ������� LDAP"
 #
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -76,14 +76,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 #, fuzzy
 msgid "LDAP database user:"
 msgstr "������������������� ������������ ���� ������"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -91,32 +91,32 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "������� ������, ������� ����� ����������� ��� ����������� � ���� ������ LDAP."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -124,7 +124,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index c9f7f97..9a2fb51 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2008-07-29 21:31+0200\n"
 "Last-Translator: Martin �gren <martin.agren@gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -31,47 +31,47 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr "Generell resursidentifierare, URI, f�r LDAP-servern:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
 "port number is optional."
 msgstr ""
-"Ange URI:n till den LDAP-server som anv�nds. Detta �r en str�ng "
-"p� formen ldap://<v�rdnamn eller IP>:<port>/ . "
-"ldaps:// eller ldapi:// kan ocks� anv�ndas. Portnumret �r valfritt."
+"Ange URI:n till den LDAP-server som anv�nds. Detta �r en str�ng p� formen "
+"ldap://<v�rdnamn eller IP>:<port>/ . ldaps:// eller ldapi:// kan ocks� "
+"anv�ndas. Portnumret �r valfritt."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
 msgstr ""
-"N�r ldap och ldaps anv�nds �r det vanligtvis en bra id� att anv�nda en IP-adress; "
-"detta reducerar risken f�r fel om namntj�nsten �r otillg�nglig."
+"N�r ldap och ldaps anv�nds �r det vanligtvis en bra id� att anv�nda en IP-"
+"adress; detta reducerar risken f�r fel om namntj�nsten �r otillg�nglig."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr "Flera URI:er kan anges separerade med blanksteg."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "S�kbas f�r LDAP-server:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -79,52 +79,52 @@ msgid ""
 "name of the search base."
 msgstr ""
 "Ange namnet (DN) f�r LDAPs s�kbas. M�nga system anv�nder komponenter av "
-"deras dom�nnamn f�r denna funktion.  Till exempel att dom�nen \"example.net\" "
-"skulle anv�nda \"dc=example,dc=net\" som sitt DN-namn f�r s�kbasen."
+"deras dom�nnamn f�r denna funktion.  Till exempel att dom�nen \"example.net"
+"\" skulle anv�nda \"dc=example,dc=net\" som sitt DN-namn f�r s�kbasen."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "LDAP-databasanv�ndare:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
 msgstr ""
-"Om LDAP-databasen kr�ver inloggning f�r vanliga uppslag, "
-"ange namnet p� det konto som ska anv�ndas. L�mna annars tomt."
+"Om LDAP-databasen kr�ver inloggning f�r vanliga uppslag, ange namnet p� det "
+"konto som ska anv�ndas. L�mna annars tomt."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Detta v�rde ska anges som ett DN (eng. \"distinguished name\")."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "LDAP-anv�ndarl�senord:"
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Ange l�senordet som ska anv�ndas f�r att logga in p� LDAP-databasen."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Namntj�nst som ska konfigureras:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -134,13 +134,12 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
 "review these changes."
 msgstr ""
-"Du kan v�lja de tj�nster som ska vara aktiverade eller avaktiverade "
-"vid LDAP-uppslag. De nya LDAP-uppslagen kommer att l�ggas till som "
-"ett sista val. Se till att se �ver dessa �ndringar."
-
+"Du kan v�lja de tj�nster som ska vara aktiverade eller avaktiverade vid LDAP-"
+"uppslag. De nya LDAP-uppslagen kommer att l�ggas till som ett sista val. Se "
+"till att se �ver dessa �ndringar."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 542f1eb..f6645f9 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: nss-ldapd 0.6\n"
+"Project-Id-Version: nss-ldapd 0.7\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
@@ -41,19 +41,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -63,13 +63,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -77,31 +77,31 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -109,7 +109,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 5f7624f..07ea935 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 238-1\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 16:33+0200\n"
+"POT-Creation-Date: 2009-04-19 21:47+0200\n"
 "PO-Revision-Date: 2005-06-08 15:25+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server Uniform Resource Identifier:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the URI of the LDAP server used. This is a string in the form "
 "ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
@@ -32,7 +32,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
@@ -46,20 +46,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 #, fuzzy
 msgid "LDAP server search base:"
 msgstr "Địa chỉ máy phục vụ LDAP"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -72,14 +72,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 #, fuzzy
 msgid "LDAP database user:"
 msgstr "người dùng cơ sở dữ liệu không có quyền truy cập đặc biệt"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
 "the account that will be used here. Leave empty otherwise."
@@ -87,31 +87,31 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Hãy nhập mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -119,7 +119,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/rules b/debian/rules
index 43a11b9..41cace5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,9 +50,9 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/libnss-ldapd
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	# make configfile fully generated
-	rm -f $(CURDIR)/debian/libnss-ldapd/etc/nss-ldapd.conf
+	rm -f $(CURDIR)/debian/tmp/etc/nss-ldapd.conf
 	# install a lintian override file
 	install -D -m 644 $(CURDIR)/debian/libnss-ldapd.lintian-overrides \
 	        $(CURDIR)/debian/libnss-ldapd/usr/share/lintian/overrides/libnss-ldapd
@@ -65,10 +65,11 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+	dh_install
 	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
-	dh_installinit --name=nslcd
+	dh_installinit
 	dh_installman
 	dh_installchangelogs
 	dh_link
author	Arthur de Jong <arthur@arthurdejong.org>	2009-04-19 21:59:10 +0200
committer	Arthur de Jong <arthur@arthurdejong.org>	2009-04-19 21:59:10 +0200
commit	c77f52a547a3691b375b33ee86225d2f5b854205 (patch)
tree	39459bb222572b7dc109bb065a01111f47151bc3 /debian
parent	bc01b71ebbe80e3d0544f9e8c429d546380421f6 (diff)