- gilles@cvs.openbsd.org 2007/09/11 15:47:17

     [session.c ssh-keygen.c sshlogin.c]
     use strcspn to properly overwrite '\n' in fgets returned buffer
     ok pyr@, ray@, millert@, moritz@, chl@

1 files changed, 2 insertions, 3 deletions

diff --git a/sshlogin.c b/sshlogin.c
index 0059ff8d0..cc35d6024 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshlogin.c,v 1.25 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: sshlogin.c,v 1.26 2007/09/11 15:47:17 gilles Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -98,8 +98,7 @@ store_lastlog_message(const char *user, uid_t uid)
 
         if (last_login_time != 0) {
                 time_string = ctime(&last_login_time);
-                if (strchr(time_string, '\n'))
-                    *strchr(time_string, '\n') = '\0';
+                time_string[strcspn(time_string, "\n")] = '\0';
                 if (strcmp(hostname, "") == 0)
                         snprintf(buf, sizeof(buf), "Last login: %s\r\n",
                             time_string);