Commit Graph

1560 Commits

Author SHA1 Message Date
thorpej c4aac2cbce Resolve conflicts from merge of 3.2a7, take 2. 1997-05-27 22:51:36 +00:00
thorpej 57d41e13fb Resolve conflicts from merge of 3.2a7, take 2. 1997-05-27 22:34:05 +00:00
thorpej f265273d8b Correct several mistakes:
- Don't make copies of ip_frag.c, ip_state.c, and ip_nat.c for ipftest.
  These should be .PATH'd in from sys/netinet.
- Get paths to ipmon and ipnat correct when we copy the manual pages.
- ipsend/ipresend/iptest actually live in the "ipsend" subdirectory
  of the ipfilter distribution.  Take this into account when copying
  the sources.
- Add ip_proxy.h to the list of #include directives that we fixup.
- ipsend.h needs to include a copy of ip_compat.h that is private
  to ipsend/ipresend/iptest.  Perform a fixup on that file to take
  that into account.
- Clean up any CVS residue from the conversion process.
- Update Makefile output to reflect new .PATH directives, etc.
1997-05-27 22:24:25 +00:00
thorpej a920c55e26 ipfilter2netbsd did not produce correct output for last import of
3.2a7.  Re-import it now that ipfilter2netbsd is fixed.
1997-05-27 22:16:47 +00:00
thorpej 772cb9b986 Don't make separate copies of these files; .PATH them in from sys/netinet. 1997-05-27 22:01:47 +00:00
mrg a307477d27 strip dollar signs from incoming RCSids 1997-05-27 07:16:24 +00:00
darrenr 24ca7d0e94 fix rcsid conflicts 1997-05-26 15:16:38 +00:00
cjs 5fd7ce7066 These updates to the build allow building against include files
and libs in the object tree, if you use a separate object tree,
while maintaining backward compatability with other build methods.
See the notes in src/share/mk/bsd.README for full details. Note
that the `make includes' target now only installs the include files
in the build directory (if you use one--otherwise they go in DESTDIR
just like before); `make install' will install include files in
DESTDIR.
1997-05-26 03:55:19 +00:00
thorpej 267e8357fc Implement an unfortunate, and temporary, kludge to address the problem
reported in PR #3668 from maximum entropy <entropy@tanstaafl.bernstein.com>.

The problem: The unit number is not being conveyed to the configuration
crosscheck with root is a network interface; the device number is set
to NODEV, which sets up the (correct) defaults for swap/dump devices.
We can't change NODEV to a unit number, as the PR's patch suggests, as
this breaks the swap/dump defaults.  Rewriting that code is not really
justified, since it's soon to be obsoleted.

The kludge: add an "nv_ifunit" member to struct nvlist, which convey's
a network interface's unit number to the crosscheck routine.  It's not
pretty, but it's not terribly invasive, and can be garbage-collected
easily when the swap/dump goo is obsoleted.
1997-05-25 18:42:54 +00:00
darrenr 87427f3d2e fix conflicts 1997-05-25 12:04:53 +00:00
darrenr 2cae843bdc Import version 3.2alpha7 1997-05-25 11:45:50 +00:00
thorpej 3c8f9e9de8 Fix a comment. 1997-05-23 03:09:56 +00:00
lukem b6572fdce5 free returned value from yp_match() if an error occurs 1997-05-21 07:20:13 +00:00
mikel 7c77aacfb1 separate option argument from description; from Enami Tsugutomo in PR 3637.
also RCSid police.
1997-05-20 04:53:12 +00:00
mikel d066405291 fix typo, from Enami Tsugutomo in PR bin/3636 1997-05-20 04:42:56 +00:00
christos 2916e1d817 Resolve conflicts 1997-05-17 22:14:13 +00:00
christos f7f066707a resolve conflicts 1997-05-17 21:33:06 +00:00
christos 63f466a41d Resolve conflicts 1997-05-17 21:23:04 +00:00
pk 80bb266e0e NULL => 0 (Arne Juul; PR#3629) 1997-05-17 20:31:15 +00:00
christos f0fe357c91 eliminate struct sigcontext 1997-05-17 15:52:52 +00:00
christos ac58fd7ef4 Fix sighandler signature. 1997-05-17 15:48:50 +00:00
veego 924c7fcffa Add y.tab.h to CLEANFILES 1997-05-15 10:04:27 +00:00
mikel 09e3ffba3e fix typos; from Dave Huang in PR bin/3611. 1997-05-13 04:55:33 +00:00
mikel 71f0bfd8cc refer to proper key file, not gettytab; from Dave Huang in PR bin/3610. 1997-05-13 04:38:20 +00:00
mikel b674a8fd0e fix typos noted by Masanobu Saitoh <msaitoh@spa.is.uec.ac.jp>. 1997-05-13 04:15:06 +00:00
mikel 5ea01ec0b8 use ../../Makefile.inc instead of defining BINDIR locally.
eliminate redundant SRCS definition.
1997-05-11 05:27:09 +00:00
christos ffb5f0fbd1 Include ../../Makefile.inc 1997-05-11 01:06:01 +00:00
mycroft 2c0b6f8e7f Use DPSRCS. 1997-05-09 13:56:04 +00:00
mycroft 6ae00799f3 Correct .PATH after this was moved down. 1997-05-09 09:36:28 +00:00
mycroft cc4a1553a1 Eliminate bogus redefinitions of standard targets. 1997-05-09 07:50:03 +00:00
mycroft a7f6387809 Remove the extraneous SUBDIR line. 1997-05-09 04:43:01 +00:00
gwr 10e180cc49 Back out the .PATH.c changes. The .depend problem (and others)
will be fixed using the new .NOPATH make feature instead.
1997-05-08 21:11:01 +00:00
christos 71cc8337ed Move pppd in its own directory. 1997-05-08 18:07:28 +00:00
lukem a18d6f1948 fix typo. from msaitoh@spa.is.uec.ac.jp, [misc/3584] 1997-05-07 23:19:03 +00:00
mycroft 185b24dd5b Use libinstall::, not install:, to prevent instaling LIB. 1997-05-07 16:20:26 +00:00
mycroft 1b437a22e5 Use SCRIPTS to install this. 1997-05-07 16:17:40 +00:00
mycroft 8306be60f4 Use afterinstall, not proginstall, to run post-installation crap. 1997-05-07 16:03:15 +00:00
mrg 78c51899a9 use ${.CURDIR} correctly. from enami tsugutomo in pr#3582 1997-05-07 13:20:40 +00:00
mycroft 77baecd155 Don't try to create pain.cf, which no longer exists. 1997-05-07 08:29:42 +00:00
mycroft fd8daf980e Add .MAKE to the .OBJDIR hacks, so they work with `make -n'. 1997-05-07 07:15:34 +00:00
gwr a6437aa465 backout previous 1997-05-06 22:38:46 +00:00
gwr 012e528f2e Use .PATH.c: ... 1997-05-06 20:44:56 +00:00
mrg a3ca95f80d move ipfilter2netbsd, and remove extra copies of opt.c that got added. 1997-05-04 15:10:36 +00:00
veego 8071a0d69a Remove a . 1997-05-04 09:52:49 +00:00
jtc 93eaf3dc87 A user name can be invalid, but not illegal 1997-05-02 01:36:18 +00:00
mrg fbb54fd51b meantion ppp(4) rather than README.bsd (inspired from PR#3548 from Martin Husemann) 1997-04-28 04:22:24 +00:00
lukem 0dbf4ab9b1 Determine filesystem level (ref: fsck_ffs(8) -c ...) and display it.
Code was derivied from observing how fsck_ffs `upgrades' to a given
level, and has been tested on recent NetBSD filesystems (reports as "3"),
SunOS ("1"), and ULTRIX ("0"). I haven't found a filesystem of level
"2" to test, but the code should detect it. Fixes [bin/1353]
1997-04-26 05:41:32 +00:00
mrg 151d9c8a60 add 0 and 0x prefixes for octal and hex numbers, in debug messages (based on pr#2964). 1997-04-26 05:12:32 +00:00
mrg dca7ab624c do not write pid file in debug mode. (pr#2825) 1997-04-26 05:08:29 +00:00
mikel b4f13ff0c4 use appropriate strto*() functions, and cast results when appropriate;
fixes PR bin/1582.
1997-04-25 05:45:24 +00:00