diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-05-18 17:48:21 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-05-18 17:48:21 +0300 |
| commit | 8c3fca619ba1cd369f60121b9d74c2bdc9a64d5a (patch) | |
| tree | abc742d03bdca396b592e20aa97166ef7c9e0062 | |
| parent | b47a46aefdb9e8ac83eacc9f30faf961e6e793a3 (diff) | |
| download | pam-modules-8c3fca619ba1cd369f60121b9d74c2bdc9a64d5a.tar.gz pam-modules-8c3fca619ba1cd369f60121b9d74c2bdc9a64d5a.tar.bz2 | |
Improve the docs.
* doc/Makefile.am (check-all-options): Check ldaphome options.
(check-ldaphome-config): New rule.
(check-options): Add check-ldaphome-config.
* doc/pam-modules.texi: Add missing documentation.
| -rw-r--r-- | doc/Makefile.am | 16 | ||||
| -rw-r--r-- | doc/pam-modules.texi | 22 |
2 files changed, 29 insertions, 9 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index aeba788..d9da2ae 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,7 +41,7 @@ check-log-options: check-all-options: - @for mod in fshadow regex sql; \ + @for mod in fshadow regex sql ldaphome; \ do \ $(CHECK_DOCS) "pam_$$mod options" \ '/struct pam_opt .*\[\] = /,/^}/s/[ \t]*{ *PAM_OPTSTR(\([^,)]*\)).*/\1/;t lab;b;: lab {/audit/d;/debug/d;/waitdebug/d;p}' \ @@ -59,7 +59,19 @@ check-sql-config: $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ $(info_TEXINFOS) -check-options: check-all-options check-log-options +check-ldaphome-config: + @$(CHECK_DOCS) 'pam_ldaphome configuration keywords' \ + 's/.*gray_env_get(.[^,]*, *"\(.[^"]*\)".*/\1/p;s/.*get_intval(.[^,]*, *"\(.[^"]*\)".*/\1/p' \ + 's/@deffn *{pam_ldaphome config} *\([a-zA-Z_][a-zA-Z0-9_-]*\) .*/\1/p' \ + $(top_srcdir)/pam_ldaphome/pam_ldaphome.c -- \ + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ + $(info_TEXINFOS) + + +check-options: \ + check-all-options\ + check-log-options\ + check-ldaphome-config all-check-docs: imprimatur-basic-checks check-options check-sql-config diff --git a/doc/pam-modules.texi b/doc/pam-modules.texi index dcc5889..27e05ba 100644 --- a/doc/pam-modules.texi +++ b/doc/pam-modules.texi @@ -1255,6 +1255,14 @@ directory to the newly created home. The default size is 16384 bytes. Sets the mode (octal) for the created user directories. @end deffn +@deffn {pam_ldaphome config} authorized_keys name +Sets the pathname (relative to the home directory) for the authorized +keys file. The default is @samp{.ssh/authorized_keys}. For normal +operation, this value must be the same as the value of +@samp{AuthorizedKeysFile} variable in @file{sshd_config}. Unless you +change the latter, there's no need to edit it. +@end deffn + @menu * ldaphome example:: @end menu @@ -1323,15 +1331,15 @@ keys. The author uses the following schema: # Attribute Definitions attributetype ( 1.3.6.1.4.1.9163.2.1.0 NAME 'grayPublicKey' - DESC 'SSH public key' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + DESC 'SSH public key' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) # Object Class Definitions objectclass ( 1.3.6.1.4.1.9163.2.2.0 NAME 'grayAccount' - DESC 'Abstraction of an employee account' - SUP posixAccount AUXILIARY - MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory ) - MAY ( userPassword $ loginShell $ gecos $ grayPublicKey ) ) + DESC 'Abstraction of an employee account' + SUP posixAccount AUXILIARY + MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory ) + MAY ( userPassword $ loginShell $ gecos $ grayPublicKey ) ) @end example @subheading /etc/nsswitch.conf |