[Git][debian-proftpd-team/proftpd][master] Add patch for upstream bug 4356.

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
3b021989 by Hilmar Preuße at 2018-08-10T08:39:19Z
Add patch for upstream bug 4356.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/upstream_4356


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ proftpd-dfsg (1.3.6-3) UNRELEASED; urgency=medium
   [ Hilmar Preuße ]
   * Pick github_pr_710.patch from upstream:
     [PATCH] Issue #674: Update mod_sftp to handle changed APIs in OpenSSL
+    [PATCH] Bug#4356: Fix infinite loop by actually iterating properly for the next configuration record.
 
   * Run configure w/ --disable-xattr only on kfreebsd to fix FTBFS.
     (Closes: #897168)


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ upstream_4336
 upstream_4312
 upstream_4312_fix_version
 github_pr_710
+upstream_4356


=====================================
debian/patches/upstream_4356
=====================================
--- /dev/null
+++ b/debian/patches/upstream_4356
@@ -0,0 +1,28 @@
+From 22b689901775d1129530e8329556d32bae878125 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Wed, 8 Aug 2018 11:15:21 -0700
+Subject: [PATCH 1/2] Bug#4356: Fix infinite loop by actually iterating properly for the next configuration record.  Oops.
+
+---
+ contrib/mod_sftp/mod_sftp.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- proftpd-dfsg.orig/contrib/mod_sftp/mod_sftp.c
++++ proftpd-dfsg/contrib/mod_sftp/mod_sftp.c
+@@ -1,6 +1,6 @@
+ /*
+  * ProFTPD - mod_sftp
+- * Copyright (c) 2008-2017 TJ Saunders
++ * Copyright (c) 2008-2018 TJ Saunders
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -1211,6 +1211,8 @@
+           insecure_hostkey_perms = TRUE;
+           break;
+         }
++
++        c = find_config_next(c, c->next, CONF_PARAM, "SFTPOptions", FALSE);
+       }
+ 
+       if (insecure_hostkey_perms) {



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/3b0219894454315d24f0cf30c990104ca9f8dbac

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/3b0219894454315d24f0cf30c990104ca9f8dbac
You're receiving this email because of your account on salsa.debian.org.