diff options
42 files changed, 107 insertions, 94 deletions
diff --git a/Makefile.am b/Makefile.am index 84e4878..e404a73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,27 +54,27 @@ DEBIAN_FILES = debian/changelog debian/compat debian/control \ debian/po/POTFILES.in debian/po/templates.pot \ $(wildcard debian/po/*.po) -EXTRA_DIST = nss-ldapd.conf nslcd.h \ +EXTRA_DIST = nslcd.conf nslcd.h \ $(wildcard m4/*.m4) HACKING $(DEBIAN_FILES) DISTCHECK_CONFIGURE_FLAGS = --enable-warnings ACLOCAL_AMFLAGS = -I m4 -NSS_LDAP_PATH_CONF = @NSS_LDAP_PATH_CONF@ +NSLCD_CONF_PATH = @NSLCD_CONF_PATH@ -install-data-local: install-ldap_conf -uninstall-local: uninstall-ldap_conf +install-data-local: install-nslcd_conf +uninstall-local: uninstall-nslcd_conf # install a default configuration file if it is not already there -install-ldap_conf: - @if [ -f $(DESTDIR)$(NSS_LDAP_PATH_CONF) ]; then \ - echo "$(DESTDIR)$(NSS_LDAP_PATH_CONF) already exists, install will not overwrite"; \ +install-nslcd_conf: + @if [ -f $(DESTDIR)$(NSLCD_CONF_PATH) ]; then \ + echo "$(DESTDIR)$(NSLCD_CONF_PATH) already exists, install will not overwrite"; \ else \ - $(INSTALL_DATA) -D $(srcdir)/nss-ldapd.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \ + $(INSTALL_DATA) -D $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH) || true; \ fi -uninstall-ldap_conf: - -rm -f $(DESTDIR)$(NSS_LDAP_PATH_CONF) +uninstall-nslcd_conf: + -rm -f $(DESTDIR)$(NSLCD_CONF_PATH) # target for easily creating a Debian package # the find is an ugly hack to fix a bug if being built on an nfs filesystem @@ -199,7 +199,7 @@ pam_ldap.so files and the daemon (nslcd). The boot process needs to be manually modified to start the daemon at the right time. Also it is recommended to create a dedicated user to run the nslcd daemon as. -Configure this user in /etc/nss-ldapd.conf using the uid and gid options. +Configure this user in /etc/nslcd.conf using the uid and gid options. CONFIGURATION @@ -233,7 +233,7 @@ on the format. As an example the file could look a little like this: # whether alias lookups really use NSS depends on the mail server aliases: files ldap -Furthermore a configuration file (by default /etc/nss-ldapd.conf) needs to be +Furthermore a configuration file (by default /etc/nslcd.conf) needs to be made. The location of this file can be specified with configure. See the shipped manual page for details on the format and options. It should at least contain something like: @@ -271,8 +271,8 @@ default attributes ------------------ This paragraph describes the mapping between the NSS lookups and the LDAP -database. The mapping may be modified by changeging the nss-ldapd.conf -configuration file. See the nss-ldapd.conf(5) manual page for details. +database. The mapping may be modified by changeging the nslcd.conf +configuration file. See the nslcd.conf(5) manual page for details. aliases (objectClass=nisMailAlias) cn - alias name @@ -331,7 +331,7 @@ using Microsoft Active Directory -------------------------------- When using Microsoft Active Directory server (typically on Microsoft Windows -2000) some changes need to be made to the nss-ldapd.conf configuration file. +2000) some changes need to be made to the nslcd.conf configuration file. The included sample configuration file has some commented out attribute mappings for such a set-up. diff --git a/configure.ac b/configure.ac index fa563e4..b92b6eb 100644 --- a/configure.ac +++ b/configure.ac @@ -160,11 +160,11 @@ fi AC_ARG_WITH(ldap-conf-file, AS_HELP_STRING([--with-ldap-conf-file=PATH], - [path to LDAP configuration file @<:@/etc/nss-ldapd.conf@:>@]), - [ NSS_LDAP_PATH_CONF="$with_ldap_conf_file" ], - [ NSS_LDAP_PATH_CONF="/etc/nss-ldapd.conf" ]) -AC_DEFINE_UNQUOTED(NSS_LDAP_PATH_CONF,"$NSS_LDAP_PATH_CONF",[Path to LDAP configuration file.]) -AC_SUBST(NSS_LDAP_PATH_CONF) + [path to nslcd configuration file @<:@/etc/nslcd.conf@:>@]), + [ NSLCD_CONF_PATH="$with_ldap_conf_file" ], + [ NSLCD_CONF_PATH="/etc/nslcd.conf" ]) +AC_DEFINE_UNQUOTED(NSLCD_CONF_PATH,"$NSLCD_CONF_PATH",[Path to nslcd configuration file.]) +AC_SUBST(NSLCD_CONF_PATH) AC_ARG_WITH(nslcd-pidfile, AS_HELP_STRING([--with-nslcd-pidfile=PATH], diff --git a/debian/libnss-ldapd.config b/debian/libnss-ldapd.config index 03d5622..6c76e97 100644 --- a/debian/libnss-ldapd.config +++ b/debian/libnss-ldapd.config @@ -2,8 +2,6 @@ set -e -CONFFILE="/etc/nss-ldapd.conf" - # source debconf library. . /usr/share/debconf/confmodule db_version 2.0 diff --git a/debian/nslcd.config b/debian/nslcd.config index 18601a4..14b4af2 100644 --- a/debian/nslcd.config +++ b/debian/nslcd.config @@ -2,7 +2,11 @@ set -e -CONFFILE="/etc/nss-ldapd.conf" +CONFFILE="/etc/nslcd.conf" +OCONFFILE="/etc/nss-ldapd.conf" + +# fall back to old configfile if new one isn't present but old one is +[ ! -f "$CONFFILE" ] && [ -f "$OCONFFILE" ] && CONFFILE="$OCONFFILE" # source debconf library. . /usr/share/debconf/confmodule diff --git a/debian/nslcd.examples b/debian/nslcd.examples index c482e9a..08032cc 100644 --- a/debian/nslcd.examples +++ b/debian/nslcd.examples @@ -1 +1 @@ -nss-ldapd.conf +nslcd.conf diff --git a/debian/nslcd.init b/debian/nslcd.init index 07d784e..679a807 100644 --- a/debian/nslcd.init +++ b/debian/nslcd.init @@ -1,6 +1,6 @@ #! /bin/sh -# /etc/init.d/linbss-ldapd script for starting and stopping nslcd +# /etc/init.d/nslcd script for starting and stopping nslcd # Copyright (C) 2006 West Consulting # Copyright (C) 2006, 2008, 2009 Arthur de Jong # @@ -35,7 +35,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin NSLCD_BIN=/usr/sbin/nslcd NSLCD_DESC="LDAP connection daemon" -NSLCD_CFG=/etc/nss-ldapd.conf +NSLCD_CFG=/etc/nslcd.conf [ -x "$NSLCD_BIN" ] || exit 0 [ -f "$NSLCD_CFG" ] || exit 0 diff --git a/debian/nslcd.postinst b/debian/nslcd.postinst index 0ae6212..baa792d 100644 --- a/debian/nslcd.postinst +++ b/debian/nslcd.postinst @@ -2,7 +2,8 @@ set -e -CONFFILE="/etc/nss-ldapd.conf" +CONFFILE="/etc/nslcd.conf" +OCONFFILE="/etc/nss-ldapd.conf" # set an option in the configuration file to the specified value cfg_set() @@ -83,10 +84,18 @@ create_config() { if [ ! -e "$CONFFILE" ] then - # create a simple configuration file from this template - cat > "$CONFFILE" << EOM + # check if the file with the old name exists + if [ -e "$OCONFFILE" ] + then + # copy the existing file + cp -p $OCONFFILE $CONFFILE + # fix reference to manual page + sed -i 's/nss-ldapd/nslcd/' $CONFFILE + else + # create a simple configuration file from this template + cat > "$CONFFILE" << EOM # $CONFFILE -# nslcd configuration file. See nss-ldapd.conf(5) +# nslcd configuration file. See nslcd.conf(5) # for details. # The user and group nslcd should run as. @@ -114,9 +123,10 @@ base dc=example,dc=net #scope sub EOM - # fix permissions - chmod 640 "$CONFFILE" - chown root:nslcd "$CONFFILE" + # fix permissions + chmod 640 "$CONFFILE" + chown root:nslcd "$CONFFILE" + fi fi # we're done return 0 diff --git a/debian/nslcd.postrm b/debian/nslcd.postrm index 66fe1bb..52ab6de 100644 --- a/debian/nslcd.postrm +++ b/debian/nslcd.postrm @@ -2,7 +2,8 @@ set -e -CONFFILE="/etc/nss-ldapd.conf" +CONFFILE="/etc/nslcd.conf" +OCONFFILE="/etc/nss-ldapd.conf" # remove /var/run/nslcd directory rm -rf /var/run/nslcd @@ -10,7 +11,7 @@ rm -rf /var/run/nslcd # remove our configuration file (not a conffile) on purge manually if [ "$1" = "purge" ] then - rm -f "$CONFFILE" + rm -f "$CONFFILE" "$OOCONFFILE" fi #DEBHELPER# diff --git a/debian/nslcd.templates b/debian/nslcd.templates index 4f4defc..9a4db7b 100644 --- a/debian/nslcd.templates +++ b/debian/nslcd.templates @@ -51,4 +51,4 @@ _Description: Check server's SSL certificate: 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. + tls_cacertfile options must be put in /etc/nslcd.conf. diff --git a/debian/po/ca.po b/debian/po/ca.po index a119b38..60be893 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -166,7 +166,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/cs.po b/debian/po/cs.po index 5174967..b1f37b1 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -170,7 +170,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "Při použití šifrovaného spojení, může být vyžádán a zkontrolován certifikát " "serveru. Vyberte si, zda mají dotazy certifikát vyžadovat a zda se má " @@ -181,7 +181,7 @@ msgstr "" " * pokusit se: certifikát bude vyžádán a zkontrolován, ale pokud\n" " nebude certifikát obdržen, bude to ignorováno;\n" " * vyžadováno: certifikát je povinný a bude zkontrolován.\n" -"Je-li zapnuta kontrola certifikátů, musí být v /etc/nss-ldapd.conf povolena " +"Je-li zapnuta kontrola certifikátů, musí být v /etc/nslcd.conf povolena " "minimálně jedna z voleb tls_cacertdir a tls_cacertfile." #. Type: multiselect diff --git a/debian/po/da.po b/debian/po/da.po index d95f4f6..b2e4765 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -179,7 +179,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/de.po b/debian/po/de.po index fe72dbe..f5cb822 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -193,7 +193,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/es.po b/debian/po/es.po index 1d1a35d..a15ef9f 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -195,7 +195,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "Cuando se utiliza una conexión cifrada, se pedirá y comprobará un " "certificado del servidor. Escoja si las búsquedas se deberían configurar " diff --git a/debian/po/fi.po b/debian/po/fi.po index b5feea3..6d8df91 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -165,7 +165,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "Käytettäessä salattua yhteyttä, palvelimelta voidaan pyytää varmenne " "tarkastettavaksi. Valitse tulisiko hakujen pyytää varmennetta ja tulisiko " @@ -176,7 +176,7 @@ msgstr "" " ei saada, tästä ei välitetä\n" " * vaadi: Varmenne vaaditaan ja tarkastetaan.\n" "Jos tarkastus on käytössä, tulisi ainakin toinen asetuksista tls_cacertdir " -"ja tls_cacertfile laittaa tiedostoon /etc/nss-ldapd.conf." +"ja tls_cacertfile laittaa tiedostoon /etc/nslcd.conf." #. Type: multiselect #. Description diff --git a/debian/po/fr.po b/debian/po/fr.po index d9920b4..62284e9 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -176,7 +176,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "En cas de connexion chiffrée, le certificat du serveur peut être demandé et " "contrôlé. Veuillez choisir la façon de réaliser ce contrôle :\n" diff --git a/debian/po/gl.po b/debian/po/gl.po index 5689b2c..7d9c76b 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -168,7 +168,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "Cando se emprega unha conexión cifrada pode pedirse e comprobarse un " "certificado do servidor. Escolla se as procuras deben estar configuradas " diff --git a/debian/po/it.po b/debian/po/it.po index eec0fac..b57b7ad 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -182,7 +182,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/ja.po b/debian/po/ja.po index daeb110..80d0585 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -170,7 +170,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "暗号化接続を利用する場合、サーバ証明書を要求して確認できます。ルックアップで" "証明書を必須とするよう設定するかどうか、および証明書の妥当性を確認するかどう" diff --git a/debian/po/nl.po b/debian/po/nl.po index e644856..d22c985 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -190,7 +190,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/pt.po b/debian/po/pt.po index 59c6464..1eb3911 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -168,7 +168,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "Quando é usada uma ligação encriptada, pode ser requisitado e verificado um " "certificado do servidor. Por favor escolha se as buscas devem ser " @@ -181,7 +181,7 @@ msgstr "" " se nenhum certificado for disponibilizado;\n" " * obrigar: será obrigatória a requisição e verificação de um certificado.\n" "Se a verificação de certificados for activada, pelo menos uma das opções " -"tls_cacertdir ou tls_cacertfile tem que ser colocada em /etc/nss-ldapd.conf." +"tls_cacertdir ou tls_cacertfile tem que ser colocada em /etc/nslcd.conf." #. Type: multiselect #. Description diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 90acc99..3e88030 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -172,7 +172,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/ru.po b/debian/po/ru.po index 7ffe5cc..1476508 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -173,7 +173,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "При использовании шифрованного соединения, можно запросить и проверить " "сертификат сервера. Выберите нужно ли запрашивать и проверять сертификат:\n" @@ -183,7 +183,7 @@ msgstr "" " * попытаться: запросить и проверить сертификат, но если его\n" " нет, то продолжать работу;\n" " * обязательна: обязательно запросить и проверить сертификат.\n" -"Если разрешена проверка сертификата, то в файле /etc/nss-ldapd.conf должен " +"Если разрешена проверка сертификата, то в файле /etc/nslcd.conf должен " "быть параметр tls_cacertdir или tls_cacertfile." #. Type: multiselect diff --git a/debian/po/sv.po b/debian/po/sv.po index a2f8303..04896c6 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -176,7 +176,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "N�r en krypterad uppkoppling anv�nds, kan ett servercertifikat efterfr�gas " "och kontrolleras. V�lj huruvida uppslag ska konfigureras f�r att kr�va ett " @@ -188,7 +188,7 @@ msgstr "" " inget certifikat tillhandah�lls kommer detta ignoreras;\n" " * kr�v: ett certifikat kommer efterfr�gas och kontrolleras.\n" "Om certifikatkontroll �r aktiverad m�ste �tminstone ett avtls_cacertdir- och " -"tls_cacertfile-direktiven l�ggas i /etc/nss-ldapd.conf." +"tls_cacertfile-direktiven l�ggas i /etc/nslcd.conf." #. Type: multiselect #. Description diff --git a/debian/po/templates.pot b/debian/po/templates.pot index c6322a7..643e2f4 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -151,7 +151,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/vi.po b/debian/po/vi.po index 17395f0..f4a1d96 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -162,7 +162,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" #. Type: multiselect diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index 5254b4a..9696063 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -154,7 +154,7 @@ msgid "" " certificate is provided it is ignored;\n" " * demand: a certificate will be requested, required, and checked.\n" "If certificate checking is enabled, at least one of the tls_cacertdir or " -"tls_cacertfile options must be put in /etc/nss-ldapd.conf." +"tls_cacertfile options must be put in /etc/nslcd.conf." msgstr "" "使用加密连接的时候，可以要求检查服务器端的证书。请选择设置是否需要服务器证" "书，是否需要验证证书的有效性:\n" @@ -162,7 +162,7 @@ msgstr "" "* allow: 会请求服务器证书，但是不检查证书是否存在和有效。* try: 会请求服务器" "证书，如服务器提供证书则验证，如无则忽略。 * demand:会请求服务器证书，必须有" "证书并验证证书。\n" -"如果启用证书检查，/etc/nss-ldapd.conf必须有tls_cacertdir或者tls_cacertfile选" +"如果启用证书检查，/etc/nslcd.conf必须有tls_cacertdir或者tls_cacertfile选" "项。" #. Type: multiselect diff --git a/debian/rules b/debian/rules index d4f575d..cc6f8da 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ configure-stamp: --disable-maintainer-mode \ --disable-dependency-tracking \ --with-ldap-lib=openldap \ - --with-ldap-conf-file=/etc/nss-ldapd.conf \ + --with-ldap-conf-file=/etc/nslcd.conf \ --with-nslcd-pidfile=/var/run/nslcd/nslcd.pid \ --with-nslcd-socket=/var/run/nslcd/socket touch configure-stamp @@ -52,7 +52,7 @@ install: build dh_prep $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # make configfile fully generated - rm -f $(CURDIR)/debian/tmp/etc/nss-ldapd.conf + rm -f $(CURDIR)/debian/tmp/etc/nslcd.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 diff --git a/man/Makefile.am b/man/Makefile.am index 43ab2da..361d1da 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -17,9 +17,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA -dist_man_MANS = nss-ldapd.conf.5 nslcd.8 +dist_man_MANS = nslcd.conf.5 nslcd.8 -EXTRA_DIST = nss-ldapd.conf.5.xml nslcd.8.xml pam_ldap.8.xml +EXTRA_DIST = nslcd.conf.5.xml nslcd.8.xml pam_ldap.8.xml # ensure that the pam_ldap manpage is always built but only installed # if the PAM module is built diff --git a/man/nslcd.8.xml b/man/nslcd.8.xml index 25fad86..1cdfa5b 100644 --- a/man/nslcd.8.xml +++ b/man/nslcd.8.xml @@ -64,7 +64,7 @@ </para> <para> <command>nslcd</command> is configured through a configuration file - (see <citerefentry><refentrytitle>nss-ldapd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). + (see <citerefentry><refentrytitle>nslcd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). </para> <para> See the included README for information on configuring the LDAP server. @@ -114,15 +114,15 @@ <refsect1 id="files"> <title>Files</title> <para> - <filename>/etc/nss-ldapd.conf</filename> - the configuration file - (see <citerefentry><refentrytitle>nss-ldapd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>) + <filename>/etc/nslcd.conf</filename> - the configuration file + (see <citerefentry><refentrytitle>nslcd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>) </para> </refsect1> <refsect1 id="see_also"> <title>See Also</title> <para> - <citerefentry><refentrytitle>nss-ldapd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + <citerefentry><refentrytitle>nslcd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> </para> </refsect1> diff --git a/man/nss-ldapd.conf.5.xml b/man/nslcd.conf.5.xml index bb6da8b..8619c43 100644 --- a/man/nss-ldapd.conf.5.xml +++ b/man/nslcd.conf.5.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <!-- - nss-ldapd.conf.5.xml - docbook manual page for nss-ldapd.conf + nslcd.conf.5.xml - docbook manual page for nslcd.conf Copyright (C) 1997-2005 Luke Howard Copyright (C) 2007, 2008, 2009 Arthur de Jong @@ -34,7 +34,7 @@ </refentryinfo> <refmeta> - <refentrytitle>nss-ldapd.conf</refentrytitle> + <refentrytitle>nslcd.conf</refentrytitle> <manvolnum>5</manvolnum> <refmiscinfo class="version">Version 0.6.11</refmiscinfo> <refmiscinfo class="manual">System Manager's Manual</refmiscinfo> @@ -42,21 +42,21 @@ </refmeta> <refnamediv id="name"> - <refname>nss-ldapd.conf</refname> - <refpurpose>configuration file for LDAP nameservice provider</refpurpose> + <refname>nslcd.conf</refname> + <refpurpose>configuration file for LDAP nameservice daemon</refpurpose> </refnamediv> <refsect1 id="description"> <title>Description</title> <para> - The <emphasis>nss-ldapd</emphasis> module allows <acronym>LDAP</acronym> + The <emphasis>nss-pam-ldapd</emphasis> package allows <acronym>LDAP</acronym> directory servers to be used as a primary source of name service information. (Name service information typically includes users, hosts, groups, and other such data historically stored in flat files or <acronym>NIS</acronym>.) </para> <para> - The file <filename>nss-ldapd.conf</filename> contains the + The file <filename>nslcd.conf</filename> contains the configuration information for running <command>nslcd</command> (see <citerefentry><refentrytitle>nslcd</refentrytitle><manvolnum>8</manvolnum></citerefentry>). The file contains options, one on each line, defining the way @@ -177,7 +177,7 @@ Specifies the clear text credentials with which to bind. This option is only applicable when used with <option>binddn</option> above. If you set this option you should consider changing the permissions - of the <filename>nss-ldapd.conf</filename> file to only grant access to + of the <filename>nslcd.conf</filename> file to only grant access to the root user. <!-- WHEN SASL IS DOCUMENTED: This option is only applicable when either the <option>binddn</option> or @@ -690,7 +690,7 @@ <title>Files</title> <variablelist remap="TP"> <varlistentry> - <term><filename>/etc/nss-ldapd.conf</filename></term> + <term><filename>/etc/nslcd.conf</filename></term> <listitem><para>the main configuration file</para></listitem> </varlistentry> <varlistentry> diff --git a/man/pam_ldap.8.xml b/man/pam_ldap.8.xml index a157dfa..5708560 100644 --- a/man/pam_ldap.8.xml +++ b/man/pam_ldap.8.xml @@ -165,10 +165,10 @@ <listitem><para>the main PAM configuration file</para></listitem> </varlistentry> <varlistentry> - <term><filename>/etc/nss-ldapd.conf</filename></term> + <term><filename>/etc/nslcd.conf</filename></term> <listitem><para> The configuration file for the <command>nslcd</command> daemon - (see <citerefentry><refentrytitle>nss-ldapd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>) + (see <citerefentry><refentrytitle>nslcd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>) </para></listitem> </varlistentry> </variablelist> @@ -179,7 +179,7 @@ <para> <citerefentry><refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nslcd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>nss-ldapd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + <citerefentry><refentrytitle>nslcd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> </para> </refsect1> diff --git a/nss-ldapd.conf b/nslcd.conf index ab60f33..ec2ad50 100644 --- a/nss-ldapd.conf +++ b/nslcd.conf @@ -2,7 +2,7 @@ # switch library's nslcd daemon. It configures the mapping # between NSS names (see /etc/nsswitch.conf) and LDAP # information in the directory. -# See the manual page nss-ldapd.conf(5) for more information. +# See the manual page nslcd.conf(5) for more information. # The uri pointing to the LDAP server to use for name lookups. # Multiple entries may be specified. The address that is used diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c index 3ad2d1f..5ed9608 100644 --- a/nslcd/nslcd.c +++ b/nslcd/nslcd.c @@ -562,7 +562,7 @@ int main(int argc,char *argv[]) if (myldap_set_debuglevel(nslcd_debugging)!=LDAP_SUCCESS) exit(EXIT_FAILURE); /* read configuration file */ - cfg_init(NSS_LDAP_PATH_CONF); + cfg_init(NSLCD_CONF_PATH); /* daemonize */ if ((!nslcd_debugging)&&(daemon(0,0)<0)) { diff --git a/tests/Makefile.am b/tests/Makefile.am index 359146d..feac01d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,7 +29,7 @@ EXTRA_PROGRAMS = test_aliases test_ethers test_group test_hosts \ test_rpc test_services test_shadow \ test_nslcd_group -EXTRA_DIST = nss-ldapd-test.conf test_myldap.sh test_nsscmds.sh usernames.txt +EXTRA_DIST = nslcd-test.conf test_myldap.sh test_nsscmds.sh usernames.txt CLEANFILES = $(EXTRA_PROGRAMS) diff --git a/tests/README b/tests/README index 0b70ef6..6f6b3e5 100644 --- a/tests/README +++ b/tests/README @@ -56,10 +56,10 @@ rpc: db files ldap netgroup: files ldap aliases: files ldap -nss-ldapd.conf --------------- +nslcd.conf +---------- -The /etc/nss-ldapd.conf file is expected to be configured like the following. +The /etc/nslcd.conf file is expected to be configured like the following. uid nslcd gid nslcd diff --git a/tests/nss-ldapd-test.conf b/tests/nslcd-test.conf index dfe5efd..5f429da 100644 --- a/tests/nss-ldapd-test.conf +++ b/tests/nslcd-test.conf @@ -1,6 +1,6 @@ -# nss-ldapd-test.conf -# nss-ldapd configuration file for test environment. -# See nss-ldapd.conf(5) for details. +# nslcd-test.conf +# nslcd configuration file for test environment. +# See nslcd.conf(5) for details. # The location at which the LDAP server(s) should be reachable. uri ldap://127.0.0.1/ diff --git a/tests/test_myldap.c b/tests/test_myldap.c index 5cf3a31..7387d51 100644 --- a/tests/test_myldap.c +++ b/tests/test_myldap.c @@ -401,7 +401,7 @@ int main(int argc,char *argv[]) srcdir=getenv("srcdir"); if (srcdir==NULL) srcdir="."; - snprintf(fname,sizeof(fname),"%s/nss-ldapd-test.conf",srcdir); + snprintf(fname,sizeof(fname),"%s/nslcd-test.conf",srcdir); fname[sizeof(fname)-1]='\0'; /* initialize configuration */ cfg_init(fname); diff --git a/tests/test_myldap.sh b/tests/test_myldap.sh index b7f89db..18b745a 100755 --- a/tests/test_myldap.sh +++ b/tests/test_myldap.sh @@ -20,14 +20,14 @@ # 02110-1301 USA # This script expects to be run in an environment where an LDAP server -# is available at the location specified in nss-ldapd-test.conf in +# is available at the location specified in nslcd-test.conf in # this directory. set -e # get LDAP config srcdir="${srcdir-"."}" -cfgfile="$srcdir/nss-ldapd-test.conf" +cfgfile="$srcdir/nslcd-test.conf" uri=`sed -n 's/^uri *//p' "$cfgfile" | head -n 1` base="dc=test,dc=tld" diff --git a/tests/test_nslcd_group.c b/tests/test_nslcd_group.c index 76ffb8b..3e73aba 100644 --- a/tests/test_nslcd_group.c +++ b/tests/test_nslcd_group.c @@ -87,9 +87,9 @@ static void initconfig(void) /* build the name of the file to read */ srcdir=getenv("srcdir"); if (srcdir==NULL) - strcpy(fname,"nss-ldapd-test.conf"); + strcpy(fname,"nslcd-test.conf"); else - snprintf(fname,sizeof(fname),"%s/nss-ldapd-test.conf",srcdir); + snprintf(fname,sizeof(fname),"%s/nslcd-test.conf",srcdir); fname[sizeof(fname)-1]='\0'; /* load config file */ cfg_init(fname); diff --git a/tests/test_nsscmds.sh b/tests/test_nsscmds.sh index 388c140..d9399e9 100755 --- a/tests/test_nsscmds.sh +++ b/tests/test_nsscmds.sh @@ -29,7 +29,7 @@ set -e # check if LDAP is configured correctly -cfgfile="/etc/nss-ldapd.conf" +cfgfile="/etc/nslcd.conf" if [ -r "$cfgfile" ] then : |