1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
Index: Linux-PAM/doc/pam_modules.sgml
===================================================================
--- Linux-PAM/doc/pam_modules.sgml (revision 274)
+++ Linux-PAM/doc/pam_modules.sgml (working copy)
@@ -925,7 +925,7 @@
<tag><tt/PAM_AUTHTOK_ERR/</tag>
The module was unable to obtain the new authentication token.
-<tag><tt/PAM_AUTHTOK_RECOVERY_ERR/</tag>
+<tag><tt/PAM_AUTHTOK_RECOVER_ERR/</tag>
The module was unable to obtain the old authentication token.
<tag><tt/PAM_AUTHTOK_LOCK_BUSY/</tag>
Index: Linux-PAM/doc/modules/pam_cracklib.sgml
===================================================================
--- Linux-PAM/doc/modules/pam_cracklib.sgml (revision 274)
+++ Linux-PAM/doc/modules/pam_cracklib.sgml (working copy)
@@ -37,7 +37,7 @@
<tag><bf>System dependencies:</bf></tag>
Requires the system library <tt/libcrack/ and a system dictionary:
-<tt>/usr/lib/cracklib_dict</tt>.
+<tt>/var/cache/cracklib/cracklib_dict</tt>.
<tag><bf>Network aware:</bf></tag>
@@ -231,18 +231,18 @@
<p>
For an example of the use of this module, we show how it may be
-stacked with the password component of <tt/pam_pwdb/:
+stacked with the password component of <tt/pam_unix/:
<tscreen>
<verb>
#
# These lines stack two password type modules. In this example the
# user is given 3 opportunities to enter a strong password. The
-# "use_authtok" argument ensures that the pam_pwdb module does not
+# "use_authtok" argument ensures that the pam_unix module does not
# prompt for a password, but instead uses the one provided by
# pam_cracklib.
#
passwd password required pam_cracklib.so retry=3
-passwd password required pam_pwdb.so use_authtok
+passwd password required pam_unix.so use_authtok
</verb>
</tscreen>
@@ -260,7 +260,7 @@
#
password required pam_cracklib.so \
difok=3 minlen=15 dcredit= 2 ocredit=2
-password required pam_pwdb.so use_authtok nullok md5
+password required pam_unix.so use_authtok nullok md5
</verb>
</tscreen>
Index: Linux-PAM/doc/modules/pam_userdb.sgml
===================================================================
--- Linux-PAM/doc/modules/pam_userdb.sgml (revision 274)
+++ Linux-PAM/doc/modules/pam_userdb.sgml (working copy)
@@ -61,7 +61,7 @@
so caution must be exercised over the access rights to the DB database itself..
The module will read the password from the user using the conversation mechanism. If
-you are using this module on top of another authentication module (like <tt/pam_pwdb/;)
+you are using this module on top of another authentication module (like <tt/pam_unix/;)
then you should tell that module to read the entered password from the PAM_AUTHTOK field, which is set by this module.
<p>
@@ -112,10 +112,10 @@
#%PAM-1.0
auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
auth sufficient pam_userdb.so icase db=/tmp/dbtest
-auth required pam_pwdb.so shadow nullok try_first_pass
+auth required pam_unix.so shadow nullok try_first_pass
auth required pam_shells.so
-account required pam_pwdb.so
-session required pam_pwdb.so
+account required pam_unix.so
+session required pam_unix.so
</verb>
</tscreen>
Index: Linux-PAM/doc/pam_appl.sgml
===================================================================
--- Linux-PAM/doc/pam_appl.sgml (revision 274)
+++ Linux-PAM/doc/pam_appl.sgml (working copy)
@@ -724,7 +724,7 @@
<tag><tt/PAM_AUTHTOK_ERR/</tag>
A module was unable to obtain the new authentication token.
-<tag><tt/PAM_AUTHTOK_RECOVERY_ERR/</tag>
+<tag><tt/PAM_AUTHTOK_RECOVER_ERR/</tag>
A module was unable to obtain the old authentication token.
<tag><tt/PAM_AUTHTOK_LOCK_BUSY/</tag>
Index: Linux-PAM/doc/pam_source.sgml
===================================================================
--- Linux-PAM/doc/pam_source.sgml (revision 274)
+++ Linux-PAM/doc/pam_source.sgml (working copy)
@@ -314,7 +314,7 @@
the program is named "pamprog" and the name of the configuration file
is /etc/pam.d/pamprog.
-In the /etc/pam.d/pamprog but the following two lines:
+In the /etc/pam.d/pamprog put the following two lines:
auth required pam_permit.so
auth required pam_warn.so
@@ -510,9 +510,10 @@
<tt/no_module_data/; <tt/conv_err/; <tt/authtok_err/;
<tt/authtok_recover_err/; <tt/authtok_lock_busy/;
<tt/authtok_disable_aging/; <tt/try_again/; <tt/ignore/; <tt/abort/;
-<tt/authtok_expired/; <tt/module_unknown/; <tt/bad_item/; and
-<tt/default/. The last of these (<tt/default/) can be used to set the
-action for those return values that are not explicitly defined.
+<tt/authtok_expired/; <tt/module_unknown/; <tt/bad_item/; <tt/conv_again/;
+<tt/incomplete/; and <tt/default/. The last of these (<tt/default/) can
+be used to set the action for those return values that are not explicitly
+defined.
<p>
The <tt/actionI/ can be a positive integer or one of the following
|
