summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorAndreas Gunnarsson <andreas@cvs.openbsd.org>2009-10-24 11:18:24 +0000
committerAndreas Gunnarsson <andreas@cvs.openbsd.org>2009-10-24 11:18:24 +0000
commit084cbb862278f8e44cd02cf7dba864a39d9fbb52 (patch)
tree23d8c70fe5b794a122061e16b70ae48b1780d815 /usr.bin/ssh
parentf184c55e374c1f4f2beebc186efbe767bc1b8e8f (diff)
Dummy implementation of wait_for_roaming_reconnect() for the server side.
It doesn't do anything yet but is needed for upcoming changes in roaming_common.c ok markus@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/roaming_serv.c29
-rw-r--r--usr.bin/ssh/sshd/Makefile4
2 files changed, 31 insertions, 2 deletions
diff --git a/usr.bin/ssh/roaming_serv.c b/usr.bin/ssh/roaming_serv.c
new file mode 100644
index 00000000000..65e9fe6313d
--- /dev/null
+++ b/usr.bin/ssh/roaming_serv.c
@@ -0,0 +1,29 @@
+/* $OpenBSD: roaming_serv.c,v 1.1 2009/10/24 11:18:23 andreas Exp $ */
+/*
+ * Copyright (c) 2004-2009 AppGate Network Security AB
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include "roaming.h"
+
+/*
+ * Wait for the roaming client to reconnect. Returns 0 if a connect ocurred.
+ */
+int
+wait_for_roaming_reconnect(void)
+{
+ return 1;
+}
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index fb06e7646ad..7ff05cf3e7d 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2009/05/28 16:50:16 andreas Exp $
+# $OpenBSD: Makefile,v 1.70 2009/10/24 11:18:23 andreas Exp $
.PATH: ${.CURDIR}/..
@@ -16,7 +16,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \
monitor_mm.c monitor.c monitor_wrap.c \
kexdhs.c kexgexs.c sftp-server.c sftp-common.c auth2-jpake.c \
- roaming_common.c
+ roaming_common.c roaming_serv.c
.include <bsd.own.mk> # for KERBEROS and AFS