From 1324e3deb9c9197e7d69099fb8758c7d54d0f5be Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Thu, 12 Oct 2000 07:18:20 +0000
Subject: Removed broken PAM support from rshd(8) and rlogind(8).  rshd does
 not allocate a pty(4) so it is not suitable at all for interactive PAM
 modules.  rlogind calls login(1) which is already PAM enabled.

Approved by:	markm
---
 libexec/rlogind/rlogind.c | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'libexec/rlogind/rlogind.c')

diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index eec34e7..46833a6 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -80,10 +80,6 @@ static const char rcsid[] =
 #include <unistd.h>
 #include "pathnames.h"
 
-#ifndef NO_PAM
-#include <security/pam_appl.h>
-#include <security/pam_misc.h>
-#endif
 
 #ifndef TIOCPKT_WINDOW
 #define TIOCPKT_WINDOW 0x80
@@ -131,9 +127,6 @@ void	setup_term __P((int));
 int	do_krb_login __P((struct sockaddr_in *));
 void	usage __P((void));
 
-#ifndef NO_PAM
-extern int auth_pam __P((char *));
-#endif
 
 int
 main(argc, argv)
@@ -570,28 +563,11 @@ int
 do_rlogin(dest)
 	union sockunion *dest;
 {
-#ifndef NO_PAM
-	int retval;
-#endif
 
 	getstr(rusername, sizeof(rusername), "remuser too long");
 	getstr(lusername, sizeof(lusername), "locuser too long");
 	getstr(term+ENVSIZE, sizeof(term)-ENVSIZE, "Terminal type too long");
 
-#ifndef  NO_PAM
-	retval = auth_pam(lusername);
- 
-	if (retval) {
-		if (retval == -1) {
-			syslog(LOG_ERR, "PAM authentication failed");
-		}  
-		else {
-			syslog(LOG_ERR,
-				"User %s failed PAM authentication", lusername);
-			exit(1);
-		}
-	}
-#endif
 	pwd = getpwnam(lusername);
 	if (pwd == NULL)
 		return (-1);
-- 
cgit v1.1