- itojun@cvs.openbsd.org 2003/05/17 03:25:58

     [auth-rhosts.c]
     just in case, put numbers to sscanf %s arg.

diff --git a/ChangeLog b/ChangeLog
index 97170da587a4a931f37ef0fe5c018fbc8b8c63b6..ea6bd929f1ec83cdf4f29a1c09430eb8525d3daf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
      [readconf.c ssh_config ssh_config.5 ssh-keysign.c]
      add AddressFamily option to ssh_config (like -4, -6 on commandline).
      Portable bug #534; ok markus@
+   - itojun@cvs.openbsd.org 2003/05/17 03:25:58
+     [auth-rhosts.c]
+     just in case, put numbers to sscanf %s arg.
  - (djm) Remove IPv4 by default hack now that we can specify AF in config
 
 20030517

diff --git a/auth-rhosts.c b/auth-rhosts.c
index de2cb67f3e2578496c7ebcf14e1319d0d1fdc88d..a38478108526ee7ed303a31368eee37b77467db1 100644 (file)
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rhosts.c,v 1.29 2003/04/08 20:21:28 itojun Exp $");
+RCSID("$OpenBSD: auth-rhosts.c,v 1.30 2003/05/17 03:25:58 itojun Exp $");
 
 #include "packet.h"
 #include "uidswap.h"
@@ -68,7 +68,8 @@ check_rhosts_file(const char *filename, const char *hostname,
                 * This should be safe because each buffer is as big as the
                 * whole string, and thus cannot be overwritten.
                 */
-               switch (sscanf(buf, "%s %s %s", hostbuf, userbuf, dummy)) {
+               switch (sscanf(buf, "%1023s %1023s %1023s", hostbuf, userbuf,
+                   dummy)) {
                case 0:
                        auth_debug_add("Found empty line in %.100s.", filename);
                        continue;