diff --git a/configure.ac b/configure.ac index 0123959..fc6417b 100644 --- a/configure.ac +++ b/configure.ac @@ -35,10 +35,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]) diff --git a/src/pam_panic/man/Makefile.am b/src/pam_panic/man/Makefile.am index 1fec783..5745140 100644 --- a/src/pam_panic/man/Makefile.am +++ b/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 diff --git a/src/pam_panic/man/de/man8/pam_panic.8 b/src/pam_panic/man/de/man8/pam_panic.8 index 73b23e9..eff087d 100644 --- a/src/pam_panic/man/de/man8/pam_panic.8 +++ b/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= reject= reboot serious= +auth requisite __PAMPANICSO__ auth= reject= reboot serious= .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= +auth requisite __PAMPANICSO__ password reboot serious= .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 diff --git a/src/pam_panic/man/es/man8/pam_panic.8 b/src/pam_panic/man/es/man8/pam_panic.8 index 5c3ec65..94a18ef 100644 --- a/src/pam_panic/man/es/man8/pam_panic.8 +++ b/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= reject= reboot serious= +auth requisite __PAMPANICSO__ auth= reject= reboot serious= .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 diff --git a/src/pam_panic/man/fr/man8/pam_panic.8 b/src/pam_panic/man/fr/man8/pam_panic.8 index ae5966b..3e3a9ff 100644 --- a/src/pam_panic/man/fr/man8/pam_panic.8 +++ b/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= reject= reboot serious= +auth requisite __PAMPANICSO__ auth= reject= reboot serious= .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" diff --git a/src/pam_panic/man/man8/pam_panic.8 b/src/pam_panic/man/man8/pam_panic.8 index 0d25e2e..1c57d61 100644 --- a/src/pam_panic/man/man8/pam_panic.8 +++ b/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= reject= reboot serious= +auth requisite __PAMPANICSO__ auth= reject= reboot serious= .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= +auth requisite __PAMPANICSO__ password reboot serious= .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 diff --git a/src/pam_panic_pw/man/Makefile.am b/src/pam_panic_pw/man/Makefile.am index f30976b..9deb2b0 100644 --- a/src/pam_panic_pw/man/Makefile.am +++ b/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 diff --git a/src/pam_panic_pw/man/de/man1/pam_panic_pw.1 b/src/pam_panic_pw/man/de/man1/pam_panic_pw.1 index cc52cb6..740092c 100644 --- a/src/pam_panic_pw/man/de/man1/pam_panic_pw.1 +++ b/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 diff --git a/src/pam_panic_pw/man/man1/pam_panic_pw.1 b/src/pam_panic_pw/man/man1/pam_panic_pw.1 index 37425cb..fcb9756 100644 --- a/src/pam_panic_pw/man/man1/pam_panic_pw.1 +++ b/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