1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
|
Index: twoftpd-anon-conf.c
===================================================================
RCS file: /var/lib/cvs/twoftpd/twoftpd-anon-conf.c,v
retrieving revision 1.4
diff -u -r1.4 twoftpd-anon-conf.c
--- twoftpd-anon-conf.c 25 Jun 2002 13:50:20 -0000 1.4
+++ twoftpd-anon-conf.c 24 Aug 2003 14:13:00 -0000
@@ -92,15 +92,14 @@
"exec 2>&1\n"
"umask 022\n"
"exec \\\n"
- "tcpserver -DRHv -llocalhost ", ip, " 21 \\\n"
- "softlimit -m 2000000 \\\n"
- "envdir ", maindir, "/env \\\n",
- conf_bin, "/twoftpd-anon");
+ "tcpsvd -v -llocalhost ", ip, " 21 \\\n"
+ " chpst -m2000000 -e./env \\\n"
+ " twoftpd-anon", 0, 0, 0, 0);
make_file("log/run", 0755,
"#!/bin/sh\n"
"exec \\\n"
- "setuidgid ", logname, " \\\n"
- "multilog t ", logdir, 0, 0, 0);
+ "chpst -u", logname, " \\\n"
+ " svlogd -t ", logdir, 0, 0, 0);
make_fileu("env/CHROOT", 1);
make_fileu("env/GID", ftpgid);
make_file("env/HOME", 0644, ftpdir, 0, 0, 0, 0, 0, 0);
Index: twoftpd-conf.c
===================================================================
RCS file: /var/lib/cvs/twoftpd/twoftpd-conf.c,v
retrieving revision 1.2
diff -u -r1.2 twoftpd-conf.c
--- twoftpd-conf.c 25 Jun 2002 13:50:20 -0000 1.2
+++ twoftpd-conf.c 24 Aug 2003 14:13:00 -0000
@@ -84,20 +84,18 @@
"exec 2>&1\n"
"umask 022\n"
"exec \\\n"
- "tcpserver -DRHv -llocalhost ", ip, " 21 \\\n"
- "envdir ", maindir, "/env \\\n");
- obuf_put7s(&conf_out,
- "softlimit -m 2000000 \\\n",
- conf_bin, "/twoftpd-auth \\\n",
- cvmpath, " \\\n",
- conf_bin, "/twoftpd-xfer");
+ "tcpsvd -v -llocalhost ", ip, " 21 \\\n"
+ " chpst -m2000000 -e./env \\\n"
+ " twoftpd-auth ",
+ cvmpath,
+ " twoftpd-xfer");
end_file();
make_file("log/run", 0755,
"#!/bin/sh\n"
"exec \\\n"
- "setuidgid ", logacct->pw_name, " \\\n"
- "multilog t ", logdir, 0, 0, 0);
+ "chpst -u", logacct->pw_name, " \\\n"
+ " svlogd -t ", logdir, 0, 0, 0);
if (dochroot) make_fileu("env/CHROOT", 1);
|