diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-rhosts.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -6,6 +6,9 @@ | |||
6 | [readconf.c ssh_config ssh_config.5 ssh-keysign.c] | 6 | [readconf.c ssh_config ssh_config.5 ssh-keysign.c] |
7 | add AddressFamily option to ssh_config (like -4, -6 on commandline). | 7 | add AddressFamily option to ssh_config (like -4, -6 on commandline). |
8 | Portable bug #534; ok markus@ | 8 | Portable bug #534; ok markus@ |
9 | - itojun@cvs.openbsd.org 2003/05/17 03:25:58 | ||
10 | [auth-rhosts.c] | ||
11 | just in case, put numbers to sscanf %s arg. | ||
9 | - (djm) Remove IPv4 by default hack now that we can specify AF in config | 12 | - (djm) Remove IPv4 by default hack now that we can specify AF in config |
10 | 13 | ||
11 | 20030517 | 14 | 20030517 |
@@ -1562,4 +1565,4 @@ | |||
1562 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1565 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1563 | ok provos@ | 1566 | ok provos@ |
1564 | 1567 | ||
1565 | $Id: ChangeLog,v 1.2734 2003/05/18 10:52:40 djm Exp $ | 1568 | $Id: ChangeLog,v 1.2735 2003/05/18 10:53:10 djm Exp $ |
diff --git a/auth-rhosts.c b/auth-rhosts.c index de2cb67f3..a38478108 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: auth-rhosts.c,v 1.29 2003/04/08 20:21:28 itojun Exp $"); | 17 | RCSID("$OpenBSD: auth-rhosts.c,v 1.30 2003/05/17 03:25:58 itojun Exp $"); |
18 | 18 | ||
19 | #include "packet.h" | 19 | #include "packet.h" |
20 | #include "uidswap.h" | 20 | #include "uidswap.h" |
@@ -68,7 +68,8 @@ check_rhosts_file(const char *filename, const char *hostname, | |||
68 | * This should be safe because each buffer is as big as the | 68 | * This should be safe because each buffer is as big as the |
69 | * whole string, and thus cannot be overwritten. | 69 | * whole string, and thus cannot be overwritten. |
70 | */ | 70 | */ |
71 | switch (sscanf(buf, "%s %s %s", hostbuf, userbuf, dummy)) { | 71 | switch (sscanf(buf, "%1023s %1023s %1023s", hostbuf, userbuf, |
72 | dummy)) { | ||
72 | case 0: | 73 | case 0: |
73 | auth_debug_add("Found empty line in %.100s.", filename); | 74 | auth_debug_add("Found empty line in %.100s.", filename); |
74 | continue; | 75 | continue; |