Add utmp.h

Signed-off-by: Laurent Bercot <ska@appnovation.com>

6 files changed, 21 insertions, 4 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index f3c9708..3a29521 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1,3 +1,5 @@
+    --enable-utmp|--enable-utmp=yes) doutmp=true ;;
+    --disable-utmp|--enable-utmp=no) doutmp=false ;;
     --enable-libc-includes|--enable-libc-includes=yes) libcincludes=true ;;
     --disable-libc-includes|--enable-libc-includes=no) libcincludes=false ;;
     --enable-nsss|--enable-nsss=yes) usensss=true ;;
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
index e361a46..ceb9660 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -10,3 +10,8 @@ else
   echo "LIBNSSS :="
   echo "MAYBEPTHREAD_LIB :="
 fi
+if $doutmp ; then
+  echo "DO_UTMP := 1"
+else
+  echo "DO_UTMP :="
+fi
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
index c0f8c1a..09f883f 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -1,5 +1,6 @@
   --enable-nsss                 use the nsss library for user information [disabled]
-  --enable-libc-includes        overwrite utmpx.h in includedir [disabled]
+  --enable-utmp                 also export utmp.h with Linux-specific declarations
+  --enable-libc-includes        overwrite utmp[x].h in includedir [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]
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index edb8ad3..c89a438 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1,4 +1,5 @@
 usensss=false
+doutmp=false
 libcincludes=false
 utmpdpath=/run/utmps/.utmpd-socket
 wtmpdpath=/run/utmps/.wtmpd-socket
diff --git a/package/deps.mak b/package/deps.mak
index 0169948..604f525 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -2,13 +2,18 @@
 # This file has been generated by tools/gen-deps.sh
 #
 
+src/include/utmps/utmp.h: src/include/utmps/utmpx.h
 src/include/utmps/utmps.h: src/include/utmps/utmpx.h
+src/include/utmp.h: src/include/utmps/utmp.h
 src/include/utmpx.h: src/include/utmps/utmpx.h
 src/utmps/utmps-internal.h: src/include/utmps/utmps.h src/include/utmps/utmpx.h
 src/utmps/endutxent.o src/utmps/endutxent.lo: src/utmps/endutxent.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
 src/utmps/getutxent.o src/utmps/getutxent.lo: src/utmps/getutxent.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
+src/utmps/getutxent_r.o src/utmps/getutxent_r.lo: src/utmps/getutxent_r.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
 src/utmps/getutxid.o src/utmps/getutxid.lo: src/utmps/getutxid.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
+src/utmps/getutxid_r.o src/utmps/getutxid_r.lo: src/utmps/getutxid_r.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
 src/utmps/getutxline.o src/utmps/getutxline.lo: src/utmps/getutxline.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
+src/utmps/getutxline_r.o src/utmps/getutxline_r.lo: src/utmps/getutxline_r.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
 src/utmps/logwtmp.o src/utmps/logwtmp.lo: src/utmps/logwtmp.c src/include/utmps/utmpx.h
 src/utmps/pututxline.o src/utmps/pututxline.lo: src/utmps/pututxline.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
 src/utmps/setutxent.o src/utmps/setutxent.lo: src/utmps/setutxent.c src/utmps/utmps-internal.h src/include/utmps/utmps.h src/include/utmps/utmpx.h
@@ -31,13 +36,13 @@ src/utmps/utmps_utmpx_unpack.o src/utmps/utmps_utmpx_unpack.lo: src/utmps/utmps_
 src/utmps/utmpxname.o src/utmps/utmpxname.lo: src/utmps/utmpxname.c src/include/utmps/utmpx.h
 
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
-libutmps.a.xyzzy: src/utmps/endutxent.o src/utmps/getutxent.o src/utmps/getutxid.o src/utmps/getutxline.o src/utmps/logwtmp.o src/utmps/pututxline.o src/utmps/setutxent.o src/utmps/updwtmpx.o src/utmps/utmpxname.o src/utmps/utmps_end.o src/utmps/utmps_getent.o src/utmps/utmps_getid.o src/utmps/utmps_getline.o src/utmps/utmps_here.o src/utmps/utmps_here_maybe_init.o src/utmps/utmps_putline.o src/utmps/utmps_rewind.o src/utmps/utmps_start.o src/utmps/utmps_updwtmpx.o src/utmps/utmps_utmpx_pack.o src/utmps/utmps_utmpx_unpack.o
+libutmps.a.xyzzy: src/utmps/endutxent.o src/utmps/getutxent.o src/utmps/getutxent_r.o src/utmps/getutxid.o src/utmps/getutxid_r.o src/utmps/getutxline.o src/utmps/getutxline_r.o src/utmps/logwtmp.o src/utmps/pututxline.o src/utmps/setutxent.o src/utmps/updwtmpx.o src/utmps/utmpxname.o src/utmps/utmps_end.o src/utmps/utmps_getent.o src/utmps/utmps_getid.o src/utmps/utmps_getline.o src/utmps/utmps_here.o src/utmps/utmps_here_maybe_init.o src/utmps/utmps_putline.o src/utmps/utmps_rewind.o src/utmps/utmps_start.o src/utmps/utmps_updwtmpx.o src/utmps/utmps_utmpx_pack.o src/utmps/utmps_utmpx_unpack.o
 else
-libutmps.a.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
+libutmps.a.xyzzy:src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxent_r.lo src/utmps/getutxid.lo src/utmps/getutxid_r.lo src/utmps/getutxline.lo src/utmps/getutxline_r.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
 endif
 libutmps.pc: EXTRA_LIBS := -lskarnet
 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
+libutmps.so.xyzzy:src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxent_r.lo src/utmps/getutxid.lo src/utmps/getutxid_r.lo src/utmps/getutxline.lo src/utmps/getutxline_r.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 := ${MAYBEPTHREAD_LIB}
 utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet
 utmps-write: EXTRA_LIBS := ${SOCKET_LIB} ${MAYBEPTHREAD_LIB}
diff --git a/package/targets.mak b/package/targets.mak
index 13b1e4d..e6f13aa 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -10,4 +10,7 @@ UTMPS_DESCRIPTION := The utmps library, a secure utmp implementation
 
 ifneq ($(DO_LIBC_INCLUDES),)
 EXTRA_INCLUDES := src/include/utmpx.h
+ifneq ($(DO_UTMP),)
+EXTRA_INCLUDES += src/include/utmp.h
+endif
 endif