summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--auth.c4
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 191ff9838..554a6ab91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
120040720 120040720
2 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2004/07/21 08:56:12
4 [auth.c]
5 s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas,
6 miod, ...
7
820040720
2 - (djm) [log.c] bz #111: Escape more control characters when sending data 9 - (djm) [log.c] bz #111: Escape more control characters when sending data
3 to syslog; from peak AT argo.troja.mff.cuni.cz 10 to syslog; from peak AT argo.troja.mff.cuni.cz
4 - (djm) [contrib/redhat/sshd.pam] bz #903: Remove redundant entries; from 11 - (djm) [contrib/redhat/sshd.pam] bz #903: Remove redundant entries; from
@@ -1543,4 +1550,4 @@
1543 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1550 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1544 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1551 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1545 1552
1546$Id: ChangeLog,v 1.3483 2004/07/21 10:44:05 djm Exp $ 1553$Id: ChangeLog,v 1.3484 2004/07/21 10:48:24 djm Exp $
diff --git a/auth.c b/auth.c
index d9ee0362f..0bb7e2807 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth.c,v 1.54 2004/05/23 23:59:53 dtucker Exp $"); 26RCSID("$OpenBSD: auth.c,v 1.55 2004/07/21 08:56:12 markus Exp $");
27 27
28#ifdef HAVE_LOGIN_H 28#ifdef HAVE_LOGIN_H
29#include <login.h> 29#include <login.h>
@@ -462,7 +462,7 @@ getpwnamallow(const char *user)
462 462
463 pw = getpwnam(user); 463 pw = getpwnam(user);
464 if (pw == NULL) { 464 if (pw == NULL) {
465 logit("Illegal user %.100s from %.100s", 465 logit("Invalid user %.100s from %.100s",
466 user, get_remote_ipaddr()); 466 user, get_remote_ipaddr());
467#ifdef CUSTOM_FAILED_LOGIN 467#ifdef CUSTOM_FAILED_LOGIN
468 record_failed_login(user, "ssh"); 468 record_failed_login(user, "ssh");