split into binary packages libnss-ldapd, libpam-ldapd and nslcd packages, using a patch for libpam-ldap by Steve Langasek <vorlon@debian.org> for the libpam-ldapd package

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@975 ef36b2f9-881f-0410-afb5-c4e39611909c
author: Arthur de Jong <arthur@arthurdejong.org> 2009-08-31 17:11:53 +0200
committer: Arthur de Jong <arthur@arthurdejong.org> 2009-08-31 17:11:53 +0200
commit: 1a1a3a2a955a0dc188d2b352e6b9135b2dab4275 (patch)
tree: 03c0133532ebcfb13f2d3278c427eb464461d961
parent: 19bf24fc48c1a207b97af3d290895aa059388cb7 (diff)
39 files changed, 1153 insertions, 1022 deletions
diff --git a/Makefile.am b/Makefile.am
index befb300..84e4878 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,16 +33,26 @@ SUBDIRS = compat common $(MAYBE_NSS) $(MAYBE_PAM) $(ENABLE_NSLCD) man tests
 
 DEBIAN_FILES = debian/changelog debian/compat debian/control \
                debian/copyright debian/rules \
-               debian/libnss-ldapd.docs \
-               debian/libnss-ldapd.examples \
-               debian/libnss-ldapd.lintian-overrides \
-               debian/libnss-ldapd.nslcd.init \
+               debian/nslcd.config \
+               debian/nslcd.docs \
+               debian/nslcd.examples \
+               debian/nslcd.init \
+               debian/nslcd.install \
+               debian/nslcd.postinst \
+               debian/nslcd.postrm \
+               debian/nslcd.templates \
                debian/libnss-ldapd.config \
-               debian/libnss-ldapd.templates \
+               debian/libnss-ldapd.install \
+               debian/libnss-ldapd.lintian-overrides \
                debian/libnss-ldapd.postinst \
                debian/libnss-ldapd.postrm \
-               $(wildcard debian/po/*.po) debian/po/templates.pot \
-               debian/po/POTFILES.in
+               debian/libnss-ldapd.templates \
+               debian/libpam-ldapd.install \
+               debian/libpam-ldapd.pam-auth-update \
+               debian/libpam-ldapd.postinst \
+               debian/libpam-ldapd.prerm \
+               debian/po/POTFILES.in debian/po/templates.pot \
+               $(wildcard debian/po/*.po)
 
 EXTRA_DIST = nss-ldapd.conf nslcd.h \
              $(wildcard m4/*.m4) HACKING $(DEBIAN_FILES)
diff --git a/debian/control b/debian/control
index 147d435..29766a1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,27 @@ Priority: extra
 Maintainer: Arthur de Jong <adejong@debian.org>
 Uploaders: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.8.2
-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://arthurdejong.org/nss-ldapd/
 Vcs-Svn: http://arthurdejong.org/svn/nss-ldapd/nss-ldapd/
 Vcs-Browser: http://arthurdejong.org/viewvc/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
+Conflicts: libnss-ldapd (< 0.7.0)
+Description: Daemon for NSS and PAM lookups using LDAP
+ This package provides a daemon for retrieving user account, and other
+ system information from LDAP.
+ .
+ It is used by the libnss-ldapd and libpam-ldapd packages but by itself is
+ not very useful.
+
+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
@@ -24,3 +36,16 @@ 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, libpam-runtime (>= 1.0.1-6)
+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
+ user authentication based on credentials stored in an LDAP server.
+ .
+ This module is still under development but strives to be able to replace
+ the libpam-ldap package in most cases.
diff --git a/debian/libnss-ldapd.config b/debian/libnss-ldapd.config
index f8141f9..03d5622 100644
--- a/debian/libnss-ldapd.config
+++ b/debian/libnss-ldapd.config
@@ -7,7 +7,6 @@ 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"
@@ -19,251 +18,27 @@ db_title "Configuring libnss-ldapd"
 # 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
-  # check ssl option
-  db_get libnss-ldapd/ldap-starttls
-  if [ -z "$RET" ]
-  then
-    if grep -qi '^ssl[[:space:]]*start_*tls' "$cfgfile"
-    then
-      db_set libnss-ldapd/ldap-starttls "true"
-    elif grep -qi '^ssl[[:space:]]' "$cfgfile"
-    then
-      db_set libnss-ldapd/ldap-starttls "false"
-    fi
-  fi
-  # check reqcert option
-  db_get libnss-ldapd/ldap-reqcert
-  if [ -z "$RET" ]
-  then
-    reqcert=`sed -n 's/^tls_\(reqcert\|checkpeer\)[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\2/ip' "$cfgfile" | tail -n 1`
-    # normalise value
-    reqcert=`echo "$reqcert" | tr 'A-Z' 'a-z' | sed 's/^no$/never/;s/^yes$/demand/'`
-    [ -n "$reqcert" ] && db_set libnss-ldapd/ldap-reqcert "$reqcert"
-  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/"
-  db_get libnss-ldapd/ldap-starttls
-  [ -z "$RET" ] && db_set libnss-ldapd/ldap-starttls "false"
+  # 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="starttls"
-    db_go || state="binddn"
-    ;;
-  starttls)
-    # check if ldaps:// URL's are used
-    db_get libnss-ldapd/ldap-uris
-    uris="$RET"
-    if (echo "$uris" | grep -q 'ldaps://')
-    then
-      # ldaps: URI defined, don't ask about StartTLS
-      db_set libnss-ldapd/ldap-starttls "false"
-    else
-      # ask whether to use StartTLS
-      db_input medium libnss-ldapd/ldap-starttls || true
-    fi
-    # ask the question, go to the next question or back
-    state="reqcert"
-    db_go || state="bindpw"
-    ;;
-  reqcert)
-    # check if ldaps:// URL's are used
-    db_get libnss-ldapd/ldap-uris
-    uris="$RET"
-    # check if StartTLS is used
-    db_get libnss-ldapd/ldap-starttls
-    starttls="$RET"
-    if (echo "$uris" | grep -q 'ldaps://') || [ "$starttls" = "true" ]
-    then
-      # ask whether to do certificate validation
-      db_input high libnss-ldapd/ldap-reqcert || true
-    fi
-    # ask the question, go to the next question or back
-    state="nsswitch"
-    db_go || state="bindpw"
-    ;;
-  nsswitch)
-    # ask for which nsswitch options to configure
-    db_capb multiselect
-    db_input high libnss-ldapd/nsswitch || true
-    state="done"
-    db_go || state="reqcert"
-    ;;
-  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 766735f..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,136 +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
-
-# SSL options
-#ssl off
-#tls_reqcert never
-
-# 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
-  if [ -n "$RET" ]
-  then
-    cfg_set base "$RET"
-  else
-    cfg_disable base
-  fi
-  # 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 ""
-  # set ssl option
-  db_get libnss-ldapd/ldap-starttls
-  if [ "$RET" = "true" ]
-  then
-    cfg_set ssl "start_tls"
-  elif grep -qi '^ssl[[:space:]]*start_*tls' $CONFFILE
-  then
-    cfg_disable ssl
-  fi
-  # set tls_reqcert option
-  db_get libnss-ldapd/ldap-reqcert
-  if [ -n "$RET" ]
-  then
-    # rename any tls_checkpeer options
-    sed -i 's/^tls_checkpeer/tls_reqcert/i' "$CONFFILE"
-    # set tls_reqcert option
-    cfg_set tls_reqcert "$RET"
-    # clear debconf value so that this option is only set if the question is asked
-    db_set libnss-ldapd/ldap-reqcert ""
-  fi
   # modify /etc/nsswitch.conf
   db_get libnss-ldapd/nsswitch
   enablenss=`echo "$RET" | sed 's/,//g'`
@@ -269,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 58942df..b21df19 100644
--- a/debian/libnss-ldapd.postrm
+++ b/debian/libnss-ldapd.postrm
@@ -2,8 +2,6 @@
 
 set -e
 
-CONFFILE="/etc/nss-ldapd.conf"
-
 # remove NSS lookups though LDAP for the specified service
 nss_disable()
 {
@@ -27,9 +25,6 @@ nss_disable()
   return 0
 }
 
-# remove /var/run/nslcd directory
-rm -rf /var/run/nslcd
-
 # offer to remove ldap from nsswitch.conf
 if ( [ "$1" = "remove" ] || [ "$1" = "purge" ] )
 then
@@ -68,12 +63,6 @@ then
   fi
 fi
 
-# remove our configuration file (not a conffile) on purge
-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 5af6f38..ea9852b 100644
--- a/debian/libnss-ldapd.templates
+++ b/debian/libnss-ldapd.templates
@@ -1,58 +1,3 @@
-Template: libnss-ldapd/ldap-uris
-Type: string
-_Description: LDAP server URI:
- Please enter the Uniform Resource Identifier of the LDAP server. The format
- is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or
- 'ldapi://' can be used. The port number is optional.
- .
- When using an ldap or ldaps scheme it is recommended to use an IP address to
- avoid failures when domain 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 it 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/ldap-starttls
-Type: boolean
-_Description: Use StartTLS?
- Please choose whether the connection to the LDAP server should use
- StartTLS to encrypt the connection.
-
-Template: libnss-ldapd/ldap-reqcert
-Type: select
-__Choices: never, allow, try, demand
-_Description: Check server's SSL certificate:
- When an encrypted connection is used, a server certificate can be requested
- and checked. Please choose whether lookups should be configured to require
- a certificate, and whether certificates should be checked for validity:
-  * never: no certificate will be requested or checked;
-  * allow: a certificate will be requested, but it is not
-           required or checked;
-  * try: a certificate will be requested and checked, but if no
-         certificate is provided it is ignored;
-  * demand: a certificate will be requested, required, and checked.
- If certificate checking is enabled, at least one of the tls_cacertdir or
- tls_cacertfile options must be put in /etc/nss-ldapd.conf.
-
 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..dc09072
--- /dev/null
+++ b/debian/libpam-ldapd.install
@@ -0,0 +1,2 @@
+lib/security
+usr/share/pam-configs/ldap
diff --git a/debian/libpam-ldapd.pam-auth-update b/debian/libpam-ldapd.pam-auth-update
new file mode 100644
index 0000000..6fdfeb7
--- /dev/null
+++ b/debian/libpam-ldapd.pam-auth-update
@@ -0,0 +1,19 @@
+Name: LDAP Authentication
+Default: yes
+Priority: 128
+Auth-Type: Primary
+Auth-Initial:
+	[success=end default=ignore]	pam_ldap.so
+Auth:
+	[success=end default=ignore]	pam_ldap.so use_first_pass
+Account-Type: Primary
+Account:
+	[success=end default=ignore]	pam_ldap.so
+Password-Type: Primary
+Password-Initial:
+	[success=end user_unknown=ignore default=die]	pam_ldap.so
+Password:
+	[success=end user_unknown=ignore default=die]	pam_ldap.so use_authtok try_first_pass
+Session-Type: Additional
+Session:
+	optional			pam_ldap.so
diff --git a/debian/libpam-ldapd.postinst b/debian/libpam-ldapd.postinst
new file mode 100644
index 0000000..20c9b76
--- /dev/null
+++ b/debian/libpam-ldapd.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+pam-auth-update --package
diff --git a/debian/libpam-ldapd.prerm b/debian/libpam-ldapd.prerm
new file mode 100644
index 0000000..4d4e093
--- /dev/null
+++ b/debian/libpam-ldapd.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ]
+then
+  pam-auth-update --package --remove ldap
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/nslcd.config b/debian/nslcd.config
new file mode 100644
index 0000000..577b7fb
--- /dev/null
+++ b/debian/nslcd.config
@@ -0,0 +1,241 @@
+#!/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 NSLCD"
+
+#
+# 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
+  # check ssl option
+  db_get libnss-ldapd/ldap-starttls
+  if [ -z "$RET" ]
+  then
+    if grep -qi '^ssl[[:space:]]*start_*tls' "$cfgfile"
+    then
+      db_set libnss-ldapd/ldap-starttls "true"
+    elif grep -qi '^ssl[[:space:]]' "$cfgfile"
+    then
+      db_set libnss-ldapd/ldap-starttls "false"
+    fi
+  fi
+  # check reqcert option
+  db_get libnss-ldapd/ldap-reqcert
+  if [ -z "$RET" ]
+  then
+    reqcert=`sed -n 's/^tls_\(reqcert\|checkpeer\)[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\2/ip' "$cfgfile" | tail -n 1`
+    # normalise value
+    reqcert=`echo "$reqcert" | tr 'A-Z' 'a-z' | sed 's/^no$/never/;s/^yes$/demand/'`
+    [ -n "$reqcert" ] && db_set libnss-ldapd/ldap-reqcert "$reqcert"
+  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/"
+  db_get libnss-ldapd/ldap-starttls
+  [ -z "$RET" ] && db_set libnss-ldapd/ldap-starttls "false"
+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="starttls"
+    db_go || state="binddn"
+    ;;
+  starttls)
+    # check if ldaps:// URL's are used
+    db_get libnss-ldapd/ldap-uris
+    uris="$RET"
+    if (echo "$uris" | grep -q 'ldaps://')
+    then
+      # ldaps: URI defined, don't ask about StartTLS
+      db_set libnss-ldapd/ldap-starttls "false"
+    else
+      # ask whether to use StartTLS
+      db_input medium libnss-ldapd/ldap-starttls || true
+    fi
+    # ask the question, go to the next question or back
+    state="reqcert"
+    db_go || state="bindpw"
+    ;;
+  reqcert)
+    # check if ldaps:// URL's are used
+    db_get libnss-ldapd/ldap-uris
+    uris="$RET"
+    # check if StartTLS is used
+    db_get libnss-ldapd/ldap-starttls
+    starttls="$RET"
+    if (echo "$uris" | grep -q 'ldaps://') || [ "$starttls" = "true" ]
+    then
+      # ask whether to do certificate validation
+      db_input high libnss-ldapd/ldap-reqcert || true
+    fi
+    # ask the question, go to the next question or back
+    state="done"
+    db_go || state="bindpw"
+    ;;
+  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 866eea3..866eea3 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..75777dd
--- /dev/null
+++ b/debian/nslcd.postinst
@@ -0,0 +1,224 @@
+#!/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
+
+# SSL options
+#ssl off
+#tls_reqcert never
+
+# 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
+  if [ -n "$RET" ]
+  then
+    cfg_set base "$RET"
+  else
+    cfg_disable base
+  fi
+  # 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 ""
+  # set ssl option
+  db_get libnss-ldapd/ldap-starttls
+  if [ "$RET" = "true" ]
+  then
+    cfg_set ssl "start_tls"
+  elif grep -qi '^ssl[[:space:]]*start_*tls' $CONFFILE
+  then
+    cfg_disable ssl
+  fi
+  # set tls_reqcert option
+  db_get libnss-ldapd/ldap-reqcert
+  if [ -n "$RET" ]
+  then
+    # rename any tls_checkpeer options
+    sed -i 's/^tls_checkpeer/tls_reqcert/i' "$CONFFILE"
+    # set tls_reqcert option
+    cfg_set tls_reqcert "$RET"
+    # clear debconf value so that this option is only set if the question is asked
+    db_set libnss-ldapd/ldap-reqcert ""
+  fi
+  # 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..d861272
--- /dev/null
+++ b/debian/nslcd.templates
@@ -0,0 +1,54 @@
+Template: libnss-ldapd/ldap-uris
+Type: string
+_Description: LDAP server URI:
+ Please enter the Uniform Resource Identifier of the LDAP server. The format
+ is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or
+ 'ldapi://' can be used. The port number is optional.
+ .
+ When using an ldap or ldaps scheme it is recommended to use an IP address to
+ avoid failures when domain 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 it 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/ldap-starttls
+Type: boolean
+_Description: Use StartTLS?
+ Please choose whether the connection to the LDAP server should use
+ StartTLS to encrypt the connection.
+
+Template: libnss-ldapd/ldap-reqcert
+Type: select
+__Choices: never, allow, try, demand
+_Description: Check server's SSL certificate:
+ When an encrypted connection is used, a server certificate can be requested
+ and checked. Please choose whether lookups should be configured to require
+ a certificate, and whether certificates should be checked for validity:
+  * never: no certificate will be requested or checked;
+  * allow: a certificate will be requested, but it is not
+           required or checked;
+  * try: a certificate will be requested and checked, but if no
+         certificate is provided it is ignored;
+  * demand: a certificate will be requested, required, and checked.
+ If certificate checking is enabled, at least one of the tls_cacertdir or
+ tls_cacertfile options must be put in /etc/nss-ldapd.conf.
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 8726d56..340708c 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: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+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,14 +17,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 msgid "LDAP server URI:"
 msgstr "adreça de l'ordinador del servidor d'LDAP"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -33,7 +33,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,20 +48,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 "
@@ -75,14 +75,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 it empty otherwise."
@@ -90,19 +90,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 "
@@ -110,13 +110,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -124,37 +124,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -171,13 +171,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -185,7 +185,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -194,13 +194,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -209,7 +209,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -219,7 +219,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/cs.po b/debian/po/cs.po
index f333137..7204163 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-07-09 10:04+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 URI:"
 msgstr "URI LDAP serveru:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain 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 "Více URI je možno zadat tak, že je oddělíte mezerami."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Kořen prohledávaného LDAP stromu:"
 
 #. 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 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 it 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 "Tato hodnota by měla být zadána jako rozlišitelné jméno (DN)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Heslo LDAP uživatele:"
 
 #. 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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "Používat StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -128,37 +128,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "nikdy"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "povoleno"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "pokusit se"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "vyžadováno"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Kontrolovat SSL certifikát serveru:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -186,13 +186,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Jmenné služby, které se mají nastavit:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -202,7 +202,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -214,13 +214,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Odstranit LDAP z nsswitch.conf?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -233,7 +233,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -247,7 +247,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/da.po b/debian/po/da.po
index fb52a73..1c872a6 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: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-21 23:51+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid "LDAP server search base:"
 msgid "LDAP server URI:"
@@ -26,7 +26,7 @@ msgstr "LDAP-server søgebase:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please enter the URI of the LDAP server used. This is a string in the "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "When using the ldap or ldaps schemes it is usually a good idea to use an "
@@ -59,19 +59,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 "
@@ -84,13 +84,13 @@ msgstr ""
 
 #. 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
 #, fuzzy
 #| msgid ""
 #| "If the LDAP database requires a login for normal lookups, enter the name "
@@ -104,32 +104,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."
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -137,37 +137,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -184,13 +184,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Navneservices at indstille:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -200,7 +200,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "You can select the services that should be enabled or disabled for LDAP "
@@ -217,13 +217,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Fjern LDAP fra nsswitch.conf nu?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 #, fuzzy
 #| msgid ""
 #| "LDAP is still configured for name lookups for the following services:\n"
@@ -240,7 +240,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -254,7 +254,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/de.po b/debian/po/de.po
index 27c3f6e..83604fa 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: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+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"
@@ -23,7 +23,7 @@ msgstr ""
 #  ddtp-prioritize: 56
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid "LDAP server search base:"
 msgid "LDAP server URI:"
@@ -31,7 +31,7 @@ msgstr "Suchbasis des LDAP-Servers:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please enter the URI of the LDAP server used. This is a string in the "
@@ -50,7 +50,7 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "When using the ldap or ldaps schemes it is usually a good idea to use an "
@@ -66,7 +66,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."
 
@@ -74,14 +74,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 "
@@ -97,13 +97,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
 #, fuzzy
 #| msgid ""
 #| "If the LDAP database requires a login for normal lookups, enter the name "
@@ -118,32 +118,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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -151,37 +151,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -198,13 +198,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Namensauflösungsdienste, die eingerichtet werden sollen:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -214,7 +214,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "You can select the services that should be enabled or disabled for LDAP "
@@ -231,13 +231,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -246,7 +246,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -256,7 +256,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/es.po b/debian/po/es.po
index c161175..aeb2f29 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-06-23 12:23+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -43,13 +43,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "URI del servidor LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -62,7 +62,7 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain name services are unavailable."
@@ -73,20 +73,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 pueden especificar múltiples URI separándolos con espacios."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Base de búsqueda en el 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 "
@@ -100,13 +100,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "Usuario de la 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 it empty otherwise."
@@ -117,19 +117,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 introducir 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 del 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 "
@@ -137,13 +137,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "¿Desea utilizar StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -153,37 +153,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "nunca"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "permitir"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "intentar"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "demanda"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Comprobación del certificado SSL del servidor:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -213,13 +213,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Indique los servicios a configurar:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -229,7 +229,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -241,13 +241,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "¿Desea borrar LDAP del archivo «nsswitch.conf» ahora?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -260,7 +260,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -274,7 +274,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 504f5b3..718dd71 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-06-23 21:44+0300\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "LDAP-palvelimen URI:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -37,7 +37,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain 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 "Voit syöttää useamman URIn erottamalla ne välilyönneillä."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "LDAP-palvelimen hakukanta:"
 
 #. 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 "LDAP-tietokannan käyttäjätunnus:"
 
 #. 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 it empty otherwise."
@@ -89,31 +89,31 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Tämä arvo tulisi antaa erittelevänä nimenä."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "LDAP-tunnuksen salasana:"
 
 #. 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 "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "Käytetäänkö StartTLS:ää?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -123,37 +123,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "ei koskaan"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "salli"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "yritä"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "vaadi"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Palvelimen SSL-varmenteen tarkistus:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -180,13 +180,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Asetettavat nimipalvelimet:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -196,7 +196,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -207,13 +207,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Poistetaan LDAP tiedostosta nsswitch.conf nyt?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -225,7 +225,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -234,12 +234,12 @@ msgid ""
 msgstr ""
 "On suositeltavaa poistaa tietueet, jos LDAP:ia ei aiota enää käyttää nimien "
 "selvittämiseen. Jos ldap jätetään tiedostoon nsswitch.conf, sen ei pitäisi "
-"useimpien palveluiden kohdalla aiheuttaa ongelmia, mutta konenimien "
-"selvitys saattaa muuttua joillain tavoilla."
+"useimpien palveluiden kohdalla aiheuttaa ongelmia, mutta konenimien selvitys "
+"saattaa muuttua joillain tavoilla."
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index a47aed2..ad36fdf 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-06-25 17:07+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "URI du serveur LDAP :"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain name services are unavailable."
@@ -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 ""
 "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 "
@@ -81,13 +81,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 it 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 "Cette valeur doit être un nom distinctif (« 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 "
@@ -118,13 +118,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "Faut-il utiliser StartTLS ?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -134,37 +134,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "Jamais"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "Autoriser"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "Essayer"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "Demander"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Contrôle du certificat SSL du serveur :"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -191,13 +191,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Services de nom à configurer :"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -207,7 +207,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -220,13 +220,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Faut-il supprimer LDAP de nsswitch.conf maintenant ?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -238,7 +238,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -252,7 +252,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/gl.po b/debian/po/gl.po
index b826649..376f855 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.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: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-07-18 10:02+0200\n"
 "Last-Translator: Marce Villarino <mvillarino@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "URI do servidor LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -37,7 +37,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain 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 "Poden especificarse varios URI separándoos con espazos."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Base da procura de 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 "Usuario da 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 it empty otherwise."
@@ -90,19 +90,19 @@ 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 debe especificarse como un DN (nome distintivo)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Contrasinal do usuario de 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 o contrasinal que se ha empregar para acceder á base de datos do "
@@ -110,13 +110,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "Debe empregarse StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -126,37 +126,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "nunca"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "permitir"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "tentar"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "demandar"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Comprobación do certificado SSL do servidor:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -183,13 +183,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Servizos de nome a configurar:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -199,7 +199,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -211,13 +211,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Desexa eliminar LDAP de nsswitch.conf?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -230,7 +230,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -244,7 +244,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/it.po b/debian/po/it.po
index e18c1c1..076cb14 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-22 07:36+0200\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid "LDAP server search base:"
 msgid "LDAP server URI:"
@@ -26,7 +26,7 @@ msgstr "Base di ricerca del server LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please enter the URI of the LDAP server used. This is a string in the "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "When using the ldap or ldaps schemes it is usually a good idea to use an "
@@ -59,19 +59,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 "È possibile specificare URI multipli, dividendoli con spazi."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:2001
+#: ../nslcd.templates:2001
 msgid "LDAP server search base:"
 msgstr "Base di ricerca del server 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 "
@@ -85,13 +85,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "LDAP database user:"
 msgstr "Utente del database LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 #, fuzzy
 #| msgid ""
 #| "If the LDAP database requires a login for normal lookups, enter the name "
@@ -106,33 +106,33 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 "Questo valore dovrebbe essere specificato come DN (distinguished name)."
 
 #. Type: password
 #. Description
-#: ../libnss-ldapd.templates:4001
+#: ../nslcd.templates:4001
 msgid "LDAP user password:"
 msgstr "Password dell'utente 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 ""
 "Inserire la password che verrà utilizzata per accedere al database LDAP."
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -140,37 +140,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -187,13 +187,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Servizi dei nomi da configurare:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -203,7 +203,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "You can select the services that should be enabled or disabled for LDAP "
@@ -220,13 +220,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Rimuovere LDAP da nsswitch.con ora?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 #, fuzzy
 #| msgid ""
 #| "LDAP is still configured for name lookups for the following services:\n"
@@ -243,7 +243,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -257,7 +257,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 7cd50d2..7f4f6da 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-06-24 08:18+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -25,42 +25,47 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "LDAP サーバの URI:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
 "'ldapi://' can be used. The port number is optional."
-msgstr "LDAP サーバの Uniform Resource Identifier を入力してください。形式は 'ldap://<ホスト名または IP>:<ポート>/' です。このほかに 'ldaps://' または 'ldapi://' も利用できます。ポート番号は省略できます。"
+msgstr ""
+"LDAP サーバの Uniform Resource Identifier を入力してください。形式は 'ldap://"
+"<ホスト名または IP>:<ポート>/' です。このほかに 'ldaps://' または 'ldapi://' "
+"も利用できます。ポート番号は省略できます。"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain name services are unavailable."
-msgstr "ldap または ldaps スキーマを使う際には、ネームサービスが利用できないときの障害回避のために IP アドレスを使うことを推奨します。"
+msgstr ""
+"ldap または ldaps スキーマを使う際には、ネームサービスが利用できないときの障"
+"害回避のために IP アドレスを使うことを推奨します。"
 
 #. 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 "
@@ -73,83 +78,87 @@ 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 it empty otherwise."
-msgstr "通常のルックアップに LDAP データベースがログインを必要とするのであれば、利用するアカウント名をここに入力してください。そうでなければ空のままにします。"
+msgstr ""
+"通常のルックアップに LDAP データベースがログインを必要とするのであれば、利用"
+"するアカウント名をここに入力してください。そうでなければ空のままにします。"
 
 #. 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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "StartTLS を利用しますか?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
-msgstr "接続の暗号化のために LDAP サーバに StartTLS を使って接続するかどうかを選んでください。"
+msgstr ""
+"接続の暗号化のために LDAP サーバに StartTLS を使って接続するかどうかを選んで"
+"ください。"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "使わない"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "許可"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "試行"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "要求"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "サーバの SSL 証明書のチェック:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -163,24 +172,27 @@ msgid ""
 "If certificate checking is enabled, at least one of the tls_cacertdir or "
 "tls_cacertfile options must be put in /etc/nss-ldapd.conf."
 msgstr ""
-"暗号化接続を利用する場合、サーバ証明書を要求して確認できます。ルックアップで証明書を必須とするよう設定するかどうか、および証明書の妥当性を確認するかどうかを選んでください。\n"
+"暗号化接続を利用する場合、サーバ証明書を要求して確認できます。ルックアップで"
+"証明書を必須とするよう設定するかどうか、および証明書の妥当性を確認するかどう"
+"かを選んでください。\n"
 " * 使わない: 証明書は要求もチェックもされない\n"
 " * 許可: 証明書を要求するが、必須ではなくチェックも\n"
 "         されない\n"
 " * 試行: 証明書は要求およびチェックされるが、\n"
 "         証明書が提供されなかった場合は単に無視される\n"
 " * 要求: 証明書は要求され、必須であり、チェックされる。\n"
-"証明書のチェックが有効の場合、tls_cacertdir、tls_cacertfile オプションのうちの少なくとも 1 つは /etc/nss-ldap.conf に掲載されている必要があります。"
+"証明書のチェックが有効の場合、tls_cacertdir、tls_cacertfile オプションのうち"
+"の少なくとも 1 つは /etc/nss-ldap.conf に掲載されている必要があります。"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "設定する名前サービス:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -190,22 +202,25 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
 "changes."
-msgstr "LDAP ルックアップを有効にしたいサービスを選択できます。新しい LDAP ルックアップは最後のデータソースとして追加されます。これらの変更を見て確認してください。"
+msgstr ""
+"LDAP ルックアップを有効にしたいサービスを選択できます。新しい LDAP ルックアッ"
+"プは最後のデータソースとして追加されます。これらの変更を見て確認してくださ"
+"い。"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "nsswitch.conf から LDAP を今削除しますか?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -217,7 +232,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -230,7 +245,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 9731a78..e428d10 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: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+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,7 +26,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid "LDAP server search base:"
 msgid "LDAP server URI:"
@@ -34,7 +34,7 @@ msgstr "LDAP-server zoekbasis:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please enter the URI of the LDAP server used. This is a string in the "
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "When using the ldap or ldaps schemes it is usually a good idea to use an "
@@ -67,19 +67,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 "
@@ -93,13 +93,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
 #, fuzzy
 #| msgid ""
 #| "If the LDAP database requires a login for normal lookups, enter the name "
@@ -114,19 +114,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 "
@@ -134,13 +134,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -148,37 +148,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -195,13 +195,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Te configureren naamdiensten:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -211,7 +211,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 #, fuzzy
 #| msgid ""
 #| "You can select the services that should be enabled or disabled for LDAP "
@@ -228,13 +228,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -243,7 +243,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -253,7 +253,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 7a151a7..1035d67 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.10\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-06-26 23:09+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "URI do servidor LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -37,7 +37,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain 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 it empty otherwise."
@@ -90,19 +90,19 @@ 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 "Palavra-passe 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 palavra-passe que vai ser usada para autenticação na base de dados "
@@ -110,13 +110,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "Utilizar StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -126,37 +126,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "nunca"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "permitir"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "tentar"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "obrigar"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Verificar o certificado SSL do servidor:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -185,13 +185,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Nomes de serviços para configurar:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -201,7 +201,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -213,13 +213,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Remover agora o LDAP do nsswitch.conf?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -232,7 +232,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -246,7 +246,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 747111d..272e2e7 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: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+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,14 +25,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 msgid "LDAP server URI:"
 msgstr "Endere�o da m�quina servidora LDAP."
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -41,7 +41,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 "
@@ -55,20 +55,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 "
@@ -82,14 +82,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 it empty otherwise."
@@ -97,32 +97,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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -130,37 +130,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -177,13 +177,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -191,7 +191,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -200,13 +200,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -215,7 +215,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -225,7 +225,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 34adf3b..9109322 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.10\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-06-23 20:24+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "URI сервера LDAP:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain name services are unavailable."
@@ -53,20 +53,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 "Можно указывать несколько 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 "
@@ -80,13 +80,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 it 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 "Значение должно быть указано в форме 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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "Использовать StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -131,37 +131,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "никогда"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "запросить"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "попытаться"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "обязательна"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Проверка SSL-сертификат сервера:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -188,13 +188,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Имена настраиваемых служб:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -204,7 +204,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -216,13 +216,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Удалить LDAP из nsswitch.conf прямо сейчас?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -234,7 +234,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index e4b8379..868b2c5 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd_sv\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-06-27 21:15+0200\n"
 "Last-Translator: Martin �gren <martin.agren@gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -31,13 +31,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "URI f�r LDAP-server:"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -49,7 +49,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain name services are unavailable."
@@ -59,19 +59,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 "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 "
@@ -84,13 +84,13 @@ msgstr ""
 
 #. 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 it empty otherwise."
@@ -100,31 +100,31 @@ msgstr ""
 
 #. 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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "Anv�nda StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -134,37 +134,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr "aldrig"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr "till�t"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr "f�rs�k"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr "kr�v"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr "Kontrollera serverns SSL-certifikat:"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -192,13 +192,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "Namntj�nster som ska konfigureras:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -208,7 +208,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -220,13 +220,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "Ta bort LDAP fr�n nsswitch.conf nu?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -239,7 +239,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -252,7 +252,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 152bf40..3577136 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+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 URI:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain 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 it 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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -109,37 +109,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -156,13 +156,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -170,7 +170,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -179,13 +179,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -194,7 +194,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -204,7 +204,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 420bd73..a186193 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: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+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,14 +17,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 #, fuzzy
 msgid "LDAP server URI:"
 msgstr "Địa chỉ máy phục vụ LDAP"
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -33,7 +33,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 "Đị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 "
@@ -73,14 +73,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 it empty otherwise."
@@ -88,31 +88,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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -120,37 +120,37 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -167,13 +167,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -181,7 +181,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -190,13 +190,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -205,7 +205,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -215,7 +215,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index da76818..0d23096 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-23 09:34+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: zym <zym@3721.com>\n"
 "Language-Team: \n"
@@ -15,13 +15,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid "LDAP server URI:"
 msgstr "LDAP 服务器URI地址："
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "Please enter the Uniform Resource Identifier of the LDAP server. The format "
 "is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
@@ -32,7 +32,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:1001
+#: ../nslcd.templates:1001
 msgid ""
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain name services are unavailable."
@@ -40,19 +40,19 @@ msgstr "使用ldap或ldaps模式时，推荐使用IP地址以防止域名无法�
 
 #. 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 "
@@ -64,13 +64,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 it empty otherwise."
@@ -78,31 +78,31 @@ msgstr "如LDAP数据库在查询时需要登录，请输入登录帐号，否�
 
 #. Type: string
 #. Description
-#: ../libnss-ldapd.templates:3001
+#: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "这个值应该设置为一个DN (distinguished name)。"
 
 #. 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: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid "Use StartTLS?"
 msgstr "使用 StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:5001
+#: ../nslcd.templates:5001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -110,31 +110,31 @@ msgstr "请选择是否使用StartTLS来加密到LDAP服务器的连接。"
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../libnss-ldapd.templates:6001
+#: ../nslcd.templates:6001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 #, fuzzy
 #| msgid "Check server SSL certificate?"
 msgid "Check server's SSL certificate:"
@@ -142,7 +142,7 @@ msgstr "需要检查服务器的SSL证书吗？"
 
 #. Type: select
 #. Description
-#: ../libnss-ldapd.templates:6002
+#: ../nslcd.templates:6002
 msgid ""
 "When an encrypted connection is used, a server certificate can be requested "
 "and checked. Please choose whether lookups should be configured to require a "
@@ -167,13 +167,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid "Name services to configure:"
 msgstr "配置名称服务："
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -181,7 +181,7 @@ msgstr "启用需要修改 /etc/nsswitch.conf 来使用ldap数据源。"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:1001
 msgid ""
 "You can select the services that should have LDAP lookups enabled. The new "
 "LDAP lookups will be added as the last datasource. Be sure to review these "
@@ -192,13 +192,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid "Remove LDAP from nsswitch.conf now?"
 msgstr "从nsswitch.conf中停用LDAP模式？"
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
@@ -210,7 +210,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
 "name resolution any more. Not removing ldap from nsswitch.conf should, for "
@@ -222,7 +222,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../libnss-ldapd.templates:8001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
diff --git a/debian/rules b/debian/rules
index 43a11b9..d4f575d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,12 +50,14 @@ 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
+	# install a pam-auth-update configuration file
+	install -D -m 644 debian/libpam-ldapd.pam-auth-update debian/tmp/usr/share/pam-configs/ldap
 
 # build architecture-independent files
 binary-indep: build install
@@ -65,10 +67,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-08-31 17:11:53 +0200
committer	Arthur de Jong <arthur@arthurdejong.org>	2009-08-31 17:11:53 +0200
commit	1a1a3a2a955a0dc188d2b352e6b9135b2dab4275 (patch)
tree	03c0133532ebcfb13f2d3278c427eb464461d961
parent	19bf24fc48c1a207b97af3d290895aa059388cb7 (diff)