Module Name: src Committed By: riz Date: Sat Nov 20 18:27:50 UTC 2010
Modified Files: src/crypto/dist/ssh [netbsd-5]: misc.c Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1392): crypto/external/bsd/openssh/dist/misc.c: revision 1.3 Fix tunnelling (ssh -w). The kernel expects a device to be passed to the socked, not a path. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.4.1 src/crypto/dist/ssh/misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/dist/ssh/misc.c diff -u src/crypto/dist/ssh/misc.c:1.22 src/crypto/dist/ssh/misc.c:1.22.4.1 --- src/crypto/dist/ssh/misc.c:1.22 Wed Sep 17 15:45:50 2008 +++ src/crypto/dist/ssh/misc.c Sat Nov 20 18:27:50 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.22 2008/09/17 15:45:50 christos Exp $ */ +/* $NetBSD: misc.c,v 1.22.4.1 2010/11/20 18:27:50 riz Exp $ */ /* $OpenBSD: misc.c,v 1.67 2008/01/01 08:47:04 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -26,7 +26,7 @@ */ #include "includes.h" -__RCSID("$NetBSD: misc.c,v 1.22 2008/09/17 15:45:50 christos Exp $"); +__RCSID("$NetBSD: misc.c,v 1.22.4.1 2010/11/20 18:27:50 riz Exp $"); #include <sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -680,6 +680,7 @@ debug("%s: %s mode %d fd %d", __func__, ifr.ifr_name, mode, fd); /* Set the tunnel device operation mode */ + snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s%d", tunbase, tun); if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) goto failed;