summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-11-05 20:05:32 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-11-05 20:05:32 +1100
commite9bf98412e41a9f18beb9c3e842d02259ddd8c67 (patch)
tree9572a2dabe51706ab0bcaf8aeafeb7d25a444f94
parent07336dae9491062f32ca93ec3ccd4b17774bdd00 (diff)
- deraadt@cvs.openbsd.org 2004/09/15 00:46:01
[ssh.c] /* fallthrough */ is something a programmer understands. But /* FALLTHROUGH */ is also understood by lint, so that is better.
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 93a2d62b9..1363c37ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
12 [clientloop.c ssh.c] 12 [clientloop.c ssh.c]
13 cleanup multiplex control socket on SIGHUP too, spotted by sturm@ 13 cleanup multiplex control socket on SIGHUP too, spotted by sturm@
14 ok markus@ deraadt@ 14 ok markus@ deraadt@
15 - deraadt@cvs.openbsd.org 2004/09/15 00:46:01
16 [ssh.c]
17 /* fallthrough */ is something a programmer understands. But
18 /* FALLTHROUGH */ is also understood by lint, so that is better.
15 19
1620041102 2020041102
17 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX 21 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
@@ -1791,4 +1795,4 @@
1791 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1795 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1792 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1796 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1793 1797
1794$Id: ChangeLog,v 1.3565 2004/11/05 09:02:16 dtucker Exp $ 1798$Id: ChangeLog,v 1.3566 2004/11/05 09:05:32 dtucker Exp $
diff --git a/ssh.c b/ssh.c
index 77f16c0c5..7859b0f78 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.226 2004/09/07 23:41:30 djm Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.227 2004/09/15 00:46:01 deraadt Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -316,7 +316,7 @@ again:
316 options.log_level++; 316 options.log_level++;
317 break; 317 break;
318 } 318 }
319 /* fallthrough */ 319 /* FALLTHROUGH */
320 case 'V': 320 case 'V':
321 fprintf(stderr, "%s, %s\n", 321 fprintf(stderr, "%s, %s\n",
322 SSH_RELEASE, SSLeay_version(SSLEAY_VERSION)); 322 SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));