This commit was manufactured by cvs2svn to create tag 'RELEASE_5_2_1'.release/5.2.1

1 files changed, 0 insertions, 64 deletions

diff --git a/security/hpn-ssh/files/patch-auth1.c b/security/hpn-ssh/files/patch-auth1.c
deleted file mode 100644
index 95d8d1a627b5..000000000000
--- a/security/hpn-ssh/files/patch-auth1.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- auth1.c.orig	Tue Sep  2 23:32:46 2003
-+++ auth1.c	Tue Sep 16 20:05:44 2003
-@@ -26,6 +26,7 @@
- #include "session.h"
- #include "uidswap.h"
- #include "monitor_wrap.h"
-+#include "canohost.h"
- 
- /* import */
- extern ServerOptions options;
-@@ -71,6 +72,18 @@
- 	u_int ulen;
- 	int prev, type = 0;
- 	struct passwd *pw = authctxt->pw;
-+#ifdef HAVE_LOGIN_CAP
-+	login_cap_t *lc;
-+#endif
-+#ifdef USE_PAM
-+	struct inverted_pam_cookie *pam_cookie;
-+#endif /* USE_PAM */
-+#if defined(HAVE_LOGIN_CAP) || defined(LOGIN_ACCESS)
-+	const char *from_host, *from_ip;
-+
-+	from_host = get_canonical_hostname(options.use_dns);
-+	from_ip = get_remote_ipaddr();
-+#endif /* HAVE_LOGIN_CAP || LOGIN_ACCESS */
- 
- 	debug("Attempting authentication for %s%.100s.",
- 	    authctxt->valid ? "" : "illegal user ", authctxt->user);
-@@ -214,6 +227,34 @@
- 			logit("Unknown message during authentication: type %d", type);
- 			break;
- 		}
-+
-+#ifdef HAVE_LOGIN_CAP
-+		if (pw != NULL) {
-+		  lc = login_getpwclass(pw);
-+		  if (lc == NULL)
-+			lc = login_getclassbyname(NULL, pw);
-+		  if (!auth_hostok(lc, from_host, from_ip)) {
-+			logit("Denied connection for %.200s from %.200s [%.200s].",
-+		      pw->pw_name, from_host, from_ip);
-+			packet_disconnect("Sorry, you are not allowed to connect.");
-+		  }
-+		  if (!auth_timeok(lc, time(NULL))) {
-+			logit("LOGIN %.200s REFUSED (TIME) FROM %.200s",
-+		      pw->pw_name, from_host);
-+			packet_disconnect("Logins not available right now.");
-+		  }
-+		  login_close(lc);
-+		  lc = NULL;
-+		}
-+#endif  /* HAVE_LOGIN_CAP */
-+#ifdef LOGIN_ACCESS
-+		if (pw != NULL && !login_access(pw->pw_name, from_host)) {
-+		  logit("Denied connection for %.200s from %.200s [%.200s].",
-+		      pw->pw_name, from_host, from_ip);
-+		  packet_disconnect("Sorry, you are not allowed to connect.");
-+		}
-+#endif /* LOGIN_ACCESS */
-+
- #ifdef BSD_AUTH
- 		if (authctxt->as) {
- 			auth_close(authctxt->as);