2 files changed, 51 insertions, 42 deletions
diff --git a/Linux-PAM/modules/pam_rhosts/Makefile.am b/Linux-PAM/modules/pam_rhosts/Makefile.am
index 26fdf9c6..547ad621 100644
--- a/Linux-PAM/modules/pam_rhosts/Makefile.am
+++ b/Linux-PAM/modules/pam_rhosts/Makefile.am
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+# Copyright (c) 2005, 2006, 2008 Thorsten Kukuk <kukuk@suse.de>
 #
 
 CLEANFILES = *~
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rhosts_auth tst-pam_rhosts
+EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rhosts
 
-TESTS = tst-pam_rhosts_auth tst-pam_rhosts
+TESTS = tst-pam_rhosts
 
 man_MANS = pam_rhosts.8
 
@@ -21,8 +21,7 @@ if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
-securelib_LTLIBRARIES = pam_rhosts_auth.la pam_rhosts.la
-pam_rhosts_auth_la_LIBADD = -L$(top_builddir)/libpam -lpam
+securelib_LTLIBRARIES = pam_rhosts.la
 pam_rhosts_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
diff --git a/Linux-PAM/modules/pam_rhosts/pam_rhosts.8 b/Linux-PAM/modules/pam_rhosts/pam_rhosts.8
index 0d7f4a16..23f03112 100644
--- a/Linux-PAM/modules/pam_rhosts/pam_rhosts.8
+++ b/Linux-PAM/modules/pam_rhosts/pam_rhosts.8
@@ -1,85 +1,95 @@
 .\"     Title: pam_rhosts
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
-.\"      Date: 06/28/2006
-.\"    Manual: Linux\-PAM Manual
-.\"    Source: Linux\-PAM Manual
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
+.\"      Date: 01/08/2008
+.\"    Manual: Linux-PAM Manual
+.\"    Source: Linux-PAM Manual
 .\"
-.TH "PAM_RHOSTS" "8" "06/28/2006" "Linux\-PAM Manual" "Linux\-PAM Manual"
+.TH "PAM_RHOSTS" "8" "01/08/2008" "Linux-PAM Manual" "Linux\-PAM Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-pam_rhosts \- The rhosts PAM module
+pam_rhosts - The rhosts PAM module
 .SH "SYNOPSIS"
 .HP 14
-\fBpam_rhosts.so\fR
+\fBpam_rhosts\.so\fR
 .SH "DESCRIPTION"
 .PP
 This module performs the standard network authentication for services, as used by traditional implementations of
 \fBrlogin\fR
 and
 \fBrsh\fR
-etc.
+etc\.
 .PP
 The authentication mechanism of this module is based on the contents of two files;
-\fI/etc/hosts.equiv\fR
+\fI/etc/hosts\.equiv\fR
 (or and
-\fI~/.rhosts\fR. Firstly, hosts listed in the former file are treated as equivalent to the localhost. Secondly, entries in the user's own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user's account on the current host. Access is granted to the user if their host is present in
-\fI/etc/hosts.equiv\fR
-and their remote account is identical to their local one, or if their remote account has an entry in their personal configuration file.
+\fI~/\.rhosts\fR\. Firstly, hosts listed in the former file are treated as equivalent to the localhost\. Secondly, entries in the user\'s own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user\'s account on the current host\. Access is granted to the user if their host is present in
+\fI/etc/hosts\.equiv\fR
+and their remote account is identical to their local one, or if their remote account has an entry in their personal configuration file\.
 .PP
 The module authenticates a remote user (internally specified by the item
 \fIPAM_RUSER\fR
 connecting from the remote host (internally specified by the item
-\fBPAM_RHOST\fR). Accordingly, for applications to be compatible this authentication module they must set these items prior to calling
-\fBpam_authenticate()\fR. The module is not capable of independently probing the network connection for such information.
+\fBPAM_RHOST\fR)\. Accordingly, for applications to be compatible this authentication module they must set these items prior to calling
+\fBpam_authenticate()\fR\. The module is not capable of independently probing the network connection for such information\.
 .SH "OPTIONS"
-.TP 3n
+.PP
 \fBdebug\fR
-Print debug information.
-.TP 3n
+.RS 4
+Print debug information\.
+.RE
+.PP
 \fBsilent\fR
-Don't print informative messages.
-.TP 3n
+.RS 4
+Don\'t print informative messages\.
+.RE
+.PP
 \fBsuperuser=\fR\fB\fIaccount\fR\fR
+.RS 4
 Handle
 \fIaccount\fR
-as root.
+as root\.
+.RE
 .SH "MODULE SERVICES PROVIDED"
 .PP
 Only the
 \fBauth\fR
-service is supported.
+service is supported\.
 .SH "RETURN VALUES"
-.TP 3n
+.PP
 PAM_AUTH_ERR
-The remote host, remote user name or the local user name couldn't be determined or access was denied by
-\fI.rhosts\fR
-file.
-.TP 3n
+.RS 4
+The remote host, remote user name or the local user name couldn\'t be determined or access was denied by
+\fI\.rhosts\fR
+file\.
+.RE
+.PP
 PAM_USER_UNKNOWN
-User is not known to system.
+.RS 4
+User is not known to system\.
+.RE
 .SH "EXAMPLES"
 .PP
 To grant a remote user access by
-\fI/etc/hosts.equiv\fR
+\fI/etc/hosts\.equiv\fR
 or
-\fI.rhosts\fR
+\fI\.rhosts\fR
 for
 \fBrsh\fR
 add the following lines to
-\fI/etc/pam.d/rsh\fR:
+\fI/etc/pam\.d/rsh\fR:
 .sp
-.RS 3n
+.RS 4
 .nf
-#%PAM\-1.0
+#%PAM\-1\.0
 #
-auth     required       pam_rhosts.so
-auth     required       pam_nologin.so
-auth     required       pam_env.so
-auth     required       pam_unix.so
+auth     required       pam_rhosts\.so
+auth     required       pam_nologin\.so
+auth     required       pam_env\.so
+auth     required       pam_unix\.so
       
 .fi
 .RE
@@ -95,4 +105,4 @@ auth     required       pam_unix.so
 \fBpam\fR(8)
 .SH "AUTHOR"
 .PP
-pam_rhosts was written by Thorsten Kukuk <kukuk@thkukuk.de>
+pam_rhosts was written by Thorsten Kukuk <kukuk@thkukuk\.de>