From 84a5921d33a5190779285017675e99e6b4aaf32f Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 9 Oct 2018 08:12:46 +0200
Subject: ftpd: Restructure chroot() handling.

Remove superfluous setting of errno = 0.

Update #3530.
---
 cpukit/ftpd/ftpd.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'cpukit/ftpd')

diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c
index 580e55cb42..9c84ff5c43 100644
--- a/cpukit/ftpd/ftpd.c
+++ b/cpukit/ftpd/ftpd.c
@@ -1872,7 +1872,6 @@ session(rtems_task_argument arg)
   while (1)
   {
     rtems_event_set set;
-    int rv;
 
     rtems_event_receive(FTPD_RTEMS_EVENT, RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT,
       &set);
@@ -1882,14 +1881,11 @@ session(rtems_task_argument arg)
         && chroot(ftpd_root) == 0);
 
     /*
-     * The chdir() must immediatly follow the chroot(), otherwise static
+     * The chdir() must immediately follow the chroot(), otherwise static
      * analysis tools may complain about a security issue.
-    */
-    rv = chroot_made ? chdir("/") : -1;
-
-    errno = 0;
+     */
 
-    if (rv == 0)
+    if (chroot_made && chdir("/") == 0)
     {
       send_reply(info, 220, FTPD_SERVER_MESSAGE);
 
-- 
cgit v1.2.3