New upstream release (7.3p1).

1 files changed, 22 insertions, 31 deletions

diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index c64e141f8..3bd2fd91f 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -1,4 +1,4 @@
-From bf0d87583a842b9e8aaf2a9cd9dbc3e976df2af4 Mon Sep 17 00:00:00 2001
+From 563974a78e937c4844e1198b5f6d79b8b2b5c600 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:09:58 +0000
 Subject: Allow harmless group-writability
@@ -22,16 +22,16 @@ Patch-Name: user-group-modes.patch
  misc.c        | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  misc.h        |  2 ++
  platform.c    | 16 --------------
- readconf.c    |  5 +++--
+ readconf.c    |  3 +--
  ssh.1         |  2 ++
  ssh_config.5  |  2 ++
- 8 files changed, 82 insertions(+), 29 deletions(-)
+ 8 files changed, 80 insertions(+), 29 deletions(-)
 
 diff --git a/auth-rhosts.c b/auth-rhosts.c
-index ee9e827..2ff2cff 100644
+index 0ef3447..c17c13c 100644
 --- a/auth-rhosts.c
 +++ b/auth-rhosts.c
-@@ -271,8 +271,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
+@@ -273,8 +273,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
                 return 0;
         }
         if (options.strict_modes &&
@@ -41,7 +41,7 @@ index ee9e827..2ff2cff 100644
                 logit("Rhosts authentication refused for %.100s: "
                     "bad ownership or modes for home directory.", pw->pw_name);
                 auth_debug_add("Rhosts authentication refused for %.100s: "
-@@ -298,8 +297,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
+@@ -300,8 +299,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
                  * allowing access to their account by anyone.
                  */
                 if (options.strict_modes &&
@@ -52,10 +52,10 @@ index ee9e827..2ff2cff 100644
                             pw->pw_name, buf);
                         auth_debug_add("Bad file modes for %.200s", buf);
 diff --git a/auth.c b/auth.c
-index bd6a026..782b7f8 100644
+index f56dcc6..3f8b348 100644
 --- a/auth.c
 +++ b/auth.c
-@@ -425,8 +425,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
+@@ -435,8 +435,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
                 user_hostfile = tilde_expand_filename(userfile, pw->pw_uid);
                 if (options.strict_modes &&
                     (stat(user_hostfile, &st) == 0) &&
@@ -65,7 +65,7 @@ index bd6a026..782b7f8 100644
                         logit("Authentication refused for %.100s: "
                             "bad owner or modes for %.200s",
                             pw->pw_name, user_hostfile);
-@@ -488,8 +487,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
+@@ -498,8 +497,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
                 snprintf(err, errlen, "%s is not a regular file", buf);
                 return -1;
         }
@@ -75,7 +75,7 @@ index bd6a026..782b7f8 100644
                 snprintf(err, errlen, "bad ownership or modes for file %s",
                     buf);
                 return -1;
-@@ -504,8 +502,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
+@@ -514,8 +512,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
                 strlcpy(buf, cp, sizeof(buf));
  
                 if (stat(buf, &st) < 0 ||
@@ -86,7 +86,7 @@ index bd6a026..782b7f8 100644
                             "bad ownership or modes for directory %s", buf);
                         return -1;
 diff --git a/misc.c b/misc.c
-index de7e1fa..5704fa6 100644
+index 9421b4d..68efb2b 100644
 --- a/misc.c
 +++ b/misc.c
 @@ -51,8 +51,9 @@
@@ -108,7 +108,7 @@ index de7e1fa..5704fa6 100644
  
  /* remove newline at end of string */
  char *
-@@ -647,6 +649,71 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
+@@ -708,6 +710,71 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
         return -1;
  }
  
@@ -181,10 +181,10 @@ index de7e1fa..5704fa6 100644
  tun_open(int tun, int mode)
  {
 diff --git a/misc.h b/misc.h
-index 374c33c..89e1f75 100644
+index 7c76a6a..42cd95e 100644
 --- a/misc.h
 +++ b/misc.h
-@@ -135,4 +135,6 @@ char        *read_passphrase(const char *, int);
+@@ -139,4 +139,6 @@ char        *read_passphrase(const char *, int);
  int     ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
  int     read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
  
@@ -192,10 +192,10 @@ index 374c33c..89e1f75 100644
 +
  #endif /* _MISC_H */
 diff --git a/platform.c b/platform.c
-index f35ec39..9a23e6e 100644
+index 4831706..2ce4dbf 100644
 --- a/platform.c
 +++ b/platform.c
-@@ -197,19 +197,3 @@ platform_krb5_get_principal_name(const char *pw_name)
+@@ -199,19 +199,3 @@ platform_krb5_get_principal_name(const char *pw_name)
         return NULL;
  #endif
  }
@@ -216,19 +216,10 @@ index f35ec39..9a23e6e 100644
 -       return 0;
 -}
 diff --git a/readconf.c b/readconf.c
-index fde6b41..cc1a633 100644
+index 3a6c67b..f6b4c8f 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -39,6 +39,8 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-+#include <pwd.h>
-+#include <grp.h>
- #ifdef HAVE_UTIL_H
- #include <util.h>
- #endif
-@@ -1626,8 +1628,7 @@ read_config_file(const char *filename, struct passwd *pw, const char *host,
+@@ -1753,8 +1753,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
  
                 if (fstat(fileno(f), &sb) == -1)
                         fatal("fstat %s: %s", filename, strerror(errno));
@@ -239,10 +230,10 @@ index fde6b41..cc1a633 100644
         }
  
 diff --git a/ssh.1 b/ssh.1
-index cc53343..feb0e89 100644
+index 4011c65..feef81a 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1459,6 +1459,8 @@ The file format and configuration options are described in
+@@ -1484,6 +1484,8 @@ The file format and configuration options are described in
  .Xr ssh_config 5 .
  Because of the potential for abuse, this file must have strict permissions:
  read/write for the user, and not writable by others.
@@ -252,10 +243,10 @@ index cc53343..feb0e89 100644
  .It Pa ~/.ssh/environment
  Contains additional definitions for environment variables; see
 diff --git a/ssh_config.5 b/ssh_config.5
-index bbf638b..ab8f271 100644
+index efc265a..5dd26bc 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1830,6 +1830,8 @@ The format of this file is described above.
+@@ -1903,6 +1903,8 @@ The format of this file is described above.
  This file is used by the SSH client.
  Because of the potential for abuse, this file must have strict permissions:
  read/write for the user, and not accessible by others.