5ef0f821ec
- Disable temporary HPN patch until HPN release new version.
- Fix rc.d script path in sshd.8
- Add FreeBSD-${PKGNAME} in SSH_VERSION and SSH_RELEASE like src does.
- Sync patches with src.
Security: CVE-2006-4924, CVE-2006-5051
51 lines
1.4 KiB
C
51 lines
1.4 KiB
C
--- auth1.c.orig Fri Sep 1 02:38:36 2006
|
|
+++ auth1.c Sat Sep 30 18:47:57 2006
|
|
@@ -39,6 +39,7 @@
|
|
#endif
|
|
#include "monitor_wrap.h"
|
|
#include "buffer.h"
|
|
+#include "canohost.h"
|
|
|
|
/* import */
|
|
extern ServerOptions options;
|
|
@@ -238,6 +239,13 @@
|
|
char info[1024];
|
|
int prev = 0, type = 0;
|
|
const struct AuthMethod1 *meth;
|
|
+#ifdef HAVE_LOGIN_CAP
|
|
+ login_cap_t *lc;
|
|
+ const char *from_host, *from_ip;
|
|
+
|
|
+ from_host = get_canonical_hostname(options.use_dns);
|
|
+ from_ip = get_remote_ipaddr();
|
|
+#endif
|
|
|
|
debug("Attempting authentication for %s%.100s.",
|
|
authctxt->valid ? "" : "invalid user ", authctxt->user);
|
|
@@ -288,6 +296,26 @@
|
|
"type %d", type);
|
|
goto skip;
|
|
}
|
|
+
|
|
+#ifdef HAVE_LOGIN_CAP
|
|
+ if (authctxt->pw != NULL) {
|
|
+ lc = login_getpwclass(authctxt->pw);
|
|
+ if (lc == NULL)
|
|
+ lc = login_getclassbyname(NULL, authctxt->pw);
|
|
+ if (!auth_hostok(lc, from_host, from_ip)) {
|
|
+ logit("Denied connection for %.200s from %.200s [%.200s].",
|
|
+ authctxt->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",
|
|
+ authctxt->pw->pw_name, from_host);
|
|
+ packet_disconnect("Logins not available right now.");
|
|
+ }
|
|
+ login_close(lc);
|
|
+ lc = NULL;
|
|
+ }
|
|
+#endif /* HAVE_LOGIN_CAP */
|
|
|
|
if (!*(meth->enabled)) {
|
|
verbose("%s authentication disabled.", meth->name);
|