Bandie/pam_panic
Bandie/pam_panic
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Fix problem with PPASSFILE having the literal '${prefix}' prefix

Browse Source
This commit is contained in:
Jordy Dickinson 2018-04-02 17:40:56 -04:00
parent 05d8fe5d5f
commit e4dc10c8b9
No known key found for this signature in database
GPG Key ID: C809BAD019EEB620
5 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,12 +1,14 @@
*.la *.la
*.lo *.lo
*.o *.o
*~
.deps .deps
.libs .libs
aclocal.m4 aclocal.m4
autom4te.cache/ autom4te.cache/
build-aux/ build-aux/
config.h config.h
config.h.in
config.log config.log
config.status config.status
configure configure
@ -14,3 +16,4 @@ libtool
Makefile Makefile
Makefile.in Makefile.in
src/pam_panic_pw/pam_panic_pw src/pam_panic_pw/pam_panic_pw
stamp-h1

2
Makefile.am
View File

@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I src
SUBDIRS = src/pam_panic src/pam_panic_pw SUBDIRS = src/pam_panic src/pam_panic_pw

21
configure.ac
View File

@ -3,6 +3,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall]) AM_INIT_AUTOMAKE([-Wall])
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([src/config.h])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
@ -13,23 +14,27 @@ AC_PROG_CC
AM_PROG_AR AM_PROG_AR
AC_PATH_PROG([REBOOT], [reboot]) AC_PATH_PROG([REBOOT], [reboot])
AC_SUBST(REBOOT) AC_DEFINE_UNQUOTED([REBOOT], "$REBOOT",
[path to the reboot command])
AC_PATH_PROG([POWEROFF], [poweroff]) AC_PATH_PROG([POWEROFF], [poweroff])
AC_SUBST(POWEROFF) AC_DEFINE_UNQUOTED([POWEROFF], "$POWEROFF",
[path to the poweroff command])
AC_PATH_PROG([CRYPTSETUP], [cryptsetup]) AC_PATH_PROG([CRYPTSETUP], [cryptsetup])
AC_SUBST(CRYPTSETUP) AC_DEFINE_UNQUOTED([CRYPTSETUP], "$CRYPTSETUP",
[path to the cryptsetup command])
AC_ARG_ENABLE(securedir, AC_ARG_ENABLE(securedir,
AS_HELP_STRING([--enable-securedir=DIR], AS_HELP_STRING([--enable-securedir=DIR],
[path to location of PAMs @<:@default=$libdir/security@:>@]), [path to location of PAMs @<:@default=LIBDIR/security@:>@]),
SECUREDIR=$enableval, SECUREDIR=$libdir/security) SECUREDIR=$enableval, SECUREDIR=$libdir/security)
AC_SUBST(SECUREDIR) AC_SUBST(SECUREDIR)
AC_ARG_ENABLE(ppassfile, AC_ARG_ENABLE(ppassfile,
AS_HELP_STRING([--enable-ppassfile=FILE], AS_HELP_STRING([--enable-ppassfile=FILE],
[path to file to be used for storing passwords @<:@default=$sysconfdir/pam_panic/auth@:>@]), [path to file to be used for storing passwords @<:@default=/etc/pam_panic/auth@:>@]),
PPASSFILE=$enableval, PPASSFILE=$sysconfdir/pam_panic/auth) PPASSFILE=$enableval, PPASSFILE=/var/lib/pam_panic/auth)
AC_SUBST(PPASSFILE) AC_DEFINE_UNQUOTED([PPASSFILE], "$PPASSFILE",
[path to file to be used for storing passwords])
LT_INIT([disable-static]) LT_INIT([disable-static])
AC_ENABLE_STATIC([no]) AC_ENABLE_STATIC([no])
@ -37,10 +42,8 @@ AC_ENABLE_SHARED([yes])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
src/pam_panic/config.h
src/pam_panic/Makefile src/pam_panic/Makefile
src/pam_panic/man/Makefile src/pam_panic/man/Makefile
src/pam_panic_pw/config.h
src/pam_panic_pw/Makefile src/pam_panic_pw/Makefile
src/pam_panic_pw/man/Makefile src/pam_panic_pw/man/Makefile
]) ])

9
src/pam_panic/config.h.in
View File

@ -1,9 +0,0 @@
#ifndef PAM_PANIC_CONFIG_H
#define PAM_PANIC_CONFIG_H
#define REBOOT "@REBOOT@"
#define POWEROFF "@POWEROFF@"
#define CRYPTSETUP "@CRYPTSETUP@"
#define PPASSFILE "@PPASSFILE@"
#endif

6
src/pam_panic_pw/config.h.in
View File

@ -1,6 +0,0 @@
#ifndef PAM_PANIC_PW_CONFIG_H
#define PAM_PANIC_PW_CONFIG_H
#define PPASSFILE "@PPASSFILE@"
#endif