- reyk@cvs.openbsd.org 2005/12/08 18:34:11

     [auth-options.c includes.h misc.c misc.h readconf.c servconf.c]
     [serverloop.c ssh.c ssh_config.5 sshd_config.5 configure.ac]
     two changes to the new ssh tunnel support. this breaks compatibility
     with the initial commit but is required for a portable approach.
     - make the tunnel id u_int and platform friendly, use predefined types.
     - support configuration of layer 2 (ethernet) or layer 3
     (point-to-point, default) modes. configuration is done using the
     Tunnel (yes|point-to-point|ethernet|no) option is ssh_config(5) and
     restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option
     in sshd_config(5).
     ok djm@, man page bits by jmc@

1 files changed, 2 insertions, 2 deletions

diff --git a/auth-options.c b/auth-options.c
index 54798d9ad..ad97e6129 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.32 2005/12/06 22:38:27 reyk Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.33 2005/12/08 18:34:11 reyk Exp $");
 
 #include "xmalloc.h"
 #include "match.h"
@@ -296,7 +296,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                         tun[i] = 0;
                         forced_tun_device = a2tun(tun, NULL);
                         xfree(tun);
-                        if (forced_tun_device < -1) {
+                        if (forced_tun_device == SSH_TUNID_ERR) {
                                 debug("%.100s, line %lu: invalid tun device",
                                     file, linenum);
                                 auth_debug_add("%.100s, line %lu: invalid tun device",