Module Name:	src
Committed By:	dsl
Date:		Fri May 16 22:59:51 UTC 2003

Modified Files:
	src/usr.sbin/mrouted: cfparse.y config.c defs.h igmp.c inet.c kern.c
	    prune.c route.c rsrr.c vif.c

Log Message:
Revert previous change.  Remove s parameter from teh function and rotate
the result through a fixed set of strings instead.
There never was a possibility of a buffer overrun in inet_fmt{s}().
Fix an actual buffer overrun in a scanf() call.


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/usr.sbin/mrouted/cfparse.y \
    src/usr.sbin/mrouted/config.c src/usr.sbin/mrouted/defs.h
cvs rdiff -r1.11 -r1.12 src/usr.sbin/mrouted/igmp.c
cvs rdiff -r1.10 -r1.11 src/usr.sbin/mrouted/inet.c \
    src/usr.sbin/mrouted/route.c
cvs rdiff -r1.8 -r1.9 src/usr.sbin/mrouted/kern.c src/usr.sbin/mrouted/rsrr.c
cvs rdiff -r1.13 -r1.14 src/usr.sbin/mrouted/prune.c \
    src/usr.sbin/mrouted/vif.c

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