diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/README | 6 | ||||
| -rw-r--r-- | tests/nslcd-test.conf (renamed from tests/nss-ldapd-test.conf) | 6 | ||||
| -rw-r--r-- | tests/test_myldap.c | 2 | ||||
| -rwxr-xr-x | tests/test_myldap.sh | 4 | ||||
| -rw-r--r-- | tests/test_nslcd_group.c | 4 | ||||
| -rwxr-xr-x | tests/test_nsscmds.sh | 2 |
7 files changed, 13 insertions, 13 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 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 : |