From 9276c41b34f90fb20bbb628ff7d5d6c44cf4b90f Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 1 Aug 2018 20:42:04 +0000
Subject:  Add nsss support

---
 configure                      | 11 +++++++++++
 package/deps.mak               |  4 ++--
 src/utmps/deps-exe/utmps-utmpd |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 42d2343..f076816 100755
--- a/configure
+++ b/configure
@@ -44,6 +44,7 @@ Optional features:
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       do not rely on PATH to access this package's binaries,
                                   hardcode absolute BINDIR/foobar paths instead [disabled]
+  --enable-nsss                 use the nsss library for user information [disabled]
 
   --with-utmpd-socket=PATH      assume the utmpd socket is at PATH [/run/utmps/.utmpd-socket]
   --with-wtmpd-socket=PATH      assume the wtmpd socket is at PATH [/run/utmps/.wtmpd-socket]
@@ -149,6 +150,7 @@ static=true
 allpic=detect
 slashpackage=false
 abspath=false
+usensss=false
 sproot=
 home=
 exthome=
@@ -192,6 +194,8 @@ for arg ; do
     --disable-slashpackage) sproot= ; slashpackage=false ;;
     --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;;
     --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;;
+    --enable-nsss|--enable-nsss=yes) usensss=true ;;
+    --disable-nsss|--enable-nsss=no) usensss=false ;;
     --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;;
     --host=*|--target=*) target=${arg#*=} ;;
     --build=*) build=${arg#*=} ;;
@@ -434,6 +438,13 @@ if $allpic ; then
 else
   echo "STATIC_LIBS_ARE_PIC :="
 fi
+if $usensss ; then
+  echo "LIBNSSS := -lnsss"
+  echo "MAYBEPTHREAD_LIB := -lpthread"
+else
+  echo "LIBNSSS :="
+  echo "MAYBEPTHREAD_LIB :="
+fi
 
 exec 1>&3 3>&-
 echo "  ... done."
diff --git a/package/deps.mak b/package/deps.mak
index 7d9b6b0..9ec3964 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -36,7 +36,7 @@ libutmps.a.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutx
 endif
 libutmps.so.xyzzy: EXTRA_LIBS := -lskarnet
 libutmps.so.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxid.lo src/utmps/getutxline.lo src/utmps/logwtmp.lo src/utmps/pututxline.lo src/utmps/setutxent.lo src/utmps/updwtmpx.lo src/utmps/utmpxname.lo src/utmps/utmps_end.lo src/utmps/utmps_getent.lo src/utmps/utmps_getid.lo src/utmps/utmps_getline.lo src/utmps/utmps_here.lo src/utmps/utmps_here_maybe_init.lo src/utmps/utmps_putline.lo src/utmps/utmps_rewind.lo src/utmps/utmps_start.lo src/utmps/utmps_updwtmpx.lo src/utmps/utmps_utmpx_pack.lo src/utmps/utmps_utmpx_unpack.lo
-utmps-utmpd: EXTRA_LIBS :=
-utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy -lskarnet
+utmps-utmpd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet
 utmps-wtmpd: EXTRA_LIBS :=
 utmps-wtmpd: src/utmps/utmps-wtmpd.o libutmps.a.xyzzy -lskarnet
diff --git a/src/utmps/deps-exe/utmps-utmpd b/src/utmps/deps-exe/utmps-utmpd
index 60d8fd7..4abb735 100644
--- a/src/utmps/deps-exe/utmps-utmpd
+++ b/src/utmps/deps-exe/utmps-utmpd
@@ -1,2 +1,4 @@
 libutmps.a.xyzzy
+${LIBNSSS}
 -lskarnet
+${MAYBEPTHREAD_LIB}
-- 
cgit v1.2.3