Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/ftpd.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/ftpd.c (modified) (7 diffs)

branches/3.2/mindi-busybox/networking/ftpd.c

@@ -12 +12 @@
  * You have to run this daemon via inetd.
  */
+
+//usage:#define ftpd_trivial_usage
+//usage:       "[-wvS] [-t N] [-T N] [DIR]"
+//usage:#define ftpd_full_usage "\n\n"
+//usage:       "Anonymous FTP server\n"
+//usage:       "\n"
+//usage:       "ftpd should be used as an inetd service.\n"
+//usage:       "ftpd's line for inetd.conf:\n"
+//usage:       "    21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
+//usage:       "It also can be ran from tcpsvd:\n"
+//usage:       "    tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
+//usage:     "\n    -w  Allow upload"
+//usage:     "\n    -v  Log errors to stderr. -vv: verbose log"
+//usage:     "\n    -S  Log errors to syslog. -SS: verbose log"
+//usage:     "\n    -t,-T   Idle and absolute timeouts"
+//usage:     "\n    DIR Change root to this directory"
 
 #include "libbb.h"
@@ -207 +223 @@
     *(uint32_t *) G.msg_err = status;
     xwrite(STDOUT_FILENO, G.msg_err, sizeof("NNN " MSG_ERR) - 1);
-    if (G.verbose > 1)
+    if (G.verbose > 0)
         verbose_log(G.msg_err);
 }
@@ -417 +433 @@
     setsockopt_reuseaddr(fd);
 
-    set_nport(G.local_addr, 0);
+    set_nport(&G.local_addr->u.sa, 0);
     xbind(fd, &G.local_addr->u.sa, G.local_addr->len);
     xlisten(fd, 1);
@@ -526 +542 @@
 #else
     G.port_addr = get_peer_lsa(STDIN_FILENO);
-    set_nport(G.port_addr, htons(port));
+    set_nport(&G.port_addr->u.sa, htons(port));
 #endif
     WRITE_OK(FTP_PORTOK);
@@ -806 +822 @@
         sprintf(buf, STR(FTP_STATFILE_OK)" %04u%02u%02u%02u%02u%02u\r\n",
             broken_out.tm_year + 1900,
-            broken_out.tm_mon,
+            broken_out.tm_mon + 1,
             broken_out.tm_mday,
             broken_out.tm_hour,
@@ -912 +928 @@
      || !S_ISREG(statbuf.st_mode)
     ) {
+        free(tempname);
         WRITE_ERR(FTP_UPLOADFAIL);
         if (local_file_fd >= 0)
@@ -1164 +1181 @@
 
     if (argv[optind]) {
-        xchdir(argv[optind]);
-        chroot(".");
+        xchroot(argv[optind]);
     }