diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 18:58:46 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 18:58:46 +1000 |
commit | b422afa41f75229da03a90a52b0f30206b5797a1 (patch) | |
tree | 313a767cedbd5a2d8e7f060a924ee5f7db8895a1 | |
parent | c5564e1c4c41ae9af96973e2996e2a4285acbae8 (diff) |
- andreas@cvs.openbsd.org 2009/06/12 20:43:22
[monitor.c packet.c]
Fix warnings found by chl@ and djm@ and change roaming_atomicio's
return type to match atomicio's
Diff from djm@, ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | monitor.c | 3 | ||||
-rw-r--r-- | packet.c | 4 |
3 files changed, 9 insertions, 3 deletions
@@ -88,6 +88,11 @@ | |||
88 | changes. Most code from Martin Forssen, maf at appgate dot com. | 88 | changes. Most code from Martin Forssen, maf at appgate dot com. |
89 | ok markus@ | 89 | ok markus@ |
90 | Also, applied appropriate changes to Makefile.in | 90 | Also, applied appropriate changes to Makefile.in |
91 | - andreas@cvs.openbsd.org 2009/06/12 20:43:22 | ||
92 | [monitor.c packet.c] | ||
93 | Fix warnings found by chl@ and djm@ and change roaming_atomicio's | ||
94 | return type to match atomicio's | ||
95 | Diff from djm@, ok markus@ | ||
91 | 96 | ||
92 | 20090616 | 97 | 20090616 |
93 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t | 98 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.103 2009/05/28 16:50:16 andreas Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.104 2009/06/12 20:43:22 andreas Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -88,6 +88,7 @@ | |||
88 | #include "compat.h" | 88 | #include "compat.h" |
89 | #include "ssh2.h" | 89 | #include "ssh2.h" |
90 | #include "jpake.h" | 90 | #include "jpake.h" |
91 | #include "roaming.h" | ||
91 | 92 | ||
92 | #ifdef GSSAPI | 93 | #ifdef GSSAPI |
93 | static Gssctxt *gsscontext = NULL; | 94 | static Gssctxt *gsscontext = NULL; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.163 2009/05/28 16:50:16 andreas Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.164 2009/06/12 20:43:22 andreas Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -188,7 +188,7 @@ struct session_state { | |||
188 | static struct session_state *active_state; | 188 | static struct session_state *active_state; |
189 | 189 | ||
190 | static struct session_state * | 190 | static struct session_state * |
191 | alloc_session_state() | 191 | alloc_session_state(void) |
192 | { | 192 | { |
193 | struct session_state *s = xcalloc(1, sizeof(*s)); | 193 | struct session_state *s = xcalloc(1, sizeof(*s)); |
194 | 194 | ||