Patch from Vorlon

(This used to be commit 837bc15a54665baddec4a68938c3f60e17757700)

diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
index 9f03f98b5f6884309976ca99a58ac9d7c7fc7031..90a07a13bd34908f3ff03eb4aea4fe662428e167 100644 (file)
--- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
+++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
@@ -211,16 +211,10 @@ For more information on PAM, see http://ftp.kernel.org/pub/linux/libs/pam/
 This module authenticates a local smbpasswd user database.  If you require
 support for authenticating against a remote SMB server, or if you're
 concerned about the presence of suid root binaries on your system, it is
-recommended that you use one of the other two following modules
+recommended that you use pam_winbind instead.
 </para>
 
 <para><programlisting>
-       pam_smb - http://www.csn.ul.ie/~airlied/pam_smb/
-         authenticates against any remote SMB server
-
-       pam_ntdom - ftp://ftp.samba.org/pub/samba/pam_ntdom/
-         authenticates against an NT or Samba domain controller
-
 Options recognized by this module are as follows:
 
         debug           -       log more debugging info

diff --git a/source3/pam_smbpass/README b/source3/pam_smbpass/README
index cf208a99140ffcb6f68b87879cd93b6cd857545e..6cdb76f9c3ff52558357ea56c8e82176ca0df9c7 100644 (file)
--- a/source3/pam_smbpass/README
+++ b/source3/pam_smbpass/README
@@ -11,13 +11,7 @@ For more information on PAM, see http://ftp.kernel.org/pub/linux/libs/pam/
 This module authenticates a local smbpasswd user database.  If you require
 support for authenticating against a remote SMB server, or if you're
 concerned about the presence of suid root binaries on your system, it is
-recommended that you use one of the other two following modules
-
-  pam_smb - http://www.csn.ul.ie/~airlied/pam_smb/
-    authenticates against any remote SMB server
-
-  pam_ntdom - ftp://ftp.samba.org/pub/samba/pam_ntdom/
-    authenticates against an NT or Samba domain controller
+recommended that you use pam_winbind instead.
 
 Options recognized by this module are as follows: