Commit Graph

1257 Commits

Author SHA1 Message Date
cgd
d594ce939b comment or delete text after CPP directives. 2001-01-16 02:50:27 +00:00
cgd
bcc8ec9959 include stdlib.h for prototypes (typically for exit()). 2001-01-16 02:44:43 +00:00
cgd
9cfe468c74 avoid C sequence point issues warned about by development version of gcc. 2001-01-16 02:41:17 +00:00
cgd
49376c23c2 use libc version of err rather than a local one. 2001-01-16 02:38:05 +00:00
christos
5d6793c06c back out previous commit; I found a better way of handling the missing
dependencies.
2001-01-14 09:39:26 +00:00
christos
61944ce838 Don't use ${OBJS} in the dependency line, cause it is not defined yet.
Also add a .NOTMAIN for good measure.
2001-01-14 09:16:47 +00:00
lukem
d59d820e4b - use SHUT_RDWR instead of 1+1 for the 2nd arg to shutdown()
- use LOG_ERR for fatal errors
- don't use LOG_ODELAY, it's the default
2001-01-11 01:32:34 +00:00
lukem
412ee5c5f1 use LOG_ERR for fatal errors, LOG_WARNING for other errors
minor knf
deprecate LOG_ODELAY; it's the default
2001-01-10 02:51:37 +00:00
lukem
105b038025 consistently use exit instead of return in main()
use LOG_WARNING instead of LOG_ERR for non critical errors
2001-01-10 01:57:51 +00:00
lukem
1ad851cb0f use LOG_WARNING instead of LOG_ERR for non critical errors 2001-01-10 01:50:05 +00:00
lukem
40dcfe23f1 consistently use LOG_NOTICE instead of LOG_INFO for hostname lookup probs 2001-01-10 01:41:38 +00:00
lukem
3f963260b9 be more consistent about syslog usage. now it's more like:
err		fatal errors
	warning		warnings
	info		status messages (-d), stats on SIGxxx
	debug		debug messages (-d), debug stats
2001-01-10 01:13:54 +00:00
lukem
23e3351629 - don't use LOG_ODELAY; it's the default
- use LOG_WARNING (instead of LOG_ERR) for non-fatal errors
2001-01-10 00:36:44 +00:00
lukem
cbddac44d6 consistently use syslog priorities 2001-01-10 00:20:49 +00:00
lukem
edc4b40801 convert to ansi knf
replace (sole use of) sprintf() with snprintf()
only syslog debug messages if logging
2001-01-09 23:29:22 +00:00
itojun
6e46d0e389 ensure replydirname() do not truncate the names.
From: Paul Janzen <pjanzen@foatdi.harvard.edu>
2001-01-09 06:07:01 +00:00
itojun
b32589e180 make sure we do not return stray " at the end of stirng, like bla"\0.
From: "William C. Allen" <allenwc@home.com>
2001-01-09 05:06:14 +00:00
joff
d68ab23851 Don't qsort() by the segcreate field. Prevents potentially serious filesystem
corruption if the clock jumps backwards.
2001-01-09 04:31:18 +00:00
lukem
de3e6adaf6 use more standard %ll_ in favour of %q_ 2001-01-04 17:24:35 +00:00
sommerfeld
1d442ae998 ${MAKE} print-objdir -> ${PRINTOBJDIR} 2000-12-30 17:29:24 +00:00
sommerfeld
ac8e2453b8 Add new :cs: modifier to gettytab which clears the screen using the
appropriate control sequence from termcap (based on the terminal type
listed in /etc/ttys for the line).
2000-12-28 22:18:27 +00:00
scw
b37a02f8c1 Define VARPSZ so dynamic binaries work on both 4K and 8K page size machines. 2000-12-21 09:12:54 +00:00
lukem
5015048190 Features:
* Add ftpd.conf(5) directive `advertise'; change the address that is
  advertised to the client for PASV transfers. this may be useful in
  certain firewall/NAT environments.

  Feature requested in [bin/9606] by Scott Presnell.

* Add -X option; syslog wu-ftpd style xferlog messages, prefixed with
  `xferlog: '.  An example line from syslog (wrapped):
	Dec 16 18:50:24 odysseus ftpd[571]: xferlog: Sat Dec 16 18:50:24 2000
	2 localhost 3747328 /pub/WLW2K601.EXE b _ o a lukem@ FTP 0 * c

  These messages can be converted to a wu-ftpd style xferlog file
  suitable for parsing with third-party tools with something like:
	grep 'xferlog: ' /var/log/xferlog | \
	    sed -e 's/^.*xferlog: //' >wuxferlog

  The format is the same as the wu-ftpd xferlog entries (with the leading
  syslog stuff), but different from the wu-ftpd syslogged xferlog entries
  because the latter is not as easy to convert into the standard xferlog
  file format.

  The choice to only syslog the xferlog messages rather than append to
  a /var/log/xferlog file was made because the latter doesn't work to
  well in the situation where the logfile is rotated and compressed and
  a long-running ftpd still has a file-descriptor to the now nonexistant
  xferlog file, and the log message will then get lost.

  Feature requested in [bin/11651] by Hubert Feyrer.


Fixes:

* In ftpd(8), clarify the -a and -c options.

* More clarifications in ftpd.conf(5).

* Ensure that all ftpd.conf commands set a parameter back to sane defaults
  if an argument of `none' or bad settings are given.

* Support the `chroot' directive for `REAL' users too (for consistency).

* For `GUEST' users, store the supplied password in pw->pw_passwd for use
  later in the xferlog.

* If show_chdir_messages() is given a code of -1, flush the cache of
  visited directories.  Invoke show_chdir_messages(-1) in end_login().

* Only syslog session stats if logging is requested.

* Rename logcmd() -> logxfer(), and dolog() -> logremotehost().

* Use cprintf() instead of fprintf() where appropriate.

* Minor KNF, and make a couple of functions static that were declared static.
2000-12-18 02:32:50 +00:00
pk
872b464997 Deal with an empty hints file. 2000-12-17 21:41:15 +00:00
wiz
7cc2f76925 Remove unnecessary header includes; remove 'register'; conform better to KNF. 2000-12-17 20:53:03 +00:00
mycroft
48b362e14c More cruft. 2000-12-15 06:49:19 +00:00
mycroft
a19119777a Clean up cruft in here. 2000-12-15 06:46:22 +00:00
assar
142187795f (scrub_env): change to only accept a listed set of variables,
including only non-filename contents for TERMCAP
2000-12-09 00:50:21 +00:00
itojun
6e3f1ac15c in replydirname(), avoid one-byte overrun.
From: Kristian Vlaardingerbroek <kris@obit.nl> (to bugs@openbsd)
2000-12-04 10:50:39 +00:00
lukem
af83a0d7c4 fix typo 2000-12-01 07:59:47 +00:00
simonb
0833efd07d Remove extern variables and functions now declared in dkstats.h. 2000-12-01 02:10:22 +00:00
simonb
80bd9216d2 ANSIfy. 2000-11-30 23:59:03 +00:00
lukem
c31c7b7d00 initialise confdir to _DEFAULT_CONFDIR again, so that -C works... 2000-11-30 08:33:33 +00:00
lukem
b01ed05afa - rename valid_passwd() -> checkpassword()
- move check for expired accounts from pass() into checkpassword()
2000-11-30 06:06:08 +00:00
lukem
be437fb5c3 - move password checking into separate valid_passwd() function, to assist
in porting to other systems.
- don't syslog() or setproctitle() "ACCT" lines (as per "PASS")
- replace #ifdef HASSETPROCTITLE with #if HAVE_SETPROCTITLE, and set the
  latter #ifdef BSD4_4
- don't compile in internal `ls' #ifdef NO_INTERNAL_LS. will need Makefile
  support if this is to be used on NetBSD.
2000-11-30 02:59:11 +00:00
simonb
ba632e7078 Use the vm.uvmexp2 sysctl. 2000-11-29 11:18:33 +00:00
lukem
dd752c833d modify dolog() to take a struct sockinet * instead of struct sockaddr * 2000-11-28 09:46:34 +00:00
lukem
a1d4e29274 - ensure all uses of AF_INET6 are wrapped in #ifdef INET6
- don't define `ALL' as a token twice in the grammar
2000-11-28 09:31:29 +00:00
mycroft
e496c5f86f Add another debugging message. 2000-11-28 06:01:46 +00:00
mycroft
6025f99517 Make this compile with -DDEBUG. 2000-11-28 06:01:34 +00:00
mycroft
6ec13b9d73 Return an error when there are too many segments rather than abort()ing.
This way `ldd /usr/libexec/ld.elf_so' doesn't core dump.
2000-11-26 05:22:15 +00:00
itojun
f28aa6da4e cope with 2292bis-01 getaddrinfo (no NI_WITHSCOPEID, always attach
scope identifier).
always check error result from getnameinfo.
2000-11-24 12:56:45 +00:00
perseant
59ca5b76e4 Don't "compress" segment data if we were using mmap instead of malloc/copy
to read the segment.
2000-11-23 23:01:55 +00:00
perseant
c019319ae3 Check for ENOENT return from lfs_{bmapv,markv} and do the right thing with it,
avoiding needless looping (possibly infinite looping) on certain kinds of
errors.

Get rid of erroneous free() in error return from add_segment.

Patch from Jesse Off <joff@gci-net.com> (PR #11547).
2000-11-22 22:17:39 +00:00
itojun
b7b6056081 make sure we do not overrun packet buffer when we set error message string. 2000-11-21 13:50:25 +00:00
itojun
9b1ccfd10e handle getnameinfo error properly 2000-11-21 13:39:07 +00:00
christos
5135a422f1 Buffer overflow and environment passing fixes [originally inspired from
FreeBSD]. We really didn't need the environment fixes, but for the sake
of keeping the code as close as possible...
2000-11-19 20:17:39 +00:00
lukem
999fd3d617 - new ftpd.conf directives:
maxfilesize	set the maximum size of uploaded files
	sanenames	if set, only permit uploaded filenames that contain
			characters from the set "-+,._A-Za-z0-9" and that
			don't start with `.'

- new/changed command line options:
	-e emailaddr	define email address for %E (see below)
	-P dataport	use dataport as the dataport (instead of ctrlport-1)
	-q		use pid files to count users	[default]
	-Q		don't use pid files to count users
	-u		write entries to utmp
	-U		don't write entries to utmp	[default]
	-w		write entries to wtmp		[default]
	-W		don't write entries to wtmp

	  NOTE:	-U used to mean `write utmp entries'. Its meaning has changed
		so that it's orthogonal with -q/-Q and -w/-W. This isn't
		considered a major problem, because using -U isn't going to
		enable something you don't want, but will disable something
		you did want (which is safer).

- new display file escape sequences:
	%E	email address
	%s	literal `s' if the previous %M or %N wasn't ``1''.
	%S	literal `S' if the previous %M or %N wasn't ``1''.

- expand the description of building ~ftp/incoming to cover the
  appropriate ftpd.conf(5) directives (which are defaults, but it pays
  to explicitly explain them)

- replace strsuftoi() with strsuftoll(), which returns a long long if
  supported, otherwise a long

- rework the way that check_modify and check_upload are done in the yacc
  parser; they're merged into a common check_write() function which is
  called explicitly

- merge all ftpclass `flag variables' into a single bitfield-based flag element

- move various common bits of parse_conf() into a couple of macros

- clean up some comments
2000-11-16 13:15:13 +00:00
itojun
0a52851e32 we can assume presense of getaddrinfo.
use NI_MAXHOST for the hostname buffer used with getnameinfo.
2000-11-15 04:07:07 +00:00
lukem
f62aa6c8ac changes to improve portability:
* replace union sockunion {} with struct sockinet {}, and modify the code
  accordingly. this is possibly more portable, as it doesn't rely upon
  the structure alignment within the union for our own stuff.  uses local
  su_len unless HAVE_SOCKADDR_SA_LEN is defined (set ifdef BSD4_4)
  (XXX: haven't tested the ipv6 stuff)
* always use getaddrinfo() and getnameinfo() instead of maintaining two code
  paths. (lukemftpd will provide replacements for these on older systems)
* use lockf() instead of open(.., O_EXLOCK) to lock the pid file
* minor KNF
* clean up long long support: create helper #defines and use as appropriate:
        #define		NO_LONG_LONG	! NO_LONG_LONG
        -------		------------	--------------
        LLF		"%ld"		"%lld"
        LLFP(x)		"%" x "ld"	"%" x "lld"
        LLT		long		long long
        ULLF		"%lu"		"%llu"
        ULLFP(x)	"%" x "lu"	"%" x "llu"
        ULLT		unsigned long	unsigned long long
        STRTOLL(x,y,z)	strtol(x,y,z)	strtoll(x,y,z)
2000-11-15 02:32:30 +00:00