import openssh-4.6p1-gsskex-20070312.patch

1 files changed, 15 insertions, 5 deletions

diff --git a/servconf.h b/servconf.h
index 0ef05bcd9..257de1c8b 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: servconf.h,v 1.72 2005/12/06 22:38:27 reyk Exp $      */
+/* $OpenBSD: servconf.h,v 1.80 2007/02/19 10:45:58 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,8 +16,6 @@
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
-#include "buffer.h"
-
 #define MAX_PORTS               256     /* Max # ports. */
 
 #define MAX_ALLOW_USERS         256     /* Max # users on allow list. */
@@ -27,6 +25,7 @@
 #define MAX_SUBSYSTEMS          256     /* Max # subsystems. */
 #define MAX_HOSTKEYS            256     /* Max # hostkeys. */
 #define MAX_ACCEPT_ENV          256     /* Max # of env vars. */
+#define MAX_MATCH_GROUPS        256     /* Max # of groups for Match. */
 
 /* permit_root_login */
 #define PERMIT_NOT_SET          -1
@@ -90,6 +89,7 @@ typedef struct {
         int     gss_authentication;     /* If true, permit GSSAPI authentication */
         int     gss_keyex;              /* If true, permit GSSAPI key exchange */
         int     gss_cleanup_creds;      /* If true, destroy cred cache on logout */
+        int     gss_strict_acceptor;    /* If true, restrict the GSSAPI acceptor name */
         int     password_authentication;        /* If true, permit password
                                                  * authentication. */
         int     kbd_interactive_authentication; /* If true, permit */
@@ -112,6 +112,7 @@ typedef struct {
         u_int num_subsystems;
         char   *subsystem_name[MAX_SUBSYSTEMS];
         char   *subsystem_command[MAX_SUBSYSTEMS];
+        char   *subsystem_args[MAX_SUBSYSTEMS];
 
         u_int num_accept_env;
         char   *accept_env[MAX_ACCEPT_ENV];
@@ -135,15 +136,24 @@ typedef struct {
         char   *authorized_keys_file;   /* File containing public keys */
         char   *authorized_keys_file2;
 
+        char   *adm_forced_command;
+
         int     use_pam;                /* Enable auth via PAM */
 
         int     permit_tun;
+
+        int     num_permitted_opens;
 }       ServerOptions;
 
 void     initialize_server_options(ServerOptions *);
 void     fill_default_server_options(ServerOptions *);
-int      process_server_config_line(ServerOptions *, char *, const char *, int);
+int      process_server_config_line(ServerOptions *, char *, const char *, int,
+             int *, const char *, const char *, const char *);
 void     load_server_config(const char *, Buffer *);
-void     parse_server_config(ServerOptions *, const char *, Buffer *);
+void     parse_server_config(ServerOptions *, const char *, Buffer *,
+             const char *, const char *, const char *);
+void     parse_server_match_config(ServerOptions *, const char *, const char *,
+             const char *);
+void     copy_set_server_options(ServerOptions *, ServerOptions *, int);
 
 #endif                          /* SERVCONF_H */