Merge pull request #40 from Bandie/master Closes #38

Closes #38

configure.ac

@@ -39,10 +39,11 @@ AC_SUBST(SECUREDIR)
 
 AC_ARG_ENABLE(ppassfile,
     AS_HELP_STRING([--enable-ppassfile=FILE],
-        [path to file to be used for storing passwords @<:@default=/etc/pam_panic/auth@:>@]),
+        [path to file to be used for storing passwords @<:@default=/var/lib/pam_panic/auth@:>@]),
     PPASSFILE=$enableval, PPASSFILE=/var/lib/pam_panic/auth)
 AC_DEFINE_UNQUOTED([PPASSFILE], "$PPASSFILE",
     [path to file to be used for storing passwords])
+AC_SUBST(PPASSFILE)
 
 LT_INIT([disable-static])
 AC_ENABLE_STATIC([no])

src/pam_panic/man/Makefile.am

@@ -1,4 +1,5 @@
 cant_believe_its_not_mandir = $(mandir)
+securelibdir = $(SECUREDIR)
 nobase_dist_cant_believe_its_not_man_DATA = \
 	man8/pam_panic.8.gz \
 	de/man8/pam_panic.8.gz \
@@ -6,4 +7,9 @@ nobase_dist_cant_believe_its_not_man_DATA = \
 	fr/man8/pam_panic.8.gz
 
 %.gz: %
-	gzip -c $< >$@
+	{ sldr=$$(echo "$(securelibdir)" | $(SED) 's/\//\\\//g') ; bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g') ; $(SED) "s/__PAMPANICSO__/$$sldr\/pam_panic\\\\\&.so/; s/__PAMPANICPW__/$$bdr\/pam_panic\\\\\&.so/" $< >$<.tmp ; }
+	gzip -c $<.tmp >$@
+
+
+clean-local:
+	rm ./*/*.tmp ./*/*.gz ./*/*/*.tmp ./*/*/*.gz

src/pam_panic/man/de/man8/pam_panic.8

@@ -139,15 +139,15 @@ Um das Modul zu aktivieren, muss PAM konfiguriert werden\&. Siehe dazu \fBpam\&.
 Man f\(:uge folgende beispielhafte Zeilen am Anfang einer Konfigurationsdatei hinzu:
 .PD 0
 .RS 4
-auth       requisite    /usr/local/lib/security/pam_panic\&.so auth=<UUID> reject=<UUID> reboot serious=<UUID>
+auth       requisite    __PAMPANICSO__ auth=<UUID> reject=<UUID> reboot serious=<UUID>
 .PP
-account    requisite    /usr/local/lib/security/pam_panic\&.so
+account    requisite    __PAMPANICSO__
 .RE
 Oder auch:
 .RS 4
-auth       requisite    /usr/local/lib/security/pam_panic\&.so password reboot serious=<UUID>
+auth       requisite    __PAMPANICSO__ password reboot serious=<UUID>
 .PP
-account    requisite    /usr/local/lib/security/pam_panic\&.so
+account    requisite    __PAMPANICSO__
 .RE
 .PD 1
 
@@ -178,12 +178,12 @@ Der Wecheldatentr\(:ager wurde nicht erkannt\&.
 
 .SH "DATEIEN"
 .PP
-/usr/local/lib/security/pam_panic\&.so
+__PAMPANICSO__
 .RS 4
 Shared object-Datei, die f\(:ur alles zust\(:andig ist\&.
 .RE
 .PP
-/usr/local/bin/pam_panic_pw
+__PAMPANICPW__
 .RS 4
 Programm zum Setzen und Ver\(:andern der Passw\(:orter\&.
 .RE

src/pam_panic/man/es/man8/pam_panic.8

@@ -95,9 +95,9 @@ Para activar el m\('odulo se tiene que configurar PAM\&. Vea \fBpam\&.conf(5)\fR
 En general, se necesita agregar lo siguiente al comienzo de un archivo de configuraci\('on PAM:
 .PD 0
 .RS 4
-auth       requisite    /usr/local/lib/security/pam_panic\&.so auth=<UUID> reject=<UUID> reboot serious=<UUID>
+auth       requisite    __PAMPANICSO__ auth=<UUID> reject=<UUID> reboot serious=<UUID>
 .PP
-account    requisite    /usr/local/lib/security/pam_panic\&.so
+account    requisite    __PAMPANICSO__
 .RE
 .PD 1
 
@@ -125,11 +125,15 @@ El media removible no fue detectados\&.
 
 .SH "ARCHIVOS"
 .PP
-/usr/local/lib/security/pam_panic\&.so
+__PAMPANICSO__
 .RS 4
 Este m\('odulo\&.
 .RE
-
+.PP
+__PAMPANICPW__
+.RS 4
+Password changer
+.RE
 
 .SH "ERRORES"
 .PP

src/pam_panic/man/fr/man8/pam_panic.8

@@ -95,9 +95,9 @@ Pour activer ce module vous devez configurer PAM\&. Lisez \fBpam\&.conf(5)\fR po
 En général, vous voudrez ajouter ce qui suit au début du fichier de configuration PAM:
 .PD 0
 .RS 4
-auth       requisite    /usr/local/lib/security/pam_panic\&.so auth=<UUID> reject=<UUID> reboot serious=<UUID>
+auth       requisite    __PAMPANICSO__ auth=<UUID> reject=<UUID> reboot serious=<UUID>
 .PP
-account    requisite    /usr/local/lib/security/pam_panic\&.so
+account    requisite    __PAMPANICSO__
 .RE
 .PD 1
 
@@ -128,10 +128,15 @@ Le péripherique amovible n'a pas été détécté\&.
 
 .SH "FICHIERS"
 .PP
-/usr/local/lib/security/pam_panic\&.so
+__PAMPANICSO__
 .RS 4
 Ce module PAM\&.
 .RE
+.PP
+__PAMPANICPW__
+.RS 4
+Password changer
+.RE
 
 
 .SH "BUGS"

src/pam_panic/man/man8/pam_panic.8

@@ -126,15 +126,15 @@ To activate the module you have to configure PAM\&. See \fBpam\&.conf(5)\fR for
 In general, you will want to add the following to the top of a PAM configuration file:
 .PD 0
 .RS 4
-auth       requisite    /usr/local/lib/security/pam_panic\&.so auth=<UUID> reject=<UUID> reboot serious=<UUID>
+auth       requisite    __PAMPANICSO__ auth=<UUID> reject=<UUID> reboot serious=<UUID>
 .PP
-account    requisite    /usr/local/lib/security/pam_panic\&.so
+account    requisite    __PAMPANICSO__
 .RE
 Or: 
 .RS 4
-auth       requisite    /usr/local/lib/security/pam_panic\&.so password reboot serious=<UUID>
+auth       requisite    __PAMPANICSO__ password reboot serious=<UUID>
 .PP
-account    requisite    /usr/local/lib/security/pam_panic\&.so
+account    requisite    __PAMPANICSO__
 .RE
 .PD 1
 
@@ -165,12 +165,12 @@ The removable media was not detected\&.
 
 .SH "FILES"
 .PP
-/usr/local/lib/security/pam_panic\&.so
+__PAMPANICSO__
 .RS 4
 This PAM module\&.
 .RE
 .PP
-/usr/local/bin/pam_panic_pw
+__PAMPANICPW__
 .RS 4
 Program to set and change the passwords\&.
 .RE

src/pam_panic_pw/man/Makefile.am

@@ -4,4 +4,9 @@ nobase_dist_cant_believe_its_not_man_DATA = \
 	de/man1/pam_panic_pw.1.gz
 
 %.gz: %
-	gzip -c $< >$@
+	{ ppf=$$(echo "$(PPASSFILE)" | $(SED) 's/\//\\\//g') ; bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g') ; $(SED) "s/__PPASSFILE__/$$ppf/; s/__PAMPANICPW__/$$bdr\/pam_panic\\\\\&.so/" $< >$<.tmp ; }
+	gzip -c $<.tmp >$@
+
+
+clean-local:
+	rm ./*/*.tmp ./*/*.gz ./*/*/*.tmp ./*/*/*.g

src/pam_panic_pw/man/de/man1/pam_panic_pw.1

@@ -58,12 +58,12 @@ Die Passwortdatei konnte nicht ge\(:offnet werden\&.
 
 .SH "DATEIEN"
 .PP
-/usr/local/bin/pam_panic_pw
+__PAMPANICPW__
 .RS 4
 Programm zum Setzen und Ver\(:andern der Passw\(:orter\&.
 .RE
 .PP
-/var/lib/pam_panic/auth
+__PPASSFILE__
 .RS 4
 Die Passwortdatei\&.
 .RE

src/pam_panic_pw/man/man1/pam_panic_pw.1

@@ -58,12 +58,12 @@ Could not open the password file\&.
 
 .SH "FILES"
 .PP
-/usr/local/bin/pam_panic_pw
+__PAMPANICPW__
 .RS 4
 Program to set and change the passwords\&.
 .RE
 .PP
-/var/lib/pam_panic/auth
+__PPASSFILE__
 .RS 4
 The password file\&.
 .RE