rename trunk to nss-pam-ldapd

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@981 ef36b2f9-881f-0410-afb5-c4e39611909c

13 files changed, 24 insertions, 24 deletions

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 79cfeb6..6f6b3e5 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
@@ -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_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..7387d51 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
 
@@ -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 2469a97..d9399e9 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.
@@ -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
   :
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