nss-pam-ldapd branch master updated. 0.9.11-19-g9edf95c

[Date Prev][Date Next] [Thread Prev][Thread Next]
From: Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org, nss-pam-ldapd-commits [at] lists.arthurdejong.org
Subject: nss-pam-ldapd branch master updated. 0.9.11-19-g9edf95c
Date: Sun, 14 Nov 2021 19:40:11 +0100 (CET)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".

The branch, master has been updated
       via  9edf95cea9173afab850d05c07a0fa58efa55065 (commit)
      from  2862447125783a2430862eb6eaa5f4510f57b13f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=9edf95cea9173afab850d05c07a0fa58efa55065

commit 9edf95cea9173afab850d05c07a0fa58efa55065
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sun Nov 14 18:35:28 2021 +0100

    Do not use user arthur in tests
    
    This makes it more complicated to run the tests on an environment where
    a local user arthur exists.

diff --git a/tests/test.ldif b/tests/test.ldif
index 0c6c377..381b799 100644
--- a/tests/test.ldif
+++ b/tests/test.ldif
@@ -29,7 +29,7 @@ description: desc
 cn: tstnetgroup
 memberNisNetgroup: tst3netgroup
 memberNisNetgroup: tst2netgroup
-nisNetgroupTriple: (,arthur,)
+nisNetgroupTriple: (,testusr1,)
 
 dn: cn=tst3netgroup,ou=netgroups,dc=test,dc=tld
 objectClass: top
@@ -48,7 +48,7 @@ cn: testgroup
 gidNumber: 6100
 objectClass: top
 objectClass: posixGroup
-memberUid: arthur
+memberUid: testusr1
 memberUid: test
 memberUid: testuser4
 
@@ -40092,11 +40092,11 @@ shadowLastChange: 12302
 userPassword:: e1NIQX13bWJpVm14ajJiVVYrT1FGbXNHWkozcnF4UUk9
 loginShell: /bin/bash
 
-dn: uid=arthur,ou=people,dc=test,dc=tld
-uid: arthur
+dn: uid=testusr1,ou=people,dc=test,dc=tld
+uid: testusr1
 gidNumber: 100
 givenName: Arthur
-homeDirectory: /home/arthur
+homeDirectory: /home/testusr1
 sambaLMPassword: 25ABFCD2391656AFEDCB213712461263
 sambaNTPassword: 7213BCD02736ABC64564ABCDFF766DE3
 sambaHomeDrive: H
@@ -40105,14 +40105,14 @@ sambaPwdLastSet: 2043613290
 sambaPwdMustChange: 3043613290
 sambaAcctFlags: [UX         ]
 sn: de Jong
-description: rarthur
+description: rtestusr1
 shadowWarning: 7
 shadowInactive: 2
-uidNumber: 1000
+uidNumber: 1007
 title:: c3V4AAA=
 title: su
-labeledURI: https://arthurdejong.org/ Arthur's homepage
-mail: arthur@arthurdejong.org
+labeledURI: https://testusr1dejong.org/ Arthur's homepage
+mail: testusr1@arthurdejong.org
 objectClass: top
 objectClass: posixAccount
 objectClass: shadowAccount
@@ -41364,7 +41364,7 @@ objectClass: top
 objectClass: posixGroup
 cn: users
 gidNumber: 100
-memberUid: arthur
+memberUid: testusr1
 memberUid: test
 description: cn=Test User2,ou=people,dc=test,dc=tld
 
@@ -41382,7 +41382,7 @@ member: cn=bar,dc=foo,dc=com
 member: cn=testhost,ou=hosts,dc=test,dc=tld
 member:: Y2490JDQkdCSINCT0pDQlNCC0IPQldCBLG91PXBlb3BsZSxkYz10ZXN0LGRjPXRsZA==
 member:: Y2495Y+v5piv5b2T6L+Z5LiqVeebmOWcqCxvdT1wZW9wbGUsZGM9dGVzdCxkYz10bGQ=
-member: uid=arthur,ou=people,dc=test,dc=tld
+member: uid=testusr1,ou=people,dc=test,dc=tld
 
 dn: cn=tst2netgroup,ou=netgroups,dc=test,dc=tld
 objectClass: top
@@ -41426,105 +41426,105 @@ objectClass: top
 objectClass: posixGroup
 cn: grp4
 gidNumber: 704
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp5,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp5
 gidNumber: 705
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp6,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp6
 gidNumber: 706
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp7,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp7
 gidNumber: 707
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp8,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp8
 gidNumber: 708
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp9,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp9
 gidNumber: 709
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp10,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp10
 gidNumber: 710
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp11,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp11
 gidNumber: 711
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp12,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp12
 gidNumber: 712
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp13,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp13
 gidNumber: 713
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp14,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp14
 gidNumber: 714
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp15,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp15
 gidNumber: 715
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp16,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp16
 gidNumber: 716
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp17,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp17
 gidNumber: 717
-memberUid: arthur
+memberUid: testusr1
 
 dn: cn=grp18,ou=groups,dc=test,dc=tld
 objectClass: top
 objectClass: posixGroup
 cn: grp18
 gidNumber: 718
-memberUid: arthur
+memberUid: testusr1
 
 dn: ou=policies,dc=test,dc=tld
 objectClass: organizationalUnit
diff --git a/tests/test_ldapcmds.sh b/tests/test_ldapcmds.sh
index f82e82b..dd7a149 100755
--- a/tests/test_ldapcmds.sh
+++ b/tests/test_ldapcmds.sh
@@ -2,7 +2,7 @@
 
 # test_ldapcmds.sh - simple test script to test lookups
 #
-# Copyright (C) 2017-2019 Arthur de Jong
+# Copyright (C) 2017-2021 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -143,11 +143,11 @@ sortgroup() {
 }
 
 check "getent.ldap group testgroup | sortgroup" << EOM
-testgroup:*:6100:arthur,test,testuser4
+testgroup:*:6100:test,testuser4,testusr1
 EOM
 
 check "getent.ldap group users | sortgroup" << EOM
-users:*:100:arthur,test
+users:*:100:test,testusr1
 EOM
 
 # group with different case should not be found
@@ -155,10 +155,10 @@ check "getent.ldap group TESTGROUP" << EOM
 EOM
 
 check "getent.ldap group 6100 | sortgroup" << EOM
-testgroup:*:6100:arthur,test,testuser4
+testgroup:*:6100:test,testuser4,testusr1
 EOM
 
-check "getent.ldap group.bymember arthur | sed 's/:.*//' | sort" << EOM
+check "getent.ldap group.bymember testusr1 | sed 's/:.*//' | sort" << EOM
 grp10
 grp11
 grp12
@@ -185,8 +185,8 @@ testgroup2
 EOM
 
 check "getent.ldap group | egrep '^(testgroup|users):' | sortgroup" << EOM
-testgroup:*:6100:arthur,test,testuser4
-users:*:100:arthur,test
+testgroup:*:6100:test,testuser4,testusr1
+users:*:100:test,testusr1
 EOM
 
 check "getent.ldap group | wc -l" << EOM
@@ -298,7 +298,7 @@ echo "test_ldapcmds.sh: testing netgroup..."
 
 # check netgroup lookup of test netgroup
 check "getent.ldap netgroup tstnetgroup" << EOM
-tstnetgroup          ( , arthur, ) (noot, , )
+tstnetgroup          ( , testusr1, ) (noot, , )
 EOM
 
 # check netgroup lookup with different case
@@ -307,7 +307,7 @@ EOM
 
 # check netgroup lookup of test netgroup without recursion
 check "getent.ldap netgroup.norec tstnetgroup" << EOM
-tstnetgroup     tst3netgroup tst2netgroup (, arthur, )
+tstnetgroup     tst3netgroup tst2netgroup (, testusr1, )
 EOM
 
 ###########################################################################
@@ -339,12 +339,12 @@ check "getent.ldap passwd ecolden | sed 's/:[x*]:/:x:/'" 
<< EOM
 ecolden:x:5972:1000:Estelle Colden:/home/ecolden:/bin/bash
 EOM
 
-check "getent.ldap passwd arthur | sed 's/:[x*]:/:x:/'" << EOM
-arthur:x:1000:100:Arthur de Jong:/home/arthur:/bin/bash
+check "getent.ldap passwd testusr1 | sed 's/:[x*]:/:x:/'" << EOM
+testusr1:x:1007:100:Arthur de Jong:/home/testusr1:/bin/bash
 EOM
 
 # check username with different case
-check "getent.ldap passwd ARTHUR" << EOM
+check "getent.ldap passwd TESTUSR1" << EOM
 EOM
 
 check "getent.ldap passwd 4089 | sed 's/:[x*]:/:x:/'" << EOM
diff --git a/tests/test_nsscmds.sh b/tests/test_nsscmds.sh
index aaeb256..93db4ae 100755
--- a/tests/test_nsscmds.sh
+++ b/tests/test_nsscmds.sh
@@ -149,13 +149,13 @@ sortgroup() {
 }
 
 check "getent group testgroup | sortgroup" << EOM
-testgroup:*:6100:arthur,test,testuser4
+testgroup:*:6100:test,testuser4,testusr1
 EOM
 
 # this does not work because users is in /etc/group but it would
 # be nice if libc supported this
 #check "getent group users" << EOM
-#users:*:100:arthur,test
+#users:*:100:testusr1,test
 #EOM
 
 # group with different case should not be found
@@ -163,10 +163,10 @@ check "getent group TESTGROUP" << EOM
 EOM
 
 check "getent group 6100 | sortgroup" << EOM
-testgroup:*:6100:arthur,test,testuser4
+testgroup:*:6100:test,testuser4,testusr1
 EOM
 
-check "groups arthur | sed 's/^.* *: *//' | sed 's/ debci//;s/ runneradmin//'" 
<< EOM
+check "groups testusr1 | sed 's/^.* *: *//'" << EOM
 users testgroup testgroup2 grp4 grp5 grp6 grp7 grp8 grp9 grp10 grp11 grp12 
grp13 grp14 grp15 grp16 grp17 grp18
 EOM
 
@@ -176,8 +176,8 @@ EOM
 
 check "getent group | egrep '^(testgroup|users|root):' | sortgroup" << EOM
 $(egrep '^(testgroup|users|root):' /etc/group)
-testgroup:*:6100:arthur,test,testuser4
-users:*:100:arthur,test
+testgroup:*:6100:test,testuser4,testusr1
+users:*:100:test,testusr1
 EOM
 
 check "getent group | wc -l" << EOM
@@ -295,7 +295,7 @@ echo "test_nsscmds.sh: testing netgroup..."
 
 # check netgroup lookup of test netgroup
 check "getent netgroup tstnetgroup" << EOM
-tstnetgroup          ( , arthur, ) (noot, , )
+tstnetgroup          ( , testusr1, ) (noot, , )
 EOM
 
 # check netgroup lookup with different case
@@ -339,12 +339,12 @@ check "getent passwd ecolden | sed 's/:[x*]:/:x:/'" << EOM
 ecolden:x:5972:1000:Estelle Colden:/home/ecolden:/bin/bash
 EOM
 
-check "getent passwd arthur | sed 's/:[x*]:/:x:/'" << EOM
-arthur:x:1000:100:Arthur de Jong:/home/arthur:/bin/bash
+check "getent passwd testusr1 | sed 's/:[x*]:/:x:/'" << EOM
+testusr1:x:1007:100:Arthur de Jong:/home/testusr1:/bin/bash
 EOM
 
 # check username with different case
-check "getent passwd ARTHUR" << EOM
+check "getent passwd TESTUSR1" << EOM
 EOM
 
 check "getent passwd 4089 | sed 's/:[x*]:/:x:/'" << EOM

-----------------------------------------------------------------------

Summary of changes:
 tests/test.ldif        | 52 +++++++++++++++++++++++++-------------------------
 tests/test_ldapcmds.sh | 24 +++++++++++------------
 tests/test_nsscmds.sh  | 20 +++++++++----------
 3 files changed, 48 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd
nss-pam-ldapd branch master updated. 0.9.11-19-g9edf95c, Commits of the nss-pam-ldapd project
Prev by Date: nss-pam-ldapd branch master updated. 0.9.11-18-g2862447
Next by Date: nss-pam-ldapd branch master updated. 0.9.11-21-g70819ae
Previous by thread: nss-pam-ldapd branch master updated. 0.9.11-18-g2862447
Next by thread: nss-pam-ldapd branch master updated. 0.9.11-21-g70819ae