summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-06-21 18:58:46 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-06-21 18:58:46 +1000
commitb422afa41f75229da03a90a52b0f30206b5797a1 (patch)
tree313a767cedbd5a2d8e7f060a924ee5f7db8895a1 /monitor.c
parentc5564e1c4c41ae9af96973e2996e2a4285acbae8 (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@
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c
index 36a9e1dc1..ace25c404 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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
93static Gssctxt *gsscontext = NULL; 94static Gssctxt *gsscontext = NULL;