* New upstream release (closes: #395507, #397961, #420035). Important

  changes not previously backported to 4.3p2:
  - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
    + On portable OpenSSH, fix a GSSAPI authentication abort that could be
      used to determine the validity of usernames on some platforms.
    + Implemented conditional configuration in sshd_config(5) using the
      "Match" directive. This allows some configuration options to be
      selectively overridden if specific criteria (based on user, group,
      hostname and/or address) are met. So far a useful subset of
      post-authentication options are supported and more are expected to
      be added in future releases.
    + Add support for Diffie-Hellman group exchange key agreement with a
      final hash of SHA256.
    + Added a "ForceCommand" directive to sshd_config(5). Similar to the
      command="..." option accepted in ~/.ssh/authorized_keys, this forces
      the execution of the specified command regardless of what the user
      requested. This is very useful in conjunction with the new "Match"
      option.
    + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
      permitopen="..." authorized_keys option, allowing fine-grained
      control over the port-forwardings that a user is allowed to
      establish.
    + Add optional logging of transactions to sftp-server(8).
    + ssh(1) will now record port numbers for hosts stored in
      ~/.ssh/known_hosts when a non-standard port has been requested
      (closes: #50612).
    + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
      non-zero exit code) when requested port forwardings could not be
      established.
    + Extend sshd_config(5) "SubSystem" declarations to allow the
      specification of command-line arguments.
    + Replacement of all integer overflow susceptible invocations of
      malloc(3) and realloc(3) with overflow-checking equivalents.
    + Many manpage fixes and improvements.
    + Add optional support for OpenSSL hardware accelerators (engines),
      enabled using the --with-ssl-engine configure option.
    + Tokens in configuration files may be double-quoted in order to
      contain spaces (closes: #319639).
    + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
      session exits very quickly (closes: #307890).
    + Fix some incorrect buffer allocation calculations (closes: #410599).
    + ssh-add doesn't ask for a passphrase if key file permissions are too
      liberal (closes: #103677).
    + Likewise, ssh doesn't ask either (closes: #99675).
  - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
    + sshd now allows the enabling and disabling of authentication methods
      on a per user, group, host and network basis via the Match directive
      in sshd_config.
    + Fixed an inconsistent check for a terminal when displaying scp
      progress meter (closes: #257524).
    + Fix "hang on exit" when background processes are running at the time
      of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
  install ChangeLog.gssapi.

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 */