summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c9
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c83c164c..01c24e6b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,10 @@
51 - djm@cvs.openbsd.org 2002/12/06 05:20:02 51 - djm@cvs.openbsd.org 2002/12/06 05:20:02
52 [sftp.1] 52 [sftp.1]
53 Fix cut'n'paste error, spotted by matthias.riese@b-novative.de; ok deraadt@ 53 Fix cut'n'paste error, spotted by matthias.riese@b-novative.de; ok deraadt@
54 - millert@cvs.openbsd.org 2002/12/09 16:50:30
55 [ssh.c]
56 Avoid setting optind to 0 as GNU getopt treats that like we do optreset.
57 markus@ OK
54 58
5520021205 5920021205
56 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org 60 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org
@@ -886,4 +890,4 @@
886 save auth method before monitor_reset_key_state(); bugzilla bug #284; 890 save auth method before monitor_reset_key_state(); bugzilla bug #284;
887 ok provos@ 891 ok provos@
888 892
889$Id: ChangeLog,v 1.2529 2002/12/23 02:23:37 mouring Exp $ 893$Id: ChangeLog,v 1.2530 2002/12/23 02:24:54 mouring Exp $
diff --git a/ssh.c b/ssh.c
index c6beb1bcf..7162e680d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.188 2002/11/27 17:53:35 markus Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.189 2002/12/09 16:50:30 millert Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -505,12 +505,11 @@ again:
505 host = ++cp; 505 host = ++cp;
506 } else 506 } else
507 host = *av; 507 host = *av;
508 ac--, av++; 508 if (ac > 1) {
509 if (ac > 0) { 509 optind = optreset = 1;
510 optind = 0;
511 optreset = 1;
512 goto again; 510 goto again;
513 } 511 }
512 ac--, av++;
514 } 513 }
515 514
516 /* Check that we got a host name. */ 515 /* Check that we got a host name. */