[Git][debian-proftpd-team/proftpd][buster] Bug #4332: Fix navigation into symlinked directories by removing interfering...

[Hilmar Preuße]

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


Commits:
1e5348ed by Hilmar Preusse at 2020-10-06T22:13:21+02:00
Bug #4332: Fix navigation into symlinked directories by removing interfering code added as part of Bug#4219.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/d0ccdef643f92ff171920a5bf2892faa5f90124d.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,9 @@ proftpd-dfsg (1.3.6-4+deb10u6) buster-security; urgency=medium
   * Add patch for Issue #1119: Cannot disable client-initiated
     renegotiation for FTPS
     https://github.com/proftpd/proftpd/issues/1119
+  * Bug #4332: Fix navigation into symlinked directories by
+    removing interfering code added as part of Bug#4219.
+    (Closes: #971742)
 
  -- Hilmar Preusse <hille42 at web.de>  Mon, 05 Oct 2020 21:17:00 +0200
 


=====================================
debian/patches/d0ccdef643f92ff171920a5bf2892faa5f90124d.diff
=====================================
@@ -0,0 +1,45 @@
+From d0ccdef643f92ff171920a5bf2892faa5f90124d Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Mon, 22 Apr 2019 16:46:36 -0700
+Subject: [PATCH] Bug #4332: Fix navigation into symlinked directories by
+ removing interfering code added as part of Bug#4219.
+
+---
+ modules/mod_core.c | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/modules/mod_core.c b/modules/mod_core.c
+index 6c1c1478c..0c783f358 100644
+--- a/modules/mod_core.c
++++ b/modules/mod_core.c
+@@ -2,7 +2,7 @@
+  * ProFTPD - FTP server daemon
+  * Copyright (c) 1997, 1998 Public Flood Software
+  * Copyright (c) 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
+- * Copyright (c) 2001-2017 The ProFTPD Project team
++ * Copyright (c) 2001-2019 The ProFTPD Project team
+  *
+  * 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
+@@ -5065,21 +5065,6 @@ MODRET core_chdir(cmd_rec *cmd, char *ndir) {
+ 
+   orig_dir = ndir;
+ 
+-  pr_fs_clear_cache2(ndir);
+-  if (pr_fsio_lstat(ndir, &st) == 0) {
+-    if (S_ISLNK(st.st_mode)) {
+-      char buf[PR_TUNABLE_PATH_MAX];
+-      int len;
+-
+-      len = dir_readlink(cmd->tmp_pool, ndir, buf, sizeof(buf)-1,
+-        PR_DIR_READLINK_FL_HANDLE_REL_PATH);
+-      if (len > 0) {
+-        buf[len] = '\0';
+-        ndir = pstrdup(cmd->tmp_pool, buf);
+-      }
+-    }
+-  }
+-
+   ptr = get_param_ptr(TOPLEVEL_CONF, "ShowSymlinks", FALSE);
+   if (ptr != NULL) {
+     show_symlinks = *ptr;


=====================================
debian/patches/series
=====================================
@@ -25,3 +25,4 @@ Issue-903-We-want-to-remove-the-data-transfer-comman.patch
 upstream_pull_657
 upstream_pull_885
 upstream_pull_1076
+d0ccdef643f92ff171920a5bf2892faa5f90124d.diff



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/1e5348eddea4ab9c6d945863c7e09b9d81016b60

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