nss-pam-ldapd branch master updated. 0.9.7-22-g3d5ab89

[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
Subject: nss-pam-ldapd branch master updated. 0.9.7-22-g3d5ab89
Date: Fri, 16 Jun 2017 18:43:16 +0200 (CEST)
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  3d5ab890d3377eb1c344e69992252bebec8a29e6 (commit)
       via  b5d1dd2196e470c5c67bfda00b776346f95b928c (commit)
       via  246a1f350ffc94d6b2425603dc3ff3766eac809b (commit)
      from  43862ba26cf97aaa62b54651ec1624aee44ac17a (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=3d5ab890d3377eb1c344e69992252bebec8a29e6

commit 3d5ab890d3377eb1c344e69992252bebec8a29e6
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Jun 16 18:31:52 2017 +0200

    Fix pam_info() and pam_error() replacement
    
    On FreeBSD these are functions while on Linux they are macros causing
    them to be incorrectly replaced on FreeBSD. This resulted in a crash of
    the PAM module when e.g. presenting messages about password expiry.

diff --git a/compat/pam_compat.h b/compat/pam_compat.h
index ac94986..0861624 100644
--- a/compat/pam_compat.h
+++ b/compat/pam_compat.h
@@ -1,7 +1,7 @@
 /*
    pam_compat.h - provide a replacement definitions for some pam functions
 
-   Copyright (C) 2009, 2010, 2011, 2012 Arthur de Jong
+   Copyright (C) 2009-2017 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
@@ -60,16 +60,16 @@ int pam_prompt(pam_handle_t *pamh, int style, char 
**response,
 #endif /* not HAVE_PAM_PROMPT */
 
 /* provide pam_info() if needed */
-#ifndef pam_info
+#ifndef HAVE_DECL_PAM_INFO
 #define pam_info(pamh, format...)                                           \
   pam_prompt(pamh, PAM_TEXT_INFO, NULL, ##format)
-#endif /* not pam_info */
+#endif /* not HAVE_DECL_PAM_INFO */
 
 /* provide pam_error() if needed */
-#ifndef pam_error
+#ifndef HAVE_DECL_PAM_ERROR
 #define pam_error(pamh, format...)                                          \
   pam_prompt(pamh, PAM_ERROR_MSG, NULL, ##format)
-#endif /* not pam_error */
+#endif /* not HAVE_DECL_PAM_ERROR */
 
 /* fall back to using getpwnam() if pam_modutil_getpwnam() isn't defined */
 #ifndef HAVE_PAM_MODUTIL_GETGWNAM
diff --git a/configure.ac b/configure.ac
index 34d42d1..564f9c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -606,6 +606,21 @@ then
   # replace some PAM functions if they are unavailable
   AC_REPLACE_FUNCS(pam_get_authtok pam_prompt)
   AC_CHECK_FUNCS(pam_modutil_getpwnam pam_syslog)
+  AC_CHECK_DECLS([pam_info, pam_error],,, [
+     #ifdef HAVE_SECURITY_PAM_APPL_H
+     #include <security/pam_appl.h>
+     #endif
+     #ifndef HAVE_PAM_PAM_MODULES_H
+     #include <security/pam_modules.h>
+     #ifdef HAVE_SECURITY_PAM_EXT_H
+     #include <security/pam_ext.h>
+     #endif
+     #else
+     #include <pam/pam_modules.h>
+     #endif
+     #ifdef HAVE_SECURITY_PAM_MODUTIL_H
+     #include <security/pam_modutil.h>
+     #endif])
 
   # find out how to link the library
   pam_ldap_so_LINK="\$(CCLD) \$(AM_CFLAGS) \$(CFLAGS) \$(pam_ldap_so_LDFLAGS) 
\$(LDFLAGS) -o \$@"

https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=b5d1dd2196e470c5c67bfda00b776346f95b928c

commit b5d1dd2196e470c5c67bfda00b776346f95b928c
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Jun 16 17:09:58 2017 +0200

    Clean log from test_pamcmds.expect
    
    This removes test_pamcmds.log that is generated by test_pamcmds.expect
    when running the test suite. This avoids an error in the distcheck
    target.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d3a622b..7746275 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST = README nslcd-test.conf usernames.txt testenv.sh 
test_myldap.sh \
              test_pynslcd_cache.py \
              setup_slapd.sh config.ldif test.ldif
 
-CLEANFILES = $(EXTRA_PROGRAMS)
+CLEANFILES = $(EXTRA_PROGRAMS) test_pamcmds.log
 
 AM_CPPFLAGS = -I$(top_srcdir)
 AM_CFLAGS = $(PTHREAD_CFLAGS) -g

https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=246a1f350ffc94d6b2425603dc3ff3766eac809b

commit 246a1f350ffc94d6b2425603dc3ff3766eac809b
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Jun 16 14:59:06 2017 +0200

    Fix running test_ldapcmds.sh during distcheck
    
    This ensures that Python can find both getent.py (from source directory)
    and constants.py (from build directory) when running the tests from the
    distcheck target.
    
    This also makes the script more similar to test_nsscmds.sh.
    
    Fixes 9c803d7.

diff --git a/tests/test_ldapcmds.sh b/tests/test_ldapcmds.sh
index 17b81c8..d1ab2a4 100755
--- a/tests/test_ldapcmds.sh
+++ b/tests/test_ldapcmds.sh
@@ -26,9 +26,11 @@ set -e
 
 # find source directory
 srcdir="${srcdir-`dirname "$0"`}"
+top_srcdir="${top_srcdir-${srcdir}/..}"
 builddir="${builddir-`dirname "$0"`}"
 top_builddir="${top_builddir-${builddir}/..}"
 python="${PYTHON-python}"
+export PYTHONPATH="${top_srcdir}/utils:${top_builddir}/utils"
 
 # ensure that we are running in the test environment
 "$srcdir/testenv.sh" check_nslcd || exit 77
@@ -44,20 +46,19 @@ fi
 FAIL=0
 
 getent_ldap() {
-  cmd="(cd "'"'"${top_builddir}/utils"'"'"; ${python} getent.py $1)"
-  eval "$cmd"
+  ${python} -m getent ${1:+"$@"}
 }
 
 check() {
   # the command to execute
-  cmd="$1"
+  cmd="$(echo $1 | sed 's/getent.ldap/getent_ldap/g')"
   # save the expected output
   expectfile=`mktemp -t expected.XXXXXX 2> /dev/null || tempfile -s .expected 
2> /dev/null`
   cat > "$expectfile"
   # run the command
-  echo 'test_ldapcmds.sh: checking "'"getent.ldap $cmd"'"'
+  echo 'test_nsscmds.sh: checking "'"$cmd"'"'
   actualfile=`mktemp -t actual.XXXXXX 2> /dev/null || tempfile -s .actual 2> 
/dev/null`
-  getent_ldap "$cmd" > "$actualfile" 2>&1 || true
+  eval "$cmd" > "$actualfile" 2>&1 || true
   # check for differences
   diff -Nauwi "$expectfile" "$actualfile" || FAIL=`expr $FAIL + 1`
   # remove temporary files
@@ -69,24 +70,24 @@ check() {
 echo "test_ldapcmds.sh: testing aliases..."
 
 # check all aliases
-check "aliases|sort" << EOM
+check "getent.ldap aliases|sort" << EOM
 bar2:           foobar@example.com
 bar:            foobar@example.com
 foo:            bar@example.com
 EOM
 
 # get alias by name
-check "aliases foo" << EOM
+check "getent.ldap aliases foo" << EOM
 foo:            bar@example.com
 EOM
 
 # get alias by second name
-check "aliases bar2" << EOM
+check "getent.ldap aliases bar2" << EOM
 bar2:           foobar@example.com
 EOM
 
 # get alias by different case
-check "aliases FOO" << EOM
+check "getent.ldap aliases FOO" << EOM
 foo:            bar@example.com
 EOM
 
@@ -95,27 +96,27 @@ EOM
 echo "test_ldapcmds.sh: testing ether..."
 
 # get an entry by hostname
-check "ethers testhost" << EOM
+check "getent.ldap ethers testhost" << EOM
 0:18:8a:54:1a:8e testhost
 EOM
 
 # get an entry by alias name
-check "ethers testhostalias" << EOM
+check "getent.ldap ethers testhostalias" << EOM
 0:18:8a:54:1a:8e testhostalias
 EOM
 
 # get an entry by hostname with different case
-check "ethers TESTHOST" << EOM
+check "getent.ldap ethers TESTHOST" << EOM
 0:18:8a:54:1a:8e testhost
 EOM
 
 # get an entry by ethernet address
-check "ethers 0:18:8a:54:1a:8b" << EOM
+check "getent.ldap ethers 0:18:8a:54:1a:8b" << EOM
 0:18:8a:54:1a:8b testhost2
 EOM
 
 # get all ethers (unsupported)
-check "ethers|sort" << EOM
+check "getent.ldap ethers|sort" << EOM
 0:18:8a:54:1a:8b testhost2
 0:18:8a:54:1a:8e testhost
 0:18:8a:54:1a:8e testhostalias
@@ -136,23 +137,23 @@ sortgroup() {
   done
 }
 
-check "group testgroup | sortgroup" << EOM
+check "getent.ldap group testgroup | sortgroup" << EOM
 testgroup:*:6100:arthur,test,testuser4
 EOM
 
-check "group users" << EOM
+check "getent.ldap group users" << EOM
 users:*:100:arthur,test
 EOM
 
 # group with different case should not be found
-check "group TESTGROUP" << EOM
+check "getent.ldap group TESTGROUP" << EOM
 EOM
 
-check "group 6100 | sortgroup" << EOM
+check "getent.ldap group 6100 | sortgroup" << EOM
 testgroup:*:6100:arthur,test,testuser4
 EOM
 
-check "group.bymember arthur | sed 's/:.*//' | sort" << EOM
+check "getent.ldap group.bymember arthur | sed 's/:.*//' | sort" << EOM
 grp10
 grp11
 grp12
@@ -173,49 +174,49 @@ testgroup2
 users
 EOM
 
-check "group.bymember testuser4 | sed 's/:.*//' | sort" << EOM
+check "getent.ldap group.bymember testuser4 | sed 's/:.*//' | sort" << EOM
 testgroup
 testgroup2
 EOM
 
-check "group | egrep '^(testgroup|users):' | sortgroup" << EOM
+check "getent.ldap group | egrep '^(testgroup|users):' | sortgroup" << EOM
 testgroup:*:6100:arthur,test,testuser4
 users:*:100:arthur,test
 EOM
 
-check "group | wc -l" << EOM
+check "getent.ldap group | wc -l" << EOM
 23
 EOM
 
-check "group | grep ^largegroup | sortgroup" << EOM
+check "getent.ldap group | grep ^largegroup | sortgroup" << EOM
 
largegroup:*:1005:akraskouskas,alat,ameisinger,bdevera,behrke,bmoldan,btempel,cjody,clouder,cmanno,dbye,dciviello,dfirpo,dgivliani,dgosser,emcquiddy,enastasi,fcunard,gcubbison,gdaub,gdreitzler,ghanauer,gpomerance,gsusoev,gtinnel,gvollrath,gzuhlke,hgalavis,hhaffey,hhydrick,hmachesky,hpaek,hpolk,hsweezer,htomlinson,hzagami,igurwell,ihashbarger,jyeater,kbradbury,khathway,kklavetter,lbuchtel,lgandee,lkhubba,lmauracher,lseehafer,lvittum,mblanchet,mbodley,mciaccia,mjuris,ndipanfilo,nfilipek,nfunchess,ngata,ngullett,nkraker,nriofrio,nroepke,nrybij,oclunes,oebrani,okveton,osaines,otrevor,pdossous,phaye,psowa,purquilla,rkoonz,rlatessa,rworkowski,sdebry,sgurski,showe,slaforge,tabdelal,testusr2,testusr3,tfalconeri,tpaa,uschweyen,utrezize,vchevalier,vdelnegro,vleyton,vmedici,vmigliori,vpender,vwaltmann,wbrettschneide,wselim,wvalcin,wworf,yautin,ykisak,zgingrich,znightingale,zwinterbottom
 EOM
 
-check "group largegroup | sortgroup" << EOM
+check "getent.ldap group largegroup | sortgroup" << EOM
 
largegroup:*:1005:akraskouskas,alat,ameisinger,bdevera,behrke,bmoldan,btempel,cjody,clouder,cmanno,dbye,dciviello,dfirpo,dgivliani,dgosser,emcquiddy,enastasi,fcunard,gcubbison,gdaub,gdreitzler,ghanauer,gpomerance,gsusoev,gtinnel,gvollrath,gzuhlke,hgalavis,hhaffey,hhydrick,hmachesky,hpaek,hpolk,hsweezer,htomlinson,hzagami,igurwell,ihashbarger,jyeater,kbradbury,khathway,kklavetter,lbuchtel,lgandee,lkhubba,lmauracher,lseehafer,lvittum,mblanchet,mbodley,mciaccia,mjuris,ndipanfilo,nfilipek,nfunchess,ngata,ngullett,nkraker,nriofrio,nroepke,nrybij,oclunes,oebrani,okveton,osaines,otrevor,pdossous,phaye,psowa,purquilla,rkoonz,rlatessa,rworkowski,sdebry,sgurski,showe,slaforge,tabdelal,testusr2,testusr3,tfalconeri,tpaa,uschweyen,utrezize,vchevalier,vdelnegro,vleyton,vmedici,vmigliori,vpender,vwaltmann,wbrettschneide,wselim,wvalcin,wworf,yautin,ykisak,zgingrich,znightingale,zwinterbottom
 EOM
 
-check "group | grep ^hugegroup | sortgroup" << EOM
+check "getent.ldap group | grep ^hugegroup | sortgroup" << EOM
 
hugegroup:*:1006:ablackstock,abortignon,achhor,ademosthenes,adenicola,adishaw,aesbensen,aferge,afredin,afuchs,agarbett,agimm,agordner,ahandy,ajaquess,akertzman,akomsthoeft,akraskouskas,akravetz,alamour,alat,alienhard,amanganelli,amaslyn,amayorga,amccroskey,amcgraw,amckinney,ameisinger,aponcedeleon,apurdon,areid,arosel,ascheno,ascovel,asemons,ashuey,asivley,astrunk,atollefsrud,atonkin,awhitt,aziernicki,badair,baigner,bbeckfield,bbrenton,bcoletta,bcolorado,bdadds,bdaughenbaugh,bdevera,bdominga,behrke,beon,bfishbeck,bgavagan,bguthary,bharnois,bhelverson,bjolly,blovig,bluellen,bmadamba,bmarlin,bmarszalek,bmicklos,bmoling,bouten,bphou,bpinedo,brodgerson,broher,bromano,bscadden,bsibal,bstrede,bswantak,btempel,btheim,bveeneman,bwinterton,bwynes,cabare,carguellez,cbarlup,cbartnick,cbelardo,cbleimehl,cbotdorf,cbourek,cbrechbill,cbrom,ccyganiewicz,cdeckard,cdegravelle,cdickes,cdrumm,cfasone,cflenner,cfleurantin,cgaler,cgalinol,cgaudette,cghianni,charriman,cjody,cjuntunen,ckerska,ckistenmacher,cklem,ckodish,clapenta,clewicki,clouder,cmafnas,cmanno,cmcanulty,cmellberg,cmiramon,cnabzdyk,cnoriego,cpaccione,cpalmios,cparee,cpencil,cpentreath,cpinela,cpluid,critchie,cscullion,csever,csoomaroo,cspilis,cswigert,ctenny,ctetteh,ctuzzo,cwank,cweiss,dasiedu,daubert,dbarriball,dbertels,dblazejewski,dcaltabiano,dciullo,ddeguire,ddigerolamo,denriquez,deshmon,dfirpo,dflore,dfollman,dgiacomazzi,dgivliani,dgosser,dhammontree,dhendon,dhindsman,dholdaway,dlablue,dlanois,dlargo,dledenbach,dlongbotham,dloubier,dmahapatra,dmarchizano,dmcgillen,dminozzi,dnegri,dpebbles,draymundo,dscheurer,dsharr,dsherard,dsteever,dtashjian,dtornow,dtuholski,dwittlinger,dzurek,eaguire,eathey,ebattee,ebeachem,eberkman,ebusk,ecelestin,ecolden,ecordas,ediga,edrinkwater,edurick,egospatrick,egrago,ehathcock,ehindbaugh,ejeppesen,ekalfas,ekenady,ekeuper,eklein,eklunder,ekurter,emanikowski,emargulis,emcquiddy,emehta,eorsten,eparham,epeterson,epoinelli,erathert,erostad,eserrett,esheehan,esonia,esproull,esthill,estockwin,etunby,ewicks,ewilles,ewismer,ewuitschick,eyounglas,eziebert,fagro,faleo,farquette,fbeatrice,fberra,fberyman,fbielecki,fburrough,fcha,fcunard,ffigert,fgoben,fgrashot,fhain,fhalon,fkeef,fmarchi,fmilsaps,fnottage,fparness,fplayfair,fsapien,fsavela,fsirianni,fsplinter,fsunderland,fsymmonds,fthein,fvallian,fvascones,fverfaille,fvinal,fwidhalm,gallanson,gapkin,garchambeault,gbitar,gbolay,gcarlini,gcervantez,gchounlapane,gclapham,gcobane,gconver,gcukaj,gcummer,gcurnutt,gdaub,gdeblasio,gdeyarmond,gdrilling,gearnshaw,gfaire,gfedewa,ggehrke,ggillim,ghann,ghelderman,ghumbles,gishii,gjankowiak,gkerens,glafontaine,gloebs,gmackinder,gmassi,gmilian,gmings,gmoen,gparkersmith,gpomerance,gportolese,greiff,gsantella,gschaumburg,gshrode,gtinnel,guresti,gvollrath,gwaud,habby,hbastidos,hbetterman,hbickford,hbraim,hbrandow,hbrehmer,hbukovsky,hcafourek,hcarrizal,hchaviano,hcintron,hcowles,hcusta,hdoiel,hdyner,hfludd,hgalavis,hhaffey,hhagee,hhartranft,hholyfield,hhysong,hkarney,hkinderknecht,hkippes,hkohlmeyer,hlauchaire,hlemon,hlichota,hliverman,hloftis,hlynema,hmateer,hmatonak,hmiazga,hmogush,hmuscaro,hpalmquist,hpimpare,hpolintan,hrapisura,hrenart,hriech,hsabol,hschelb,hschoepfer,hspiry,hstreitnatter,hsweezer,htilzer,htomlinson,htsuha,hvannette,hveader,hwestermark,hwoodert,hzagami,hzinda,iambrosino,ibeto,ibreitbart,ibuzo,ibyles,ichewning,icoard,ideveyra,ienglert,igizzi,ihalford,ihanneman,ihegener,ihernan,iherrarte,ihimmelwright,ihoa,iiffert,ikadar,ikulbida,ilacourse,ilamberth,ilawbaugh,ileaman,ilevian,imarungo,imcbay,imensah,imicthell,imillin,imuehl,inarain,iogasawara,iroiger,iseipel,isowder,isplonskowski,istallcup,istarring,isteinlicht,ithum,ivanschaack,iweibe,iyorgey,iyorks,jamber,jappleyard,jbielicki,jbjorkman,jcaroll,jdodge,jeuresti,jeverton,jglotzbecker,jherkenratt,jholzmiller,jjumalon,jkimpton,jknight,jlebouf,jlunney,jmartha,jmarugg,jmatty,joligee,jquicksall,jrees,jreigh,jroman,jscheitlin,jseen,jsegundo,jsenavanh,jskafec,jspohn,jsweezy,jvillaire,jwinterton,jzych,kaanerud,kalguire,kbarnthouse,kbartolet,kbattershell,kbrevitz,kbrugal,kcofrancesco,kcomparoni,kconkey,kdevincent,kepps,kfaure,kfend,kgarced,kgremminger,khartness,kheadlon,khovanesian,kjoslyn,klitehiser,klundsten,klurie,kmallach,kmandolfo,kmarzili,kmayoras,kmcardle,kmcguire,kmedcaf,kmeester,kmisove,kmoesch,kmosko,kmuros,kolexa,kottomaniello,kpalka,kpannunzio,kpenale,kpuebla,krahman,kseisler,kshippy,ksiering,ksollitto,ksparling,kstachurski,kthede,ktoni,ktriblett,ktuccio,ktuner,kwidrick,kwinterling,kwirght,laksamit,lautovino,lbanco,lbassin,lbove,lbuchtel,lcanestrini,lcaudell,lcavez,lcocherell,lcoulon,lcremer,leberhardt,lfarraj,lfichtner,lgadomski,lgandee,lgradilla,lhuggler,limbrogno,ljomes,lkimel,llarmore,llasher,lmadruga,lmauracher,lmcgeary,lmichaud,lmuehlberger,lnormand,lparrish,lpeagler,lpintor,lpitek,lpondexter,lrandall,lringuette,lschenkelberg,lschnorbus,lschollmeier,lseabold,lseehafer,lshilling,lsivic,lsobrino,lsous,lspielvogel,lvaleriano,lvanconant,lwedner,lyoula,mallmand,maustine,mbeagley,mbodley,mbravata,mcampagnone,mcaram,mcashett,mcasida,mcoch,mcolehour,mcontreras,mdanos,mdecourcey,mdedon,mdickinson,mdimaio,mdoering,mdyce,meconomides,mespinel,mfaeth,mfeil,mferandez,mfitzherbert,mgavet,mgayden,mground,mheilbrun,mhollings,mjeon,mkibler,mkofoed,mlaverde,mlenning,mlinak,mlinardi,mmangiamele,mmattu,mmcchristian,mmerriwether,mmesidor,mneubacher,moller,moser,mpanahon,mpark,mpellew,mpilon,mpizzaro,mpytko,mquigg,mredd,mrizer,mruppel,mrydelek,mskeele,mstirn,mswogger,mtanzi,mtintle,mvanbergen,mvanpelt,mvas,mvedder,mviverette,myokoyama,nagerton,nasmar,nbuford,nbugtong,ncermeno,nchrisman,nciucci,ndesautels,ndrumgole,nedgin,nendicott,nerbach,nevan,nforti,nfunchess,ngiesler,nglathar,ngrowney,ngullett,nhayer,nhelfinstine,nhija,ninnella,njordon,nkempon,nkubley,nlainhart,nlatchaw,nlemma,nlinarez,nlohmiller,nmccolm,nmoren,nnamanworth,nnickel,nousdahl,nphan,nramones,nranck,nridinger,nriofrio,nrybij,nrysavy,nschmig,nsiemonsma,nslaby,nspolar,nvyhnal,nwescott,nwiker,oahyou,oalthouse,obeaufait,obenallack,obercier,obihl,ocalleo,ochasten,oclunes,oconerly,ocrabbs,oebrani,ofelcher,ohatto,ohearl,ohedlund,ohoffert,ohove,ojerabek,okave,okveton,omalvaez,omasone,omatula,omcdaid,oolivarez,oosterhouse,opeet,opizzuti,opoch,oport,opuglisi,oreiss,osaber,oscarpello,oshough,ovibbert,owhelchel,owhitelow,pahles,pbascom,pbeckerdite,pbiggart,pbondroff,pbrentano,pcaposole,pcornn,pdauterman,pdech,pdischinger,pduitscher,pdulac,pdurando,pfavolise,pgiegerich,pgreenier,pgrybel,phalkett,pheathcock,phyer,pmineo,pminnis,ppedraja,ppeper,pphuaphes,prepasky,prowena,psabado,psalesky,pschrayter,psharits,psiroky,psundeen,pthornberry,ptoenjes,ptraweek,purquilla,pvierthaler,pvirelli,pviviani,pwademan,pwashuk,pwetherwax,pwhitmire,pwohlenhaus,pwutzke,qhanly,ralspach,rbernhagen,rbillingsly,rbloomstrand,rbrisby,rcheshier,rchevrette,rdubs,rdubuisson,redling,rfassinger,rfauerbach,rfidel,rginer,rgoonez,rgramby,rgriffies,rguinane,rheinzmann,rkraszewski,rlambertus,rlatessa,rlosinger,rmandril,rmcstay,rnordby,rpastorin,rpikes,rpinilla,rpitter,rramirez,rrasual,rschkade,rtole,rtooker,saben,sackles,sarndt,saycock,sbemo,sbettridge,sbloise,sbonnie,sbrabyn,scocuzza,sdebry,senrico,sestergard,sgefroh,sgirsh,sgropper,sgunder,sgurski,shaith,sherzberg,showe,sjankauskas,skanjirathinga,skoegler,slaningham,slaudeman,slerew,smccaie,smillian,smullowney,snotari,spolmer,srees,srubenfield,sscheiern,sskone,sskyers,sspagnuolo,sstough,sstuemke,svandewalle,svielle,svogler,svongal,swoodie,tabdelal,tairth,tbagne,tbattista,tboxx,tcacal,tcossa,tcrissinger,tdonathan,teliades,tfalconeri,tfetherston,tgelen,tgindhart,tguinnip,tharr,thelfritz,thoch,thynson,tkeala,tkelly,tkhora,tlana,tlowers,tmalecki,tmarkus,tmccaffity,tmccamish,tmcmickle,tmelland,tmorr,tmurata,tmysinger,tnaillon,tnitzel,tpaa,tplatko,tredfearn,tsablea,tsann,tschnepel,tsearle,tsepulueda,tsowells,tstalworth,tvehrs,tvrooman,tyounglas,ualway,uazatyan,ubenken,ubieniek,ubynum,udatu,uednilao,ueriks,uflander,ugerpheide,ugreenberg,uhayakawa,uholecek,ulanigan,umarbury,umosser,upater,upellam,uransford,urosentrance,uschweyen,usevera,uslavinski,uspittler,uvanmatre,uwalpole,uweyand,vbaldasaro,vbigalow,vbonder,vburton,vchevalier,vcrofton,vdesir,vdolan,veisenhardt,vemily,venfort,vfeigel,vglidden,vkrug,vlubic,vmaynard,vmedici,vnazzal,vnery,vpeairs,vpender,vpiraino,vrodick,vrunyon,vsefcovic,vstirman,vtowell,vtresch,vtrumpp,vwabasha,vwaltmann,vwisinger,vwokwicz,wbrill,wclokecloak,wconces,wconstantino,wcreggett,wdagrella,wdevenish,wdovey,wenglander,werrick,wesguerra,wganther,wkhazaleh,wleiva,wlynch,wmailey,wmendell,wnunziata,wottesen,wselim,wstjean,wtruman,wvalcin,wvermeulen,xeppley,xlantey,xrahaim,yautin,ycerasoli,ycobetto,ycostaneda,yduft,yeven,yfrymoyer,ygockel,yhenriques,ykimbel,yolivier,yschmuff,ysnock,yvdberg,zanderlik,zborgmeyer,zbuscaglia,zculp,zfarler,zhaulk,zkutchera,zmeeker,zneeb,zratti,zscammahorn,zvagt,zwinterbottom
 EOM
 
-check "group hugegroup | sortgroup" << EOM
+check "getent.ldap group hugegroup | sortgroup" << EOM
 
hugegroup:*:1006:ablackstock,abortignon,achhor,ademosthenes,adenicola,adishaw,aesbensen,aferge,afredin,afuchs,agarbett,agimm,agordner,ahandy,ajaquess,akertzman,akomsthoeft,akraskouskas,akravetz,alamour,alat,alienhard,amanganelli,amaslyn,amayorga,amccroskey,amcgraw,amckinney,ameisinger,aponcedeleon,apurdon,areid,arosel,ascheno,ascovel,asemons,ashuey,asivley,astrunk,atollefsrud,atonkin,awhitt,aziernicki,badair,baigner,bbeckfield,bbrenton,bcoletta,bcolorado,bdadds,bdaughenbaugh,bdevera,bdominga,behrke,beon,bfishbeck,bgavagan,bguthary,bharnois,bhelverson,bjolly,blovig,bluellen,bmadamba,bmarlin,bmarszalek,bmicklos,bmoling,bouten,bphou,bpinedo,brodgerson,broher,bromano,bscadden,bsibal,bstrede,bswantak,btempel,btheim,bveeneman,bwinterton,bwynes,cabare,carguellez,cbarlup,cbartnick,cbelardo,cbleimehl,cbotdorf,cbourek,cbrechbill,cbrom,ccyganiewicz,cdeckard,cdegravelle,cdickes,cdrumm,cfasone,cflenner,cfleurantin,cgaler,cgalinol,cgaudette,cghianni,charriman,cjody,cjuntunen,ckerska,ckistenmacher,cklem,ckodish,clapenta,clewicki,clouder,cmafnas,cmanno,cmcanulty,cmellberg,cmiramon,cnabzdyk,cnoriego,cpaccione,cpalmios,cparee,cpencil,cpentreath,cpinela,cpluid,critchie,cscullion,csever,csoomaroo,cspilis,cswigert,ctenny,ctetteh,ctuzzo,cwank,cweiss,dasiedu,daubert,dbarriball,dbertels,dblazejewski,dcaltabiano,dciullo,ddeguire,ddigerolamo,denriquez,deshmon,dfirpo,dflore,dfollman,dgiacomazzi,dgivliani,dgosser,dhammontree,dhendon,dhindsman,dholdaway,dlablue,dlanois,dlargo,dledenbach,dlongbotham,dloubier,dmahapatra,dmarchizano,dmcgillen,dminozzi,dnegri,dpebbles,draymundo,dscheurer,dsharr,dsherard,dsteever,dtashjian,dtornow,dtuholski,dwittlinger,dzurek,eaguire,eathey,ebattee,ebeachem,eberkman,ebusk,ecelestin,ecolden,ecordas,ediga,edrinkwater,edurick,egospatrick,egrago,ehathcock,ehindbaugh,ejeppesen,ekalfas,ekenady,ekeuper,eklein,eklunder,ekurter,emanikowski,emargulis,emcquiddy,emehta,eorsten,eparham,epeterson,epoinelli,erathert,erostad,eserrett,esheehan,esonia,esproull,esthill,estockwin,etunby,ewicks,ewilles,ewismer,ewuitschick,eyounglas,eziebert,fagro,faleo,farquette,fbeatrice,fberra,fberyman,fbielecki,fburrough,fcha,fcunard,ffigert,fgoben,fgrashot,fhain,fhalon,fkeef,fmarchi,fmilsaps,fnottage,fparness,fplayfair,fsapien,fsavela,fsirianni,fsplinter,fsunderland,fsymmonds,fthein,fvallian,fvascones,fverfaille,fvinal,fwidhalm,gallanson,gapkin,garchambeault,gbitar,gbolay,gcarlini,gcervantez,gchounlapane,gclapham,gcobane,gconver,gcukaj,gcummer,gcurnutt,gdaub,gdeblasio,gdeyarmond,gdrilling,gearnshaw,gfaire,gfedewa,ggehrke,ggillim,ghann,ghelderman,ghumbles,gishii,gjankowiak,gkerens,glafontaine,gloebs,gmackinder,gmassi,gmilian,gmings,gmoen,gparkersmith,gpomerance,gportolese,greiff,gsantella,gschaumburg,gshrode,gtinnel,guresti,gvollrath,gwaud,habby,hbastidos,hbetterman,hbickford,hbraim,hbrandow,hbrehmer,hbukovsky,hcafourek,hcarrizal,hchaviano,hcintron,hcowles,hcusta,hdoiel,hdyner,hfludd,hgalavis,hhaffey,hhagee,hhartranft,hholyfield,hhysong,hkarney,hkinderknecht,hkippes,hkohlmeyer,hlauchaire,hlemon,hlichota,hliverman,hloftis,hlynema,hmateer,hmatonak,hmiazga,hmogush,hmuscaro,hpalmquist,hpimpare,hpolintan,hrapisura,hrenart,hriech,hsabol,hschelb,hschoepfer,hspiry,hstreitnatter,hsweezer,htilzer,htomlinson,htsuha,hvannette,hveader,hwestermark,hwoodert,hzagami,hzinda,iambrosino,ibeto,ibreitbart,ibuzo,ibyles,ichewning,icoard,ideveyra,ienglert,igizzi,ihalford,ihanneman,ihegener,ihernan,iherrarte,ihimmelwright,ihoa,iiffert,ikadar,ikulbida,ilacourse,ilamberth,ilawbaugh,ileaman,ilevian,imarungo,imcbay,imensah,imicthell,imillin,imuehl,inarain,iogasawara,iroiger,iseipel,isowder,isplonskowski,istallcup,istarring,isteinlicht,ithum,ivanschaack,iweibe,iyorgey,iyorks,jamber,jappleyard,jbielicki,jbjorkman,jcaroll,jdodge,jeuresti,jeverton,jglotzbecker,jherkenratt,jholzmiller,jjumalon,jkimpton,jknight,jlebouf,jlunney,jmartha,jmarugg,jmatty,joligee,jquicksall,jrees,jreigh,jroman,jscheitlin,jseen,jsegundo,jsenavanh,jskafec,jspohn,jsweezy,jvillaire,jwinterton,jzych,kaanerud,kalguire,kbarnthouse,kbartolet,kbattershell,kbrevitz,kbrugal,kcofrancesco,kcomparoni,kconkey,kdevincent,kepps,kfaure,kfend,kgarced,kgremminger,khartness,kheadlon,khovanesian,kjoslyn,klitehiser,klundsten,klurie,kmallach,kmandolfo,kmarzili,kmayoras,kmcardle,kmcguire,kmedcaf,kmeester,kmisove,kmoesch,kmosko,kmuros,kolexa,kottomaniello,kpalka,kpannunzio,kpenale,kpuebla,krahman,kseisler,kshippy,ksiering,ksollitto,ksparling,kstachurski,kthede,ktoni,ktriblett,ktuccio,ktuner,kwidrick,kwinterling,kwirght,laksamit,lautovino,lbanco,lbassin,lbove,lbuchtel,lcanestrini,lcaudell,lcavez,lcocherell,lcoulon,lcremer,leberhardt,lfarraj,lfichtner,lgadomski,lgandee,lgradilla,lhuggler,limbrogno,ljomes,lkimel,llarmore,llasher,lmadruga,lmauracher,lmcgeary,lmichaud,lmuehlberger,lnormand,lparrish,lpeagler,lpintor,lpitek,lpondexter,lrandall,lringuette,lschenkelberg,lschnorbus,lschollmeier,lseabold,lseehafer,lshilling,lsivic,lsobrino,lsous,lspielvogel,lvaleriano,lvanconant,lwedner,lyoula,mallmand,maustine,mbeagley,mbodley,mbravata,mcampagnone,mcaram,mcashett,mcasida,mcoch,mcolehour,mcontreras,mdanos,mdecourcey,mdedon,mdickinson,mdimaio,mdoering,mdyce,meconomides,mespinel,mfaeth,mfeil,mferandez,mfitzherbert,mgavet,mgayden,mground,mheilbrun,mhollings,mjeon,mkibler,mkofoed,mlaverde,mlenning,mlinak,mlinardi,mmangiamele,mmattu,mmcchristian,mmerriwether,mmesidor,mneubacher,moller,moser,mpanahon,mpark,mpellew,mpilon,mpizzaro,mpytko,mquigg,mredd,mrizer,mruppel,mrydelek,mskeele,mstirn,mswogger,mtanzi,mtintle,mvanbergen,mvanpelt,mvas,mvedder,mviverette,myokoyama,nagerton,nasmar,nbuford,nbugtong,ncermeno,nchrisman,nciucci,ndesautels,ndrumgole,nedgin,nendicott,nerbach,nevan,nforti,nfunchess,ngiesler,nglathar,ngrowney,ngullett,nhayer,nhelfinstine,nhija,ninnella,njordon,nkempon,nkubley,nlainhart,nlatchaw,nlemma,nlinarez,nlohmiller,nmccolm,nmoren,nnamanworth,nnickel,nousdahl,nphan,nramones,nranck,nridinger,nriofrio,nrybij,nrysavy,nschmig,nsiemonsma,nslaby,nspolar,nvyhnal,nwescott,nwiker,oahyou,oalthouse,obeaufait,obenallack,obercier,obihl,ocalleo,ochasten,oclunes,oconerly,ocrabbs,oebrani,ofelcher,ohatto,ohearl,ohedlund,ohoffert,ohove,ojerabek,okave,okveton,omalvaez,omasone,omatula,omcdaid,oolivarez,oosterhouse,opeet,opizzuti,opoch,oport,opuglisi,oreiss,osaber,oscarpello,oshough,ovibbert,owhelchel,owhitelow,pahles,pbascom,pbeckerdite,pbiggart,pbondroff,pbrentano,pcaposole,pcornn,pdauterman,pdech,pdischinger,pduitscher,pdulac,pdurando,pfavolise,pgiegerich,pgreenier,pgrybel,phalkett,pheathcock,phyer,pmineo,pminnis,ppedraja,ppeper,pphuaphes,prepasky,prowena,psabado,psalesky,pschrayter,psharits,psiroky,psundeen,pthornberry,ptoenjes,ptraweek,purquilla,pvierthaler,pvirelli,pviviani,pwademan,pwashuk,pwetherwax,pwhitmire,pwohlenhaus,pwutzke,qhanly,ralspach,rbernhagen,rbillingsly,rbloomstrand,rbrisby,rcheshier,rchevrette,rdubs,rdubuisson,redling,rfassinger,rfauerbach,rfidel,rginer,rgoonez,rgramby,rgriffies,rguinane,rheinzmann,rkraszewski,rlambertus,rlatessa,rlosinger,rmandril,rmcstay,rnordby,rpastorin,rpikes,rpinilla,rpitter,rramirez,rrasual,rschkade,rtole,rtooker,saben,sackles,sarndt,saycock,sbemo,sbettridge,sbloise,sbonnie,sbrabyn,scocuzza,sdebry,senrico,sestergard,sgefroh,sgirsh,sgropper,sgunder,sgurski,shaith,sherzberg,showe,sjankauskas,skanjirathinga,skoegler,slaningham,slaudeman,slerew,smccaie,smillian,smullowney,snotari,spolmer,srees,srubenfield,sscheiern,sskone,sskyers,sspagnuolo,sstough,sstuemke,svandewalle,svielle,svogler,svongal,swoodie,tabdelal,tairth,tbagne,tbattista,tboxx,tcacal,tcossa,tcrissinger,tdonathan,teliades,tfalconeri,tfetherston,tgelen,tgindhart,tguinnip,tharr,thelfritz,thoch,thynson,tkeala,tkelly,tkhora,tlana,tlowers,tmalecki,tmarkus,tmccaffity,tmccamish,tmcmickle,tmelland,tmorr,tmurata,tmysinger,tnaillon,tnitzel,tpaa,tplatko,tredfearn,tsablea,tsann,tschnepel,tsearle,tsepulueda,tsowells,tstalworth,tvehrs,tvrooman,tyounglas,ualway,uazatyan,ubenken,ubieniek,ubynum,udatu,uednilao,ueriks,uflander,ugerpheide,ugreenberg,uhayakawa,uholecek,ulanigan,umarbury,umosser,upater,upellam,uransford,urosentrance,uschweyen,usevera,uslavinski,uspittler,uvanmatre,uwalpole,uweyand,vbaldasaro,vbigalow,vbonder,vburton,vchevalier,vcrofton,vdesir,vdolan,veisenhardt,vemily,venfort,vfeigel,vglidden,vkrug,vlubic,vmaynard,vmedici,vnazzal,vnery,vpeairs,vpender,vpiraino,vrodick,vrunyon,vsefcovic,vstirman,vtowell,vtresch,vtrumpp,vwabasha,vwaltmann,vwisinger,vwokwicz,wbrill,wclokecloak,wconces,wconstantino,wcreggett,wdagrella,wdevenish,wdovey,wenglander,werrick,wesguerra,wganther,wkhazaleh,wleiva,wlynch,wmailey,wmendell,wnunziata,wottesen,wselim,wstjean,wtruman,wvalcin,wvermeulen,xeppley,xlantey,xrahaim,yautin,ycerasoli,ycobetto,ycostaneda,yduft,yeven,yfrymoyer,ygockel,yhenriques,ykimbel,yolivier,yschmuff,ysnock,yvdberg,zanderlik,zborgmeyer,zbuscaglia,zculp,zfarler,zhaulk,zkutchera,zmeeker,zneeb,zratti,zscammahorn,zvagt,zwinterbottom
 EOM
 
-check "group nstgrp1 | sortgroup" << EOM
+check "getent.ldap group nstgrp1 | sortgroup" << EOM
 nstgrp1:*:800:testusr2
 EOM
 
-check "group nstgrp2 | sortgroup" << EOM
+check "getent.ldap group nstgrp2 | sortgroup" << EOM
 nstgrp2:*:801:testusr2,testusr3
 EOM
 
-check "group nstgrp3 | sortgroup" << EOM
+check "getent.ldap group nstgrp3 | sortgroup" << EOM
 nstgrp3:*:802:testusr2,testusr3
 EOM
 
-check "group.bymember testusr2 | sed 's/:.*//' | sort" << EOM
+check "getent.ldap group.bymember testusr2 | sed 's/:.*//' | sort" << EOM
 largegroup
 nstgrp1
 nstgrp2
@@ -223,7 +224,7 @@ nstgrp3
 testgroup2
 EOM
 
-check "group.bymember testusr3 | sed 's/:.*//' | sort" << EOM
+check "getent.ldap group.bymember testusr3 | sed 's/:.*//' | sort" << EOM
 largegroup
 nstgrp2
 nstgrp3
@@ -233,24 +234,24 @@ EOM
 
 echo "test_ldapcmds.sh: testing hosts..."
 
-check "hosts testhost" << EOM
+check "getent.ldap hosts testhost" << EOM
 192.0.2.123        testhost testhostalias
 EOM
 
-check "hosts testhostalias" << EOM
+check "getent.ldap hosts testhostalias" << EOM
 192.0.2.123        testhost testhostalias
 EOM
 
 # check hostname with different case
-check "hosts TESTHOST" << EOM
+check "getent.ldap hosts TESTHOST" << EOM
 192.0.2.123        testhost testhostalias
 EOM
 
-check "hosts 192.0.2.123" << EOM
+check "getent.ldap hosts 192.0.2.123" << EOM
 192.0.2.123        testhost testhostalias
 EOM
 
-check "hosts | grep testhost | sort" << EOM
+check "getent.ldap hosts | grep testhost | sort" << EOM
 192.0.2.123        testhost testhostalias
 192.0.2.124        testhost2
 192.0.2.126        testhost4
@@ -259,31 +260,31 @@ check "hosts | grep testhost | sort" << EOM
 2001:db8::feed:c0de testhost3
 EOM
 
-check "hosts 2001:db8::dead:beef | sort" << EOM
+check "getent.ldap hosts 2001:db8::dead:beef | sort" << EOM
 192.0.2.124     testhost2
 2001:db8::dead:beef testhost2
 EOM
 
-check "hostsv4 testhost2" << EOM
+check "getent.ldap hostsv4 testhost2" << EOM
 192.0.2.124     testhost2
 EOM
 
-check "hostsv6 testhost2" << EOM
+check "getent.ldap hostsv6 testhost2" << EOM
 2001:db8::dead:beef testhost2
 EOM
 
-check "hostsv4 192.0.2.124" << EOM
+check "getent.ldap hostsv4 192.0.2.124" << EOM
 192.0.2.124     testhost2
 EOM
 
-check "hostsv6 2001:db8::dead:beef" << EOM
+check "getent.ldap hostsv6 2001:db8::dead:beef" << EOM
 2001:db8::dead:beef testhost2
 EOM
 
-check "hostsv4 2001:db8::dead:beef" << EOM
+check "getent.ldap hostsv4 2001:db8::dead:beef" << EOM
 EOM
 
-check "hostsv6 192.0.2.124" << EOM
+check "getent.ldap hostsv6 192.0.2.124" << EOM
 EOM
 
 ###########################################################################
@@ -291,16 +292,16 @@ EOM
 echo "test_ldapcmds.sh: testing netgroup..."
 
 # check netgroup lookup of test netgroup
-check "netgroup tstnetgroup" << EOM
+check "getent.ldap netgroup tstnetgroup" << EOM
 tstnetgroup          ( , arthur, ) (noot, , )
 EOM
 
 # check netgroup lookup with different case
-check "netgroup TSTNETGROUP" << EOM
+check "getent.ldap netgroup TSTNETGROUP" << EOM
 EOM
 
 # check netgroup lookup of test netgroup without recursion
-check "netgroup.norec tstnetgroup" << EOM
+check "getent.ldap netgroup.norec tstnetgroup" << EOM
 tstnetgroup     tst3netgroup tst2netgroup (, arthur, )
 EOM
 
@@ -308,20 +309,20 @@ EOM
 
 echo "test_ldapcmds.sh: testing networks..."
 
-check "networks testnet" << EOM
+check "getent.ldap networks testnet" << EOM
 testnet               192.0.2.0
 EOM
 
 # check network name with different case
-check "networks TESTNET" << EOM
+check "getent.ldap networks TESTNET" << EOM
 testnet               192.0.2.0
 EOM
 
-check "networks 192.0.2.0" << EOM
+check "getent.ldap networks 192.0.2.0" << EOM
 testnet               192.0.2.0
 EOM
 
-check "networks | grep testnet" << EOM
+check "getent.ldap networks | grep testnet" << EOM
 testnet               192.0.2.0
 EOM
 
@@ -329,24 +330,24 @@ EOM
 
 echo "test_ldapcmds.sh: testing passwd..."
 
-check "passwd ecolden | sed 's/:[x*]:/:x:/'" << EOM
+check "getent.ldap passwd ecolden | sed 's/:[x*]:/:x:/'" << EOM
 ecolden:x:5972:1000:Estelle Colden:/home/ecolden:/bin/bash
 EOM
 
-check "passwd arthur | sed 's/:[x*]:/:x:/'" << EOM
+check "getent.ldap passwd arthur | sed 's/:[x*]:/:x:/'" << EOM
 arthur:x:1000:100:Arthur de Jong:/home/arthur:/bin/bash
 EOM
 
 # check username with different case
-check "passwd ARTHUR" << EOM
+check "getent.ldap passwd ARTHUR" << EOM
 EOM
 
-check "passwd 4089 | sed 's/:[x*]:/:x:/'" << EOM
+check "getent.ldap passwd 4089 | sed 's/:[x*]:/:x:/'" << EOM
 jguzzetta:x:4089:1000:Josephine Guzzetta:/home/jguzzetta:/bin/bash
 EOM
 
 # count the number of passwd entries in the 4000-5999 range
-check "passwd | grep -c ':[x*]:[45][0-9][0-9][0-9]:'" << EOM
+check "getent.ldap passwd | grep -c ':[x*]:[45][0-9][0-9][0-9]:'" << EOM
 2000
 EOM
 
@@ -354,27 +355,27 @@ EOM
 
 echo "test_ldapcmds.sh: testing protocols..."
 
-check "protocols protfoo" << EOM
+check "getent.ldap protocols protfoo" << EOM
 protfoo               253 protfooalias
 EOM
 
-check "protocols protfooalias" << EOM
+check "getent.ldap protocols protfooalias" << EOM
 protfoo               253 protfooalias
 EOM
 
 # check protocol with different case
-check "protocols PROTFOO" << EOM
+check "getent.ldap protocols PROTFOO" << EOM
 EOM
 
 # test protocol alias with different case
-check "protocols PROTFOOALIAS" << EOM
+check "getent.ldap protocols PROTFOOALIAS" << EOM
 EOM
 
-check "protocols 253" << EOM
+check "getent.ldap protocols 253" << EOM
 protfoo               253 protfooalias
 EOM
 
-check "protocols | grep protfoo" << EOM
+check "getent.ldap protocols | grep protfoo" << EOM
 protfoo               253 protfooalias
 EOM
 
@@ -382,23 +383,23 @@ EOM
 
 echo "test_ldapcmds.sh: testing rpc..."
 
-check "rpc rpcfoo" << EOM
+check "getent.ldap rpc rpcfoo" << EOM
 rpcfoo          160002  rpcfooalias
 EOM
 
-check "rpc rpcfooalias" << EOM
+check "getent.ldap rpc rpcfooalias" << EOM
 rpcfoo          160002  rpcfooalias
 EOM
 
 # test rpc name with different case
-check "rpc RPCFOO" << EOM
+check "getent.ldap rpc RPCFOO" << EOM
 EOM
 
-check "rpc 160002" << EOM
+check "getent.ldap rpc 160002" << EOM
 rpcfoo          160002  rpcfooalias
 EOM
 
-check "rpc | grep rpcfoo" << EOM
+check "getent.ldap rpc | grep rpcfoo" << EOM
 rpcfoo          160002  rpcfooalias
 EOM
 
@@ -406,60 +407,60 @@ EOM
 
 echo "test_ldapcmds.sh: testing services..."
 
-check "services foosrv" << EOM
+check "getent.ldap services foosrv" << EOM
 foosrv                15349/tcp
 EOM
 
-check "services foosrv/tcp" << EOM
+check "getent.ldap services foosrv/tcp" << EOM
 foosrv                15349/tcp
 EOM
 
-check "services foosrv/udp" << EOM
+check "getent.ldap services foosrv/udp" << EOM
 EOM
 
 # check with different case
-check "services FOOSRV" << EOM
+check "getent.ldap services FOOSRV" << EOM
 EOM
 
 # check protocol name case sensitivity (TCP is commonly an alias)
-check "services foosrv/tCp" << EOM
+check "getent.ldap services foosrv/tCp" << EOM
 EOM
 
-check "services 15349/tcp" << EOM
+check "getent.ldap services 15349/tcp" << EOM
 foosrv                15349/tcp
 EOM
 
-check "services 15349/udp" << EOM
+check "getent.ldap services 15349/udp" << EOM
 EOM
 
-check "services barsrv | sort" << EOM
+check "getent.ldap services barsrv | sort" << EOM
 barsrv                15350/tcp
 barsrv                15350/udp
 EOM
 
-check "services barsrv/tcp" << EOM
+check "getent.ldap services barsrv/tcp" << EOM
 barsrv                15350/tcp
 EOM
 
-check "services barsrv/udp" << EOM
+check "getent.ldap services barsrv/udp" << EOM
 barsrv                15350/udp
 EOM
 
-check "services | egrep '(foo|bar)srv' | sort" << EOM
+check "getent.ldap services | egrep '(foo|bar)srv' | sort" << EOM
 barsrv                15350/tcp
 barsrv                15350/udp
 foosrv                15349/tcp
 EOM
 
-check "services sssin" << EOM
+check "getent.ldap services sssin" << EOM
 sssin                 5000/tcp SSSIN
 EOM
 
-check "services SSSIN" << EOM
+check "getent.ldap services SSSIN" << EOM
 sssin                 5000/tcp SSSIN
 EOM
 
-check "services | sort" << EOM
+check "getent.ldap services | sort" << EOM
 barsrv                15350/tcp
 barsrv                15350/udp
 foosrv                15349/tcp
@@ -472,21 +473,21 @@ echo "test_ldapcmds.sh: testing shadow..."
 
 # NOTE: the output of this should depend on whether we are root or not
 
-check "shadow ecordas" << EOM
+check "getent.ldap shadow ecordas" << EOM
 ecordas:*::::7:2::0
 EOM
 
-check "shadow adishaw" << EOM
+check "getent.ldap shadow adishaw" << EOM
 adishaw:*:12302:::7:2::0
 EOM
 
 # check case-sensitivity
-check "shadow ADISHAW" << EOM
+check "getent.ldap shadow ADISHAW" << EOM
 EOM
 
 # check if the names of users match between passwd and shadow
-getent_ldap "passwd | sed 's/:.*//' | sort" | \
-  check "shadow | sed 's/:.*//' | sort"
+getent_ldap passwd | sed 's/:.*//' | sort | \
+  check "getent.ldap shadow | sed 's/:.*//' | sort"
 
 ###########################################################################
 # determine the result

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

Summary of changes:
 compat/pam_compat.h    |  10 +--
 configure.ac           |  15 +++++
 tests/Makefile.am      |   2 +-
 tests/test_ldapcmds.sh | 171 +++++++++++++++++++++++++------------------------
 4 files changed, 107 insertions(+), 91 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
https://lists.arthurdejong.org/nss-pam-ldapd-commits/
nss-pam-ldapd branch master updated. 0.9.7-22-g3d5ab89, Commits of the nss-pam-ldapd project
Prev by Date: nss-pam-ldapd branch master updated. 0.9.7-19-g43862ba
Next by Date: nss-pam-ldapd branch master updated. 0.9.7-27-gfee74d9
Previous by thread: nss-pam-ldapd branch master updated. 0.9.7-19-g43862ba
Next by thread: nss-pam-ldapd branch master updated. 0.9.7-27-gfee74d9