1 files changed, 29 insertions, 18 deletions

diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch
index a6a842ecd..5d98b81a2 100644
--- a/debian/patches/auth-log-verbosity.patch
+++ b/debian/patches/auth-log-verbosity.patch
@@ -1,14 +1,25 @@
-Description: Quieten logs when multiple from= restrictions are used
-Author: Colin Watson <cjwatson@debian.org>
+From ec5991d73abdc0b3c43ea9f8a0e99da045e7beb1 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Sun, 9 Feb 2014 16:10:02 +0000
+Subject: Quieten logs when multiple from= restrictions are used
+
 Bug-Debian: http://bugs.debian.org/630606
 Forwarded: no
 Last-Update: 2013-09-14
 
-Index: b/auth-options.c
-===================================================================
+Patch-Name: auth-log-verbosity.patch
+---
+ auth-options.c | 35 ++++++++++++++++++++++++++---------
+ auth-options.h |  1 +
+ auth-rsa.c     |  2 ++
+ auth2-pubkey.c |  3 +++
+ 4 files changed, 32 insertions(+), 9 deletions(-)
+
+diff --git a/auth-options.c b/auth-options.c
+index 12e2e1d..15c00d0 100644
 --- a/auth-options.c
 +++ b/auth-options.c
-@@ -58,9 +58,20 @@
+@@ -58,9 +58,20 @@ int forced_tun_device = -1;
  /* "principals=" option. */
  char *authorized_principals = NULL;
  
@@ -29,7 +40,7 @@ Index: b/auth-options.c
  auth_clear_options(void)
  {
         no_agent_forwarding_flag = 0;
-@@ -288,10 +299,13 @@
+@@ -288,10 +299,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 /* FALLTHROUGH */
                         case 0:
                                 free(patterns);
@@ -47,7 +58,7 @@ Index: b/auth-options.c
                                 auth_debug_add("Your host '%.200s' is not "
                                     "permitted to use this key for login.",
                                     remote_host);
-@@ -513,11 +527,14 @@
+@@ -513,11 +527,14 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
                                         break;
                                 case 0:
                                         /* no match */
@@ -67,11 +78,11 @@ Index: b/auth-options.c
                                         auth_debug_add("Your address '%.200s' "
                                             "is not permitted to use this "
                                             "certificate for login.",
-Index: b/auth-options.h
-===================================================================
+diff --git a/auth-options.h b/auth-options.h
+index 7455c94..a3f0a02 100644
 --- a/auth-options.h
 +++ b/auth-options.h
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,7 @@ extern int forced_tun_device;
  extern int key_is_cert_authority;
  extern char *authorized_principals;
  
@@ -79,11 +90,11 @@ Index: b/auth-options.h
  int    auth_parse_options(struct passwd *, char *, char *, u_long);
  void   auth_clear_options(void);
  int    auth_cert_options(Key *, struct passwd *);
-Index: b/auth-rsa.c
-===================================================================
+diff --git a/auth-rsa.c b/auth-rsa.c
+index 6ed152c..9b139c9 100644
 --- a/auth-rsa.c
 +++ b/auth-rsa.c
-@@ -174,6 +174,8 @@
+@@ -174,6 +174,8 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file,
         if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL)
                 return 0;
  
@@ -92,11 +103,11 @@ Index: b/auth-rsa.c
         /*
          * Go though the accepted keys, looking for the current key.  If
          * found, perform a challenge-response dialog to verify that the
-Index: b/auth2-pubkey.c
-===================================================================
+diff --git a/auth2-pubkey.c b/auth2-pubkey.c
+index 12eb8a6..7c0ceee 100644
 --- a/auth2-pubkey.c
 +++ b/auth2-pubkey.c
-@@ -257,6 +257,7 @@
+@@ -257,6 +257,7 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert)
                 restore_uid();
                 return 0;
         }
@@ -104,7 +115,7 @@ Index: b/auth2-pubkey.c
         while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
                 /* Skip leading whitespace. */
                 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
-@@ -318,6 +319,7 @@
+@@ -318,6 +319,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
         found_key = 0;
  
         found = NULL;
@@ -112,7 +123,7 @@ Index: b/auth2-pubkey.c
         while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
                 char *cp, *key_options = NULL;
                 if (found != NULL)
-@@ -453,6 +455,7 @@
+@@ -453,6 +455,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key)
         if (key_cert_check_authority(key, 0, 1,
             principals_file == NULL ? pw->pw_name : NULL, &reason) != 0)
                 goto fail_reason;