Import openssh_6.9p1.orig.tar.gz

1 files changed, 11 insertions, 4 deletions

diff --git a/servconf.h b/servconf.h
index 9922f0c8c..606d80c9d 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.116 2015/01/13 07:39:19 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.119 2015/05/22 03:50:02 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -58,7 +58,9 @@ typedef struct {
         u_int   num_ports;
         u_int   ports_from_cmdline;
         int     ports[MAX_PORTS];       /* Port number to listen on. */
-        char   *listen_addr;            /* Address on which the server listens. */
+        u_int   num_queued_listens;
+        char   **queued_listen_addrs;
+        int    *queued_listen_ports;
         struct addrinfo *listen_addrs;  /* Addresses on which the server listens. */
         int     address_family;         /* Address family used by the server. */
         char   *host_key_files[MAX_HOSTKEYS];   /* Files containing host keys. */
@@ -116,6 +118,7 @@ typedef struct {
                                                  * authenticated with Kerberos. */
         int     gss_authentication;     /* If true, permit GSSAPI authentication */
         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 */
@@ -176,9 +179,11 @@ typedef struct {
         char   *chroot_directory;
         char   *revoked_keys_file;
         char   *trusted_user_ca_keys;
-        char   *authorized_principals_file;
         char   *authorized_keys_command;
         char   *authorized_keys_command_user;
+        char   *authorized_principals_file;
+        char   *authorized_principals_command;
+        char   *authorized_principals_command_user;
 
         int64_t rekey_limit;
         int     rekey_interval;
@@ -214,9 +219,11 @@ struct connection_info {
                 M_CP_STROPT(banner); \
                 M_CP_STROPT(trusted_user_ca_keys); \
                 M_CP_STROPT(revoked_keys_file); \
-                M_CP_STROPT(authorized_principals_file); \
                 M_CP_STROPT(authorized_keys_command); \
                 M_CP_STROPT(authorized_keys_command_user); \
+                M_CP_STROPT(authorized_principals_file); \
+                M_CP_STROPT(authorized_principals_command); \
+                M_CP_STROPT(authorized_principals_command_user); \
                 M_CP_STROPT(hostbased_key_types); \
                 M_CP_STROPT(pubkey_key_types); \
                 M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \