diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -203,6 +203,9 @@ | |||
203 | - djm@cvs.openbsd.org 2006/03/04 04:12:58 | 203 | - djm@cvs.openbsd.org 2006/03/04 04:12:58 |
204 | [serverloop.c] | 204 | [serverloop.c] |
205 | move a debug() outside of a signal handler; ok markus@ a little while back | 205 | move a debug() outside of a signal handler; ok markus@ a little while back |
206 | - djm@cvs.openbsd.org 2006/03/12 04:23:07 | ||
207 | [ssh.c] | ||
208 | knf nit | ||
206 | 209 | ||
207 | 20060313 | 210 | 20060313 |
208 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 211 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4104,4 +4107,4 @@ | |||
4104 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4107 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4105 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4108 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4106 | 4109 | ||
4107 | $Id: ChangeLog,v 1.4198 2006/03/15 01:01:34 djm Exp $ | 4110 | $Id: ChangeLog,v 1.4199 2006/03/15 01:03:53 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.265 2006/02/22 00:04:45 stevesk Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.266 2006/03/12 04:23:07 djm Exp $"); |
44 | 44 | ||
45 | #include <sys/types.h> | 45 | #include <sys/types.h> |
46 | #ifdef HAVE_SYS_STAT_H | 46 | #ifdef HAVE_SYS_STAT_H |
@@ -254,7 +254,7 @@ main(int ac, char **av) | |||
254 | /* Parse command-line arguments. */ | 254 | /* Parse command-line arguments. */ |
255 | host = NULL; | 255 | host = NULL; |
256 | 256 | ||
257 | again: | 257 | again: |
258 | while ((opt = getopt(ac, av, | 258 | while ((opt = getopt(ac, av, |
259 | "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) { | 259 | "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) { |
260 | switch (opt) { | 260 | switch (opt) { |