Skip to content

Commit 6faab0d

Browse files
committed
man: update with info about conf file
Generate pam_u2f.8.txt from pam_u2f.8.txt.in, replacing SCONFDIR
1 parent 727d605 commit 6faab0d

File tree

4 files changed

+31
-0
lines changed

4 files changed

+31
-0
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ m4/lt~obsolete.m4
3636
tests/.deps/
3737
tests/dlsym_check
3838
man/pam_u2f.8
39+
man/pam_u2f.8.txt
3940
pamu2fcfg/cmdline.c
4041
pamu2fcfg/cmdline.h
4142
pamu2fcfg/pamu2fcfg

configure.ac

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ AC_CONFIG_FILES([
115115
tests/Makefile
116116
fuzz/Makefile
117117
man/Makefile
118+
man/pam_u2f.8.txt
118119
])
119120

120121
creduser=$(whoami)

man/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dist_man1_MANS = pamu2fcfg.1
44
dist_man8_MANS = pam_u2f.8
55
MAINTAINERCLEANFILES = $(MANS)
66
EXTRA_DIST = $(MANS:=.txt)
7+
DISTCLEANFILES = pam_u2f.8
78

89
SUFFIXES = .1.txt .1 .8.txt .8
910

man/pam_u2f.8.txt man/pam_u2f.8.txt.in

+28
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@ FIDO devices. It is not possible to mix native credentials and SSH
134134
credentials. Once this option is enabled all credentials will be parsed
135135
as SSH.
136136

137+
*conf*=_path/to/pam_u2f.conf_::
138+
Set an alternative location for the configuration file.
139+
The supplied path must be absolute and must correspond to an existing
140+
regular file.
141+
See *CONFIGURATION FILE*.
142+
137143
== EXAMPLES
138144

139145
Second factor authentication deferring user verification configuration to the
@@ -162,6 +168,28 @@ mapping file in an encrypted home directory, will result in the
162168
impossibility of logging into the system. The partition is decrypted
163169
after login and the mapping file can not be accessed.
164170

171+
== CONFIGURATION FILE
172+
173+
A configuration file can be used to set the default module arguments.
174+
175+
The file has a `name = value` format, with comments starting with the `#`
176+
character.
177+
White spaces at the beginning of line, end of line, and around
178+
the `=` sign are ignored.
179+
180+
Any `conf` argument in the configuration file is ignored.
181+
182+
The maximum size for the configuration file is 4 KiB.
183+
184+
The default path for the configuration file is
185+
`@SCONFDIR@/pam_u2f.conf`.
186+
Note that it may have been set to another value by the distribution.
187+
The default file is allowed to not exist.
188+
An alternative path may be set in the module command line options.
189+
190+
The options specified on the module command line override the values
191+
from the configuration file.
192+
165193
== NOTES
166194

167195
*Nodetect*

0 commit comments

Comments
 (0)