Module Name:	src
Committed By:	lukem
Date:		Thu Apr 12 01:28:13 UTC 2007

Modified Files:
	src/usr.bin/ftp: ruserpass.c version.h

Log Message:
Various fixes from Nicholas Marriott sent to openbsd-tech and in private email:
* Prevent segfault if a .netrc token is too long.
* Prevent segfault when using a macro from an empty macdef.
* Check more return values.


To generate a diff of this commit:
cvs rdiff -r1.31 -r1.32 src/usr.bin/ftp/ruserpass.c
cvs rdiff -r1.60 -r1.61 src/usr.bin/ftp/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.