[gentoo-commits] gentoo-x86 commit in net-ftp/oftpd/files: oftpd-0.3.7-delay-root-check.patch

[Mike Frysinger (vapier)]

vapier      14/03/29 20:58:11

  Added:                oftpd-0.3.7-delay-root-check.patch
  Log:
  Delay root check until after processing the command line.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch?rev=1.1&content-type=text/plain

Index: oftpd-0.3.7-delay-root-check.patch
===================================================================
check for root after processing args so non-root can run --help

--- a/src/oftpd.c
+++ b/src/oftpd.c
@@ -56,12 +56,6 @@ int main(int argc, char *argv[])
         exe_name = argv[0];
     }
 
-    /* verify we're running as root */
-    if (geteuid() != 0) {
-        fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
-        exit(1);
-    }
-
     /* default command-line arguments */
     port = FTP_PORT;
     user_ptr = NULL;
@@ -187,6 +181,12 @@ int main(int argc, char *argv[])
         exit(1);
     }
 
+    /* verify we're running as root */
+    if (geteuid() != 0) {
+        fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
+        exit(1);
+    }
+
     /* become a daemon */
     if (detach) {
         daemonize();