d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,436 Commits 6 Branches 133 Tags 2.6 GiB
1ec84e5051
Commit Graph

2405 Commits

Author SHA1 Message Date
Dag-Erling Smørgrav
7c99428b69 This commit was generated by cvs2svn to compensate for changes in r94889, 
which included commits to RCS files with non-trunk default branches.
 2002-04-16 22:25:21 +00:00
Dag-Erling Smørgrav
00d65bdc4b Vendor import of pam_passwdqc v0.5. 2002-04-16 22:25:21 +00:00
Dag-Erling Smørgrav
b81138f1a3 Don't echo log messages to stderr (perforce change 9758) 2002-04-16 22:04:22 +00:00
Dag-Erling Smørgrav
904bb47d69 This commit was generated by cvs2svn to compensate for changes in r94884, 
which included commits to RCS files with non-trunk default branches.
 2002-04-16 22:04:22 +00:00
Dag-Erling Smørgrav
193cf419da Log dlopen() / dlsym() failures at the debug level (perforce change 9760) 2002-04-16 21:35:53 +00:00
Dag-Erling Smørgrav
700246cb79 This commit was generated by cvs2svn to compensate for changes in r94880, 
which included commits to RCS files with non-trunk default branches.
 2002-04-16 21:35:53 +00:00
Dag-Erling Smørgrav
bdcb69e2b5 Fix braino in the openpam_log() macro that caused the arguments to be 
expanded twice (perforce change 9853)
 2002-04-16 21:34:41 +00:00
Dag-Erling Smørgrav
1f287e050e This commit was generated by cvs2svn to compensate for changes in r94878, 
which included commits to RCS files with non-trunk default branches.
 2002-04-16 21:34:41 +00:00
Dag-Erling Smørgrav
69665ef57f Print newline after error and info messages (perforce change 9750) 2002-04-15 06:32:54 +00:00
Dag-Erling Smørgrav
dfcaf7512d This commit was generated by cvs2svn to compensate for changes in r94735, 
which included commits to RCS files with non-trunk default branches.
 2002-04-15 06:32:54 +00:00
Dag-Erling Smørgrav
f116fd5df6 Fix typo in pam_get_authtok(3) (perforce change 9746) 2002-04-15 01:26:36 +00:00
Dag-Erling Smørgrav
6ff9b5cda1 This commit was generated by cvs2svn to compensate for changes in r94706, 
which included commits to RCS files with non-trunk default branches.
 2002-04-15 01:26:36 +00:00
Dag-Erling Smørgrav
402783abd1 Bug & warning fixes; pretty much what will become 0.5 later this week. 
Submitted by:	Solar Designer <solar@openwall.com>
 2002-04-14 22:30:54 +00:00
Dag-Erling Smørgrav
26c5765441 This commit was generated by cvs2svn to compensate for changes in r94691, 
which included commits to RCS files with non-trunk default branches.
 2002-04-14 22:30:54 +00:00
Dag-Erling Smørgrav
183bda3791 Vendor import of OpenPAM Cineraria. 2002-04-14 18:28:22 +00:00
Dag-Erling Smørgrav
0a276ef941 This commit was generated by cvs2svn to compensate for changes in r94670, 
which included commits to RCS files with non-trunk default branches.
 2002-04-14 18:28:22 +00:00
Dag-Erling Smørgrav
8d38dc9dca Fix typo in openpam_log macro (perforce change 9634) 
Sponsored by:	DARPA, NAI Labs
 2002-04-12 22:22:27 +00:00
Dag-Erling Smørgrav
c8688e3e8c This commit was generated by cvs2svn to compensate for changes in r94562, 
which included commits to RCS files with non-trunk default branches.
 2002-04-12 22:22:27 +00:00
David E. O'Brien
1fd0912fbd Use the stock 2.12 snapshot version of this. 2002-04-12 19:55:38 +00:00
David E. O'Brien
8ce8f99278 Merge rev 1.2 (FreeBSD a.out configuration support) into the 
Binutils 2.12_20020410 snap.
 2002-04-12 19:54:53 +00:00
David E. O'Brien
8bff87fcbb Bring the binutils_2_12_20020410 snap version of this to the HEAD branch. 2002-04-12 19:54:03 +00:00
David E. O'Brien
6b42ebd631 Merge the stock 2.12.0 snap version. 2002-04-12 19:52:34 +00:00
David E. O'Brien
aec81a114a Merge rev 1.6 (ELF_DYNAMIC_INTERPRETER) into Binutils 2.12_20020410 snap. 2002-04-12 19:51:31 +00:00
David E. O'Brien
bcf1d3f7ac Merge rev 1.8 ("ELF_DYNAMIC_INTERPRETER") into Binutils 2.12_20020410 snap. 2002-04-12 19:50:32 +00:00
David E. O'Brien
58692393f0 Merge our ELF branding into Binutils 2.12_20020410 snapshot. 2002-04-12 19:49:24 +00:00
David E. O'Brien
d31ed8e471 This commit was generated by cvs2svn to compensate for changes in r94536, 
which included commits to RCS files with non-trunk default branches.
 2002-04-12 19:33:52 +00:00
David E. O'Brien
0aecce1e34 Import of Binutils from the FSF 2.12 branch. 
(this fixes several linker problems and coredumps)
These bits are taken from the FSF anoncvs repo on 10-April-2002 13:24 Zulu
 2002-04-12 19:33:52 +00:00
Dag-Erling Smørgrav
b825a3ace6 Linux-PAM compatibility improvements (perforce change 9623) 
Sponsored by:	DARPA, NAI Labs
 2002-04-12 18:31:28 +00:00
Dag-Erling Smørgrav
2b8a72b7e3 This commit was generated by cvs2svn to compensate for changes in r94532, 
which included commits to RCS files with non-trunk default branches.
 2002-04-12 18:31:28 +00:00
Gregory Neil Shapiro
89b0ba9b30 A couple more sendmail-related files 2002-04-10 05:16:45 +00:00
Gregory Neil Shapiro
a4a4d0803c Record sendmail 8.12.3 import 2002-04-10 03:08:35 +00:00
Gregory Neil Shapiro
320f00e768 Fix conflicts from sendmail 8.12.3 import 2002-04-10 03:06:22 +00:00
Gregory Neil Shapiro
605302a5c9 Import sendmail 8.12.3 2002-04-10 03:05:00 +00:00
Gregory Neil Shapiro
982281085c This commit was generated by cvs2svn to compensate for changes in r94334, 
which included commits to RCS files with non-trunk default branches.
 2002-04-10 03:05:00 +00:00
Gregory Neil Shapiro
6409bf9271 Found two more files that use the sendmail infrastructure. 2002-04-09 02:09:14 +00:00
Dag-Erling Smørgrav
2a26decf71 Vendor import of OpenPAM Cinchona. 2002-04-08 12:38:21 +00:00
Dag-Erling Smørgrav
7ed5b91302 This commit was generated by cvs2svn to compensate for changes in r94213, 
which included commits to RCS files with non-trunk default branches.
 2002-04-08 12:38:21 +00:00
Dag-Erling Smørgrav
93889be53d Vendor import of OpenPAM Cinchona. 2002-04-08 12:30:31 +00:00
Dag-Erling Smørgrav
082a49237f This commit was generated by cvs2svn to compensate for changes in r94209, 
which included commits to RCS files with non-trunk default branches.
 2002-04-08 12:30:31 +00:00
Andrey A. Chernov
173ef5da34 Original code bugfixed. This NOT touch old sorting order a bit. 
1) Remove \n from COPYRIGHT macro to shut up assembler warning
2) Fix struct sigaction initialization (arguments swap)
3) Fix out of bounds negative indexing for -R arg > 127
4) Remove doubled initialization of vars already initialized statically
5) Convert ctype macros char arg to u_char to prevents sign extension
 2002-04-07 00:49:00 +00:00
Dag-Erling Smørgrav
11d144d325 MFOpenPAM: a slew of changes, mostly related to pam_get_authtok() (perforce 
changes 9207, 9209, 9210, 9211, 9213, 9220)

Sponsored by:	DARPA, NAI Labs
 2002-04-06 19:28:08 +00:00
Dag-Erling Smørgrav
cbd5aec83b This commit was generated by cvs2svn to compensate for changes in r93982, 
which included commits to RCS files with non-trunk default branches.
 2002-04-06 19:28:08 +00:00
Gregory Neil Shapiro
e84338ffa2 Another man page that can change as sendmail requirements change. 2002-04-06 17:53:06 +00:00
Dag-Erling Smørgrav
855d400bea This commit was generated by cvs2svn to compensate for changes in r93968, 
which included commits to RCS files with non-trunk default branches.
 2002-04-06 13:50:26 +00:00
Dag-Erling Smørgrav
3c47d4feac Virgin import of NetBSD's regression tests for sort(1). 2002-04-06 13:50:26 +00:00
Dag-Erling Smørgrav
b6605bd666 This commit was generated by cvs2svn to compensate for changes in r93966, 
which included commits to RCS files with non-trunk default branches.
 2002-04-06 13:49:43 +00:00
Dag-Erling Smørgrav
1c015e5c73 Virgin import of NetBSD's sort(1) where it belongs. 2002-04-06 13:49:43 +00:00
Gregory Neil Shapiro
6e4caefe33 Add usr.sbin/mailwrapper/Makefile to the list of changed files as 
it contains a list of symlinks to make which are normally symlinks
to the sendmail binary.
 2002-04-05 04:28:10 +00:00
Gregory Neil Shapiro
56f22faff3 Add a list of files sendmail importants may affect. This is mostly 
for my own reference so I don't miss things on future imports.
 2002-04-05 03:52:48 +00:00
Dag-Erling Smørgrav
0b0ecb56f2 Vendor import of Solar Designer's pam_passwdqc module. 2002-04-04 15:50:47 +00:00
Dag-Erling Smørgrav
a39e9db943 This commit was generated by cvs2svn to compensate for changes in r93787, 
which included commits to RCS files with non-trunk default branches.
 2002-04-04 15:50:47 +00:00
Dag-Erling Smørgrav
d32a969cca Fix incorrect allocation size (perforce change 8918) 
PR:		bin/36658
Submitted by:	Takanori Saneto <sanewo@ba2.so-net.ne.jp>
 2002-04-02 20:57:22 +00:00
Dag-Erling Smørgrav
0c1e1e1aa7 This commit was generated by cvs2svn to compensate for changes in r93694, 
which included commits to RCS files with non-trunk default branches.
 2002-04-02 20:57:22 +00:00
Dag-Erling Smørgrav
a65dc9cb60 Fix braino in code path for new items (perforce change 8760). 
Based on a patch submitted by Joe Marcus Clarke <marcus@marcuscom.com>.

Sponsored by:	DARPA, NAI LabS
cvs: ----------------------------------------------------------------------
 2002-04-01 12:20:48 +00:00
Dag-Erling Smørgrav
0f3ac1c96f This commit was generated by cvs2svn to compensate for changes in r93526, 
which included commits to RCS files with non-trunk default branches.
 2002-04-01 12:20:48 +00:00
Murray Stokely
f4626a61ae Document recent DHCP upgrade. 2002-04-01 08:44:51 +00:00
Murray Stokely
41156c80b5 Resolve conflicts. 2002-04-01 08:09:50 +00:00
Murray Stokely
d04685cfb2 Resolve conflicts: 
* $FreeBSD$
  * connect std{in,out,err} (r1.19).
  * prefer strlcpy to strpy (r1.13).
  * quiet by default (r1.6).
  * document -D option.
 2002-04-01 08:02:18 +00:00
Murray Stokely
09ba34e687 Resolve conflicts: 
* $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
 2002-04-01 07:59:50 +00:00
Murray Stokely
7ca37d5578 This commit was generated by cvs2svn to compensate for changes in r93507, 
which included commits to RCS files with non-trunk default branches.
 2002-04-01 07:54:44 +00:00
Murray Stokely
33075c330b Import ISC DHCP 3.0.1 RC8 client. 2002-04-01 07:54:44 +00:00
David E. O'Brien
8e069c8cbe GCC 3.1 uses crtstuff.c on Alpha now. [yay!] 2002-03-27 22:18:22 +00:00
David E. O'Brien
50a5655602 Switch register numbers for DWARF2_DEBUG also. 2002-03-27 05:22:35 +00:00
Ruslan Ermilov
43c1371d7a Removed (new in 3.4.25 import) duplicate copies of files already present 
in sys/contrib/ipfilter.
 2002-03-26 13:44:40 +00:00
Ruslan Ermilov
237624bef6 Update for GNU texinfo 4.1. 2002-03-25 13:16:33 +00:00
Ruslan Ermilov
2ac8654d50 Merge texinfo 4.1 changes onto the trunk. 2002-03-25 13:11:52 +00:00
Ruslan Ermilov
1f4bf5475b Use stock (FSF) version of this file. 2002-03-25 13:10:59 +00:00
Ruslan Ermilov
093e96ffd9 This commit was generated by cvs2svn to compensate for changes in r93139, 
which included commits to RCS files with non-trunk default branches.
 2002-03-25 13:08:32 +00:00
Ruslan Ermilov
3423f6a2cb Import of stripped down GNU texinfo 4.1 2002-03-25 13:08:32 +00:00
Mark Murray
f4083b2413 Resolve conflicts. 2002-03-21 23:42:52 +00:00
Mark Murray
7b0f9607c9 This commit was generated by cvs2svn to compensate for changes in r92906, 
which included commits to RCS files with non-trunk default branches.
 2002-03-21 22:50:02 +00:00
Mark Murray
cfb697297a Vendor import of OPIE 2.4 2002-03-21 22:50:02 +00:00
David E. O'Brien
701de7a951 Manpages moved into doc/ for 2.12. 2002-03-20 23:13:45 +00:00
David E. O'Brien
694ba608d4 Merge rev 1.2 (teach `ld' how to access FreeBSD's ld ELF hints) 
into Binutils 2.12.0.
 2002-03-20 22:04:42 +00:00
David E. O'Brien
0b17d82867 Use the stock version of this. 2002-03-20 22:03:53 +00:00
David E. O'Brien
76d0de241e Bring the 2.12.0 release version of this to the HEAD branch. 2002-03-20 22:02:35 +00:00
David E. O'Brien
1a00a2a761 Commit the stock 2.12.0 release version. 2002-03-20 21:59:13 +00:00
David E. O'Brien
55ba99bb8d Import of Binutils from the FSF 2.12 branch (just post-.0 release). 
These bits are taken from the FSF anoncvs repo on 20-March-2002 13:33:33 PST.
 2002-03-20 21:37:13 +00:00
David E. O'Brien
771ecfb273 This commit was generated by cvs2svn to compensate for changes in r92828, 
which included commits to RCS files with non-trunk default branches.
 2002-03-20 21:37:13 +00:00
Darren Reed
95ca00720d For this regression test to pass, you must run ipmon in the Australia/Victoria 
(EST-10) timezone to generate the correct timestamps in output.
 2002-03-19 15:17:06 +00:00
Darren Reed
8617526df1 remove because of licence reasons 2002-03-19 15:13:27 +00:00
Darren Reed
68d1243587 fix conflicts generated by import, completing import of ipf3.4.25 2002-03-19 11:48:16 +00:00
Darren Reed
0868380a54 Import IPFilter 3.4.25 2002-03-19 11:45:24 +00:00
Darren Reed
0df2c61f4f This commit was generated by cvs2svn to compensate for changes in r92688, 
which included commits to RCS files with non-trunk default branches.
 2002-03-19 11:45:24 +00:00
Darren Reed
d564cc784f Import IPFilter 3.4.25 2002-03-19 11:45:20 +00:00
Darren Reed
f371049810 This commit was generated by cvs2svn to compensate for changes in r92686, 
which included commits to RCS files with non-trunk default branches.
 2002-03-19 11:45:20 +00:00
Mark Murray
81703db930 Punt to attic files not in 5.6.1 OR not needed by FreeBSD. 2002-03-16 22:35:55 +00:00
Mark Murray
3ef3e55298 Restore vendor RCS tag. 2002-03-16 22:17:19 +00:00
Mark Murray
0e8d8a09a5 Update conflict merge for 5.6.1. This is a rotten hack, but it 
works for all FreeBSD purposes.
 2002-03-16 22:15:33 +00:00
Mark Murray
2d278eb6c2 Resolve conflicts. 2002-03-16 21:30:07 +00:00
Mark Murray
fd787c8c7a This commit was generated by cvs2svn to compensate for changes in r92444, 
which included commits to RCS files with non-trunk default branches.
 2002-03-16 20:14:31 +00:00
Mark Murray
cf90a21ebd Vendor import Perl 5.6.1 2002-03-16 20:14:31 +00:00
Mark Murray
535b847ca7 This commit was generated by cvs2svn to compensate for changes in r92442, 
which included commits to RCS files with non-trunk default branches.
 2002-03-16 20:14:30 +00:00
Mark Murray
fc75d06644 Vendor import Perl 5.6.1 2002-03-16 20:14:30 +00:00
David E. O'Brien
d6cfbc78d7 This commit was generated by cvs2svn to compensate for changes in r92422, 
which included commits to RCS files with non-trunk default branches.
 2002-03-16 16:50:57 +00:00
David E. O'Brien
146a1e500c Vendor import of bwk's 2002-02-10 release. 2002-03-16 16:50:57 +00:00
Dag-Erling Smørgrav
856bb440c7 Vendor import of OpenPAM Centaury. 2002-03-14 20:42:07 +00:00
Dag-Erling Smørgrav
5bfbfe394b This commit was generated by cvs2svn to compensate for changes in r92289, 
which included commits to RCS files with non-trunk default branches.
 2002-03-14 20:42:07 +00:00
David E. O'Brien
1719980ed9 This commit was generated by cvs2svn to compensate for changes in r92282, 
which included commits to RCS files with non-trunk default branches.
 2002-03-14 19:25:32 +00:00
David E. O'Brien
4ac46041bb Import of LukeM's ftpd version 1.2 Beta 1. 2002-03-14 19:25:32 +00:00
David E. O'Brien
d8041b613d Add note about genscripts.sh. 2002-03-13 07:16:00 +00:00
David E. O'Brien
23c27fc6d9 Remove bogon from bad merge. 2002-03-13 04:39:40 +00:00
Dag-Erling Smørgrav
c850bf03ed Say good-bye, Linux-PAM. 2002-03-08 13:03:58 +00:00
Dag-Erling Smørgrav
6f9b443b18 Fix bugs in module loading and caching code (perforce change #7381) 
Sponsored by:	DARPA, NAI Labs
 2002-03-07 19:24:22 +00:00
Dag-Erling Smørgrav
ba75d60a65 This commit was generated by cvs2svn to compensate for changes in r91830, 
which included commits to RCS files with non-trunk default branches.
 2002-03-07 19:24:22 +00:00
Dag-Erling Smørgrav
527825f1c2 s/PAM_REINITIALISE_CRED/PAM_REINITIALIZE_CRED/ 
Sponsored by:	DARPA, NAI Labs
 2002-03-07 12:11:34 +00:00
Dag-Erling Smørgrav
311828b5d0 This commit was generated by cvs2svn to compensate for changes in r91799, 
which included commits to RCS files with non-trunk default branches.
 2002-03-07 12:11:34 +00:00
Dag-Erling Smørgrav
bda8155763 Add missing #include <string.h> 2002-03-07 11:59:04 +00:00
Dag-Erling Smørgrav
543405dc9d This commit was generated by cvs2svn to compensate for changes in r91796, 
which included commits to RCS files with non-trunk default branches.
 2002-03-07 11:59:04 +00:00
Dag-Erling Smørgrav
4579d22cac Vendor import of OpenPAM Celandine. 2002-03-05 13:49:56 +00:00
Dag-Erling Smørgrav
7e7f2e51f0 This commit was generated by cvs2svn to compensate for changes in r91684, 
which included commits to RCS files with non-trunk default branches.
 2002-03-05 13:49:56 +00:00
David E. O'Brien
fcd0ff585f Allow for better control over the GCC front-end when building a cross 
compiler.

* Undo the diking out of cross compiler logic from gcc.c rev 1.16.
* Add the `CROSS_STARTFILE_PREFIX' knob.
* Add our own definition of `STANDARD_INCLUDE_DIR'.  This should have been
  included in freebsd-native.h rev 1.5.
 2002-03-05 00:17:24 +00:00
David E. O'Brien
a84e77fb7b Allow one to specify a STANDARD_EXEC_PREFIX for GCC (but not BINUTILS) bits. 2002-03-03 04:18:00 +00:00
David E. O'Brien
7486111210 Better granularity of the FREEBSD_NATIVE #ifdef's. 2002-03-02 09:58:48 +00:00
David E. O'Brien
99339e95db Use the default 'ld' emulation rather than hard coding it. 
For FreeBSD, 'ld' 2.12.0 uses a different emulation than in the past.
So this change makes the upgrade easier.
 2002-02-25 04:49:17 +00:00
Dag-Erling Smørgrav
46acc37026 Vendor import of OpenPAM Cantaloupe 2002-02-23 01:24:02 +00:00
Dag-Erling Smørgrav
bf9ae4e89d This commit was generated by cvs2svn to compensate for changes in r91100, 
which included commits to RCS files with non-trunk default branches.
 2002-02-23 01:24:02 +00:00
Dag-Erling Smørgrav
ac676a1116 Vendor import of OpenPAM Caliopsis 2002-02-23 01:23:20 +00:00
Dag-Erling Smørgrav
9350e3cd49 This commit was generated by cvs2svn to compensate for changes in r91097, 
which included commits to RCS files with non-trunk default branches.
 2002-02-23 01:23:20 +00:00
Dag-Erling Smørgrav
5c1eca5551 Vendor import of OpenPAM Calamite 2002-02-23 01:22:51 +00:00
Dag-Erling Smørgrav
82170ab754 This commit was generated by cvs2svn to compensate for changes in r91094, 
which included commits to RCS files with non-trunk default branches.
 2002-02-23 01:22:51 +00:00
David E. O'Brien
1e2fa85a95 Explain how I did the binutils_2_12_anoncvs_20020221 import. 2002-02-22 05:11:49 +00:00
David E. O'Brien
9d34368f3a Merge rev 1.2 (teach `ld' how to access FreeBSD's ld ELF hints) 
into Binutils 2.12_20020221_snap.
 2002-02-22 04:52:00 +00:00
David E. O'Brien
dd23d95f1b Bring the binutils_2_12_20020221_snap version of this to the HEAD branch. 2002-02-22 04:51:15 +00:00
David E. O'Brien
a6c1198cb5 Merge rev 1.2 (FreeBSD a.out configuration support) into 
Binutils 2.12_20020221_snap.
 2002-02-22 04:49:49 +00:00
David E. O'Brien
4ed0906c0d Use the stock (2.12_20020221_snap) version of this. 2002-02-22 04:48:12 +00:00
David E. O'Brien
9426fb2b85 Use the stock version of this. 2002-02-22 04:47:47 +00:00
David E. O'Brien
a4029a1784 Use the vendor's 2.12_20020221_snap version of this file as in rev 1.4. 2002-02-22 04:47:16 +00:00
David E. O'Brien
00cb9610b5 Merge rev 1.6 (only define "ELF_DYNAMIC_INTERPRETER" if it isn't defined 
elsewhere) into Binutils 2.12_20020221_snap.
 2002-02-22 04:46:20 +00:00
David E. O'Brien
d3e821e6ac Merge rev 1.8 (only define "ELF_DYNAMIC_INTERPRETER" if it isn't defined 
elsewhere) into Binutils 2.12_20020221_snap.
 2002-02-22 04:45:47 +00:00
David E. O'Brien
3fe4d18dc1 Merge our ELF branding into Binutils 2.12_20020221_snap. 2002-02-22 04:44:56 +00:00
David E. O'Brien
eb1d121cb5 Import of Binutils from the FSF 2.12 branch (pre-.0 release). 
These bits are taken from the FSF anoncvs repo on 21-Feburary-2002 20:15 PST.
 2002-02-22 04:18:42 +00:00
David E. O'Brien
9e68b78882 This commit was generated by cvs2svn to compensate for changes in r91041, 
which included commits to RCS files with non-trunk default branches.
 2002-02-22 04:18:42 +00:00
David E. O'Brien
4bda744b0a Reflect the rename of the vendor branch. 2002-02-20 02:36:24 +00:00
Jacques Vidrine
eacee0ff7e Update build after import of Heimdal Kerberos 2002/02/17. 2002-02-19 15:53:33 +00:00
Murray Stokely
7d8cb95f1c Add information about the 3.0.1RC6 upgrade. 2002-02-19 14:55:44 +00:00
Murray Stokely
a2f98fcc9e Resolve conflicts. Remove references to dhcpd from the man page, 
since only the client exists in the base system.
 2002-02-19 12:43:18 +00:00
Murray Stokely
eae30be95a Resolve conflicts. 2002-02-19 12:22:54 +00:00
Murray Stokely
edc4c2b49d Resolve conflicts. 
* Note that option hostname is only honored if the hostname is not
    already set. (r1.2)
 2002-02-19 12:15:09 +00:00
Murray Stokely
e51a769ab7 Resolve conflicts. 
* Space the output consistently. (r1.19)
  * Use the cleaner "-n" syntax instead of comparing against "". (r1.17)
  * Fix arp invocation. (r1.13)
 2002-02-19 12:10:40 +00:00
Murray Stokely
74a4b94fe6 Resolve conflicts. 
* $FreeBSD$
  * Fix numerous typos.
  * Use correct path for dhclient-script.
 2002-02-19 12:07:09 +00:00
Murray Stokely
727d8dcff2 Resolve conflicts. 
* $FreeBSD$
  * connect std{in,out,err}. (r1.19)
  * prefer strlcpy to strpy. (r1.13)
  * quiet by default. (r1.6)
  * document -D option.
 2002-02-19 12:04:29 +00:00
Murray Stokely
5e84f73d96 Resolve conflicts : 
* $FreeBSD$ id, obrien copyright.
  * Document the -D option. (r1.6)
  * Correct man page reference and fix typo. (r1.8)

Reviewed by: obrien
 2002-02-19 12:00:47 +00:00
Murray Stokely
92c4d51b6d Resolve conflicts : 
* $FreeBSD$ line.
  * Remove dhcpd and dhcprelay from the SEE ALSO section, since these
    are not in the base system.
 2002-02-19 11:57:47 +00:00
Murray Stokely
c31fe933fc Resolve conflicts : 
* $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
 2002-02-19 11:55:09 +00:00
Murray Stokely
ce99b771f8 Import ISC DHCP 3.0.1 RC6 client. 2002-02-19 11:04:34 +00:00
Murray Stokely
4f80634345 This commit was generated by cvs2svn to compensate for changes in r90908, 
which included commits to RCS files with non-trunk default branches.
 2002-02-19 11:04:34 +00:00
Dag-Erling Smørgrav
2340d160b1 Really document the import procedure. 2002-02-19 09:36:40 +00:00
Dag-Erling Smørgrav
007c6572bf Vendor import of bwk's 2002-02-18 release. Most significant update is the 
inclusion of my character class patch.
 2002-02-19 09:35:25 +00:00
Dag-Erling Smørgrav
24949f0dbd This commit was generated by cvs2svn to compensate for changes in r90902, 
which included commits to RCS files with non-trunk default branches.
 2002-02-19 09:35:25 +00:00