diff options
66 files changed, 221 insertions, 181 deletions
@@ -1,11 +1,12 @@ -This document tries to describe the software layout and design of nss-ldapd. -It should provide some help for contributing code to this package. +This document tries to describe the software layout and design of +nss-pam-ldapd. It should provide some help for contributing code to this +package. -CONTRIBUTING TO NSS-LDAPD -========================= +CONTRIBUTING TO NSS-PAM-LDAPD +============================= -Contributions to nss-ldapd are most welcome. Integrating contributions +Contributions to nss-pam-ldapd are most welcome. Integrating contributions will be done on a best-effort basis and can be made easier if the following are considered: @@ -1,18 +1,23 @@ - nss-ldapd - NSS library for name lookups using LDAP + nss-pam-ldapd - NSS and PAM library for name lookups and authentication + using LDAP - nss-ldapd is a fork from nss_ldap which was originally written by - Luke Howard of PADL Software Pty Ltd. + nss-pam-ldapd started as nss-ldapd which was a fork from nss_ldap which was + originally written by Luke Howard of PADL Software Pty Ltd. http://www.padl.com/OSS/nss_ldap.html - In 2006 Arthur de Jong of West Consuling forked the library to - split it into a thin NSS part and a server part. Most of the code - was rewritten. - http://arthurdejong.org/nss-ldapd/ + In 2006 Arthur de Jong of West Consuling forked the library to split it + into a thin NSS part and a server part. Most of the code was rewritten. + + The software was renamed to nss-pam-ldapd when PAM code contributed by + Howard Chu for the OpenLDAP nssov module was integrated. + + http://arthurdejong.org/nss-pam-ldapd/ Copyright (C) 1997-2006 Luke Howard Copyright (C) 2006, 2007 West Consulting Copyright (C) 2006, 2007, 2008, 2009 Arthur de Jong + Copyright (C) 2009 Howard Chu This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -33,21 +38,35 @@ INTRODUCTION ============ -This is the nss-ldapd library which is an NSS module to do name lookups to an -LDAP directory server. This library was forked from nss_ldap as provided by -Luke Howard of PADL Software Pty Ltd. +This is the nss-pam-ldapd library which consists of an NSS module to do name +lookups to an LDAP directory server and a PAM module to do authentication to +an LDAP server. The NSS part of this library was forked from nss_ldap as +provided by Luke Howard of PADL Software Pty Ltd. The PAM module was mostly +provided by Howard Chu of the OpenLDAP project. + +The NSS library allows distributing account, group, host and other +configuration information from a central LDAP server throughout an +organisation. Because LDAP is a hierarchical directory service, you can +distribute the information in a manner which reflects an organisational +structure. This contrasts with the flat, single domain policy of NIS. LDAP has +many of the advantages of NIS+ (security and scalability) without the +complexity. The system will work alongside your existing NIS, NIS+, DNS and +flat file name services. + +The PAM library (module) can be used to perform authentication based on +information inside the LDAP directory. + +Both libraries consist of a thin NSS or PAM part that communicates with a +local daemon (nslcd) that handles the LDAP lookups. This simplifies the +architecture and fixes some scalability and locking problems in the original +design. -The library allows distributing account, group, host and other configuration -information from a central LDAP server throughout an organisation. Because -LDAP is a hierarchical directory service, you can distribute the information -in a manner which reflects an organisational structure. This contrasts with -the flat, single domain policy of NIS. LDAP has many of the advantages of NIS+ -(security and scalability) without the complexity. The system will work -alongside your existing NIS, NIS+, DNS and flat file name services. +Also it is possible to use the thin NSS and PAM parts together with the nssov +overlay in the OpenLDAP server (slapd). -This library consists of a thin NSS part that communicates with a local daemon -that handles the LDAP lookups. This simplifies the architecture and fixes some -scalability and locking problems in the original design. +The three parts (NSS module, PAM module, and nslcd server) can be build +separately and are not tied together. This means that for instance you can +still use pam_ldap and use the NSS module from nss-pam-ldapd. improvements over nss_ldap -------------------------- @@ -59,12 +78,12 @@ The biggest of those problems were host name lookups through LDAP which could cause deadlocks in most cases and some general name lookup problems during booting (when the LDAP server was not started or not yet reachable). -With nss-ldapd a number of refactoring steps were taken to simplify the code -and improve maintainability. Legacy code was removed and support for non-Linux -operating systems was initially removed to make the code more readable. -Portability will be re-added once the architecture stabilises. +A number of refactoring steps were done to simplify the code and improve +maintainability. Legacy code was removed and support for non-Linux operating +systems was initially removed to make the code more readable. Portability will +be re-added once the architecture stabilises. -The most practical improvements of nss-ldapd over nss_ldap are: +The most practical improvements over nss_ldap are: - the LDAP library is not loaded for every process doing LDAP lookups - the number of connections to the LDAP server is limited, because not every process will open it's own connection (this problem is also mitigated by @@ -82,6 +101,14 @@ requests to the daemon. Note that the package currently cannot be used on the same system alongside nss_ldap. +comparison to pam_ldap +---------------------- + +The PAM module that is currently implemented contains functionality for +authentication, account management, password management and session management +but only authentication is currently implemented in the nslcd daemon. The +OpenLDAP nssov overlay implements more functionality. + supported C libraries --------------------- @@ -89,6 +116,11 @@ This library currently only supports the GNU C Library. Support for other C libraries has been removed in a refactoring step. Compatibility code and support for other C libraries will be added in due time upon request. +supported PAM implementation +---------------------------- + +The PAM module is currently only regularly tested on Linux PAM + supported name databases ------------------------ @@ -121,31 +153,37 @@ interfaces should be exported and how the LDAP schema part should look like. supported LDAP libraries ------------------------ -The current version of nss-ldapd has been developed with OpenLDAP 2.4 but +The current version of nss-pam-ldapd has been developed with OpenLDAP 2.4 but adding support for other LDAP libraries with similar interfaces should not be too hard. unsupported features -------------------- -Since nss-ldapd was forked from nss_ldap most of the features that came with -nss_ldap are available. However, not all features have extensively tested yet -and may cause problems. +Since nss-pam-ldapd was forked from nss_ldap most of the features that came +with nss_ldap are available. However, not all features have extensively tested +yet and may cause problems. - attribute value defaults and overrides have been removed (but may reappear some day if requested) - the configuration file formats are not fully compatible - nested groups are currently unsupported - rootbinddn/rootbindpw support is removed and is not likely to return +For the PAM module a lot more functionality is missing. Comparing it to +pam_ldap: +- only BIND authentication is implemented +- no authorisation checks are performed +- password changing is under development + In general, the focus is to have the functionality that is present be well -tested and supported. +tested and supported and add more features when they are needed. INSTALLATION ============ -The nss-ldapd library uses autoconf and automake for building. Installing -nss-ldapd should be as simple as: +The nss-pam-ldapd library uses autoconf and automake for building. Installing +nss-pam-ldapd should be as simple as: % ./configure % make @@ -156,9 +194,9 @@ running: % ./configure --help -The last step (make install) should install the libnss_ldap.so.* file and the -daemon (nslcd). The boot process needs to be manually modified to start the -daemon at the right time. +The last step (make install) should install the libnss_ldap.so.* and +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. @@ -169,8 +207,8 @@ CONFIGURATION After installation the name service switch configuration file (/etc/nsswitch.conf) needs to be modified to do name lookups using the new -module. Also, the nss-ldapd configuration file (specified at configure time) -needs to be modified to contain to the correct LDAP configuration. +module. Also, the nss-pam-ldapd configuration file (specified at configure +time) needs to be modified to contain to the correct LDAP configuration. Editing nsswitch.conf consist mostly of adding ldap in the list of lookup methods in the right place. See the nsswitch.conf(5) manual page for details @@ -209,7 +247,7 @@ contain something like: service discovery through DNS ----------------------------- -nss-ldapd supports looking up LDAP server names through DNS SRV records as +nss-pam-ldapd supports looking up LDAP server names through DNS SRV records as specified in RFC 2782. However, Priority and Weight are not considered separately and a single list of servers in added as if they had been specified with uri options in the configuration file. @@ -223,7 +261,7 @@ include something like the following in your zone: LDAP SCHEMA =========== -nss-ldapd supports a wide range of possible LDAP schema configurations. +nss-pam-ldapd supports a wide range of possible LDAP schema configurations. Furthermore it can be customized heavily. The LDAP schema used is described in RFC 2307. Groups with distinguished name members (instead of login names) (RFC 2307bis) are also supported, although use of memberUid has much better @@ -328,9 +366,9 @@ case sensitivity Most values in the NSS databases are considered case-sensitive (e.g. the user "Foo" is a different user from the user "foo"). Values in an LDAP database are -however cosidered case-insensitive. nss-ldapd tries to solve this problem by -adding an extra filtering layer and ensure that e.g. when looking for the user -"foo" it will not return a user "Foo" that is found in LDAP. +however cosidered case-insensitive. nss-pam-ldapd tries to solve this problem +by adding an extra filtering layer and ensure that e.g. when looking for the +user "foo" it will not return a user "Foo" that is found in LDAP. For the group, netgroup, passwd, protocols, rpc, services and shadow maps the matches will be checked case-sensitively and for aliases, ethers, hosts and @@ -349,7 +387,7 @@ REPORTING BUGS If you find any bugs or missing features please send email to arthur@arthurdejong.org -If you are using the Debian package you are encouraged to use the BTS. -Please include as much information as needed (platform, output of configure -if compilation fails, output of the failure, etc). Patches are more than -welcome (also see the file HACKING). +If you are using the Debian package you are encouraged to use the BTS. Please +include as much information as needed (platform, output of configure if +compilation fails, output of the failure, etc). Patches are more than welcome +(also see the file HACKING). diff --git a/common/dict.c b/common/dict.c index 1bad382..a0f9f35 100644 --- a/common/dict.c +++ b/common/dict.c @@ -1,6 +1,6 @@ /* dict.c - dictionary functions - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008 Arthur de Jong diff --git a/common/dict.h b/common/dict.h index 10dd7b2..ba9fd6a 100644 --- a/common/dict.h +++ b/common/dict.h @@ -1,6 +1,6 @@ /* dict.h - dictionary functions - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008 Arthur de Jong diff --git a/common/set.c b/common/set.c index 9efc582..7e82730 100644 --- a/common/set.c +++ b/common/set.c @@ -1,6 +1,6 @@ /* set.c - set functions - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2008 Arthur de Jong diff --git a/common/set.h b/common/set.h index f867815..e38b52e 100644 --- a/common/set.h +++ b/common/set.h @@ -1,6 +1,6 @@ /* set.h - set functions - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2008 Arthur de Jong diff --git a/common/tio.c b/common/tio.c index 0821f90..9e182ca 100644 --- a/common/tio.c +++ b/common/tio.c @@ -1,6 +1,6 @@ /* tio.c - timed io functions - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008 Arthur de Jong diff --git a/common/tio.h b/common/tio.h index d6c8d9c..25dbce9 100644 --- a/common/tio.h +++ b/common/tio.h @@ -1,6 +1,6 @@ /* tio.h - timed io functions - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008 Arthur de Jong diff --git a/compat/getpeercred.c b/compat/getpeercred.c index a003bae..7ec5b5c 100644 --- a/compat/getpeercred.c +++ b/compat/getpeercred.c @@ -1,7 +1,7 @@ /* getpeercred.h - function for determining information about the other end of a unix socket - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2008 Arthur de Jong diff --git a/compat/getpeercred.h b/compat/getpeercred.h index 2db6b5d..73b3e26 100644 --- a/compat/getpeercred.h +++ b/compat/getpeercred.h @@ -1,7 +1,7 @@ /* getpeercred.h - function for determining information about the other end of a unix socket - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2008 Arthur de Jong diff --git a/compat/pagectrl.c b/compat/pagectrl.c index 9dff696..2697843 100644 --- a/compat/pagectrl.c +++ b/compat/pagectrl.c @@ -1,7 +1,7 @@ /* pagectrl.c - provide a replacement ldap_create_page_control() function. This file was part of the nss_ldap library which has been - forked into the nss-ldapd library. + forked into the nss-pam-ldapd library. Copyright (C) 2002 Max Caines This software is not subject to any license of the University diff --git a/compat/pagectrl.h b/compat/pagectrl.h index cd64b77..a62bb10 100644 --- a/compat/pagectrl.h +++ b/compat/pagectrl.h @@ -1,7 +1,7 @@ /* pagectrl.h - provide a replacement ldap_create_page_control() function. This file was part of the nss_ldap library which has been - forked into the nss-ldapd library. + forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard diff --git a/configure.ac b/configure.ac index c7fbe18..fa563e4 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ version 2.1 of the License, or (at your option) any later version. See the configure.ac file for more details.]) # initialize and set version and bugreport address -AC_INIT([nss-ldapd],[0.6.11],[arthur@arthurdejong.org]) +AC_INIT([nss-pam-ldapd],[0.6.11],[arthur@arthurdejong.org]) RELEASE_MONTH="Jul 2009" AC_SUBST(RELEASE_MONTH) AC_CONFIG_SRCDIR([nslcd.h]) diff --git a/debian/control b/debian/control index b69842f..3250c09 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ -Source: nss-ldapd +Source: nss-pam-ldapd Section: admin Priority: extra Maintainer: Arthur de Jong <adejong@debian.org> Uploaders: Richard A Nelson (Rick) <cowboy@debian.org> Standards-Version: 3.8.3 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/ +Homepage: http://arthurdejong.org/nss-pam-ldapd/ +Vcs-Svn: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd/ +Vcs-Browser: http://arthurdejong.org/viewvc/nss-pam-ldapd/nss-pam-ldapd/ Package: nslcd Architecture: any diff --git a/debian/copyright b/debian/copyright index bca11b8..25ed843 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,16 +1,18 @@ -This is nss-ldapd, a library for doging NSS name lookups using an LDAP server. +This is nss-pam-ldapd, a library for doging NSS and PAM lookups using an LDAP +server. -nss-ldapd is a fork from nss_ldap which was originally written by Luke Howard -of PADL Software Pty Ltd. http://www.padl.com/OSS/nss_ldap.html +nss-pam-ldapd started as nss-ldapd which was a fork from nss_ldap which was +originally written by Luke Howard of PADL Software Pty Ltd. +http://www.padl.com/OSS/nss_ldap.html In 2006 Arthur de Jong of West Consuling forked the library to split it into a thin NSS part and a server part. Most of the code was rewritten. -http://arthurdejong.org/nss-ldapd/ +http://arthurdejong.org/nss-pam-ldapd/ Arthur de Jong is both the upstream and Debian package maintainer, so there are no differences between the Debian package and the upstream version. -The Debian package of nss-ldapd was partially based on packaging of the +The Debian package of nss-pam-ldapd was partially based on packaging of the libnss-ldap package. The libnss-ldap package was maintained by Ben Collins, Davide Puricelli (evo), Sami Haahtinen and Stephen Frost. @@ -86,4 +88,3 @@ The file m4/acx_pthread.m4 contains the following copyright statement: make and distribute a modified version of the Autoconf Macro, you may extend this special exception to the GPL to apply to your modified version as well. - diff --git a/debian/nslcd.config b/debian/nslcd.config index 577b7fb..18601a4 100644 --- a/debian/nslcd.config +++ b/debian/nslcd.config @@ -24,25 +24,25 @@ db_title "Configuring NSLCD" parsesys() { # guess domain based on system information - db_get libnss-ldapd/ldap-base + db_get nslcd/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 + db_get nslcd/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" + db_set nslcd/ldap-base "$searchbase" fi fi # guess ldap server - db_get libnss-ldapd/ldap-uris + db_get nslcd/ldap-uris if [ -z "$RET" ] then server=`getent hosts ldap` || true @@ -56,7 +56,7 @@ parsesys() 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/" + db_set nslcd/ldap-uris "ldap://$ip/" fi fi # we're done @@ -70,7 +70,7 @@ parsecfg() # check existance [ -f "$cfgfile" ] || return 0 # find uri/host/port combo - db_get libnss-ldapd/ldap-uris + db_get nslcd/ldap-uris if [ -z "$RET" ] then uris=`sed -n 's/^uri[[:space:]]*//ip' "$cfgfile" | tr '\n' ' '` @@ -88,49 +88,49 @@ parsecfg() fi done fi - [ -n "$uris" ] && db_set libnss-ldapd/ldap-uris "$uris" + [ -n "$uris" ] && db_set nslcd/ldap-uris "$uris" fi # find base config - db_get libnss-ldapd/ldap-base + db_get nslcd/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" + [ -n "$searchbase" ] && db_set nslcd/ldap-base "$searchbase" fi # find binddn - db_get libnss-ldapd/ldap-binddn + db_get nslcd/ldap-binddn if [ -z "$RET" ] then binddn=`sed -n 's/^binddn[[:space:]]*//ip' "$cfgfile" | tail -n 1` - db_set libnss-ldapd/ldap-binddn "$binddn" + db_set nslcd/ldap-binddn "$binddn" fi # find bindpw - db_get libnss-ldapd/ldap-bindpw + db_get nslcd/ldap-bindpw if [ -z "$RET" ] then bindpw=`sed -n 's/^bindpw[[:space:]]*//ip' "$cfgfile" | tail -n 1` - db_set libnss-ldapd/ldap-bindpw "$bindpw" + db_set nslcd/ldap-bindpw "$bindpw" fi # check ssl option - db_get libnss-ldapd/ldap-starttls + db_get nslcd/ldap-starttls if [ -z "$RET" ] then if grep -qi '^ssl[[:space:]]*start_*tls' "$cfgfile" then - db_set libnss-ldapd/ldap-starttls "true" + db_set nslcd/ldap-starttls "true" elif grep -qi '^ssl[[:space:]]' "$cfgfile" then - db_set libnss-ldapd/ldap-starttls "false" + db_set nslcd/ldap-starttls "false" fi fi # check reqcert option - db_get libnss-ldapd/ldap-reqcert + db_get nslcd/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" + [ -n "$reqcert" ] && db_set nslcd/ldap-reqcert "$reqcert" fi # we're done return 0 @@ -141,10 +141,10 @@ parsecfg() 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 "" + db_set nslcd/ldap-uris "" + db_set nslcd/ldap-base "" + db_set nslcd/ldap-binddn "" + db_set nslcd/ldap-bindpw "" # parse current configuration parsecfg "$CONFFILE" else @@ -154,12 +154,12 @@ else 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" + db_get nslcd/ldap-uris + [ -z "$RET" ] && db_set nslcd/ldap-uris "ldap://127.0.0.1/" + db_get nslcd/ldap-base + [ -z "$RET" ] && db_set nslcd/ldap-base "dc=example,dc=net/" + db_get nslcd/ldap-starttls + [ -z "$RET" ] && db_set nslcd/ldap-starttls "false" fi # @@ -174,8 +174,8 @@ 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 + db_input high nslcd/ldap-uris || true + db_input high nslcd/ldap-base || true # ask the questions, go to the next question or exit state="binddn" db_go || exit 1 @@ -183,21 +183,21 @@ do ;; binddn) # ask for login information - db_input medium libnss-ldapd/ldap-binddn || true + db_input medium nslcd/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 + db_get nslcd/ldap-binddn if [ -n "$RET" ] then # ask for login information - db_input medium libnss-ldapd/ldap-bindpw || true + db_input medium nslcd/ldap-bindpw || true else # clear password - db_set libnss-ldapd/ldap-bindpw "" + db_set nslcd/ldap-bindpw "" fi # ask the question, go to the next question or back state="starttls" @@ -205,15 +205,15 @@ do ;; starttls) # check if ldaps:// URL's are used - db_get libnss-ldapd/ldap-uris + db_get nslcd/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" + db_set nslcd/ldap-starttls "false" else # ask whether to use StartTLS - db_input medium libnss-ldapd/ldap-starttls || true + db_input medium nslcd/ldap-starttls || true fi # ask the question, go to the next question or back state="reqcert" @@ -221,15 +221,15 @@ do ;; reqcert) # check if ldaps:// URL's are used - db_get libnss-ldapd/ldap-uris + db_get nslcd/ldap-uris uris="$RET" # check if StartTLS is used - db_get libnss-ldapd/ldap-starttls + db_get nslcd/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 + db_input high nslcd/ldap-reqcert || true fi # ask the question, go to the next question or back state="done" diff --git a/debian/nslcd.init b/debian/nslcd.init index 866eea3..07d784e 100644 --- a/debian/nslcd.init +++ b/debian/nslcd.init @@ -27,14 +27,14 @@ # X-Start-Before: $mail-transport-agent mail-transport-agent exim4 sendmail nullmailer masqmail citadel cron atd autofs am-utils # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: nss-ldapd connection daemon +# Short-Description: LDAP connection daemon # Description: nslcd is a LDAP connection daemon that is used to -# do LDAP queries for the NSS libraries. +# do LDAP queries for the NSS and PAM modules. ### END INIT INFO PATH=/bin:/usr/bin:/sbin:/usr/sbin NSLCD_BIN=/usr/sbin/nslcd -NSLCD_DESC="nss-ldapd connection daemon" +NSLCD_DESC="LDAP connection daemon" NSLCD_CFG=/etc/nss-ldapd.conf [ -x "$NSLCD_BIN" ] || exit 0 diff --git a/debian/nslcd.postinst b/debian/nslcd.postinst index 75777dd..0ae6212 100644 --- a/debian/nslcd.postinst +++ b/debian/nslcd.postinst @@ -86,7 +86,7 @@ create_config() # create a simple configuration file from this template cat > "$CONFFILE" << EOM # $CONFFILE -# nss-ldapd configuration file. See nss-ldapd.conf(5) +# nslcd configuration file. See nss-ldapd.conf(5) # for details. # The user and group nslcd should run as. @@ -134,7 +134,7 @@ then else # create nslcd user and group adduser --system --group --home /var/run/nslcd/ \ - --gecos "nss-ldapd name service LDAP connection daemon" \ + --gecos "nslcd name service LDAP connection daemon" \ --no-create-home \ nslcd # add uid/gid options to the config file if it exists @@ -142,7 +142,7 @@ then if [ -f "$CONFFILE" ] then echo "Adding uid and gid options to $CONFFILE..." >&2 - echo "# automatically added on upgrade of libnss-ldapd package" >> "$CONFFILE" + echo "# automatically added on upgrade of nslcd package" >> "$CONFFILE" cfg_set uid nslcd cfg_set gid nslcd fi @@ -150,10 +150,10 @@ then # create a default configuration create_config # set server uri - db_get libnss-ldapd/ldap-uris + db_get nslcd/ldap-uris cfg_uris "$RET" # set search base - db_get libnss-ldapd/ldap-base + db_get nslcd/ldap-base if [ -n "$RET" ] then cfg_set base "$RET" @@ -161,11 +161,11 @@ then cfg_disable base fi # set bind dn/pw - db_get libnss-ldapd/ldap-binddn + db_get nslcd/ldap-binddn if [ -n "$RET" ] then cfg_set binddn "$RET" - db_get libnss-ldapd/ldap-bindpw + db_get nslcd/ldap-bindpw if [ -n "$RET" ] then cfg_set bindpw "$RET" @@ -187,9 +187,9 @@ then fi fi # remove password from database - db_set libnss-ldapd/ldap-bindpw "" + db_set nslcd/ldap-bindpw "" # set ssl option - db_get libnss-ldapd/ldap-starttls + db_get nslcd/ldap-starttls if [ "$RET" = "true" ] then cfg_set ssl "start_tls" @@ -198,7 +198,7 @@ then cfg_disable ssl fi # set tls_reqcert option - db_get libnss-ldapd/ldap-reqcert + db_get nslcd/ldap-reqcert if [ -n "$RET" ] then # rename any tls_checkpeer options @@ -206,7 +206,7 @@ then # 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 "" + db_set nslcd/ldap-reqcert "" fi # we're done db_stop diff --git a/debian/nslcd.templates b/debian/nslcd.templates index d861272..4f4defc 100644 --- a/debian/nslcd.templates +++ b/debian/nslcd.templates @@ -1,4 +1,4 @@ -Template: libnss-ldapd/ldap-uris +Template: nslcd/ldap-uris Type: string _Description: LDAP server URI: Please enter the Uniform Resource Identifier of the LDAP server. The format @@ -10,7 +10,7 @@ _Description: LDAP server URI: . Multiple URIs can be be specified by separating them with spaces. -Template: libnss-ldapd/ldap-base +Template: nslcd/ldap-base Type: string _Description: LDAP server search base: Please enter the distinguished name of the LDAP search base. Many sites use @@ -18,7 +18,7 @@ _Description: LDAP server search base: domain "example.net" would use "dc=example,dc=net" as the distinguished name of the search base. -Template: libnss-ldapd/ldap-binddn +Template: nslcd/ldap-binddn Type: string _Description: LDAP database user: If the LDAP database requires a login for normal lookups, enter the name of @@ -26,18 +26,18 @@ _Description: LDAP database user: . This value should be specified as a DN (distinguished name). -Template: libnss-ldapd/ldap-bindpw +Template: nslcd/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 +Template: nslcd/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 +Template: nslcd/ldap-reqcert Type: select __Choices: never, allow, try, demand _Description: Check server's SSL certificate: diff --git a/debian/po/ca.po b/debian/po/ca.po index 340708c..a119b38 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: libnss-ldap 211-4\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/cs.po b/debian/po/cs.po index 7204163..5174967 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/da.po b/debian/po/da.po index 1c872a6..d95f4f6 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.6\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/de.po b/debian/po/de.po index 83604fa..fe72dbe 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.5\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/es.po b/debian/po/es.po index aeb2f29..1d1a35d 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.6.8\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/fi.po b/debian/po/fi.po index 718dd71..b5feea3 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/fr.po b/debian/po/fr.po index ad36fdf..d9920b4 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.3\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/gl.po b/debian/po/gl.po index 376f855..5689b2c 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.6\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/it.po b/debian/po/it.po index 076cb14..eec0fac 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.6.8\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/ja.po b/debian/po/ja.po index 7f4f6da..daeb110 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.6.8\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/nl.po b/debian/po/nl.po index e428d10..e644856 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.3\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/pt.po b/debian/po/pt.po index 1035d67..59c6464 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.6.10\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 272e2e7..90acc99 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: libnss-ldap_203-1\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/ru.po b/debian/po/ru.po index 9109322..7ffe5cc 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd 0.6.10\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/sv.po b/debian/po/sv.po index 868b2c5..a2f8303 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: nss-ldapd_sv\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 3577136..c6322a7 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/vi.po b/debian/po/vi.po index a186193..17395f0 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: libnss-ldap 238-1\n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\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" diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index 0d23096..5254b4a 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n" +"Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n" "POT-Creation-Date: 2009-06-26 17:06+0200\n" "PO-Revision-Date: \n" "Last-Translator: zym <zym@3721.com>\n" @@ -68,7 +68,7 @@ /* The current version of the protocol. Note that version 1 is experimental and this version will be used until a - 1.0 release of nss-ldapd is made. */ + 1.0 release of nss-pam-ldapd is made. */ #define NSLCD_VERSION 1 /* Email alias (/etc/aliases) NSS requests. The result values for a diff --git a/nslcd/alias.c b/nslcd/alias.c index ed744f1..993b520 100644 --- a/nslcd/alias.c +++ b/nslcd/alias.c @@ -1,7 +1,7 @@ /* alias.c - alias entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-alias.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/attmap.c b/nslcd/attmap.c index 9115c06..765d178 100644 --- a/nslcd/attmap.c +++ b/nslcd/attmap.c @@ -1,6 +1,6 @@ /* attmap.c - attribute mapping values and functions - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008, 2009 Arthur de Jong diff --git a/nslcd/attmap.h b/nslcd/attmap.h index 0c350eb..7ec9177 100644 --- a/nslcd/attmap.h +++ b/nslcd/attmap.h @@ -1,6 +1,6 @@ /* attmap.h - attribute mapping variables - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008 Arthur de Jong diff --git a/nslcd/cfg.c b/nslcd/cfg.c index 9051e68..bdf125b 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -1,7 +1,7 @@ /* cfg.c - functions for configuration information This file contains parts that were part of the nss_ldap - library which has been forked into the nss-ldapd library. + library which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2007 West Consulting diff --git a/nslcd/cfg.h b/nslcd/cfg.h index 79eef20..76b94c0 100644 --- a/nslcd/cfg.h +++ b/nslcd/cfg.h @@ -1,7 +1,7 @@ /* cfg.h - definition of configuration information This file contains parts that were part of the nss_ldap - library which has been forked into the nss-ldapd library. + library which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2007 West Consulting diff --git a/nslcd/common.c b/nslcd/common.c index 033dc3c..13d62b1 100644 --- a/nslcd/common.c +++ b/nslcd/common.c @@ -1,6 +1,6 @@ /* common.c - common server code routines - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2006 West Consulting Copyright (C) 2006, 2007, 2008, 2009 Arthur de Jong diff --git a/nslcd/common.h b/nslcd/common.h index 48674c9..eabbfaa 100644 --- a/nslcd/common.h +++ b/nslcd/common.h @@ -1,6 +1,6 @@ /* common.h - common server code routines - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2006 West Consulting Copyright (C) 2006, 2007, 2008, 2009 Arthur de Jong diff --git a/nslcd/ether.c b/nslcd/ether.c index 4a1d6a0..3c9c86b 100644 --- a/nslcd/ether.c +++ b/nslcd/ether.c @@ -1,7 +1,7 @@ /* ether.c - ethernet address entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-ethers.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/group.c b/nslcd/group.c index f457cbb..0558651 100644 --- a/nslcd/group.c +++ b/nslcd/group.c @@ -1,7 +1,7 @@ /* group.c - group entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-grp.c) which - has been forked into the nss-ldapd library. + has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2006 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/host.c b/nslcd/host.c index 63826d5..5907c05 100644 --- a/nslcd/host.c +++ b/nslcd/host.c @@ -1,7 +1,7 @@ /* host.c - host name lookup routines Parts of this file were part of the nss_ldap library (as ldap-hosts.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/myldap.c b/nslcd/myldap.c index 5e35718..9e36699 100644 --- a/nslcd/myldap.c +++ b/nslcd/myldap.c @@ -1,7 +1,7 @@ /* myldap.c - simple interface to do LDAP requests Parts of this file were part of the nss_ldap library (as ldap-nss.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2006 Luke Howard Copyright (C) 2006, 2007 West Consulting diff --git a/nslcd/myldap.h b/nslcd/myldap.h index a83a86a..55cf1da 100644 --- a/nslcd/myldap.h +++ b/nslcd/myldap.h @@ -1,6 +1,6 @@ /* myldap.h - simple interface to do LDAP requests - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008, 2009 Arthur de Jong diff --git a/nslcd/netgroup.c b/nslcd/netgroup.c index 58078f8..9acc79f 100644 --- a/nslcd/netgroup.c +++ b/nslcd/netgroup.c @@ -1,7 +1,7 @@ /* netgroup.c - netgroup lookup routines Parts of this file were part of the nss_ldap library (as ldap-netgrp.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/network.c b/nslcd/network.c index c2bcce2..73e88d2 100644 --- a/nslcd/network.c +++ b/nslcd/network.c @@ -1,7 +1,7 @@ /* network.c - network address entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-network.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/passwd.c b/nslcd/passwd.c index fef1720..911df52 100644 --- a/nslcd/passwd.c +++ b/nslcd/passwd.c @@ -1,7 +1,7 @@ /* passwd.c - password entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-pwd.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/protocol.c b/nslcd/protocol.c index fadb66f..a47b7b2 100644 --- a/nslcd/protocol.c +++ b/nslcd/protocol.c @@ -1,7 +1,7 @@ /* protocol.c - network address entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-proto.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/rpc.c b/nslcd/rpc.c index 9958d48..7783994 100644 --- a/nslcd/rpc.c +++ b/nslcd/rpc.c @@ -1,7 +1,7 @@ /* rpc.c - rpc name lookup routines Parts of this file were part of the nss_ldap library (as ldap-rpc.c) which - has been forked into the nss-ldapd library. + has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/service.c b/nslcd/service.c index cb9cf4f..f3980a7 100644 --- a/nslcd/service.c +++ b/nslcd/service.c @@ -1,7 +1,7 @@ /* service.c - service entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-service.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/nslcd/shadow.c b/nslcd/shadow.c index 44c63db..0966356 100644 --- a/nslcd/shadow.c +++ b/nslcd/shadow.c @@ -1,7 +1,7 @@ /* shadow.c - service entry lookup routines Parts of this file were part of the nss_ldap library (as ldap-spwd.c) - which has been forked into the nss-ldapd library. + which has been forked into the nss-pam-ldapd library. Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting diff --git a/tests/README b/tests/README index 79cfeb6..0b70ef6 100644 --- a/tests/README +++ b/tests/README @@ -3,9 +3,9 @@ This document tries to descrive the test in this directory. Most of these tests should be self-explanitory as they should be simple unit tests of the shipped modules (more unit tests are welcome). -Since nss-ldapd is meant for providing data from an LDAP server for some tests -you should have an LDAP server and for even other tests you need to have -nss-ldapd installed (patches for using LD_PRELOAD or similar tricks instead +Since nss-pam-ldapd is meant for providing data from an LDAP server for some +tests you should have an LDAP server and for even other tests you need to have +nss-pam-ldapd installed (patches for using LD_PRELOAD or similar tricks instead are welcome). For this a test setup should be made (the tests are ignored if no such setup diff --git a/tests/test_cfg.c b/tests/test_cfg.c index ce16a48..269b57c 100644 --- a/tests/test_cfg.c +++ b/tests/test_cfg.c @@ -1,6 +1,6 @@ /* test_cfg.c - simple test for the cfg module - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2009 Arthur de Jong diff --git a/tests/test_common.c b/tests/test_common.c index d8aa35b..89856d4 100644 --- a/tests/test_common.c +++ b/tests/test_common.c @@ -1,6 +1,6 @@ /* test_common.c - simple test for the common module - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2008 Arthur de Jong diff --git a/tests/test_dict.c b/tests/test_dict.c index 0684fc2..905d916 100644 --- a/tests/test_dict.c +++ b/tests/test_dict.c @@ -1,6 +1,6 @@ /* test_dict.c - simple test for the dict module - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008 Arthur de Jong diff --git a/tests/test_getpeercred.c b/tests/test_getpeercred.c index 73786c8..13edf97 100644 --- a/tests/test_getpeercred.c +++ b/tests/test_getpeercred.c @@ -1,6 +1,6 @@ /* test_getpeercred.c - simple test for the peercred module - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2008 Arthur de Jong diff --git a/tests/test_myldap.c b/tests/test_myldap.c index 23ac574..5cf3a31 100644 --- a/tests/test_myldap.c +++ b/tests/test_myldap.c @@ -1,6 +1,6 @@ /* test_myldap.c - simple test for the myldap module - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007 Arthur de Jong diff --git a/tests/test_nsscmds.sh b/tests/test_nsscmds.sh index 2469a97..388c140 100755 --- a/tests/test_nsscmds.sh +++ b/tests/test_nsscmds.sh @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA -# This script expects to be run in an environment where nss-ldapd +# This script expects to be run in an environment where nss-pam-ldapd # is deployed with an LDAP server with the proper contents (nslcd running). # FIXME: update the above description and provide actual LDIF file # It's probably best to run this in an environment without nscd. diff --git a/tests/test_set.c b/tests/test_set.c index ccd5891..7ebfe4e 100644 --- a/tests/test_set.c +++ b/tests/test_set.c @@ -1,6 +1,6 @@ /* test_set.c - simple test for the set module - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2008 Arthur de Jong diff --git a/tests/test_tio.c b/tests/test_tio.c index 6f4410d..0e2a3e8 100644 --- a/tests/test_tio.c +++ b/tests/test_tio.c @@ -1,6 +1,6 @@ /* test_tio.c - simple test for the tio module - This file is part of the nss-ldapd library. + This file is part of the nss-pam-ldapd library. Copyright (C) 2007, 2008 Arthur de Jong |