Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/dist/ssh SKEY and BSDAUTH #ifdef mixup
details: https://anonhg.NetBSD.org/src/rev/1bf69ede5014
branches: trunk
changeset: 551607:1bf69ede5014
user: itojun <itojun%NetBSD.org@localhost>
date: Mon Sep 08 21:00:41 2003 +0000
description:
SKEY and BSDAUTH #ifdef mixup
diffstat:
crypto/dist/ssh/auth2-chall.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 57cc86263eb0 -r 1bf69ede5014 crypto/dist/ssh/auth2-chall.c
--- a/crypto/dist/ssh/auth2-chall.c Mon Sep 08 20:54:48 2003 +0000
+++ b/crypto/dist/ssh/auth2-chall.c Mon Sep 08 21:00:41 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth2-chall.c,v 1.11 2003/07/10 01:09:42 lukem Exp $ */
+/* $NetBSD: auth2-chall.c,v 1.12 2003/09/08 21:00:41 itojun Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2001 Per Allansson. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: auth2-chall.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $");
-__RCSID("$NetBSD: auth2-chall.c,v 1.11 2003/07/10 01:09:42 lukem Exp $");
+__RCSID("$NetBSD: auth2-chall.c,v 1.12 2003/09/08 21:00:41 itojun Exp $");
#include "ssh2.h"
#include "auth.h"
@@ -325,7 +325,7 @@
#ifdef BSD_AUTH
extern KbdintDevice mm_bsdauth_device;
#endif
-#ifdef SKEY
+#if !defined(BSD_AUTH) && defined(SKEY)
extern KbdintDevice mm_skey_device;
#endif
/* As long as SSHv1 has devices[0] hard coded this is fine */
Home |
Main Index |
Thread Index |
Old Index