From: Andrew G. Morgan <morgan@kernel.org>
Date: Fri, 10 May 2002 04:03:01 +0000 (+0000)
Subject: Relevant BUGIDs: 554274, 554261, 554182
X-Git-Tag: Linux-PAM-0-76~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d0f9ece4a5ec369397974d1a5645f86f6820919;p=linux-pam

Relevant BUGIDs: 554274, 554261, 554182

Purpose of commit: documentation fixes

Commit summary:
---------------
Three fixes for documentation - bugs, typos, expired truths.
---

diff --git a/CHANGELOG b/CHANGELOG
index 4d3dbaab..7e0286b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -55,6 +55,9 @@ bug report - outstanding bugs are listed here:
 0.76: please submit patches for this section with actual code/doc
       patches!
 
+* documentation: pam_time.sgml typo fixed, pam_motd exists now,
+  correct Red Hat comment about config files (Bugs 554274, 554261,
+  554182 - agmorgan)
 * pam_limits: added '%' domain for maxlogins limiting, now '*' and @group
   have the old meaning (every) and '%' the new one (all)
   (Bug 533664 - baggins)
diff --git a/doc/modules/pam_deny.sgml b/doc/modules/pam_deny.sgml
index 7d9df7e7..6953231f 100644
--- a/doc/modules/pam_deny.sgml
+++ b/doc/modules/pam_deny.sgml
@@ -155,11 +155,9 @@ session on the host computer.
 <tag><bf>Examples/suggested usage:</bf></tag>
 
 Together with another session module, that displays a message of the
-day perhaps (XXX - such a module needs to be written),
-this module can be used to block a user from starting a shell. Given
-the presence of a <tt/pam_motd/ module, we might use the following
-entries in the configuration file to inform the user it is system
-time:
+day perhaps (<tt/pam_motd/ for example), this module can be used to
+block a user from starting a shell. We might use the following entries
+in the configuration file to inform the user it is system time:
 <tscreen>
 <verb>
 #
@@ -167,7 +165,7 @@ time:
 # session (politely)
 #
 login	session	 required	pam_motd.so \
-			file=/etc/system_time
+			motd=/etc/system_time
 login	session	 required	pam_deny.so
 </verb>
 </tscreen>
diff --git a/doc/modules/pam_time.sgml b/doc/modules/pam_time.sgml
index a1829c16..8c5f677f 100644
--- a/doc/modules/pam_time.sgml
+++ b/doc/modules/pam_time.sgml
@@ -58,7 +58,7 @@ and their terminal from which they are making their request.
 <tag><bf>Description:</bf></tag>
 
 This module bases its actions on the rules listed in its configuration
-file: <tt>/etc/security/pam.conf</tt>.  Each rule has the following
+file: <tt>/etc/security/time.conf</tt>.  Each rule has the following
 form,
 <tscreen>
 <em/services/<tt/;/<em/ttys/<tt/;/<em/users/<tt/;/<em/times/
diff --git a/doc/pam_source.sgml b/doc/pam_source.sgml
index 160e9293..92295126 100644
--- a/doc/pam_source.sgml
+++ b/doc/pam_source.sgml
@@ -4,7 +4,7 @@
 
  $Id$
 
-    Copyright (c) Andrew G. Morgan 1996-2001.  All rights reserved.
+    Copyright (c) Andrew G. Morgan 1996-2002.  All rights reserved.
 
 Redistribution and use in source (sgml) and binary (derived) forms,
 with or without modification, are permitted provided that the
@@ -46,7 +46,7 @@ DAMAGE.
 
 <title>The Linux-PAM System Administrators' Guide
 <author>Andrew G. Morgan, <tt>morgan@kernel.org</tt>
-<date>DRAFT v0.76 2001/12/08
+<date>DRAFT v0.76 2002/05/09
 <abstract>
 This manual documents what a system-administrator needs to know about
 the <bf>Linux-PAM</bf> library. It covers the correct syntax of the
@@ -599,9 +599,9 @@ mode uses either <tt>/etc/pam.d/</tt> or <tt>/etc/pam.conf</tt>
 configuration but not both.  That is to say, if there is a
 <tt>/etc/pam.d/</tt> directory then libpam only uses the files
 contained in this directory.  However, in the absence of the
-<tt>/etc/pam.d/</tt> directory the <tt>/etc/pam.conf</tt> file is
-used.  The other mode (and the one currently supported by Red Hat 4.2
-and higher) is to use both <tt>/etc/pam.d/</tt> and
+<tt>/etc/pam.d/</tt> directory the <tt>/etc/pam.conf</tt> file is used
+(this is likely to be the mode your preferred distribution uses).  The
+other mode is to use both <tt>/etc/pam.d/</tt> and
 <tt>/etc/pam.conf</tt> in sequence.  In this mode, entries in
 <tt>/etc/pam.d/</tt> override those of <tt>/etc/pam.conf</tt>.
 
@@ -1071,9 +1071,9 @@ for all the good work they have done.
 <sect>Copyright information for this document
 
 <p>
-Copyright (c) Andrew G. Morgan 1996-9.  All rights reserved.
+Copyright (c) Andrew G. Morgan 1996-2002.  All rights reserved.
 <newline>
-Email: <tt>&lt;morgan@linux.kernel.org&gt;</tt>
+Email: <tt>&lt;morgan@kernel.org&gt;</tt>
 
 <p>
 Redistribution and use in source and binary forms, with or without