Compare commits

...
2553 Commits
Author SHA1 Message Date
Colin Percival f5f3db0e5a Fix logic error in sshd(8) concerning the handling of failed
attempts to bind ports for X11 forwarding.

Security:	FreeBSD-SA-08:05.openssh
Approved by:	so (cperciva)
2008-04-17 00:00:54 +00:00
Simon L. B. Nielsen a3287dcbb9 Fix sendfile(2) write-only file permission bypass.
Security:	FreeBSD-SA-08:03.sendfile
Approved by:	so (simon)
2008-02-14 11:47:39 +00:00
Colin Percival e901cc3b3d Fix date of last advisory -- January 14th, not January 18th.
Approved by:	so (cperciva)
2008-01-15 23:36:53 +00:00
Colin Percival 059d7fbb6e Fix issues which allow snooping on ptys.
Security: FreeBSD-SA-08:01.pty
Approved by:	so (cperciva)
2008-01-14 22:57:19 +00:00
Simon L. B. Nielsen 0b332cd34f Correct a random value disclosure in random(4).
Security:	FreeBSD-SA-07:09.random
Approved by:	so (simon)
2007-11-29 16:07:53 +00:00
Simon L. B. Nielsen 2c1529431a Correct a buffer overflow in OpenSSL SSL_get_shared_ciphers().
Security:	FreeBSD-SA-07:08.openssl
Approved by:	so (simon)
2007-10-03 21:42:32 +00:00
Simon L. B. Nielsen 9d631c8afd Correct buffer overflow in tcpdump(1). [SA-07:06]
Correct predictable query ids in named(8). [SA-07:07]

Security:	FreeBSD-SA-07:06.tcpdump
Security:	FreeBSD-SA-07:07.bind
Approved by:	so (simon)
2007-08-01 20:45:49 +00:00
Colin Percival d3b186cba6 Correct multiple security issues in how libarchive handles corrupt
tar archives, including a potentially exploitable buffer overflow.

Approved by:	so (cperciva)
Reviewed by:	kientzle
Security:	FreeBSD-SA-07:05.libarchive
2007-07-12 15:01:56 +00:00
Colin Percival d48f2df24a Fix buffer overflow in libmagic(3).
Security:	FreeBSD-SA-07:04.file
Approved by:	so (cperciva)
2007-05-23 16:13:20 +00:00
Colin Percival 0f2698e88d Disable processing of IPv6 type 0 Routing Headers. This behaviour
can be changed via the (newly added) net.inet6.ip6.rthdr0_allowed
sysctl.

Security:	FreeBSD-SA-07:03.ipv6
Approved by:	so (cperciva)
2007-04-26 23:42:23 +00:00
Simon L. B. Nielsen e53a4bc781 Update zoneinfo and required support files for change in Daylight
Savings Time that begins in 2007.

Approved by:	so (simon)
Submitted by:	re (kensmith)
Errata:		FreeBSD-EN-07:04.zoneinfo
2007-02-28 18:23:09 +00:00
Colin Percival 9c37cbe4f8 Correct problems with locking, namei leakage, and symlink
creation in the NFS subsystem.

Approved by:	so (cperciva)
Submitted by:	re (hrs)
Errata:		FreeBSD-EN-07:01.nfs
2007-02-14 22:30:33 +00:00
Colin Percival 05362dd703 Correct two remote denials of service in BIND involving DNSSEC and
recursive DNS queries respectively.

Security:	FreeBSD-SA-07:02.bind
Approved by:	so (cperciva)
2007-02-09 20:24:15 +00:00
Simon L. B. Nielsen 45d6ac9590 Fix jail rc.d script privilege escalation via symlink attack against
/var/log/console.log and mount points.

Security:	FreeBSD-SA-07:01.jail
Approved by:	so (simon)
2007-01-11 18:19:33 +00:00
Colin Percival cd761870cc Correct a signedness bug which allowed members of the operator
group to read kernel memory.

Security:	FreeBSD-SA-06:25.kmem
Approved by:	so (cperciva)
2006-12-06 09:15:40 +00:00
Simon L. B. Nielsen 2095932134 Correct multiple vulnerabilities in OpenSSH.
Security:	FreeBSD-SA-06:22.openssh
Approved by:	so (simon)
2006-09-30 19:58:07 +00:00
Colin Percival 7f5d78ef4d Correct problem in the 2006-09-28 patch concerning the handling of
excessively large DH moduli.

Reported by:	Steve Kiernan (Juniper SIRT)
Security:	FreeBSD-SA-06:23.openssl
Approved by:	so (cperciva)
2006-09-29 13:46:41 +00:00
Colin Percival 0dccb6340a Correct multiple vulnerabilities in crypto(3).
Limit the size of public keys used in order to protect applications
from a denial of service via insane key sizes.

Security:	FreeBSD-SA-06:23.openssl
Approved by:	so (cperciva)
2006-09-28 13:06:23 +00:00
Simon L. B. Nielsen f474a9c236 Correct multiple vulnerabilities in gzip(1).
Security:	FreeBSD-SA-06:21.gzip
Approved by:	so (simon)
2006-09-19 14:13:53 +00:00
Simon L. B. Nielsen dfef628538 Correct incorrect PKCS#1 v1.5 padding validation in crypto(3). [1]
Correct multiple denial-of-service vulnerabilities in BIND related to
SIG Query Processing and Excessive Recursive Queries. [2]

Security:	FreeBSD-SA-06:19.openssl [1]
Security:	FreeBSD-SA-06:20.bind [2]
Approved by:	so (simon)
2006-09-06 21:23:16 +00:00
Colin Percival baa7837455 Correct several problems in the network stack, including a
locally-triggered kernel panic, inaccuracy in reported memory
allocation statistics, and problems on IPv6 point-to-point links.

Approved by:	so (cperciva)
Errata:		FreeBSD-EN-06:02.net
2006-08-28 07:31:11 +00:00
Colin Percival 6f40360613 Correct buffer overflow in the handling of LCP options in ppp(4)
Security:	FreeBSD-SA-06:18.ppp
Approved by:	so (cperciva)
2006-08-23 22:06:40 +00:00
Colin Percival 46d4f14f41 Fix problems in the startup scripts for jails.
Errata:		FreeBSD-EN-06:01.jail
Approved by:	so (cperciva)
2006-07-07 07:25:21 +00:00
Colin Percival f4515e9204 Correct a bug in the handling of multipart messages by sendmail(8)
which can allow a malformed message to crash a sendmail queue
processing process.

Security:	FreeBSD-SA-06:17.sendmail
Approved by:	so (cperciva)
2006-06-14 16:01:20 +00:00
Colin Percival 74ba010497 Enable inadvertantly disabled "securenet" access controls in ypserv. [1]
Correct a bug in the handling of backslash characters in smbfs which can
allow an attacker to escape from a chroot(2). [2]

Approved by:	so (cperciva)
Security:	FreeBSD-SA-06:15.ypserv [1]
Security:	FreeBSD-SA-06:16.smbfs [2]
2006-05-31 22:33:41 +00:00
Scott Long 28a0f029fa Fix a forgetting RELENG_6_1 pointer.
Approved by: re
2006-05-06 19:24:13 +00:00
Xin LI 0973f109dc MFen 1.883.2.15.2.5 -> 1.883.2.15.2.7
Approved by:	re (hrs, scottl)
2006-05-06 16:53:40 +00:00
Scott Long 92b8d3701b Set all the pointers to 6.1-RELEASE.
Approved by: re
2006-05-06 07:41:04 +00:00
Scott Long 9d150e609f MFC: Cosmetic kernel print fixes.
Approved by: re
2006-05-06 06:37:15 +00:00
Scott Long a6c9e54730 MFC: unbreak 'make universe'
Approved by: re
2006-05-06 06:36:38 +00:00
Ceri Davies 33127c0c9b MFC r1.87:
Fix binary upgrades by accounting for the schg flag on /var/empty.

PR:		96711, 96780
Submitted by:	Nobuyuki Koganemaru, Martin Jackson
Approved by:	re (scottl)
2006-05-05 18:52:21 +00:00
Hiroki Sato b22ba070e3 New release notes:
jail_interface rc.conf variable added.

Approved by:	re (implicitly)
2006-05-05 17:07:14 +00:00
Hiroki Sato f4c2b01c85 New release notes:
rr232x(4) added,
	sound(4) improvements[*]

Suggested by:	netchild
Approved by:	re (implicitly)
2006-05-05 16:53:09 +00:00
Florent Thoumie 8d09b9b0f4 MFC:
- If no pidfile has been created at startup, only stop processes
  with current jid.

      src/etc/rc.subr: rev 1.53 -> 1.55

PR:		conf/93287
Submitted by:	anders
Approved by:	re (scottl)
2006-05-05 10:02:54 +00:00
Florent Thoumie 96c54a017a MFC:
- Add following global jail options, used if no jail-specific options are
  set:
   * jail_mount_enable
   * jail_devfs_ruleset
   * jail_devfs_enable
   * jail_fdescfs_enable
   * jail_procfs_enable
   * jail_fstab
   * jail_flags
  - Add a jail_interface / jail_<jid>_interface option. An ip alias will be
  created (jail_<jid>_ip) on jail_interface or jail_<jid>_interface if set.
  This is not a mandatory option.
  - Document all missing jail_* options in rc.conf(5).

      src/share/man/man5/rc.conf.5: rev 1.289 -> 1.290
      src/etc/rc.d/jail: rev 1.26 -> 1.27

Approved by:	re (scottl)
2006-05-05 09:58:13 +00:00
Xin LI b2de0ed23e MFen:
relnotes/common/new.sgml: 1.883.2.15.2.3 -> 1.883.2.15.2.5
	hardware/common/new.sgml: 1.282.2.10 -> 1.282.2.11

Approved by:	re (scottl)
Obtained from:	The FreeBSD Simplified Chinese Project
2006-05-04 15:11:12 +00:00
Scott Long 4bbd19e5d8 MFC rev 1.669. This is done only because the change has been tested for a
month, and then only because it has been heavily reviewed and recommended.

Approved by: re
2006-05-04 07:42:52 +00:00
Scott Long d5a2c3f47f MFC rev 1.1-1.4 of if_bcereg.h
Approved by: re
2006-05-04 07:31:56 +00:00
Maxim Konovalov 1ef0ad7013 MFC rev. 1.3: repair ext2fs writes.
Approved by:	re (scottl)
2006-05-03 21:51:52 +00:00
Pawel Jakub Dawidek 4e83471684 MFC: sys/geom/raid3/g_raid3.c 1.65
We shouldn't lock the topology here - we will panic on assertion inside
g_raid3_bump_syncid().

Reported by:	Bradley W. Dutton <[email protected]>
Approved by:	re (kensmith)
2006-05-02 20:41:49 +00:00
David Malone f9ea98cfc6 MFC: 1.37
Stop dump reading off the end of its inode bitmaps when it finds an
invalid inode number in a directory entry.

Approved by:	re
2006-05-02 19:07:57 +00:00
David Malone 82ce8d0116 MFC: v1.45, v1.44
Make port 37 time work on machines with 64 bit longs. Also merge a couple
of updates to comments.

Approved by:	re
2006-05-02 18:31:02 +00:00
Sam Leffler 106db7d3c1 MFC 1.141: honor fixed tx antenna when sending beacon frames
Approved by:	re (kensmith)
2006-05-02 17:08:34 +00:00
Ariff Abdullah 7548146ead MFC (revision 1.65)
Add inverted amplifier sense quirks for Sony VAIO VGN B1VP/B1XP.

Reported by:	Stan Behrens <s.behrens at kon.de>
Approved by:	re (kensmith)
2006-05-02 13:35:35 +00:00
Ed Maste db0659afad MFC queue.3 1.39 to RELENG_6_1:
The removal of CIRCLEQ left four queue macro families, but one sentence
  in the man page wasn't updated.

PR:             docs/94938
Submitted by:   Ed Schouten <[email protected]>
Approved by:    re
2006-05-02 04:04:26 +00:00
Maxim Konovalov 7da880acea Forced commit: the previous commit was "MFC rev. 1.7: fix prototype
for SYSCALL_MODULE(9)."

Approved by: 	re (OK, I'm lying)
2006-05-01 20:36:50 +00:00
Maxim Konovalov 163275f03b MFC rev. 1.33: document SO_NOSIGPIPE.
Approved by:	re (kensmith)
2006-05-01 20:31:15 +00:00
Maxim Konovalov b5325c7d6a MFC rev. 1.33: document SO_NOSIGPIPE.
Approved by:	re (kensmith)
2006-05-01 20:25:35 +00:00
Maxim Konovalov bad7d9576d MFC rev. 1.19 netflow.c: set to zero engine_type, engine_id and
pad (cisco calls it sampling_interval) fields in netflow v5 header.

MFC rev. 1.4 netflow.h: replace disappeared URLs to Cisco docs by
new ones, style.

Approved by:	re (kensmith)
2006-05-01 20:07:38 +00:00
Maxim Konovalov dd7aaf9dc5 MFC rev. 1.59: describe what actually boot(8) -m mutes.
Approved by:	re (kensmith)
2006-05-01 20:01:13 +00:00
Maxim Konovalov b1b162bc99 MFC rev. 1.95: do not double i/o stats for cd(4).
Approved by:	re (kensmith)
2006-05-01 19:55:13 +00:00
Maxim Konovalov 9cc8c29dbf MFC rev. 1.9: dbm_close(3) returns void.
Approved by:	re (kensmith)
2006-05-01 19:48:09 +00:00
Maxim Konovalov 0e60ad5302 MFC rev. 1.7: document /dev/fido.
Approved by:	re (kensmith)
2006-05-01 19:44:16 +00:00
Maxim Konovalov 4b6466bf2b MFC rev. 1.120: s/PsuedoRAID/PseudoRAID/.
Approved by:	re (kensmith)
2006-05-01 19:37:55 +00:00
Maxim Konovalov 53050c1396 MFC rev. 1.54: be pedantic and do fts_close() when done.
Approved by:	re (kensmith)
2006-05-01 19:34:34 +00:00
Maxim Konovalov a0b94e6f7c MFC rev. 1.32: reset lineno to 1 for each devd config file.
Approved by:	re (kensmith)
2006-05-01 19:30:43 +00:00
Maxim Konovalov 38458fc3e4 MFC rev. 1.67: bridge implementation change.
MFC rev. 1.69: -mdoc sweep.
MFC rev. 1.70: note that the bridge interface need to be upped.

Approved by:	re (kensmith)
2006-05-01 19:28:45 +00:00
Maxim Konovalov 3360476dcc MFC rev. 1.38: note that the bridge interface need to be upped.
Approved by:	re (kensmith)
2006-05-01 19:28:20 +00:00
Christian Brueffer 0033a00b72 MFC:
Autogenerate hardware notes for rr232x(4).

Approved by:    re (hrs)
2006-05-01 08:26:00 +00:00
Joe Marcus Clarke 90d64fa613 MFC:
Fix a file descriptor leak in cam_lookup_pass() when the ioctl to find
the passthru device fails.

Approved by:	re (scottl)
2006-05-01 00:21:47 +00:00
Scott Long 190fbbec64 MFC The rr232x driver.
Approved by: re.
2006-05-01 00:15:13 +00:00
David Xu 94d955ca8d MFC revision 1.27:
> Clear TDF_SINTR in sleepq_resume_thread, also sleepq_catch_signal does
> not need to clear it now, this should fix panic when msleep is recursivly
> called. Patch is slightly adjusted after review.

Approved by: re (scottl)
2006-04-30 23:24:33 +00:00
cvs2svn 11160b949f This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-30 16:44:43 +00:00
cvs2svn 801f8c4f29 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-04-30 16:44:42 +00:00
Ken Smith 45a18f2784 MFC:
> revision 1.86.2.2
> date: 2006/04/21 09:40:25;  author: takawata;  state: Exp;  lines: +3 -0
> MFC:  Rev 1.89
> Add psm ID's for glide point devices.

Requested by:	takawata, but he only did RELENG_6
Approved by: re (hrs)
2006-04-30 05:32:35 +00:00
Hiroki Sato eef16e395c New release notes:
bfe(4) + >1GB RAM problem fixed,
	ypwhich(1) -m bug fixed.

Approved by:	re (implicitly)
2006-04-30 05:31:09 +00:00
Ken Smith ccbcff8338 MFC:
> jhb         2006-04-06 17:17:45 UTC
>
>   FreeBSD src repository
>
>   Modified files:
>     sys/i386/i386        machdep.c
>     sys/i386/isa         npx.c
>   Log:
>   - Don't set CR0_NE and CR0_MP in npx_probe() as they are already set
>     earlier in cpu_setregs().
>   - If we know this CPU has a FPU via cpuid, then just assume the INT16
>     interface and make the npx device quiet to not clutter the dmesg.  This
>     is true for all Pentium and later CPUs and even some of the later 486dx
>     CPUs.
>
>   Reviewed by:    bde
>   Tested by:      ps
>   MFC after:      1 week
>
>   Path                                Revision
>   src/sys/i386/i386/machdep.c         1.625
>   src/sys/i386/isa/npx.c              1.164

Requested by:   jhb
Approved by:    re (scottl)
2006-04-30 05:17:59 +00:00
Ken Smith 622d8d883b MFC:
> jhb         2006-04-06 17:17:45 UTC
>
>   FreeBSD src repository
>
>   Modified files:
>     sys/i386/i386        machdep.c
>     sys/i386/isa         npx.c
>   Log:
>   - Don't set CR0_NE and CR0_MP in npx_probe() as they are already set
>     earlier in cpu_setregs().
>   - If we know this CPU has a FPU via cpuid, then just assume the INT16
>     interface and make the npx device quiet to not clutter the dmesg.  This
>     is true for all Pentium and later CPUs and even some of the later 486dx
>     CPUs.
>
>   Reviewed by:    bde
>   Tested by:      ps
>   MFC after:      1 week
>
>   Path				Revision
>   src/sys/i386/i386/machdep.c		1.625
>   src/sys/i386/isa/npx.c		1.164

Requested by:	jhb
Approved by:	re (scottl)
2006-04-30 05:15:20 +00:00
Ken Smith 243ce4b4d0 MFC revision 1.25.2.5:
> date: 2006/04/28 05:39:58;  author: silby;  state: Exp;  lines: +20 -17
> MFC revs 1.33, 1.34, 1.35, and 1.36.
>
> These changes allow bfe to work on machines with > 1GB of ram.

Requested by:	silby (who didn't have a RELENG_6_1 tree to work with)
Approved by:    re (kensmith)
2006-04-30 04:55:34 +00:00
Kris Kennaway 2185285fed MFC r1.90, r1.91:
> - Lock giant when assigning ni_vp and keep vfslocked state valid.

> - Consistently track ni_dvp and ni_vp with dvfslocked and vfslocked rather
>   than trying to optimize it into a single lock.  This adds more calls to
>   lock giant with non smpsafe filesystems but is the only way to reliably
>   hold the correct lock.
> - Remove an invalid assert in the mountedhere case in lookup and fix the
>   code to properly deal with the scenario.  We can actually have a lookup
>   that returns dp == dvp with mountedhere set with certain unmount races.

Approved by:    re (scottl)
2006-04-30 03:58:12 +00:00
Kris Kennaway a436a36ca3 MFC r1.90, r1.91:
> - Lock giant when assigning ni_vp and keep vfslocked state valid.

> - Consistently track ni_dvp and ni_vp with dvfslocked and vfslocked rather
>   than trying to optimize it into a single lock.  This adds more calls to
>   lock giant with non smpsafe filesystems but is the only way to reliably
>   hold the correct lock.
> - Remove an invalid assert in the mountedhere case in lookup and fix the
>   code to properly deal with the scenario.  We can actually have a lookup
>   that returns dp == dvp with mountedhere set with certain unmount races.

Approved by:	re (scottl)
2006-04-30 03:57:46 +00:00
Kris Kennaway 8daaca8521 MFC r1.18:
>  Bump up the NFS server dupreq cache limit to 2K (from 64). With a small
>  duplicate request cache, under heavy load a lot of non-idempotent requests
>  were getting served again, resulting in errors.

Approved by:    re (scottl)
2006-04-30 03:56:12 +00:00
Kris Kennaway dca566cf73 MFC r1.18:
>  Bump up the NFS server dupreq cache limit to 2K (from 64). With a small
>  duplicate request cache, under heavy load a lot of non-idempotent requests
>  were getting served again, resulting in errors.

Approved by:	re (scottl)
2006-04-30 03:55:45 +00:00
Ken Smith 824d78e1bb Get ready for 6.1-RC2 builds. Update here so people who participate
by updating a machine still get notice they're at RC2.

Approved by:	re (implicit)
2006-04-30 01:16:13 +00:00
Pawel Jakub Dawidek 2147f1316d MFC: sys/geom/raid3/g_raid3.c 1.64
- Don't hold the device sx lock when going to sleep.
- Prevent possible live-lock in case of memory problems by freeing
  already completed requests first.

Reported and tested by:	markus, Bradley W. Dutton <[email protected]>
Approved by:	re (hrs)
2006-04-29 17:50:42 +00:00
Pawel Jakub Dawidek 6cdd67086f MFC: sys/geom/raid3/g_raid3.c 1.64
- Don't hold the device sx lock when going to sleep.
- Prevent possible live-lock in case of memory problems by freeing
  already completed requests first.

Reported and tested by:	markus, Bradley W. Dutton <[email protected]>
Approved by:	re (hrs)
2006-04-29 17:50:42 +00:00
Yoshihiro Takahashi e202bd656a MFC: rev 1.909 (Fix the acpi.ko path for boot.flp).
Approved by:	re (hrs)
2006-04-29 15:22:00 +00:00
Yoshihiro Takahashi e1fac86b50 MFC: rev 1.909 (Fix the acpi.ko path for boot.flp).
Approved by:	re (hrs)
2006-04-29 15:22:00 +00:00
Andrew Thompson 73cc8a917c MFC r1.14-16, sync to HEAD
Approved by:    re (hrs)
2006-04-29 03:31:28 +00:00
Andrew Thompson 2585a31e09 MFC r1.14-16, sync to HEAD
Approved by:	re (hrs)
2006-04-29 03:29:24 +00:00
cvs2svn 5b5d570ca1 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-04-28 23:21:37 +00:00
Colin Percival dd073152f2 MFC: Allow L2 caches to be shared between processors by default.
Approved by:    re (scottl)
2006-04-28 06:54:34 +00:00
Colin Percival f14817724b MFC: Allow L2 caches to be shared between processors by default.
Approved by:	re (scottl)
2006-04-28 06:30:19 +00:00
Mike Silbersack e82fca1fd8 MFC revs 1.33, 1.34, 1.35, and 1.36.
These changes allow bfe to work on machines with > 1GB of ram.

Approved by:	re
2006-04-28 05:39:58 +00:00
Giorgos Keramidas f34e71906c MFC: 1.3 and 1.4
# [1.3]
# Add more details about enabling a custom ruleset for /dev in `rc.conf',
# and add ruleset labels/numbering to the custom ruleset example.
#
# PR:           docs/90362
# Submitted by: Roland Smith <[email protected]>
# MFC after:    3 days

# [1.4]
# Expand contractions.

Approved by:    re (hrs)
2006-04-27 17:17:06 +00:00
Giorgos Keramidas 803dc6c3e8 MFC top.X up to 1.15 and top.c up to 1.18 to RELENG_6_1 too.
Approved by:    re (hrs)
2006-04-27 17:11:11 +00:00
Giorgos Keramidas e6eaea1e42 MFC: 1.3 and 1.4
# [1.3]
# Add more details about enabling a custom ruleset for /dev in `rc.conf',
# and add ruleset labels/numbering to the custom ruleset example.
#
# PR:		docs/90362
# Submitted by:	Roland Smith <[email protected]>
# MFC after:	3 days

# [1.4]
# Expand contractions.

Approved by:	re (hrs)
2006-04-27 15:45:48 +00:00
Giorgos Keramidas 77772c8708 MFC:
* top.X

  revision 1.15
  Document the -C option of top(1), which has been added to the source
  and the usage message of top, but not to the manpage.

  Pointy hat to:  keramida
  Reminded by:    ru
  MFC after:      1 week

* top.c

  revision 1.18
  Bring SYNOPSIS in line with usage().
  ----------
  revision 1.19
  Re-add option -C to usage().

Approved by:	re (hrs)
2006-04-27 02:58:47 +00:00
Christian Brueffer 8e3a1a4839 MFC: rev. 1.5
Mention VIA VT8251 support.

Approved by:    re (hrs)
2006-04-26 18:46:12 +00:00
Christian Brueffer f6b39649c1 MFC: rev. 1.5
Mention VIA VT8251 support.

Approved by:	re (hrs)
2006-04-26 18:45:39 +00:00
Christian Brueffer 5537a15e89 MFC: rev. 1.57
Document how the backoff delay is calculated.

Approved by:    re (hrs)
2006-04-26 18:43:49 +00:00
Christian Brueffer f919c190dd MFC: rev. 1.57
Document how the backoff delay is calculated.

Approved by:	re (hrs)
2006-04-26 18:43:08 +00:00
Christian Brueffer 5e84123265 MFC: rev. 1.32
Add a missing .Pp call.

Approved by:    re (hrs)
2006-04-26 18:41:40 +00:00
Christian Brueffer f0251908dc MFC: rev. 1.32
Add a missing .Pp call.

Approved by:	re (hrs)
2006-04-26 18:41:00 +00:00
Christian Brueffer 08be74ea37 MFC: rev. 1.4
Correct two typos in comments.

Approved by:    re (hrs)
2006-04-26 18:39:17 +00:00
Christian Brueffer 8cabdf3f33 MFC: rev. 1.4
Correct two typos in comments.

Approved by:	re (hrs)
2006-04-26 18:38:43 +00:00
Sam Leffler 0f5af8fed8 MFC: add eapol_version config parameter
Approved by:	re (hrs)
2006-04-26 17:53:14 +00:00
Sam Leffler 8fe4b5f76e MFC: add eapol_version config parameter
Approved by:	re (hrs)
2006-04-26 17:53:14 +00:00
Pawel Jakub Dawidek 0514b915b1 Don't destroy device twice. This can lead to kernel panic on reboot/shutdown.
This is not an MFC, because the code in HEAD has other changes and there is
no such problem there.

Reported and tested by:	ken
Approved by:	re (hrs)
2006-04-26 06:35:11 +00:00
Pawel Jakub Dawidek fa847954bf Don't destroy device twice. This can lead to kernel panic on reboot/shutdown.
This is not an MFC, because the code in HEAD has other changes and there is
no such problem there.

Reported and tested by:	ken
Approved by:	re (hrs)
2006-04-26 06:35:11 +00:00
Xin LI 693f3994d6 MFC 1.2 (tjr):
Fix a one byte off error which causes "less" to crash if you view a
large file, jump to the end, scroll backwards with "b" and try to search
backwards afterwards.

Submitted by:	Matthias Scheler
Approved by:	re (hrs)
2006-04-26 03:46:10 +00:00
Xin LI 968e15ed2e MFC 1.2 (tjr):
Fix a one byte off error which causes "less" to crash if you view a
large file, jump to the end, scroll backwards with "b" and try to search
backwards afterwards.

Submitted by:	Matthias Scheler
Approved by:	re (hrs)
2006-04-26 03:46:10 +00:00
Xin LI a12c23e527 MFC 1.1.1.11 (sam):
correct dlt buffer alloc; this goes on the vendor branch as it
will be committed there shortly.

Approved by:	re (scottl)
2006-04-26 01:47:43 +00:00
Xin LI 3ddb9b2b68 MFC 1.1.1.11 (sam):
correct dlt buffer alloc; this goes on the vendor branch as it
will be committed there shortly.

Approved by:	re (scottl)
2006-04-26 01:47:43 +00:00
Kris Kennaway b3be603193 MFC: r1.78 and r1.79; fix locking assertions
Approved by:	re
2006-04-26 01:23:59 +00:00
Kris Kennaway 7238bef6f9 MFC: r1.78 and r.179; fix locking assertions
Approved by:	re
2006-04-26 01:23:24 +00:00
Pawel Jakub Dawidek d6cd19abc7 MFC: sys/geom/raid3/g_raid3.c 1.61
Fix storing offset of already synchronized data. Offset in entire array was
stored in metadata instead of an offset in single disk.
After reboot/crash synchronization process started from a wrong offset
skipping (not synchronizing) part of the component which can lead to data
corrutpion (when synchronization process was interrupted on initial
synchronization) or other strange situations like 'graid3 status' showing
value more than 100%.

Reported, reviewed and tested by:	ru
Reported by:	Dmitry Morozovsky <[email protected]>
Approved by:	re (hrs)
2006-04-25 22:11:10 +00:00
Pawel Jakub Dawidek 779bf23794 MFC: sys/geom/raid3/g_raid3.c 1.61
Fix storing offset of already synchronized data. Offset in entire array was
stored in metadata instead of an offset in single disk.
After reboot/crash synchronization process started from a wrong offset
skipping (not synchronizing) part of the component which can lead to data
corrutpion (when synchronization process was interrupted on initial
synchronization) or other strange situations like 'graid3 status' showing
value more than 100%.

Reported, reviewed and tested by:	ru
Reported by:	Dmitry Morozovsky <[email protected]>
Approved by:	re (hrs)
2006-04-25 22:11:10 +00:00
Marius Strobl 7070fe7e7c MFC: sys/sparc64/sparc64/exception.S 1.73,
sys/sparc64/sparc64/interrupt.S 1.9

- In intr_fast() fix a race which is fallout from critical sections no longer
  raising the PIL and can cause corruption of the interrupt request lists.
- In intr_fast() assert that the ir_func to be called is non-zero.
- Increment interrupt stats after calling the handlers rather than before in
  order to reduce the delay until direct and fast handlers are serviced.

Approved by:	re (hrs)
2006-04-25 19:37:03 +00:00
Marius Strobl 127087a6d3 MFC: sys/sparc64/sparc64/exception.S 1.73,
sys/sparc64/sparc64/interrupt.S 1.9

- In intr_fast() fix a race which is fallout from critical sections no longer
  raising the PIL and can cause corruption of the interrupt request lists.
- In intr_fast() assert that the ir_func to be called is non-zero.
- Increment interrupt stats after calling the handlers rather than before in
  order to reduce the delay until direct and fast handlers are serviced.

Approved by:	re (hrs)
2006-04-25 19:37:03 +00:00
Scott Long 2963c585b0 MFC rev 1.43.2.4: avoid high ordered pages that are outside of the requested
range.

Approved by: re
2006-04-25 15:29:50 +00:00
Bruce A. Mah a46c89bc6c Fix assorted grammar and punctuation nits, and relocate the ppp
script note to the correct section.

Not quite an MFC but this change is roughly equivalent to rev. 1.916,
plus a couple of fixes that are only applicable to RELENG_6_1.

Approved by:	re (hrs)
2006-04-25 15:27:31 +00:00
Scott Long d708fa1d07 Don't scan pages that are above the passed in high value. This is a partial
MFC of rev 1.48; the rest of that change is incomplete and not appropriate
for merging yet.

Approved by: re
2006-04-25 15:04:29 +00:00
Ariff Abdullah 7e567c1b97 MFC (revision 1.24)
Add support for (latest) VIA VT8251 audio controller.

A slight difference of this chip from its previous siblings is that
it need a gentle "wake up" on every (full) DMA buffer completion to
avoid stalled interrupt handler.

Thanks to George Hartzell for permission on doing remote debugging.

PR:		i386/95949
Tested by:	[1] George Hartzel
          	myself (remotely)
Approved by:	re (hrs)

[1] http://lists.freebsd.org/pipermail/freebsd-multimedia/2006-April/004003.html
2006-04-25 14:41:30 +00:00
Ariff Abdullah cbff35eced MFC (revision 1.24)
Add support for (latest) VIA VT8251 audio controller.

A slight difference of this chip from its previous siblings is that
it need a gentle "wake up" on every (full) DMA buffer completion to
avoid stalled interrupt handler.

Thanks to George Hartzell for permission on doing remote debugging.

PR:		i386/95949
Tested by:	[1] George Hartzel
          	myself (remotely)
Approved by:	re (hrs)

[1] http://lists.freebsd.org/pipermail/freebsd-multimedia/2006-April/004003.html
2006-04-25 14:41:30 +00:00
Jung-uk Kim 6a6045dd41 MFC: Multicore detection.
- Print number of physical/logical cores and more CPUID info.
- Add newer CPUID definitions for future use.
- Correct few MSR addresses while I am here.
- Fix spelling mistake.

Approved by:	re (hrs)
2006-04-24 18:24:31 +00:00
Jung-uk Kim 943b424fcd MFC: Multicore detection.
- Print number of physical/logical cores and more CPUID info.
- Add newer CPUID definitions for future use.
- Correct few MSR addresses while I am here.
- Fix spelling mistake.

Approved by:	re (hrs)
2006-04-24 18:24:31 +00:00
Marcel Moolenaar 13632bd3a7 MFC rev. 1.14 (1.11.2.1): Implement nexus_teardown_intr() properly.
Approved by: re (kensmith)
2006-04-24 17:42:21 +00:00
Marcel Moolenaar 2fd8cecafa MFC rev. 1.14: Implement nexus_teardown_intr() properly.
Approved by: re (kensmith)
2006-04-24 17:26:46 +00:00
Xin LI a66df87ba2 Update with the latest English revisioN:
errata/article.sgml -> 1.73.2.15.2.1
	relnotes/common/new.sgml -> 1.883.2.15.2.3

Approved by:	re (hrs)
2006-04-24 01:09:25 +00:00
Xin LI 8ea579a1c6 MFC: Document SA-06:14.fpu
Approved by:	re (hrs)
2006-04-24 01:06:36 +00:00
Xin LI 214ac33d2e MFC revision 1.7
date: 2006/04/19 05:10:34;  author: delphij;  state: Exp;  lines: +1 -1
Make ldconfig as SERVER dependency.  This makes it possible
for some early starting services from the ports collection
to have their shared objects available before start.

Reviewed by:    freebsd-rc (dougb, brooks)
Approved by:	re (hrs)
2006-04-23 15:29:36 +00:00
Xin LI fcd98ff8d1 MFC revision 1.7
date: 2006/04/19 05:10:34;  author: delphij;  state: Exp;  lines: +1 -1
Make ldconfig as SERVER dependency.  This makes it possible
for some early starting services from the ports collection
to have their shared objects available before start.

Reviewed by:    freebsd-rc (dougb, brooks)
Approved by:	re (hrs)
2006-04-23 15:29:36 +00:00
Hiroki Sato 2e2cb53a89 Remove unnecessary part.
Approved by:	re (implicitly)
2006-04-22 23:24:42 +00:00
Hiroki Sato e11f48a648 Activate release.type.release instead of release.type.current.
Approved by:	re (implicitly)
2006-04-22 23:23:40 +00:00
Hiroki Sato 00634f8750 Update release notes with MFC'd items after 6.0-RELEASE. 2006-04-22 23:07:48 +00:00
Alan Cox 127e268176 Include opt_pmap.h for PMAP_SHPGPERPROC.
PR: 94509
Approved by: re (scottl)
2006-04-22 20:41:21 +00:00
Alan Cox d3e91d5cf1 Include opt_pmap.h for PMAP_SHPGPERPROC.
PR: 94509
Approved by: re (scottl)
2006-04-22 20:41:21 +00:00
Andrew Thompson 89f0b07c78 Document a limitation where the bridge may not forward a reassembled fragment,
this is becuase the new packet may be larger than the MTU.

Approved by:    re (hrs)
2006-04-21 10:28:22 +00:00
Andrew Thompson 863462900d Document a limitation where the bridge may not forward a reassembled fragment,
this is becuase the new packet may be larger than the MTU.

Approved by:	re (hrs)
2006-04-21 10:27:22 +00:00
Takanori Watanabe d489ef4c76 MFC: Rev 1.89
Add psm ID's for glide point devices.

Approved by: re
2006-04-21 09:40:25 +00:00
cvs2svn ca48bfcfee This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-04-21 07:19:23 +00:00
Brooks Davis 3048193471 MFC rev 1.13:
Fix ypwhich -m.  This should be MFC'ed back at least as far as RELENG_5.

Submitted by:	Gil Kloepfer <[email protected]>
PR:		64445
Approved by:	re (scottl)
2006-04-21 05:16:41 +00:00
Brooks Davis d2b3c62703 MFC rev 1.13:
Fix ypwhich -m.  This should be MFC'ed back at least as far as RELENG_5.

Submitted by: Gil Kloepfer <[email protected]>
PR:		64445
Approved by:	re (scottl)
2006-04-21 05:14:20 +00:00
cvs2svn 7f682d9fde This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-04-21 04:28:44 +00:00
SUZUKI Shinsuke e0b7377daa MFC Rev 1.37
use if_allmulti(0) for disabling the multicast promiscuous mode

Approved by: re(scottl)
2006-04-20 16:05:17 +00:00
SUZUKI Shinsuke 5bae264686 MFC Rev 1.37
use if_allmulti(0) for disabling the multicast promiscuous mode

Approved by: re(scottl)
2006-04-20 15:43:45 +00:00
Garance A Drosehn 35a93319d5 MFC 1.76 (aka 1.72.2.3): Make sure the correct fix for the bug
introduced in 1.73 is included for 6.1-release.  The original
bug wrt specifying a new column header for an aliased `-o' option
also remains fixed.

Approved by:	re (scottl)
2006-04-19 21:59:57 +00:00
Ruslan Ermilov b726f67555 MFC: 1.6: Fix a small bug.
Approved by:	re (mux)
2006-04-19 18:22:18 +00:00
Ruslan Ermilov 20482fe95d MFC: 1.6: Fix a small bug.
Approved by:	re (mux)
2006-04-19 18:22:18 +00:00
Sam Leffler 7bb07cc99f MFC 1.139: unbreak cabq handling 2006-04-19 16:23:40 +00:00
Sam Leffler 52511b6035 MFC 1.139: unbreak cabq handling
Approved by:	re (scottl)
2006-04-19 16:14:47 +00:00
John Baldwin f43591cc76 MF6: Drop the kqueue global mutex as soon as we are finished with it.
Approved by:	re (scottl)
2006-04-19 16:00:31 +00:00
John Baldwin 1ff32c6b03 MF6: Fix compile w/o DDB.
Approved by:	re (scottl)
2006-04-19 16:00:05 +00:00
John Baldwin 8a9eeaab80 MFC: Drop the kqueue global mutex as soon as we are finished with it.
Approved by:	re (scottl)
2006-04-19 15:47:36 +00:00
John Baldwin 5f39e81a8b MFC 1.200: Fix compile w/o DDB.
Approved by:	re (scottl)
2006-04-19 15:45:29 +00:00
Colin Percival fbcec12298 MFC: Correct a local information leakage bug affecting AMD FPUs.
Security:	FreeBSD-SA-06:14.fpu
Approved by:	re (scottl)
2006-04-19 07:01:30 +00:00
Colin Percival ff4100a14a MFC: Correct a local information leakage bug affecting AMD FPUs.
Security:	FreeBSD-SA-06:14.fpu
Approved by:	re (scottl)
2006-04-19 07:01:30 +00:00
Jonathan Chen 856e92a3e1 MFC 1.261 - fix a crash when an nfsv2 mount fails
Approved by:	re
2006-04-18 14:15:50 +00:00
Maxim Sobolev 1c3deed1c5 MFC: Merge in timeout into A20-enable routine from cdboot/boot1.
Approved by:	re
Reminded by:	Xin LI <delphij delphij net>
2006-04-18 13:51:13 +00:00
Xin LI 919cb71aee MFC src/sys/nfsclient/nfs_bio.c,v 1.154
and src/sys/nfsclient/nfs_vnops.c,v 1.262 (by ps@):

 - Always return success from NFS strategy. nfs_doio(), in the
   event of an error, does the right thing, in terms of setting
   the error flags in the buf header. That fixes a crash from
   bstrategy().
 - Treat ETIMEDOUT as a "recoverable" error, causing the buffer
   to be re-dirtied. ETIMEDOUT can occur on soft mounts, when
   the number of retries are exceeded, and we don't want data loss
   in that case.

Submitted by:   Mohan Srinivasan
Approved by:	re (scottl)
2006-04-18 05:31:58 +00:00
Xin LI afb82cc72e MFC src/sys/nfsclient/nfs_bio.c,v 1.154
and src/sys/nfsclient/nfs_vnops.c,v 1.262 (by ps@):

 - Always return success from NFS strategy. nfs_doio(), in the
   event of an error, does the right thing, in terms of setting
   the error flags in the buf header. That fixes a crash from
   bstrategy().
 - Treat ETIMEDOUT as a "recoverable" error, causing the buffer
   to be re-dirtied. ETIMEDOUT can occur on soft mounts, when
   the number of retries are exceeded, and we don't want data loss
   in that case.

Submitted by:   Mohan Srinivasan
Approved by:	re (scottl)
2006-04-18 05:31:58 +00:00
Jonathan Chen aecfa5ae6c MFC 1.261 - fix a crash when an nfsv2 mount fails
Approved by:	re
2006-04-18 05:18:47 +00:00
Hiroki Sato 4f61b1b522 Remove description about subscribing to stable@.
This is not for 6.1-RELEASE.

Approved by:	re (implicitly)
2006-04-17 18:08:50 +00:00
Hiroki Sato b91cf6c5e1 Update version numbers for 6.1-RELEASE.
Approved by:	re (implicitly)
2006-04-17 18:05:32 +00:00
Hiroki Sato c122f20ab8 Update branch name for 6.1-RELEASE.
Approved by:	re (implicitly)
2006-04-17 18:03:18 +00:00
Matteo Riondato 54db71c729 Add device ID for Intel Pro/100 VE Network Connection card
Approved by:	re (scottl)
2006-04-16 16:07:09 +00:00
Matteo Riondato b46b34796e Add device ID for Intel Pro/100 VE Network Connection card
Approved by:	re (scottl)
2006-04-16 15:58:19 +00:00
John-Mark Gurney 2a39153633 MFC: v1.2 pidfile.c
use pwrite to always write at the begining of the file..  If multiple calls
to pidfile_write happen, the pidfile will have nul characters prepended
due to the cached file descriptor offset...

Approved by:	re (scottl)
2006-04-16 04:43:32 +00:00
Scott Long c77f3da8ad Fix compile breakage.
Approved by: re (implicit)
2006-04-15 20:08:33 +00:00
Scott Long 9d5b428408 Fix compile breakage.
Approved by: re (implicit)
2006-04-15 19:08:26 +00:00
Xin LI e9a444481f MFen:
errata/article.sgml	 1.73.2.14 -> 1.73.2.15
	hardware/common/dev.sgml 1.282.2.9 -> 1.282.2.10

Obtained from:	The FreeBSD Simplified Chinese Project
Approved by:	re (hrs)
2006-04-15 14:51:36 +00:00
Xin LI 326de9b39d MFen:
errata/article.sgml	 1.73.2.14 -> 1.73.2.15
	hardware/common/dev.sgml 1.282.2.9 -> 1.282.2.10

Obtained from:	The FreeBSD Simplified Chinese Project
Approved by:	re (hrs)
2006-04-15 14:51:36 +00:00
Jung-uk Kim 8561361c40 MFC: 1.418
Fix minimal installation check.  'X' was not displayed when it was selected.

Approved by:	re (scottl)
2006-04-14 20:51:17 +00:00
Jung-uk Kim b5e8eb4a2a MFC: 1.418
Fix minimal installation check.  'X' was not displayed when it was selected.

Approved by:	re (scottl)
2006-04-14 20:51:17 +00:00
John-Mark Gurney 70ed19936b MFC: pidfile.c v1.2
use pwrite to always write at the begining of the file..  If multiple calls
to pidfile_write happen, the pidfile will have nul characters prepended
due to the cached file descriptor offset...

Approved by:	re (scottl)
2006-04-14 19:14:58 +00:00
Christian Brueffer 7c69c865b5 MFC: rev. 1.24
bce(4) does polling too.

Approved by:	re (scottl)
2006-04-14 14:17:41 +00:00
Christian Brueffer da3fecbbd3 MFC: rev. 1.24
bce(4) does polling too.

Approved by:	re (scottl)
2006-04-14 14:17:41 +00:00
Christian Brueffer c55efb0fd6 MFC: rev. 1.3
s/militate/mitigate/, fits better in this context.

Approved by:	re (scottl)
2006-04-14 14:17:03 +00:00
Christian Brueffer d072f81a80 MFC: rev. 1.3
s/militate/mitigate/, fits better in this context.

Approved by:	re (scottl)
2006-04-14 14:17:03 +00:00
Maxim Sobolev 02ee188f06 MFC: When enabling A20 put upper limit on amount of time we wait for the
keyboard controller to get ready (65K x ISA access time, visually around
1 second). If we have wait more than that amount it's likely that the
hardware is a legacy-free one and simply doesn't have keyboard controller
and doesn't require enabling A20 at all.

This makes cdboot/pxeldr working for MacBook Pro with Boot Camp and
other legacy-free i386 hardware like IBM Netvista S40.

Approved by:	re (scottl)
2006-04-14 03:47:51 +00:00
Garance A Drosehn aa86ecff28 MFC 1.76: Implement the correct fix for the bug introduced in 1.73.
This time we avoid the seg-fault while still keeping the column
headers in uppercase.  And the original bug wrt specifying a new
column header for an aliased `-o' option remains fixed.

Approved by:	re (scottl)
2006-04-14 02:47:30 +00:00
Paul Saab 1d3fded2d3 MFC: rev 1.3, fix DEVICE_POLLING support (compile tested only)
Approved by: re
2006-04-13 22:42:07 +00:00
Paul Saab 0584234409 MFC: rev 1.3, fix DEVICE_POLLING support (compile tested only)
Approved by:	re
2006-04-13 22:41:33 +00:00
John Baldwin cfd1feb22d MF6: Restore API and ABI compat for ithread_destroy().
Approved by:	re (scottl)
2006-04-13 18:45:49 +00:00
John Baldwin 6a5a314d2e MFC: Activate ithread_destroy() (but rename it to ithread_destroy2() for
ABI reasons) and call it from intr_event_destroy().
Only in 6: Add API and ABI compat shims for ithread_destroy() to call
intr_event_destroy().

Approved by:	re (scottl)
Tested by:	Artem Ignatiev <[email protected]>
2006-04-13 17:31:01 +00:00
Christian Brueffer 482b2718c6 MFC: rev. 1.28
Document that VIS_CSTYLE encodes space (040) as '\s'.

Approved by:	re (hrs)
2006-04-13 08:55:01 +00:00
Christian Brueffer c96f91a7b5 MFC: rev. 1.16
Add bce(4).

Approved by:	re (hrs)
2006-04-13 08:54:19 +00:00
Christian Brueffer d44709a353 MFC:
Autogenerate hardware notes for bce(4) and mfi(4).

Approved by:	re (hrs)
2006-04-13 08:53:30 +00:00
Christian Brueffer 431a78cf37 MFC: rev. 1.28
Document that VIS_CSTYLE encodes space (040) as '\s'.

Approved by:	re (hrs)
2006-04-13 08:49:58 +00:00
Christian Brueffer c09efc23dd MFC: rev. 1.16
Add bce(4).

Approved by:	re (hrs)
2006-04-13 08:49:12 +00:00
Christian Brueffer 9f51dd98bd Autogenerate hardware notes for bce(4) and mfi(4).
Approved by:	re (hrs)
2006-04-13 08:47:27 +00:00
Pawel Jakub Dawidek a55154da0a MFC: sbin/geom/core/geom.c 1.26
Fix an off-by-one error causing geom(8) utilities to fail or crash in random
situations.

Approved by:	re (scottl)
2006-04-13 06:36:26 +00:00
Pawel Jakub Dawidek 0740ca13c7 MFC: sbin/geom/core/geom.c 1.26
Fix an off-by-one error causing geom(8) utilities to fail or crash in random
situations.

Approved by:	re (scottl)
2006-04-13 06:36:26 +00:00
Gregory Neil Shapiro 17a90e44ad Forced commit to bump the $FreeBSD$ version so mergemaster merges
/etc/mail/freebsd.cf and /etc/mail/freebsd.submit.cf.

PR:		conf/95634
Submitted by:	Rostislav Krasny
Approved by:	re (scottl)
Obtained from:	keramida
2006-04-13 04:08:22 +00:00
Gregory Neil Shapiro 3e8281e13f Forced commit to bump the $FreeBSD$ version so mergemaster merges
/etc/mail/freebsd.cf and /etc/mail/freebsd.submit.cf.

PR:		conf/95634
Submitted by:	Rostislav Krasny
Approved by:	re (scottl)
Obtained from:	keramida
2006-04-13 04:08:22 +00:00
Ken Smith 414b4df023 MFC 1.3: adapt PacketGetAdapterNames to 0.4.8 calling convention
Approved by:	re (scottl)
Submitted by:	sam (who got HEAD/RELENG_6 patched but ran out of time)
2006-04-13 04:06:18 +00:00
cvs2svn bd2a83fc45 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-04-12 21:22:45 +00:00
Paul Saab c86ede860a MFC rev 1.40: Fix the PHY support for the 5780.
Approved by:	re
2006-04-12 18:38:59 +00:00
Paul Saab 62132dfb93 MFC rev 1.40: Fix the PHY support for the 5780.
Approved by:	re
2006-04-12 18:38:59 +00:00
Paul Saab 0d2cb9bba5 MFC: add bce
Approved by:	re
2006-04-12 18:09:28 +00:00
Paul Saab 5ac6a57bdd MFC: Add bce
Approved by:	re
2006-04-12 17:45:27 +00:00
Sam Leffler 05d58b3e6d MFC 1.3: adapt PacketGetAdapterNames to 0.4.8 calling convention
Approved by:	re (scottl)
2006-04-12 17:21:08 +00:00
cvs2svn eabdaf0918 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-10 20:12:19 +00:00
cvs2svn de87e7942d This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-04-10 20:12:18 +00:00
Max Laier a3e3a2c834 MFR6:
Stopgap fix to avoid "mutex ipw0 recursed" panics in msleep for recursive
  ioctl paths.  Instead of using a recursive mutex we use conditional
  locking and keep track of the recursion on the stack.

  Reported and tested by:	Ulrich Spoerlein

Approved by:	re (scottl)
2006-04-10 18:29:31 +00:00
Max Laier 714065cc9e Stopgap fix to avoid "mutex ipw0 recursed" panics in msleep for recursive
ioctl paths.  Instead of using a recursive mutex we use conditional locking
and keep track of the recursion on the stack.

Reported and tested by:	Ulrich Spoerlein
Approved by:		re (scottl)
2006-04-10 18:27:00 +00:00
Ken Smith 887ff7cd1d MFC v1.887.2.9:
> Drop the languages we'll build docs for as part of the release down to
> just English due to a ISO size crisis for disc2.  This is being done
> after consultation with the doceng folks, who basically agreed that
> of the two evils this is less evil than going with the -lite versions
> of gnome/kde.  We are only doing this on RELENG_5/RELENG_6.  On HEAD
> we plan to adjust sysinstall so there will be no packages at all on
> disc1/disc2 and we can have an arbitrary number of dedicated package
> discs but that seems like too much of a change for RELENG_5/RELENG_6
> particularly at this stage in the release.

Discussed with: re@, doceng@
Approved by:    re (scottl)
2006-04-09 04:28:24 +00:00
Ken Smith 096c279814 Drop the languages we'll build docs for as part of the release down to
just English due to a ISO size crisis for disc2.  This is being done
after consultation with the doceng folks, who basically agreed that
of the two evils this is less evil than going with the -lite versions
of gnome/kde.  We are only doing this on RELENG_5/RELENG_6.  On HEAD
we plan to adjust sysinstall so there will be no packages at all on
disc1/disc2 and we can have an arbitrary number of dedicated package
discs but that seems like too much of a change for RELENG_5/RELENG_6
particularly at this stage in the release.

Discussed with:	re@, doceng@
Approved by:	re (scottl)
2006-04-09 04:22:44 +00:00
cvs2svn ca7f9e5033 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-08 14:42:24 +00:00
Scott Long dd68dc0b7a Belatedly move forward to 6.1-RC.
Approved by: re
2006-04-08 14:42:23 +00:00
cvs2svn 99779cd74f This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-05 22:20:45 +00:00
Pawel Jakub Dawidek 76d81583a0 Sync with HEAD.
Approved by:	re (scottl)
2006-04-05 22:20:44 +00:00
Pawel Jakub Dawidek 00e1cad30d MFC: sys/kern/md5c.c 1.27
Fix a panic on sparc64 related to inproper aligment - we cannot assume,
that 'unsigned char *' argument is 4 byte aligned.

Approved by:	re (scottl)
2006-04-05 22:15:00 +00:00
cvs2svn 1a045775ff This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-05 22:12:31 +00:00
cvs2svn 5bc6dadf6b This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-05 22:12:30 +00:00
Pawel Jakub Dawidek b79c0e95f9 Sync with HEAD.
Approved by:	re (scottl)
2006-04-05 22:12:29 +00:00
Christian Brueffer 8fccd996a3 Back out the fan control changes that were merged in revision 1.2.2.5.
The necessary changes to the driver haven't been merged yet, which won't
happen before 6.1-RELEASE.

Submitted by:   markus
Approved by:    re (scottl)
2006-04-05 21:53:42 +00:00
John Baldwin 12e2881878 MFC: Always explicitly panic in propogate_priority() if we try to propogate
a lock's priority to a sleeping thread.

Approved by:	re (scottl)
2006-04-05 21:15:19 +00:00
cvs2svn 5d58c67b65 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-05 21:01:32 +00:00
Garance A Drosehn 48ef805a8f MFC 1.75: Fix a problem introduced by previous change, which causes
a seg-fault if the user specifies a keyword which is implemented as
an alias to some other keyword.

Submitted by:	Kostik Belousov
Approved by:	re (scottl)
2006-04-05 21:01:31 +00:00
Oleg Bulyzhin 3421635133 MFC brgphy.c rev.1.39, miidevs rev.1.31
- Add basic support for BCM5780 PHY.

Submitted by:	grehan
Approved by:	re (hrs)
2006-04-05 20:41:47 +00:00
Hiroki Sato 8010b26135 MFC the following change:
Retire NETSMBCRYPTO as a kernel option and make its functionality
 enabled by default in NETSMB and smbfs.ko.

 With the most of modern SMB providers requiring encryption by
 default, there is little sense left in keeping the crypto part
 of NETSMB optional at the build time.

 This will also return smbfs.ko to its former properties users
 are rather accustomed to.

Submitted by:	yar
Approved by:	re (implicitly)
2006-04-05 15:44:12 +00:00
Robert Watson b18704a035 Merge getfacl.1:1.10, getfacl.c:1.11 from HEAD to RELENG_6:
Add "-q" argument to getfacl(1), which suppresses the per-file header
  comment listing the file name, owner, and group.

  Submitted by:   Jan Srzednicki <w at expro dot pl>

Approved by:	re (scottl)
Reminded by:	delphij
2006-04-05 08:25:46 +00:00
cvs2svn 6b3cb18e09 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-05 03:39:24 +00:00
cvs2svn b15c37440a This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-05 03:39:23 +00:00
Xin LI 6ac7b6f8be MFen:
hardware/common/dev.sgml 1.282.2.8 -> 1.282.2.9
	relnotes/common/new.sgml 1.883.2.12 -> 1.883.2.15

Obtained from:	FreeBSD Simplified Chinese Project
Approved by:	re (scottl)
2006-04-05 03:39:22 +00:00
cvs2svn 432a08778a This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-04 23:55:34 +00:00
Sam Leffler d32594a9d5 MFC: ath config option additions/changes
Approved by:	re (scottl)
2006-04-04 23:55:33 +00:00
David Xu 4854706ad5 MFC thr_cancel.c revision 1.12
thr_kern.c    revision 1.20
    thr_private.h revision 1.58
    thr_sig.c     revision 1.16, 1.17
    thr_rtld.c    revision 1.0-1.2

    Add rtld locking support.

Approved by: re (scottl)
2006-04-04 23:23:50 +00:00
David Xu a257089d60 MFC revision 1.31.
Approved by: re (scottl)
2006-04-04 23:21:22 +00:00
Marcus Alves Grando 5844ba4c52 MFC: Sync with HEAD
Approved by:	re (scottl)
2006-04-04 21:22:35 +00:00
Christian Brueffer f1cd62c7bf MFC:
Convert the SYNOPSIS section to look like the ones used in other driver
manpages, mention module support.

Approved by:	re (hrs)
2006-04-04 21:03:08 +00:00
Christian Brueffer 79cec8e9bc MFC:
Convert the SYNOPSIS section to look like the ones used in other driver
manpages, mention module support.
Also add the crypto and cryptodev devices as the drivers are kind of useless
without them.

Approved by:	re (hrs)
2006-04-04 21:02:17 +00:00
Christian Brueffer c8558c4037 MFC: rev. 1.15
Convert the SYNOPSIS section to look like the ones used in other driver
manpages.

Approved by:	re (hrs)
2006-04-04 21:01:05 +00:00
Christian Brueffer 4056e10bf0 MFC: rev. 1.12
Convert the SYNOPSIS section to look like the ones used in other driver
manpages.  Don't mention the include file, it's not important for the
operation of this driver.

Approved by:	re (hrs)
2006-04-04 21:00:21 +00:00
Christian Brueffer 8cf794073b MFC: rev. 1.22
Add a standard boilerplate to the SYNOPSIS section that mentions how
to load a kernel module.

Approved by:	re (hrs)
2006-04-04 20:58:53 +00:00
Garance A Drosehn 644ca518f6 MFC 1.73->1.74: Fix the case where the user specifies an alternate
heading for some output-format keyword, and the keyword they picked
is an alias to some other keyword.

PR:		bin/57833
Approved by:	re (scottl)
2006-04-04 20:31:26 +00:00
Max Laier 61fecef923 MFC pf.conf, 1.3:
Document the user/group LOR in our sample pf.conf

  Submitted by:	Devon H. O'Dell

Reminded by:	delphij
Approved by:	re (scottl)
2006-04-04 20:31:20 +00:00
Andre Oppermann f61d37df1e MFC rev. 1.32: Add link status descriptions and related structures for userland
applications.

Approved by:	re
2006-04-04 20:24:19 +00:00
Andre Oppermann ed70b0821e MFC route.h rev. 1.65 and rtsock.c rev. 1.133:
- Fill in the correct rtm_index for RTM_ADD and RTM_CHANGE messages.

  - Allow RTM_CHANGE to change a number of route flags as specified by
    RTF_FMASK.

  - The unused rtm_use field in struct rt_msghdr is redesignated as
    rtm_fmask field to communicate route flag changes in RTM_CHANGE
    messages from userland.  The use count of a route was moved to
    rtm_rmx a long time ago.  For source code compatibility reasons
    a define of rtm_use to rtm_fmask is provided.

Approved by:	re
2006-04-04 20:07:23 +00:00
Andre Oppermann ebd16e1fe5 MFC rev. 1.19: Add definitions for MD5_BLOCK_LENGTH, MD5_DIGEST_LENGTH and
MD5_DIGEST_STRING_LENGTH.

Approved by:	re
2006-04-04 19:59:52 +00:00
Andre Oppermann cef409b142 MFC of import of OpenBSD's strtonum(3).
Approved by:	re
2006-04-04 19:56:46 +00:00
Andre Oppermann cc00ded446 MFC of import of OpenBSD's sys/sys/hash.h providing generic 32bit hash functions.
Approved by:	re
2006-04-04 19:50:02 +00:00
Stephan Uphoff d9940ff950 mfc: 1.117 src/sys/i386/i386/mem.c
log:	Fix race conditions.

Approved by:	re (scottl)
2006-04-04 19:46:44 +00:00
Tor Egge 784f8694e7 MFC: Eliminate softdep_flush() livelock by accounting for number of worklist
items marked as being in progress.

Approved by:	re (hrs)
2006-04-04 18:14:31 +00:00
Ariff Abdullah fa4c64ea60 MFC:
dsp.c		revision 1.95
	mixer.c		revision 1.49
	sound.c		revision 1.103
	sound.h		revision 1.68
	vchan.c		revision 1.24

MEGA Fixes / Cleanup
--------------------

Fix severe 8bit integer overflow during channel creation and
destruction, especially for vchans. It turns out that channel
numbering always depend on d->devcount counter (which keep
increasing), while PCMMKMINOR() truncate everything to 8bit length.
At some point the truncation cause the newly created character device
overlapped with the existed one, causing erratic overall system
behaviour and panic. Easily reproduce with something like:

	(Luckily, only root can reproduce this)

	while : ; do
		sysctl hw.snd.pcm0.vchans=200
		sysctl hw.snd.pcm0.vchans=100
	done

- Enforce channel/chardev numbering within 8bit boundary. Return
  E2BIG if necessary.
- Traverse d->channels SLIST and try to reclaim "free" counter during
  channel creation. Don't rely on d->devcount at all.
- Determine open direction using 'flags', not 'mode'. This bug exist
  since past 4 years.
- Don't allow opening the same device twice, be it in a same or
  different direction.
- O_RDWR is allowed, provided that it is done by a single open (for
  example by mixer(8)) and the underlying hardware support true
  full-duplex operation.
- Seal the fate of long standing memory leak (4 years, 7 months)
  during pcm_unregister(). While destroying cdevs, scan / detect
  possible children and free its SLIST placeholder properly.
- Optimize channel allocation / numbering even further. Do brute
  cyclic checking only if the channel numbering screwed.
- Mega vchan create/destroy cleanup:
  o Implement pcm_setvchans() so everybody can use it freely instead
    of implementing their own, be it through sysctl or channel auto
    allocation.
  o Increase vchan creation/destruction resiliency:
    + it's possible to increase/decrease total vchans even during
      busy playback/recording. Busy channel will be left alone,
      untouched. Abusive test sample:
      # play whatever...
      #
         while : ; do
           sysctl hw.snd.pcm0.vchans=1
           sysctl hw.snd.pcm0.vchans=10
           sysctl hw.snd.pcm0.vchans=100
           sysctl hw.snd.pcm0.vchans=200
         done
      # Play something else, leave above loop running frantically.
    + Seal another 4 years old bug where it is possible to destroy
      (virtual) channel even when its cdevs being referenced by other
      process.  The "First Come First Served" nature of dsp_clone() is
      the main culprit of this issue, and usually manifest itself as
      dangling channel <-> process association. Ensure that all of its
      cdevs are free from being referenced before destroying it
      (through ORPHAN_CDEVT() macross).

Approved by:	re (scottl)
2006-04-04 17:43:49 +00:00
Ariff Abdullah c8949cb9c2 MFC (revision 1.109)
Pointer align should be generic enough to handle awkward byte size
especially for true 24bit format.

Approved by:	re (scottl)
2006-04-04 17:37:51 +00:00
Ariff Abdullah c3cae95595 MFC (revision 1.20)
Convert NULL checks into KASSERT (and move them before the first
dereferencing) since a NULL value would be a bug here.

Note: Both affected functions look very similar. A refactoring may
be beneficial.

CID:		483, 485
Found with:	Coverity Prevent(tm)
Approved by:	re (scottl)
2006-04-04 17:34:10 +00:00
Ariff Abdullah 0cb774825f MFC (revision 1.37)
A pointer was checked for NULL after dereferencing it. The check is
not needed here, except there's a bug which results in detaching the
device twice.

Move the NULL pointer check to the beginning of the function and
convert it into a KASSERT.

CID:		483
Found with:	Coverity Prevent(tm)
Approved by:	re (scottl)
2006-04-04 17:32:48 +00:00
cvs2svn ea91bcb8c0 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-04-04 17:31:47 +00:00
John-Mark Gurney a63f2ebae2 MFC: kern_event.c v1.97
clear any action flags on the register knote

Approved by:	re (scottl)
2006-04-04 17:31:46 +00:00
Ariff Abdullah d31ba6ddff MFC (revision 1.105)
Fix memory leak in some failure cases.

CID:		429
Found with:	Coverity Prevent(tm)
Approved by:	re (scottl)
2006-04-04 17:30:59 +00:00
Ariff Abdullah a3452362b9 MFC (revision 1.63)
Don't set primary resume interrupt flag during channel initialization
since it can cause high interrupt rate (storm) and slowdown the entire
system.

Note: Please report back to me if this commit cause any abnormal
      behaviour, especially during suspend / resume.

Reported/Submitted by:	[1] Daan Vreeken [PA4DAN] <Danovitsch_at_vitsch dot net>
Reported/Confirmed by:	[2] Angka H. K. <harikurniawan at gmail dot com>

MFC (revision 1.64)
Add device ID for nForce 410 MCP audio controller.

PR:		kern/95257
Submitted by:	cenix <cenixxx at gmail dot com>

Approved by:	re (scottl)
2006-04-04 17:27:57 +00:00
Ariff Abdullah 12db991106 MFC (revision 1.6)
Misc. fixups:

- [1] Make the driver friendly towards kernel without PREEMPTION.
  Use msleep(9) instead of simple unlock-check_variable-lock
  mechanisme since the later not really effective in non-preemptible
  kernel (especially during codec detection routine).
- Free most driver resources in a sane manner to avoid possible
  double free and panics especially during device detach and codec
  detection failure.

Approved by:	re (scottl)

[1] http://lists.freebsd.org/pipermail/freebsd-questions/2006-March/116515.html
2006-04-04 17:24:33 +00:00
Ariff Abdullah 3109ce1a52 MFC (revision 1.39)
Recover (?) support for AD1815 based ISA soundcards.

PR:		kern/94388
Submitted by:	Krzysztof Kotlenga <piernik at gmail dot com>
Approved by:	re (scottl)
2006-04-04 17:23:24 +00:00
Maksim Yevmenkin ada424c216 MFC:
Add kbdmux(4) to GENERIC on i386 and amd64.

Remove the USB keyboard hack now that KBDMUX is enabled by default.
Allow it to be disabled if Safe Mode is selected.

Requested by:	scottl
Approved by:	re (scottl)
2006-04-04 17:03:44 +00:00
Søren Schmidt faf36e46c3 MFC:
Make the ATAPI sense data accessible when using the ioctl interface
Approved by: re@ (scottl)
2006-04-04 16:07:42 +00:00
Chuck Lever 9bb7841098 rick says:
The following bug was just identified in OpenBSD and it looks like the same
bug exists in the other BSDen NFS servers.

A Linux client (don't know which version, but you can look at
        http://bugzilla.kernel.org/show_bug.cgi?id=6256)
does a Setattr of mtime to the server's time, where the file is mode 0664 and
the client user has group access (ie. caller is not the file owner).

The BSD servers fail the Setattr with EPERM, since the VA_UTIMES_NULL flag
isn't set before doing the VOP_SETATTR.

It seems to me that this should be allowed, since it is allowed for a local
utimes(2). If so, the fix is to set VA_UTIMES_NULL for the
"set-time-to-server-time" cases of setting atime and/or mtime.

MFC of revision 1.140 to RELENG_6.

Submitted by:   [email protected]
Reviewed by:	cel
Approved by:	re (scottl), silby
2006-04-04 15:29:51 +00:00
Florent Thoumie 8e15831f88 MFC:
- Replace awk parts with shell.

      src/etc/rc.d/nsswitch: rev 1.5 -> 1.6

Approved by:	re (scottl)
2006-04-04 14:28:41 +00:00
Gleb Smirnoff 9a05cd62cb To fix build of newer RELENG_6 on older ones, add gensnmptree
to the list of bootstrap-tools.

Submitted by:	ru
Tested by:	osa
Approved by:	re (scottl)
2006-04-04 14:24:03 +00:00
Scott Long 09d2168c28 Teach sysinstall about MFI.
Approved by: re
2006-04-04 04:39:35 +00:00
Scott Long 7a965552b5 Add the mfi.4 man page.
Approved by: re
2006-04-04 04:14:09 +00:00
cvs2svn 817518b1ad This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-04-04 04:11:56 +00:00
Scott Long 6ff2b9d6de Hook the MFI driver up to the kernel build.
Approved by: re
2006-04-04 04:08:07 +00:00
Scott Long 3d6c878482 Add the MFI driver. Thanks to IronPort Systems, Dell, and Yahoo for their
contributions towards this.

Approved by: re
2006-04-04 03:24:49 +00:00
Sam Leffler 98bae44da8 MFC 1.46: implement set(IEEE80211_IOC_STA_STATS) for hostapd
Approved by:	re (hrs)
2006-04-03 17:21:05 +00:00
Sam Leffler f0a860bf8b MFC 1.37: stop device so we don't panic on card removal when active
Approved by:	re (hrs)
2006-04-03 17:18:22 +00:00
Marcel Moolenaar b72084ad31 MFC 1.10: On ia64, the unaligned_print sysctl is a debugging knob.
Approved by: re (hrs)
2006-04-03 04:34:47 +00:00
Marcel Moolenaar 5217ce63aa MFC rev. 1.109: In afd_describe(), don't initialize sizestring.
Approved by: re (hrs@)
2006-04-02 18:39:59 +00:00
Robert Watson 7114ab8164 Merge if_ppp.c:1.113 from HEAD to RELENG_6:
Add IFF_NEEDSGIANT to kernel PPP support.  I have no idea why this wasn't
  here, but it should have been.

Approved by:	re (hrs)
2006-04-02 11:10:38 +00:00
John-Mark Gurney bdd9b5533b MFC: uart.4 v1.9
document uart's dev files

Approved by:	re (hrs)
2006-04-02 08:24:47 +00:00
John-Mark Gurney f8a6fe459c MFC: kern_event.c v1.96
fix race condition

Approved by:	re (hrs)
2006-04-02 08:22:43 +00:00
Hiroki Sato 38e0569a0a MFC: Fix version number when the feature was added.
Spotted by:	ceri
Approved by:	re (implicitly)
2006-04-02 08:07:14 +00:00
Andrew Thompson 3534da96b0 MFC r1.57-58
Use m_dup rather than m_copypacket as we need a writable mbuf

On behalf of:	rik
Approved by:	re (hrs)
2006-04-02 04:41:53 +00:00
Chuck Lever 4d951b6878 If an NFS server returns more than a few EJUKEBOX errors for a given RPC
request, the FreeBSD NFS client will quickly back off to a excessively
long wait (days, then weeks) before retrying the request.

Change the behavior of the FreeBSD NFS client to match the behavior of
the reference NFS client implementation (Solaris).  This provides a fixed
delay of 10 seconds between each retry by default.  A sysctl, called
nfs3_jukebox_delay, is now available to tune the delay.  Unlike Solaris,
the sysctl value on FreeBSD is in seconds, rather than in HZ.

MFC revision 1.136 to RELENG_6

Sponsored by:   Network Appliance, Incorporated
Reviewed by:    rick
Approved by:    re (kensmith), silby
2006-04-02 04:11:23 +00:00
Sam Leffler ccb37cbdb5 backout taskqueue changes
Approved by:	re (scottl)
2006-04-02 00:14:57 +00:00
Bjoern A. Zeeb c0068c3fc3 MFC:
rev. 1.3 src/sys/netipsec/xform.h, rev. 1.12 src/sys/netipsec/xform_ipip.c

  Fix more stack corruptions on amd64.

  Vararg functions have a different calling convention than regular
  functions on amd64. Casting a varag function to a regular one to
  match the function pointer declaration will hide the varargs from
  the caller and we will end up with an incorrectly setup stack.

  Entirely remove the varargs from these functions and change the
  functions to match the declaration of the function pointers.
  Remove the now unnecessary casts.

  Also change static struct ipprotosw[] to two independent
  protosw/ip6protosw definitions to remove an unnecessary cast.

PR:				amd64/95008
Submitted and tested by:	Mats Palmgren
Reviewed by:			rwatson
Approved by:			re (mux)
2006-04-01 15:22:44 +00:00
Robert Watson b293e8c736 Merge ipsec.c:1.44 from HEAD to RELENG_6:
Remove manual assignment of m_pkthdr from one mbuf to another in
  ipsec_copypkt(), as this is already handled by the call to
  M_MOVE_PKTHDR(), which also knows how to correctly handle MAC m_tags.
  This corrects a panic when running with MAC and KAME IPSEC.

  PR:             kern/94599
  Submitted by:   zhouyi zhou <zhouyi04 at ios dot cn>
  Reviewed by:    bz, gnn

Approved by:	re (mux)
2006-04-01 15:16:14 +00:00
Marius Strobl 2a5016eda6 MFC: 1.32
- We only lock the local per-CPU page in the local dTLB, so accessing the
  foreign per-CPU pages in cpu_ipi_send() in order to get the module IDs
  of the other CPUs can cause a page fault. If this happens when doing a
  TLB shootdown while dealing with another page fault this causes a panic
  due to the recursive page fault. As I don't spot other code that assumes
  or requires that accessing foreign per-CPU pages must not page fault
  solve this by adding a statically allocated (and therefore locked as
  part of the kernel pages) array which establishes a FreeBSD CPU ID ->
  module ID relation and use that in cpu_ipi_selected().
- Fix a potential race in cpu_ipi_send(); as we don't serialize the access
  to cpu_ipi_selected() between MI and MD use (only MI-MI and MD-MD) we
  might catch the NACK bit caused by sending another IPI. Solve this by
  checking the NACK bit in the contents of the interrupt dispatch status
  reg read while interrupts were still turned off instead of reading that
  reg anew after interrupts were turned on again. This is also what the
  CPU docs suggest to do.
- Add a workaround for the SpitFire erratum #54 bug (affecting interrupt
  dispatch). While public info regarding what this CPU bug actually causes
  is not available testing shows that with the workaround in place it's
  less likely to get a "couldn't send ipi" panic, it doesn't solve these
  panics entirely though.

Approved by:	re (mux)
2006-03-31 23:48:12 +00:00
Marius Strobl 6aeec23424 MFC: 1.10
Add convenience macros for the bits in ASI_ESTATE_ERROR_EN_REG (used
for ECC handling) and the additional uses of the ASIs 0x77 and 0x7f
as well as their bits (used for a CPU bug workaround).

Approved by:	re (mux)
2006-03-31 23:40:42 +00:00
Marius Strobl 1d2c3f670e MFC: 1.128
- Add a comment describing why tick_init() is called before cninit().
- Fix a typo in another comment.

Approved by:	re (mux)
2006-03-31 23:40:05 +00:00
Marius Strobl e97167ce10 MFC: 1.21
- Move the check for too high HZ values from tick_init() to tick_start()
  as we have to call tick_init() before cninit() in order to provide the
  low-level console drivers with a working DELAY() which in turn means we
  cannot use panic() in tick_init().
- s,to high, too high, in the panic string

Approved by:	re (mux)
2006-03-31 23:38:29 +00:00
Gleb Smirnoff ea62296663 MFC 1.4, 1.5, 1.6:
- Do not point at bar.com.
  - Document how change polling interval for HC
    interface, counters.

Approved by:	re (scottl)
2006-03-31 12:47:50 +00:00
Gleb Smirnoff 2a53364e60 Sync bsnmpd with HEAD.
Approved by:	re (scottl)
Approved by:	harti
2006-03-31 12:44:51 +00:00
cvs2svn ec2fcbc9c3 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-31 07:39:25 +00:00
Kris Kennaway cfd818571e MFC r1.89:
- LK_RETRY means nothing when passed to VOP_LOCK.  Call vn_lock instead.
 - Move the vn_lock of the dvp until after we've unbusied the filesystem
   to avoid a LOR with the mount point lock.
 - In the v_mountedhere while loop we acquire a new instance of giant each
   time through without releasing the first.  This would cause us to leak
   Giant.

Sponsored by:   Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-31 07:39:24 +00:00
Kris Kennaway ace1645700 MFC r1.137:
Fix a bug in the NFS/TCP retransmission path.

The bug was that earlier, if a request was retransmitted,
we would do subsequent retransmits every 10 msecs.

This can cause data corruption under moderate loads by reordering
operations as seen by the client NFS attribute cache, and on the
server side when the retransmission occurs after the original request
has left the duplicate cache, since the operation will be committed
for a second time.

Further work on retransmission handling is needed (e.g. they are still
being done sent too often since they are scaled by HZ, and the size of
the dup cache is too small and easily overwhelmed on busy servers).

Submitted by:   mohans
Approved by:	re (mux)
2006-03-31 07:13:09 +00:00
Sam Leffler f78cf387a0 MFC: 1.36: honor tunable when starting up task q threads
Approved by:	re (scottl)
2006-03-30 22:59:12 +00:00
Christian S.J. Peron a99fea341d MFC 1.144 tty_pty.c
Allow root to open jail PTYs from the host environment. This un-breaks using
utilities like watch(8) (or other programs which use snp(4)) to monitor
behavior within prisons from the host environment. This regression was
introduced when we changed the ioctl(SNPSTTY) to use a file descriptor
instead of a dev_t

Approved by:	re (hrs)
2006-03-30 16:46:56 +00:00
cvs2svn 1a28468d42 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-30 15:31:37 +00:00
Hiroki Sato 1466213c11 Document 06:13.sendmail, 06:12.opie, 06:11.ipsec, and 06:10.nfs.
Submitted by:	delphij
Approved by:	re (implicitly)
2006-03-30 15:31:36 +00:00
Max Laier 6ef194e19e MFC authpf.8 rev. 1.2
Document authpf's requirement for a mounted fdescfs(5).

  PR:		docs/89635

Approved by:	re (hrs)
2006-03-30 08:14:55 +00:00
Brad Davis c3499e046e MFC 1.39
Fix a typo.

Approved by:	re@, ceri@
2006-03-30 04:15:40 +00:00
SUZUKI Shinsuke a763a28c94 MFC Rev 1.15
fixed a potential memory leak

Approved by: re(hrs)
2006-03-29 21:06:50 +00:00
SUZUKI Shinsuke cd40ef7952 MFC Rev 1.64
fixed a memory leak when net.inet6.icmp6.nd6_maxqueuelen is greater than 1

Approved by: re(hrs)
2006-03-29 21:05:11 +00:00
cvs2svn 49dc049c99 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-29 18:11:33 +00:00
Chuck Lever 409f89b3a9 Fix a bug in NFSv3 READDIRPLUS reply processing
The client's READDIRPLUS logic skips the attributes and
filehandle of the ".." entry.  If the server doesn't send
attributes but does send a filehandle for "..", the
client's logic doesn't account for the extra "value
Fix a bug in NFSv3 READDIRPLUS reply processing

The client's READDIRPLUS logic skips the attributes and
filehandle of the ".." entry.  If the server doesn't send
attributes but does send a filehandle for "..", the
client's logic doesn't account for the extra "value
follows" field that indicates whether the filehandle is
present, causing the remaining entries in the reply
to be ignored.

This is an MFC of 1.264 in the CURRENT branch.

Sponsored by:   Network Appliance, Inc.
Reviewed by:    rick, mohans
Approved by:    re, silby
2006-03-29 18:11:32 +00:00
Robert Watson 1cd634de55 Merge ip_ip.c:1.43,1.44 from HEAD to RELENG_6:
When the kernel is compiled with options IPXIP, run the network stack
   with Giant, as there is current unsafety in the IPX tunneled over IP
   code.  There have been no reports of trouble, but there probably would
   be if anyone were running this code at high speed on SMP systems.

   Include kernel.h to get NET_NEEDS_GIANT() definition, which for some
   reason compiled fine here.  I may be running with other include file
   changes locally.

Approved by:	re (kensmith)
2006-03-29 12:42:43 +00:00
cvs2svn d5c610c891 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-29 07:56:11 +00:00
Gregory Neil Shapiro 968bebe8d8 MFC: Add sendmail 8.13.4 -> 8.13.6 release note entry.
Approved by:	re (kensmith)
2006-03-29 07:56:10 +00:00
Gregory Neil Shapiro 0646f7a4a3 MFC: Add new libsm file from sendmail 8.13.6
Approved by:	re (kensmith)
2006-03-29 07:34:59 +00:00
Gregory Neil Shapiro fddc2fa523 MFC: sendmail 8.13.6
Approved by:	re (kensmith)
2006-03-29 07:34:35 +00:00
Hajimu UMEMOTO 53efdc22df MFC:
- When res_send() fails, we should reserve an error code.
  - When res_nquerydomain() returns SERVFAIL, we should try next domain.

	src/lib/libc/net/getaddrinfo.c:		1.75, 1.76
	src/lib/libc/resolv/res_query.c:	1.3

Approved by:	re (hrs)
2006-03-29 03:38:58 +00:00
cvs2svn a1045340b1 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-03-28 23:59:08 +00:00
Ceri Davies 26ef0c2630 MFC revision 1.71:
The rpc.pcnfsd server was in the base for a little over seven
	minutes back in 1994.  Change the example entry to point at the
	port, as per the entries for uucpd et al.

Approved by:	re (kensmith)
2006-03-28 15:52:12 +00:00
Max Laier 388fa01494 MFC pf_norm.c rev. 1.17:
Loopback pf_norm.c rev. 1.106 from OpenBSD:
      fixup IP checksum when modifying IP header fields

  PR:			kern/93849
  Obtained from:	OpenBSD

Approved by:	re (kensmith)
2006-03-28 15:06:03 +00:00
Robert Watson 429308f188 Merge fifo_vnops.c:1.134 from HEAD to RELENG_6:
Add a_fdidx to comment prototype for fifo_open().

  Submitted by:   Kostik Belousov <kostikbel at gmail dot com>

Approved by:	re (mux)
2006-03-28 12:42:20 +00:00
Xin LI 7103579aee MFC (by scottl@):
> Free the newtag if we exit with a failure from alloc_bounce_zone().
>
> Found by: Coverity Prevent(tm)
>
> Revision  Changes    Path
> 1.73      +3 -1      src/sys/amd64/amd64/busdma_machdep.c
> 1.76      +6 -1      src/sys/i386/i386/busdma_machdep.c

Approved by:	re (mux)
2006-03-28 06:28:37 +00:00
Xin LI 36e8a6be15 MFC (by scottl@):
>
> Don peril sensitive sunglasses and jack up the MAX_BPAGES limit to 8192
> on amd64.  If you're going to stuff >4GB into your box, reserving 32MB for
> bonce pages amounts to a rounding error in the overall scheme of things.
>
> Revision  Changes    Path
> 1.72      +1 -1      src/sys/amd64/amd64/busdma_machdep.c

Approved by:	re (mux)
2006-03-28 06:25:11 +00:00
Xin LI 5f6fc26c87 MFC (by le@):
> sys/amd64/amd64/busdma_machdep.c,v 1.71
> sys/i386/i386/busdma_machdep.c,v 1.75

Fix typos.

Approved by:	re (mux)
2006-03-28 06:23:00 +00:00
Hiroki Sato aec6276ac0 New release notes:
FreeBSD-SA-06:10.nfs,
	FreeBSD-SA-06:11.ipsec,
	FreeBSD-SA-06:12.opie, and
	FreeBSD-SA-06:13.sendmail.

Submitted by:	delphij
Approved by:	re (implicitly)
2006-03-26 16:28:59 +00:00
David Xu 8bdacbab25 MFC revision 1.232, 1.233, fix thread suspension race.
Approved by: re (kensmith)
2006-03-26 01:29:55 +00:00
Marius Strobl cfcca0dbd3 MFC: 1.2
- Add info regarding the watchdog part of the MK48Txx.
- Add a missing .Tn before Mostek.

Approved by:	re (hrs)
2006-03-25 12:20:41 +00:00
Marius Strobl abb465350f MFC: 1.11
For E250 and E450 enable the watchdog part of the MK48Txx as it just
works there.

Approved by:	re (hrs)
2006-03-25 12:17:23 +00:00
Marius Strobl 4677688976 - Clear the interrupt source flags before processing the interrupt
events and turn off NIC interrupts while in the interrupt handler.
  This fixes the device timeouts seen with the VMware LANCE.
- Relax the watchdog timer somewhat; don't enable it until the last
  packet is enqueued and if there is a TX interrupt but there are
  still outstanding ones reload the timer.

Approved by:	re (hrs)
2006-03-25 12:13:21 +00:00
Ian Dowse 3582b34477 MFC 1.26: Correct the calculation of the report size and only look
at reports that have the specified kind, instead of assuming that
there is only one report of the right kind in the report descriptor.

Approved by:	re (kensmith)
2006-03-25 04:46:52 +00:00
Ian Dowse b806a4f500 MFC: Sony DSC cameras with revision number 6.0 require the same
quirk as those reporting revision 5.0.

Approved by:	re (mux)
2006-03-24 21:42:02 +00:00
Ruslan Ermilov 7110c94417 MFC: Serialize access to the info/dir file; needed for parallel installs.
Approved by:	re (kensmith)
2006-03-24 19:28:38 +00:00
SUZUKI Shinsuke 842b24af93 MFC Rev 1.27 (avoid heap overrun)
Approved by: re(kensmith)
2006-03-24 14:53:53 +00:00
Christian Brueffer de5df1fa1a MFC: rev. 1.64
Document JMicron JMB361, 365 and 366 support.

Approved by:	re (hrs)
2006-03-24 05:44:32 +00:00
Xin LI d067595ca4 MFC 1.263: a typo fix (diff reduction against -HEAD)
Approved by:	re (hrs)
2006-03-24 04:48:42 +00:00
Sam Leffler b24b375bbc MFC: update for v0.4.8 import of wpa_supplicant and hostapd
Approved by:	re (hrs)
2006-03-24 01:43:18 +00:00
cvs2svn 77850b7412 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-24 01:42:37 +00:00
Sam Leffler c4a30433e7 MFC v0.4.8 import of hostapd
Approved by:	re (hrs)
2006-03-24 01:42:36 +00:00
Sam Leffler 1d002880ea MFC v0.4.8 import of wpa_supplicant
Approved by:	re (hrs)
2006-03-24 01:41:10 +00:00
Pyun YongHyeon 6ae613eb0f MFC if_hme.c:1.47 to RELENG_6:
Backout rev. 1.46. It caused Rx checksum offload breakage on little
 endian systems.

Approved by:    re (hrs)
2006-03-24 00:38:07 +00:00
Sam Leffler d8810b6ae8 MFC 1.40: when doing s/w crypto make sure work is done w/ a writable
mbuf chain; this corrects problems with drivers that rely on the
    host to do crypto

Approved by:	re (hrs)
2006-03-23 23:28:43 +00:00
Sam Leffler c3ef821012 MFC: promote fast ipsec's m_clone routine for public use; it is renamed
m_unshare and the caller can now control how mbufs are allocated

Approved by:	re (hrs)
2006-03-23 23:24:33 +00:00
Maxim Sobolev 0c3744afc5 MFC: also look for BSD label at 512-byte offset, if we can't find
it on the very beginning of the second sector. This makes it compatible
with labels created by disklabel(8) on non-512-byte-per-sector
devices.

Approved by:	re
2006-03-23 22:40:28 +00:00
Hiroki Sato 26226e09f4 MFC(rev.1.15):
Revert description of EBUSY.

Approved by:	re (implicitly)
2006-03-23 07:48:50 +00:00
Hiroki Sato 7bdf4eacd3 MFC:
Fix version number when the feature was added.

Submitted by:	Yoshihiko Sarumaru (mistral at imasy dot or dot jp)
PR:		docs/93801 and docs/93803
Approved by:	re (kensmith)
2006-03-23 07:41:33 +00:00
Hiroki Sato 25a5543e5e MFC (rev.1.5):
Fix incorrect command line examples.

Submitted by:	Yoshihiko Sarumaru (mistral at imasy dot or dot jp)
PR:		docs/94158
Approved by:	re (kensmith)
2006-03-23 07:38:26 +00:00
Christian S.J. Peron caa22e3753 MFC descriptor fixes in hopes of killing the "dup(2) regression on 6.x" show
stopper item on the 6.1-RELEASE TODO list.

Approved by:	re (scottl)
2006-03-23 04:07:01 +00:00
Tor Egge 8bfb3eed77 MFC: Let snapshots make a copy of old contents for all buffers taking part
in a cluster instead of just the first buffer.

     Delay buf_start() calls until snapshots have a copy of old content.

     Allow compilation when not using softupdates.

     Remove unused leaked debug function prototype.

PR:		kern/93942
Approved by:	re (kensmith)
2006-03-22 17:54:50 +00:00
Tor Egge 199f1722fd MFC: Add kludge to avoid deadlock when unlinking snapshot.
Approved by:	re (kensmith)
2006-03-22 17:46:50 +00:00
Tor Egge db8df6a2a3 MFC: Reduce probability of unmount failing after having unmounted snapshots.
Approved by:	re (kensmith)
2006-03-22 17:44:42 +00:00
Tor Egge 200b795ed0 MFC: Ensure that vnode for directory isn't reclaimed before ffs_snapshot()
has completed expunging unlinked files.  It could come back at another
     memory location causing a lock order reversal.

Approved by:	re (kensmith)
2006-03-22 17:42:31 +00:00
Tor Egge 2d2dfc8ad4 MFC: Call vn_start_write() before locking vnode.
Approved by:	re (kensmith)
2006-03-22 17:39:27 +00:00
Tor Egge 60735fb66f MFC: Don't call vn_finished_write() if vn_start_write() failed.
Approved by:	re (kensmith)
2006-03-22 17:34:39 +00:00
Colin Percival d8c8d3e20b Add missing code needed for the detection of IPSec packet replays. [1]
Correctly identify the user running opiepasswd(1) when the login name
differs from the account name. [2]

Modify timeout handling logic in sendmail(8) to correct a reported
signal handling race condition. [3]

Approved by:	re (scottl)
Security:	FreeBSD-SA-06:11.ipsec [1]
Security:	FreeBSD-SA-06:12.opie [2]
Security:	FreeBSD-SA-06:13.sendmail [3]
2006-03-22 16:01:56 +00:00
Yaroslav Tykhiy 97bd3c7675 MFC in the pf and pflog modules:
pf: Respect KERNBUILDDIR.
both: Don't depend on DEV_*.

Approved by:	re (scottl)
2006-03-22 15:56:32 +00:00
Yaroslav Tykhiy 1559730fec MFC rev. 1.11:
Revert to setting vlan and vlandev parametes synchronously, as soon
as both have been read from the command line.  Still use the callback,
but this time only to verify that both vlan and vlandev have been
found on the command line.

This should allow for control over the relative order of processing
parameters, which is needed to satisfy some caveats of the if_vlan
driver.  E.g., MTU cannot be changed on a vlan interface until it's
attached to its parent.

Approved by:	re (scottl)
2006-03-22 15:32:30 +00:00
Yaroslav Tykhiy 1f11e3ee0b MFC rev. 1.8:
Avoid pulling in the whole <net/pfvar.h> by opaquely declaring
the structs pflog_packet() takes pointers to.

Approved by:	re (scottl)
2006-03-22 15:18:04 +00:00
cvs2svn d9805bba09 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-22 13:45:48 +00:00
Stephan Uphoff 9cbdd2896b MFC: 1.271
Enable global pages TLB extension on Application Processors.

Approved by:    re (kensmith)
2006-03-22 13:45:47 +00:00
Joseph Koshy 893c7cb5dd MFC {r1.19,r1.21 sys/dev/hwpmc/hwpmc_mod.c; r1.5 hwpmc_logging.c}:
- When a process is de-configuring a log file, also stop all of its
   PMCs that require a log file to operate.  This change should fix
   PR 90269. [1]
 - When deconfiguring a log, only stop PMCs that are in the RUNNING
   state. [2]

Approved by:	re (scottl) [1], (hrs) [2]
PR:		kern/90269
2006-03-22 10:25:37 +00:00
Gleb Smirnoff 49b82345cb Partial backout. Do not use time_uptime instead of time_second, since
this change wasn't merged to other files.

Pointy hat to:	glebius
Approved by:	re (hrs)
2006-03-22 07:48:31 +00:00
cvs2svn 9d79201db6 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-22 06:34:38 +00:00
SUZUKI Shinsuke adab063200 MFC Rev 1.36
(added a note about the assumption for m->m_pkthdr.rcvif)

Approved by: re(hrs)
2006-03-22 06:34:37 +00:00
SUZUKI Shinsuke 4015b15c62 MFC Rev 1.43
updates net.inet6.ip6.kame_version as the proof of the latest KAME merge

Approved by: re(hrs)
2006-03-22 06:32:54 +00:00
John Baldwin 47d1eefa3d MFC: Add device ID for the Neteasy DRP-32TXD cardbus 10/100 card.
Approved by:	re (hrs)
2006-03-21 21:10:58 +00:00
Sam Leffler 2b540b655d MFC 1.2: correct install location
Approved by:	re (hrs)
2006-03-21 20:54:22 +00:00
cvs2svn a5d082537c This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-21 20:53:53 +00:00
Sam Leffler bc87078612 MFC 1.907: make sure install scripts are executable
Approved by:	re (hrs)
2006-03-21 20:53:52 +00:00
Hiroki Sato 00181b1df2 MFC(rev.1.25):
Correctly locate the character proceeding the matched string in -w
  mode when in non-UTF-8 multibyte locales (e.g. EUC, GB2312, etc.).

PR:		gnu/91909
Silence from:	tjr
Approved by:	re (kensmith)
2006-03-21 20:51:35 +00:00
John-Mark Gurney 376aa3f4fa MFC: systat.1 v1.46, vmstat.c v1.69
Properly spell and document ozfod...

Approved by:	re (hrs)
2006-03-21 20:49:50 +00:00
Maksim Yevmenkin eacf1a9412 MFC:
Reorganize /etc/rc.d/syscons and move all keyboard related settings
into one function syscons_configure_keyboard(). Call new function from
both syscons_start() and sysconst_setkeyboard(). The reason for this
is because syscons_start() will (re)configure both keyboard and screen
settings. Apparently, some graphics cards have problems with running
vidcontrol(1) while X11 is running.

Remove "/etc/rc.d/syscons restart" from /etc/devd.conf. It is no longer
required. Using "/etc/rc.d/syscons setkeyboard" is enough. This also
should fix annoying "syscons not running?" message.

Tested by:	Ulrich Spoerlein < q at galgenberg dot net >
Approved by:	re (hrs)
2006-03-21 19:42:32 +00:00
cvs2svn ef3eaca223 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-20 19:56:45 +00:00
John Baldwin 8b4c467a88 MFC: Don't allow userland to set hardware watch points on kernel memory.
Approved by:	re (mux)
2006-03-20 19:56:44 +00:00
Ruslan Ermilov 146b12b114 MFC: 1.538: Don't create stray objects on pc98.
Approved by:	re (mux)
2006-03-20 16:33:28 +00:00
SUZUKI Shinsuke c9ea2c19ba MFC Rev 1.32
Approved by: re(mux)
2006-03-20 16:23:08 +00:00
Pawel Jakub Dawidek 2e0d21b104 MFC: graid3(8)
Synchronize graid3(8) with HEAD:
- Speed up synchronization process by using configurable number of parallel
  I/O requests.
- Reimplement graid3 softc synchronization by using per-device sx(9) lock.
- Stop synchronization from pre-sync hook.
- Fix possible race between synchronization and regular requests.

Approved by:	re (mux)
2006-03-20 15:50:02 +00:00
Pawel Jakub Dawidek b2ee6c821b MFC: gmirror(8)
Synchronize gmirror(8) with HEAD:
- Speed up synchronization process by using configurable number of parallel
  I/O requests.
- Allow for kernel dumps to the mirror.
- Reimplement gmirror softc synchronization by using per-device sx(9) lock.
- Stop synchronization from pre-sync hook.
- Fix possible race between synchronization and regular requests.

Approved by:	re (mux)
2006-03-20 15:48:55 +00:00
Pawel Jakub Dawidek e98601ce0d MFC: sys/nfsclient/nfs_diskless.c 1.15
I wanted 'nolockd' here instead of 'lockd'.

Approved by:	re (mux)
2006-03-20 15:45:14 +00:00
Robert Watson 642698815d Merge ktrace.c:1.21 from HEAD to RELENG_6:
When opening a trace file, open O_NONBLOCK so that ktrace doesn't stall
  if the target is a fifo.  After opening a trace file, check that it is a
  regular file, and if not, return an error.

  Reported by:    kris
  PR:             94278

Approved by:	re (scottl)
2006-03-20 14:25:19 +00:00
Robert Watson f59c08ae54 Merge fifo_vnops.c:1.133 from HEAD to RELENG_6:
If fifo_open() is called with a negative file descriptor, return EINVAL
  rather than panicking later.  This can occur if the kernel calls
  vn_open() on a fifo, as there will be no associated file descriptor,
  and therefore the file descriptor operations cannot be modified to
  point to the fifo operation set.

  Reported by:    Martin <nakal at nurfuerspam dot de>
  PR:             94278

Approved by:    re (scottl)
2006-03-20 14:24:21 +00:00
Joseph Koshy 1fd509a95f MFC {r1.9 libpmc.c, r1.10 pmc.3}: Add an alias 'unhalted-cycles'
denoting cycles where the CPU is not in a halt or sleep state. [1]
Increment the manual page date, bring the copyright year upto-date.

Approved by:	re (mux) [1]
2006-03-19 01:48:44 +00:00
David Xu 8fbaebca77 MFC revision 1.258.
Approved by: re (mux)
2006-03-18 23:37:36 +00:00
David Xu 602c37bc80 MFC kern_thread.c revision 1.231
kern_exit.c   revision 1.286

    calcu fix for threaded process.

Approved by: re (mux)
2006-03-18 23:36:21 +00:00
Gleb Smirnoff b1235ac334 MFC 1.3:
Free private data when deleting hook.

  PR:		kern/93952
  Submitted by:	Antoine Brodin <antoine.brodin laposte.net>

Approved by:	re (mux)
2006-03-18 22:00:37 +00:00
Gleb Smirnoff 57a8ba9d12 MFC 1.119:
There is no IFF_POLLING flag anymore.

Approved by:	re (mux)
2006-03-18 21:59:22 +00:00
Gleb Smirnoff 2a81b4811a MFC 1.21,1.22:
Fix several typos and trim spaces at eol.

  PR:		kern/93759
  Submitted by:	Antoine Brodin <antoine.brodin laposte.net>

Approved by:	re (mux)
2006-03-18 21:55:43 +00:00
Gleb Smirnoff cae884e65f MFC 1.24,1.25:
Fix misinformation in "setconfig" message description.

  Noticed by:	Brian A. Seklecki <lavalamp spiritual-machines.org>

Approved by:	re (mux)
2006-03-18 21:54:09 +00:00
Gleb Smirnoff 88cc81fb60 MFC:
Add '-F' option which allows to delete existing empty directories, when
  creating symbolic links.

  PR:		bin/92149
  Submitted by:	Eugene Grosbein <eugen grosbein.pp.ru>

Approved by:	re (mux)
2006-03-18 21:49:43 +00:00
Gleb Smirnoff 65e08a7ae6 MFC 1.111:
Set ifp->if_baudrate according to current speed.

Approved by:	re (mux)
2006-03-18 21:48:08 +00:00
Joerg Wunsch 9afeecc194 Add reference to PR for TOSHIBA TransMemory quirk entry.
Approved by:	re (implicitly)
2006-03-18 21:15:40 +00:00
Florent Thoumie 63987e41f6 MFC:
- Add a scsi_da.c and a umass.c quirk for Genesys 6-in-1 Card Reader.

      src/sys/dev/usb/usbdevs: rev 1.250 -> 1.251
      src/sys/cam/scsi/scsi_da.c: rev 1.185 -> 1.186
      src/sys/dev/usb/umass.c: rev 1.130 -> 1.131

Approved by:	re (mux)
2006-03-18 20:30:26 +00:00
Andrew Thompson 7aebad0217 MFC r1.9, r1.10
- If a keymap file is not found for the selected country then default to the
   more common USA ISO rather than index 0 (Belgian).

 - Use jp.pc98 as default keymap for pc98

Approved by:	re (murray)
2006-03-17 21:55:31 +00:00
Joerg Wunsch a9ace1e3c0 MFC rev 1.29. In short, it unbreaks symlinks that have double
slashes recorded in them, as in

pathnames.h -> ../../bsdi.1.0/include//pathnames.h

Approved by:	re (scottl)
2006-03-17 21:32:14 +00:00
cvs2svn 3ce45bf1e0 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-17 21:30:59 +00:00
cvs2svn 21a661cb37 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-17 21:30:58 +00:00
Gleb Smirnoff 388593fdf3 MFC:
Do not touch ifp->if_baudrate in miibus aware drivers.

Approved by:	re (scottl)
2006-03-17 21:30:57 +00:00
Joerg Wunsch 65c5977b97 MFC rev 1.187: Add no synchronize cache quirk for TOSHIBA TransMemory
USB stick.

Approved by:	re (scottl)
2006-03-17 21:30:03 +00:00
Gleb Smirnoff 04914962f9 MFC:
- Introduce ifmedia_baudrate(), which returns correct baudrate of the
    given media status. [1]
  - Utilize ifmedia_baudrate() in miibus_statchg() to update ifp->if_baudrate.

  Obtained from:  NetBSD [1]

Approved by:	re (scottl)
2006-03-17 20:17:43 +00:00
cvs2svn 3a444a3c2a This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-17 17:32:47 +00:00
John Baldwin 07e66aff3b Add a compat API shim for ithread_remove_handler().
Approved by:	re (mux)
2006-03-17 17:32:46 +00:00
Xin LI 40d488a281 MFC: Add snapinfo.
Discussed with:	marks
Approved by:	re (scottl)
2006-03-17 05:08:16 +00:00
Ken Smith 2e5800dbe7 MFC v1.11:
> date: 2006/03/17 02:05:46;  author: kensmith;  state: Exp;  lines: +0 -5
> First pass at trimming package set down.  Disc2 is still too big
> even with this but we're still deciding exactly what to do about
> that.

Approved by:	re (scottl)
2006-03-17 02:12:34 +00:00
Robert Watson 432d4dbfd5 Regenerate.
Approved by:	re (scottl)
2006-03-17 01:47:33 +00:00
Robert Watson 47cb0eb81d Provide unconditionally compiled stub implementations of audit system
calls that simply return ENOSYS.  This will allow basic forward
compatibility with userland audit pieces to be committed in the future,
avoiding the "login killed by SIGSYS" problem users of CVS HEAD
experienced when booting older kernels with newer user spaces (an
unsupported but not uncommon situation when debugging problems).

Approved by:	re (scottl)
Obtained from:	TrustedBSD Project
2006-03-17 01:47:06 +00:00
Daniel Eischen 40837c5215 MFC: Relevent commit logs are below.
Only catch SIGINFO (for dumping thread states) when LIBPTHREAD_DEBUG
  is defined in the environment.

  Modify the code path of the ifdef NOTYET part of _kse_single_thread():

  o  Don't reinitialise the atfork() handler list in the child.  We
     are meant to call the child handler, and on subsequent fork()s
     should call all three functions as normal.
  o  Don't reinitialise the thread specific keyed data in the
     child after a fork.  Applications may require this for context.
  o  Reinitialise curthread->tlflags after removing ourselves from
     (and reinitialising) the various internal thread lists.
  o  Reinitialise __malloc_lock in the child after fork() (to balance
     our explicitly taking the lock prior to the fork()).

  With these changes, it is possible to enable the NOTYET code in
  thr_kern.c to allow the use of non-async-safe functions after
  fork()ing from a threaded program.

  Eliminate a race condition in timed waits (cv, mutex, and sleeps).

  Don't forget to initialize a tailq before using it.

  For the ``#ifdef NOTYET'' code that allows calling non-async-safe
  functions in the child after a fork() from a threaded process,
  use __sys_setprocmask() rather than setprocmask() to keep our
  signal handling sane.  Without this fix, signals are essentially
  ignored in said child and things such as protection violations
  result in an endless busy loop.

  Allocate a thread's tcb last so it is easier to handle failures to
  malloc() siginfo.

  Include needed headers that were obtained through <pthread.h>.  Sort headers
  while here.

  amd64
  -----
  Fix a race condition introduced when redzones were added.  Use an
  atomic operation to return and adjust the stack (amd64).

  test
  -----
  o  Include <string.h>
  o  Make this ILP32/LP64 clean: cast pointers to long.

Approved by:	re (scottl)
2006-03-16 23:29:08 +00:00
Søren Schmidt 0683a54a56 MFC:
Add new modes.

Approved by: re@ (mux)
2006-03-16 21:30:09 +00:00
Søren Schmidt 750d0d3b39 MFC:
Add support for the JMicron JMB361, 365 and 366 chips.
HW and documentation kindly provided by JMicron.

Approved by: re@ (mux)
2006-03-16 21:28:51 +00:00
Matteo Riondato 57ef35db54 Change "grep" with "egrep". Merging by hand is not always the best solution@
This change is approved, since the original patch I sent to re@, didn't have this mistake.

Submitted by:	gad
Approved by:	re (implicit)
2006-03-16 12:22:00 +00:00
Alan Cox c8b43e1a0f MFC
File                  Revisions
  kern/imgact_aout.c    1.100
  kern/imgact_elf.c     1.167-1.172, 1.175
  kern/imgact_gzip.c    1.55
  vm/vm_extern.h        1.77
  vm/vm_glue.c          1.214

  Use sf_buf_alloc() instead of vm_map_find() on exec_map to create
  the ephemeral mappings that are used as the source for three copy
  operations from kernel space to user space.  There are two reasons
  for making this change: (1) Under heavy load exec_map can fill up
  causing vm_map_find() to fail.  When it fails, the nascent process
  is aborted (SIGABRT).  Whereas, this reimplementation using
  sf_buf_alloc() sleeps.  (2) Although it is possible to sleep on
  vm_map_find()'s failure until address space becomes available (see
  kmem_alloc_wait()), using sf_buf_alloc() is faster.  Furthermore,
  the reimplementation uses a CPU private mapping, avoiding a TLB
  shootdown on multiprocessors.

  The second argument to vm_map_find() should be NULL instead of 0.

  Correct a long-standing problem in elfN_map_insert(): In order to
  copy a page to user space, the user space mapping must allow write
  access.

  Eliminate an unneeded (vm_prot_t) parameter from two functions.
  Eliminate unnecessary uses of a local variable.

  Maintain the vnode lock throughout elfN_load_file() rather than
  releasing it and reacquiring it in vrele().  Consequently, there is
  no reason to increase the reference count on the vm object caching
  the file's pages.

  Eliminate unused parameters to elfN_load_file().

  Maintain the lock on the vnode for most of exec_elfN_imgact().
  Specifically, it is required for the I/O that may be performed by
  elfN_load_section().

  Avoid an obscure deadlock in the a.out, elf, and gzip image
  activators.  Add a comment describing why the deadlock does not
  occur in the common case and how it might occur in less usual
  circumstances.

  Eliminate an unused variable from exec_aout_imgact().

  Avoid a vm object reference leak in a rarely used code path.

  An executable contains at most one PT_INTERP program header.
  Therefore, the loop that searches for it can terminate after it is
  found rather than iterating over the entire set of program headers.

  Eliminate an unneeded initialization.

Approved by: re (mux)
2006-03-16 00:25:32 +00:00
Pawel Jakub Dawidek f008516410 MFC: sys/modules/geom/geom_eli/Makefile 1.2
Forgotten MFC.

Approved by:	re (scottl)
2006-03-15 19:20:07 +00:00
Matteo Riondato b738287618 MFC:
Don't build IPv6 support if NO_INET6 was defined

PR:	kern/73865
Approved by:	re (scottl)
2006-03-15 07:44:28 +00:00
cvs2svn 73b91cb8b5 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-15 00:09:44 +00:00
Doug Barton 8d7910cb91 MFC moving abi and archdep before SERVERS, and removing scary BEFORE's
MFC'ed versions:
SERVERS 1.6, abi 1.8, archdep 1.11

Reminded by:	delphij
Approved by:	re (scottl)
2006-03-15 00:09:43 +00:00
Sam Leffler 16da188c4b MFC: sync taskqueue api with HEAD modulo preserving the calling
convention for taskqueue_create

Reviewed by:	various
Approved by:	re (scottl)
2006-03-14 23:28:30 +00:00
Sam Leffler 1572a7ed20 MFC 1.90: use m_dup instead of m_copypacket when doing internal bridging
in case packets are modified (e.g. encrypted)

Approved by:	re (scottl)
2006-03-14 23:24:02 +00:00
Sam Leffler 6f56f3679b MFC 1.14: correct ni_txrate when using a fixed rate
Approved by:	re (scottl)
2006-03-14 23:22:27 +00:00
Joe Marcus Clarke 0d25c9c536 MFC:
Add missing libdata/ldconfig[32] entries.

Approved by:	re (scottl)
2006-03-14 22:13:13 +00:00
cvs2svn 206444925c This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-14 21:13:00 +00:00
John Baldwin 88c729d24a MFC: Add the tl_trap_*() and t1_text_*() symbols to unbreak the build.
The changes in rev 1.25 of db_trace.c to use these symbols was MFC'd
earlier.

Approved by:	re (scottl)
2006-03-14 21:12:59 +00:00
John Baldwin 41ca5c02ef MFC: Don't route interrupts to hyperthreads in an HT system. This
eliminates some performance degradation seen in some workloads when
the change was made from logical APIC addresses to physical APIC addresses.

Approved by:	re (scottl)
2006-03-14 21:07:35 +00:00
John Baldwin 0c26452ae6 MFC: Simplify the i8254 timecounter on Alpha, enable use of the alpha
timecounter in UP kernels on SMP machines and, and G/C some cruft.

Approved by:	re (scottl)
2006-03-14 21:04:46 +00:00
cvs2svn 2fe503f0f6 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-13 08:08:16 +00:00
Warner Losh cbd0594d1f Kill 'n' accendtially introduced in last commit.
Approved by: re@ (scottl) implied because the 'n' in the last commit wasn't
			  authorized :-)
2006-03-13 08:08:15 +00:00
Warner Losh 1690765686 MFC: document audit group being added.
Approved by: re@ (scottl)
2006-03-13 06:41:00 +00:00
Sam Leffler 3d964b0760 MFC 1.30: fix switching between agressive and non-agressive wmm modes
Approved by:	re (mux)
2006-03-13 03:10:31 +00:00
Sam Leffler 81ddc30708 MFC 1.89: deliver an l2uf frame on sta join to prime the bridge
Approved by:	re (mux)
2006-03-13 03:09:18 +00:00
Jeff Roberson 09558a56c9 MFC Rev 1.226
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:08:26 +00:00
Jeff Roberson fd7e8a85d7 MFC Revs 1.357, 1.355
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:08:21 +00:00
cvs2svn 0523ecf6ad This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-13 03:08:18 +00:00
Jeff Roberson 01b65737bd MFC Revs 1.81, 1.80
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:08:17 +00:00
Jeff Roberson 690b559142 MFC Revs 1.65, 1.66
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:08:12 +00:00
Jeff Roberson c75ad91a64 MFC Rev 1.84
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:08:08 +00:00
Jeff Roberson 884a9aa46c MFC Revs 1.36, 1.35
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:08:03 +00:00
Jeff Roberson 63c3904408 MFC Rev 1.19
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:08:00 +00:00
Jeff Roberson 5c2be15832 MFC Revs 1.301, 1.302, 1.303
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:55 +00:00
Jeff Roberson cc1e8bcf0c MFC Revs 1.192, 1.191, 1.190, 1.189
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:48 +00:00
Jeff Roberson 8f4fed08f2 MFC Revs 1.115, 1.114, 1.113
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:42 +00:00
Jeff Roberson bbd5cdf217 MFC Revs 1.71, 1.70
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:37 +00:00
Jeff Roberson 620e24e21e MFC Rev 1.139
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:32 +00:00
Jeff Roberson a0888114d4 MFC Revs 1.315, 1.314, 1.305
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:27 +00:00
Jeff Roberson 60abd04058 MFC Rev 1.238
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:23 +00:00
Jeff Roberson 0cabb4f80f MFC VFS SMP fixes, stack api, softupdates fixes.
Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:17 +00:00
Jeff Roberson 3e3059693b MFC Revs 1.208, 1.207, 1.206, 1.205
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:14 +00:00
Jeff Roberson aa491572fc MFC Revs 1.49, 1.48
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:09 +00:00
Jeff Roberson 3e539ead17 MFC Revs 1.24, 1.25
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:05 +00:00
Jeff Roberson 3c768a879a MFC Rev 1.10
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:07:01 +00:00
Jeff Roberson 3fdf6ecce1 MFC Rev 1.138
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:57 +00:00
Jeff Roberson 5585860311 MFC Revs 1.163, 1.162
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:49 +00:00
Jeff Roberson 6018ce6c3b MFC Revs 1.237, 1.236, 1.234
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:44 +00:00
Jeff Roberson 3bd94c2fbc MFC Revs 1.409, 1.404, 1.403, 1.402, 1.401
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:39 +00:00
Jeff Roberson 3f0c143c70 MFC Revs 1.664, 1.661, 1.660, 1.659, 1.658, 1.657
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:34 +00:00
Jeff Roberson 32185948b0 MFC Revs 1.218, 1.217, 1.216
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:27 +00:00
Jeff Roberson 749b012f8e MFC Revs 1.88, 1.86
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:22 +00:00
Jeff Roberson 721d3b6606 MFC Rev 1.128
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:17 +00:00
Jeff Roberson d34a2e8e28 MFC Rev 1.104
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:14 +00:00
Jeff Roberson ea0c75966e MFC Revs 1.503, 1.501, 1.493
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:09 +00:00
Jeff Roberson a791f3a70b MFC Rev 1.162
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:06:03 +00:00
Jeff Roberson b49cc68f48 VFS SMP fixes, stack api, softupdates fixes.
Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:58 +00:00
Jeff Roberson e52e708f9a MFC Rev 1.177
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:54 +00:00
Jeff Roberson 233f27e237 MFC Revs 1.96, 1.91, 1.90
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:50 +00:00
Sam Leffler a122d28838 MFC: when scanning channels marked passive defer probe request until
802.11 traffic is seend; fixes problems with ap's hiding their ssid

Approved by:	re (mux)
2006-03-13 03:05:48 +00:00
Jeff Roberson 4e6e06688f MFC Rev 1.107
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:47 +00:00
Jeff Roberson 5d205414ca MFC Rev 1.288
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:42 +00:00
Jeff Roberson fce02f8d71 MFC Rev 1.24
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:37 +00:00
Jeff Roberson 2314cdda58 MFC Revs 1.67, 1.70
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:33 +00:00
Jeff Roberson 9ac366de1f MFC Revs 1.91, 1.90
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:26 +00:00
Jeff Roberson f3ce2a5886 MFC Revs 1.77, 1.76, 1.73
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:21 +00:00
Jeff Roberson 478d014497 MFC Rev 1.50
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:17 +00:00
Jeff Roberson a8389bc627 MFC Rev 1.163
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:13 +00:00
Jeff Roberson 46704f2b59 MFC Rev 1.45
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:06 +00:00
Jeff Roberson e352a9fb9c MFC Rev 1.49
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:05:02 +00:00
Jeff Roberson 126b300d83 MFC Rev 1.1039
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:04:12 +00:00
Jeff Roberson 80c0605a2b MFC Rev 1.75
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:04:07 +00:00
Jeff Roberson 105aefbd7b MFC Rev 1.21
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:04:04 +00:00
Jeff Roberson 453633d5b7 MFC Rev 1.68
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:04:00 +00:00
Jeff Roberson 4dd411b1da MFC Rev 1.11
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:03:55 +00:00
Jeff Roberson 81be73ca49 MFC Rev 1.72
VFS SMP fixes, stack api, softupdates fixes.

Sponsored by:	Isilon Systems, Inc.
Approved by:	re (scottl)
2006-03-13 03:03:51 +00:00
David Xu 3c870e76ed MFC revision 1.268, fix KSE stack alignment for gcc.
Approved by: re (scottl)
2006-03-13 02:46:55 +00:00
cvs2svn ac22040d81 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-12 23:44:01 +00:00
Roman Kurakin da740f11ae MFC:
Add support for Cronyx Tau32-PCI adapters.

Approved by:	re(scottl)
2006-03-12 23:44:00 +00:00
Scott Long a64b885637 MFC: Call vfs_destroy_object() before v_data gets set to NULL.
Approved by: re
2006-03-12 21:50:02 +00:00
Matteo Riondato e83b116214 MFC:
Fix output and exit status when daily_mailq_shorten is set to YES

PR:		conf/93472
Approved by:	re (scottl)
2006-03-12 18:42:11 +00:00
Scott Long 8e144cc377 MFC: iir works on PAE now.
Approved by: re
2006-03-12 16:39:40 +00:00
Scott Long 63a4f80603 Update the iir driver to include >4GB support.
Approved by: re
2006-03-12 16:38:28 +00:00
Andre Oppermann 6cbb820b0a MFC rev. 1.23: Properly handle the case when the packet secondary zone can't allocate
further mbuf clusters to attach to mbufs.

Approved by:	re (scottl)
2006-03-12 16:27:40 +00:00
Ariff Abdullah 2f66532382 MFC (revision 1.62):
Add inverted amplifier sense quirks for:
[1] Sony VAIO Type T
[2] Kvazar-Micro Senator 3592XT.

PR:		[1] kern/94056
Submitted by:	[1] Yoshihiko Sarumaru <mistral at imasy.or.jp>
             	[2] Alexandr Krivulya <admin at marcom-group.com>
Approved by:	re (scottl)

[2] http://lists.freebsd.org/pipermail/freebsd-multimedia/2006-March/003773.html
2006-03-11 19:37:26 +00:00
Andrew Thompson ee260f4046 MFC r1.151
Further refine the bridge hack in the arp code. Only do the special arp
  handling for interfaces which are actually in the bridge group, ignore all
  others.

Approved by:	re (hrs)
2006-03-11 19:32:44 +00:00
Sam Leffler 6a5d6cdc2a MFC 1.39: consolidate calculation of capabilities ie
Approved by:	re (scottl)
2006-03-11 19:30:14 +00:00
Sam Leffler 70d3587b56 MFC: make driver override of net80211 parameter state consistent with methods
Approved by:	re (scottl)
2006-03-11 19:25:23 +00:00
cvs2svn a4b66fad93 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-11 18:52:48 +00:00
Sam Leffler 269a679784 MFC sysinstall and make release mods to auto-select up/smp kernel
Reviewed by:	ru
Approved by:	re (scottl)
2006-03-11 18:52:47 +00:00
SUZUKI Shinsuke 2c04d5ba89 MFC Rev 1.26
fixed a bug that an MLD report is not advertised for a group-specific MLD query

Approved by: re(mux)
2006-03-11 10:36:23 +00:00
Max Khon 89a85b8ca0 MFC: rev. 1.26
Fix overriding jail_list from command line.

Approved by:	re (mux)
2006-03-11 08:00:57 +00:00
Yaroslav Tykhiy 4d95a8e88c MFC:
Two years ago, in rev. 1.12, a typo slipped in etc/isdn/Makefile:
  a control variable was misspelled as `SCRIPTS_NAME_isdntel.sh'
  (should've been `SCRIPTSNAME_isdntel.sh') when the Makefile was
  converted to using <bsd.prog.mk>.  Consequently, `isdntel.sh' has
  been installed as `isdntel' since then.  Nevertheless, nobody has
  been unhappy with the change.  So it's time to make it official.

Approved by:	re (mux)
2006-03-11 07:28:32 +00:00
Roman Kurakin 1af71efa6c MFC:
Add support for Cronyx Tau32-PCI adapters. (connect to the build)

Approved by:	re(scottl)
2006-03-10 23:27:41 +00:00
Roman Kurakin 077916e86d MFC:
Add support for Cronyx Tau32-PCI adapters. (update)

Approved by:	re(scottl)
2006-03-10 23:10:39 +00:00
Roman Kurakin bdb3c2ef80 MFC:
Add support for Cronyx Tau32-PCI adapters. (new code)

Approved by:	re(scottl)
2006-03-10 22:57:36 +00:00
Sam Leffler 9f331610cf fix harmless merge botches
Approved by:	re
2006-03-10 22:17:57 +00:00
Sam Leffler eab02a201b MFC 1.135: drop softc lock around copyin/copyout
Approved by:	re (mux)
2006-03-10 22:14:11 +00:00
Sam Leffler 4e8d1f8fb5 MFC 1.134: fix build w/o AR_DEBUG
Approved by:	re (mux)
2006-03-10 22:12:17 +00:00
Sam Leffler 13a9359818 MFC 1.133: improve tx/rx buf printing routines
Approved by:	re (mux)
2006-03-10 22:10:51 +00:00
Sam Leffler 902b0df0d2 MFC 1.130: use ath_hal_gettxintrtxqs so we only process h/w tx
queues that have an interrupt pending

Approved by:	re (mux)
2006-03-10 22:08:07 +00:00
Sam Leffler e49629fdc5 MFC 1.115: explain what list chan displays
Approved by:	re (scottl, hrs)
2006-03-10 22:05:53 +00:00
Sam Leffler 2382f7abb6 MFC: sync with HEAD
Approved by:	re (scottl, hrs)
2006-03-10 22:04:07 +00:00
cvs2svn ae05f84bde This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-10 19:37:36 +00:00
John Baldwin 272174a97c MFC: Split struct ithd into struct intr_thread and intr_event and
associated changes.  More details below:

  Remove public declarations of variables that were forgotten when they were
  made static.

  Revision  Changes    Path
  1.31      +0 -1      src/sys/sys/interrupt.h

  Make sure the interrupt is masked before processing it, or bad things
  can happen.

  Revision  Changes    Path
  1.10      +3 -3      src/sys/arm/arm/intr.c

  Reorganize the interrupt handling code a bit to make a few things cleaner
  and increase flexibility to allow various different approaches to be tried
  in the future.
  - Split struct ithd up into two pieces.  struct intr_event holds the list
    of interrupt handlers associated with interrupt sources.
    struct intr_thread contains the data relative to an interrupt thread.
    Currently we still provide a 1:1 relationship of events to threads
    with the exception that events only have an associated thread if there
    is at least one threaded interrupt handler attached to the event.  This
    means that on x86 we no longer have 4 bazillion interrupt threads with
    no handlers.  It also means that interrupt events with only INTR_FAST
    handlers no longer have an associated thread either.
  - Renamed struct intrhand to struct intr_handler to follow the struct
    intr_foo naming convention.  This did require renaming the powerpc
    MD struct intr_handler to struct ppc_intr_handler.
  - INTR_FAST no longer implies INTR_EXCL on all architectures except for
    powerpc.  This means that multiple INTR_FAST handlers can attach to the
    same interrupt and that INTR_FAST and non-INTR_FAST handlers can attach
    to the same interrupt.  Sharing INTR_FAST handlers may not always be
    desirable, but having sio(4) and uhci(4) fight over an IRQ isn't fun
    either.  Drivers can always still use INTR_EXCL to ask for an interrupt
    exclusively.  The way this sharing works is that when an interrupt
    comes in, all the INTR_FAST handlers are executed first, and if any
    threaded handlers exist, the interrupt thread is scheduled afterwards.
    This type of layout also makes it possible to investigate using interrupt
    filters ala OS X where the filter determines whether or not its companion
    threaded handler should run.
  - Aside from the INTR_FAST changes above, the impact on MD interrupt code
    is mostly just 's/ithread/intr_event/'.
  - A new MI ddb command 'show intrs' walks the list of interrupt events
    dumping their state.  It also has a '/v' verbose switch which dumps
    info about all of the handlers attached to each event.
  - We currently don't destroy an interrupt thread when the last threaded
    handler is removed because it would suck for things like ppbus(8)'s
    braindead behavior.  The code is present, though, it is just under
    #if 0 for now.
  - Move the code to actually execute the threaded handlers for an interrrupt
    event into a separate function so that ithread_loop() becomes more
    readable.  Previously this code was all in the middle of ithread_loop()
    and indented halfway across the screen.
  - Made struct intr_thread private to kern_intr.c and replaced td_ithd
    with a thread private flag TDP_ITHREAD.
  - In statclock, check curthread against idlethread directly rather than
    curthread's proc against idlethread's proc. (Not really related to intr
    changes)

  Tested on:      alpha, amd64, i386, sparc64
  Tested on:      arm, ia64 (older version of patch by cognet and marcel)

  Revision  Changes    Path
  1.88      +43 -29    src/sys/alpha/alpha/interrupt.c
  1.38      +5 -5      src/sys/alpha/isa/isa.c
  1.16      +58 -52    src/sys/amd64/amd64/intr_machdep.c
  1.6       +1 -1      src/sys/amd64/include/intr_machdep.h
  1.16      +2 -2      src/sys/amd64/isa/atpic.c
  1.11      +28 -22    src/sys/arm/arm/intr.c
  1.462     +2 -2      src/sys/dev/sio/sio.c
  1.6       +1 -1      src/sys/dev/uart/uart_kbd_sun.c
  1.24      +2 -2      src/sys/dev/uart/uart_tty.c
  1.15      +58 -52    src/sys/i386/i386/intr_machdep.c
  1.8       +1 -1      src/sys/i386/include/intr_machdep.h
  1.21      +2 -2      src/sys/i386/isa/atpic.c
  1.52      +32 -25    src/sys/ia64/ia64/interrupt.c
  1.180     +3 -2      src/sys/kern/kern_clock.c
  1.127     +437 -270  src/sys/kern/kern_intr.c
  1.206     +0 -1      src/sys/kern/subr_witness.c
  1.6       +3 -3      src/sys/powerpc/include/intr_machdep.h
  1.7       +35 -32    src/sys/powerpc/powerpc/intr_machdep.c
  1.14      +1 -1      src/sys/sparc64/include/intr_machdep.h
  1.24      +43 -36    src/sys/sparc64/sparc64/intr_machdep.c
  1.32      +36 -36    src/sys/sys/interrupt.h
  1.440     +1 -3      src/sys/sys/proc.h

  Catch up with interrupt-thread changes.

  Revision  Changes    Path
  1.32      +1 -1      src/sys/dev/zs/zs.c

  Catch up with new interrupt handling code.

  Revision  Changes    Path
  1.16      +3 -3      src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c

  Catch up with new interrupt handling code.

  Revision  Changes    Path
  1.162     +2 -2      src/sys/dev/cy/cy.c
  1.101     +2 -2      src/sys/dev/rc/rc.c

  Catch up with new interrupt handling code.

  Revision  Changes    Path
  1.50      +2 -2      src/sys/dev/cx/if_cx.c
  1.41      +1 -1      src/sys/dev/sab/sab.c
  1.238     +2 -2      src/sys/pc98/cbus/sio.c

  Add a swi_remove() function to teardown software interrupt handlers.  For
  now it just calls intr_event_remove_handler(), but at some point it might
  also be responsible for tearing down interrupt events created via swi_add.

  Revision  Changes    Path
  1.128     +17 -0     src/sys/kern/kern_intr.c
  1.33      +1 -0      src/sys/sys/interrupt.h

  - Use swi_remove() to teardown swi handlers rather than
    intr_event_remove_handler().
  - Remove tty: prefix from a couple of swi handler names.

  Revision  Changes    Path
  1.51      +1 -1      src/sys/dev/cx/if_cx.c
  1.102     +2 -2      src/sys/dev/rc/rc.c
  1.42      +1 -1      src/sys/dev/sab/sab.c
  1.25      +1 -1      src/sys/dev/uart/uart_tty.c
  1.33      +1 -1      src/sys/dev/zs/zs.c
  1.17      +2 -2      src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c

  Remove a stray return statement in the interrupt dispatch function
  that caused a premature exit after calling a fast interrupt handler
  and bypassing a much needed critical_exit() and the scheduling of
  the interrupt thread for non-fast handlers. In short: unbreak :-)

  Revision  Changes    Path
  1.53      +0 -1      src/sys/ia64/ia64/interrupt.c

  If we get a stray interrupt, return after logging it.  In the extremely
  rare case of a stray interrupt to an unregistered source (such as a stray
  interrupt from the 8259As when using APIC), this could result in a page
  fault when it tried to walk the list of interrupt handlers to execute
  INTR_FAST handlers.  This bug was introduced with the intr_event changes,
  so it's not present in 5.x or 6.x.

  Submitted by:   Mark Tinguely tinguely at casselton dot net

  Revision  Changes    Path
  1.17      +1 -0      src/sys/amd64/amd64/intr_machdep.c
  1.16      +1 -0      src/sys/i386/i386/intr_machdep.c

Approved by:	re (scottl)
2006-03-10 19:37:35 +00:00
Søren Schmidt 2bc61aa6fe MFC
missed line in last commit
Approved by:    re@ (implicit)
2006-03-10 12:43:42 +00:00
Søren Schmidt 9ff9f0fd9a MFC:
Only use the channel in the request given to ata_completed if its
still present.
Only look for ICRC and CORR errors on ATA devices not ATAPI.
Get rid of all the "long long"/"maxint" casting around in printf's.
On all our platforms intmax == int64_t so simply using %j to print
int64_t's is safe all over, and doesn't pullute the code.
Update atapi-fd to support direct devices such as disks.
ATAUSB will need to hook into the delayed boot identify to have
interrupts running, so externalize it.
Add USB modes.

Approved by: re@ (mux)
2006-03-10 12:30:08 +00:00
Gleb Smirnoff 25cb517e0d MFC 1.13:
Update URL at cisco.com.

Approved by:	re (mux)
2006-03-10 07:35:09 +00:00
Gleb Smirnoff 2b37ef449b MFC 1.65:
Correctly switch IFCAP_VLAN_HWTAGGING on and off.

Approved by:	re (mux)
2006-03-10 07:34:21 +00:00
Yaroslav Tykhiy 9af6c021c5 MFC:
Some years ago handling login.access(5) was moved from login(1) to
pam_login_access(8) completely and unconditionally.  This patch is
to finalize the move by deleting unused files and defines, and by
updating the manpages.  In addition, login.access.5 will be installed
from the pam_login_access src directory, to where it belongs and
where it has lived for quite a while, too.

Besides satisfying general purism, this patch should stop ongoing
attempts to fix the dead code.

Approved by:	re (mux)
2006-03-09 22:18:07 +00:00
Yaroslav Tykhiy ec6819af4f MFC:
Move the functionality controlled by "options TDFX_LINUX"
from 3dfx.ko to a separate module, 3dfx_linux.ko.
The option is retained in RELENG_6 for POLA reasons
while it has been turned into "device tdfx_linux" in HEAD.

Approved by:	re (scottl)
2006-03-09 21:51:00 +00:00
Matt Jacob 53894dfad5 MFC 1.4 to make sure the ioctl doesn't get smushed.
Approved by:	[email protected]
2006-03-09 21:43:10 +00:00
Hajimu UMEMOTO ae2b534749 MFC 1.15: Remove trailing dot from the servername in the serverlist to
be able to use portsnap from behind a http proxy.  Some HTTP proxy
don't like trailing dot in the servername.

Approved by:	re (hrs)
2006-03-09 17:10:33 +00:00
Hajimu UMEMOTO c9c54a2ff1 MFC 1.9: Correct handling of HTTP_PROXY_AUTH. A password may have `:'.
Approved by:	 re (hrs)
2006-03-09 17:08:41 +00:00
Gleb Smirnoff e1d17cbbfa MFC 1.127:
- Do not leak read lock in IP_FW_TABLE_GETSIZE case of ipfw_ctl().
  - Acquire read (not write) lock in case of IP_FW_TABLE_LIST.

Approved by:	re (hrs)
2006-03-09 13:42:44 +00:00
Xin LI b8ef932f32 MFC recent locale changes for both Simplified and Traditional
Chinese, so that applications like tcsh(1) can handle them
properly.

Approved by:	re (hrs)
2006-03-09 12:48:36 +00:00
George V. Neville-Neil 544fe9ae1e Merge manual pages from HEAD to RELENG_6
1.21      src/lib/libipsec/ipsec_set_policy.3
1.14      src/lib/libipsec/ipsec_strerror.3
1.17,1.18 src/share/man/man4/ipsec.4

Clean up some descriptions and remove ambiguities in the language.
Add explanations to the examples.

Approved by: re (scottl)
2006-03-09 12:41:34 +00:00
George V. Neville-Neil ac03452f99 Merge in6.c:1.60 from HEAD to RELENG_6
Fix for an inappropriate bzero of the ICMPv6 stats.  The code was zero'ing the wrong structure member but setting the correct one.

Submitted by:   James dot Juran at baesystems dot com
Approved by: re (scottl)
2006-03-09 11:59:03 +00:00
Christian Brueffer 5f978bd340 MFC: rev. 1.30
Remove a useless word.

Approved by:	re (hrs)
2006-03-09 09:18:52 +00:00
Hajimu UMEMOTO b29a3fa281 MFC: Revert `proto ip' back to the previous behavior. The kernel side of
ipfw2 doesn't allow zero as protocol number.

	sbin/ipfw/ipfw.8:	1.186
	sbin/ipfw/ipfw2.c:	1.85

Approved by:	re (mux)
2006-03-09 09:18:37 +00:00
Hajimu UMEMOTO 7ff9c8d954 MFC 1.210:
- Reduce needless DNS query by lookup only appropriate address
  family.
- Specify appropriate hints to getaddrinfo(3).
- Obtain address family from peername in inetd mode.

Approved by:	re (mux)
2006-03-09 09:15:34 +00:00
Christian Brueffer 22e2f60fa4 MFC: rev. 1.29
DDB depends on KDB for some time now.

Approved by:	re (hrs)
2006-03-09 09:14:23 +00:00
Hajimu UMEMOTO fa6e53f9c3 MFC: Handle the errors returned by res_querydomain() in same manner.
lib/libc/net/getaddrinfo.c:	1.72
	lib/libc/net/res_query.c:	1.32

Approved by:	 re (mux)
2006-03-09 09:06:44 +00:00
Andrew Thompson fc6be366c3 MFC bridgestp.c r1.12, if_bridgevar.h r1.11
Add a timer to periodically check the interface state.

Approved by:	re (scottl)
2006-03-09 08:21:19 +00:00
Matteo Riondato ac6bd6e476 MFC: Enhance loginfail: it will catch sshd, proftpd and su errors, as well as other programs
PR:		conf/70973
Approved by:	re (hrs)
2006-03-09 06:55:36 +00:00
Matteo Riondato c425afde76 MFC: Document ldconfig32_paths
PR:	amd64/91571
Approved by:	re (hrs)
2006-03-09 06:54:05 +00:00
Matteo Riondato 50c07b06ab MFC: Add a default ldconfig32_paths entry in default/rc.conf for 32-bit compatibility shared libraries.
It is used by the ldconfig rc.d scripts.

PR:		amd64/91571
Approved by:	re (hrs)
2006-03-09 06:52:39 +00:00
Tor Egge bfdc6bfde5 MFC: Don't set IN_CHANGE and IN_UPDATE on inodes for potentially suspended
file systems.  This could cause deadlocks when creating snapshots.

Approved by:	re (mux)
2006-03-09 00:21:23 +00:00
cvs2svn aece1fbffd This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-03-09 00:18:46 +00:00
Tor Egge b276e34705 MFC: Eliminate a deadlock when creating snapshots. Blocking
vn_start_write() must be called without any vnode locks held.
     Remove calls to vn_start_write() and vn_finished_write() in
     vnode_pager_putpages() and add these calls before the vnode lock
     is obtained to most of the callers that don't already have them.

Approved by:	re (mux)
2006-03-09 00:18:45 +00:00
Tor Egge f4a4451042 MFC: Hold extra reference to vm object while cleaning pages.
Ignore dirty pages owned by "dead" objects.

Approved by:	re (mux)
2006-03-09 00:07:35 +00:00
Tor Egge cacc17d8f7 MFC: Don't try to show marker nodes.
Approved by:	re (mux)
2006-03-09 00:04:27 +00:00
Tor Egge 8635b499dc MFC: Expand scope of marker to reduce the number of page queue scan restarts.
Approved by:	re (mux)
2006-03-09 00:02:51 +00:00
Tor Egge fb411bf9d0 MFC: Check return value from nonblocking call to vn_start_write().
Approved by:	re (mux)
2006-03-09 00:01:29 +00:00
Tor Egge 04d002d9ad MFC: Rounding addr upwards to next 4M or 2M boundary in pmap_growkernel()
could cause addr to become 0, resulting in an early return without
     populating the last PDE.

Approved by:	re (mux)
2006-03-08 23:59:41 +00:00
Tor Egge 2f57461cca MFC: For low memory situations, non-VMIO buffers didnt't release pages back
to the system when brelse() was called with B_RELBUF set on the buffer.
     This could be a problem when the system was low on memory, had many
     buffers on QUEUE_EMPTYKVA and started to traverse directories.  For
     each getnewbuf(), pages were allocated from the system, driving the
     free reserve downwards. For each brelse(), the system put the buffer
     on QUEUE_CLEAN, with B_INVAL set.

     This commit changes the semantics of B_RELBUF to also free pages from
     non-VMIO buffers.

Approved by:	re (mux)
2006-03-08 23:57:07 +00:00
Tor Egge b2be2fe71e MFC: Don't access fs->first_object after dropping reference to it.
The result could be a missed or extra giant unlock.

Approved by:	re (mux)
2006-03-08 23:53:39 +00:00
Kris Kennaway 591462965c MFC:
----------------------------
revision 1.101
date: 2006/02/28 00:05:44;  author: kris;  state: Exp;  lines: +2 -4
Correct the vnode locking in fdescfs.

PR:             kern/93905
Submitted by:   Kostik Belousov <[email protected]>
Reviewed by:    jeff
----------------------------

Approved by:	re (mux)
2006-03-08 23:06:07 +00:00
Christian Brueffer 3bfdbb57b0 MFC: rev. 1.57 - 1.59
Document the ataraid(8), gmirror(8), graid3(8), gstripe(8) and gconcat(8)
periodic scripts.

Approved by:	re (mux)
2006-03-08 23:03:12 +00:00
Christian Brueffer dcc742a95f MFC: rev. 1.34 + 1.37
Add the gmirror(8), graid3(8), gstripe(8) and gconcat(8) status scripts,
default is "off".

Approved by:	re (mux), rwatson (mentor)
2006-03-08 23:01:18 +00:00
Christian Brueffer d89a638d52 MFC: rev. 1.13 + 1.14
Add periodic scripts that check the status of gmirror(8), graid3(8), gstripe(8)
and gconcat(8) devices, respectively.  Also sort.

Approved by:	re (mux), rwatson (mentor)
2006-03-08 22:59:47 +00:00
Christian Brueffer 9289626395 Add periodic scripts that check the status of gmirror(8), graid3(8), gstripe(8)
and gconcat(8) devices, respectively.

Approved by:	re (mux), rwatson (mentor)
2006-03-08 22:56:28 +00:00
Robert Watson 93754b3603 Merge BSD.var.dist:1.73,1.74 from HEAD to RELENG_6:
Add /var/audit, mode 750, which will hold audit trail files.

  Change group for /var/audit to audit, so that audit review can be
  delegated to non-administrators.

  Obtained from:  TrustedBSD Project

Approved by:	re (mux)
2006-03-08 22:55:13 +00:00
Robert Watson 1fd04a6b62 Merge Makefile.inc1:1.536 from HEAD to RELENG_6:
Detect that the "audit" group is missing earlier during install.

Submitted by:	ru
Approved by:	re (scottl)
2006-03-08 21:30:47 +00:00
cvs2svn 90645b6d16 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-03-08 18:03:10 +00:00
Pawel Jakub Dawidek 390c7cf2c3 MFC: sbin/bsdlabel/bsdlabel.8 1.63,1.64
Fix evil examples - first partition should start at offset 16 and explain why
this is important.

Approved by:	re (hrs)
2006-03-08 14:23:13 +00:00
Pawel Jakub Dawidek d545882185 MFC: sys/geom/label/g_label_ufs.c 1.10
We need to check if file system size is equal to provider's size, because
sysinstall(8) still bogusly puts the first partition at offset 0 instead of 16,
so glabel/ufs will find file system on a slice instead of partition.

Before sysinstall is fixed, we must keep this code, which means that we
wont't be able to detect UFS file systems created with 'newfs -s ...'.

PS. bsdlabel(8) creates partitions properly.

Approved by:	re (hrs)
2006-03-08 14:20:14 +00:00
Marcus Alves Grando 7f5a09b8f7 MFC 1.13:
- New sentence should start from the new line
	- Forget to bump .Dd

	Reported by:	maxim

Approved by:	re (hrs)
2006-03-08 12:56:06 +00:00
John Baldwin f7ab7e7039 MFC: Throw out all the logical APIC ID stuff and just wire up interrupts
to individual CPUs using physical addressing and fixed delivery mode.

Approved by:	re (scottl)
2006-03-07 18:33:21 +00:00
John Baldwin 37a4ca6036 MFC: Close some races between procfs/ptrace and exit1() by changing
exit1() to block until any current PHOLD's are released.  This includes
Simplifying the cleanup code in kern_ptrace() and removing the now
unnecessary vmspace ref counting magic from proc_rwmem().  Also, the
locking for ptrace_single_step(), ptrace_set_pc(), and
ptrace_clear_single_step() have been fixed to be consistent across the
tree.

Approved by:	re (scottl)
2006-03-07 18:08:09 +00:00
Sam Leffler aa137c7683 MFC 1.37: cleanup line break formatting
Approved by:	re (scottl)
2006-03-07 17:50:23 +00:00
John Baldwin 3e30eb9359 MFC: Autogenerate a menu containing a list of countries supported by
syscons and pop it up during installs.  In addition, use the specified
country as a hint for the keymap to use and if the non-default country is
chosen during the install startup, pop up the keymap menu before entering
the main sysinstall menu.

Approved by:	re (scottl)
2006-03-07 16:06:41 +00:00
John Baldwin a32610c048 MFC: Remove some dead code.
Approved by:	re (scottl)
2006-03-07 15:51:19 +00:00
John Baldwin 3b5add23e3 MFC: Fix various minor bugs and nits in callout handling.
Approved by:	re (scottl)
2006-03-07 15:50:25 +00:00
John Baldwin d3fda104fb MFC: Add a missing check for the return value from copyin().
Approved by:	re (scottl)
2006-03-07 15:49:11 +00:00
Maksim Yevmenkin d4630d9d05 MFC:
Add new 'setkeyboard' method to the /etc/rc.d/syscons. It accepts the
keyboard device name (i.e. /dev/kbd0). This method will do nothing is
kbdmux(4) is the current active keyboard, otherwise it will switch
active keyboard as requested.

Modify ukbd(4) entries in the /etc/devd.conf to use /etc/rc.d/syscons
and new 'setkeyboard' method.

Approved by:	re (scottl)
2006-03-07 06:13:17 +00:00
Xin LI 7e5043b944 Synchnorize with the latest translation for RELENG_6.
errata/article.sgml:		  1.73.2.1 -> 1.73.2.14
  hardware/common/dev.sgml:	 1.282.2.3 -> 1.282.2.8
  relnotes/common/new.sgml:	 1.883.2.8 -> 1.883.2.12
  relnotes/sparc64/article.sgml:        ?? -> 1.6

Obtained from:	The FreeBSD Simplified Chinese Project
Approved by:	re (hrs)
2006-03-07 05:06:25 +00:00
Robert Watson 45554ec16c Merge group:1.33,1.34 from HEAD to RELENG_6:
Assign gid 77 to audit instead of gid 73.  The ports group list did not
  include '73', which was assigned in a ports passwd entry to ircservices.

  Pointed out by: ceri

  Allocate an 'audit' group, membership in which will grant the audit
  review right by virtue of read file permission on /var/audit and its
  contents.

  Obtained from:  TrustedBSD Project

Approved by:	re (scottl)
2006-03-06 22:23:10 +00:00
Ruslan Ermilov 222c4eba5f MFC: don't attempt to compile DEFAULTS and don't compile LINT twice.
Requested by:	jkoshy
Approved by:	re (scottl)
2006-03-06 19:36:22 +00:00
Max Laier c6563059d3 MFC:
Make pflog a seperate module.  As a result pflog_packet() becomes a
  function pointer that is declared in pf_ioctl.c

  Requested by:   yar (as part of the module build reorg)

Approved by:	re (scottl)
2006-03-06 16:10:19 +00:00
Max Laier 29a1a56ace Link the firmware module the build. Forgotten in original MFC.
Reminded by:	Joerg Pulz
Approved by:	re (scottl)
2006-03-06 16:05:53 +00:00
Hajimu UMEMOTO dec1026d26 MFC: Sync inet_net_pton() and inet_net_ntop() with latest BIND9's
includes an IPv6 support.

	lib/libc/net/inet_net.3:	1.3
	lib/libc/net/inet_net_ntop.c:	1.8
	lib/libc/net/inet_net_pton.c:	1.10

Approved by:	re (scottl)
2006-03-06 14:55:48 +00:00
Hajimu UMEMOTO 9f5dc9608f MFC 1.28: Decrease the value of RES_DFLRETRY from 4 to 2.
Approved by:	re (scottl)
2006-03-06 14:31:30 +00:00
Yaroslav Tykhiy 79fb8aad2c MFC rev. 1.326:
Do not discard the current value of __MAKE_CONF when testing
  whether MAKEOBJDIRPREFIX is set at a wrong place.

Approved by:	re (scottl)
2006-03-06 11:17:49 +00:00
Paul Saab 9e37de0202 MFC:
Don't truncate f_mntfromname & f_mntonname to 16 characters when
translating statfs into ostatfs.  Also use strlcpy instead of bcopy
to make sure the copied strings are properly terminated.

Approved by:	re (scottl)
2006-03-06 10:56:43 +00:00
Paul Saab 4ff32caea4 MFC: rev 1.153
Fix bug in malloc_uninit():
Releasing items from the mt_zone can not be done by a simple
uma_zfree() call since mt_zone is allocated with the UMA_ZONE_MALLOC
flag. Use uma_zfree_arg instead and supply the slab.

This bug caused panics in low memory situations on unloading kernel
modules containing MALLOC_DEFINE(..) statements.

Approved by:	re (scottl)
2006-03-06 08:42:07 +00:00
Andrew Thompson 960db15e8a MFC r1.8: Do not use the TSC where its known to be broken.
Approved by:	re (scottl)
2006-03-06 06:38:38 +00:00
Wojciech A. Koszek 4907ba87b6 MFC:
crypto.ko depends on zlib.

   Submitted by:   Ben Kelly <bkelly at vadev.org>
   Approved by:    rwatson
   Point hat to:   me
   MFC after:      1 day

Approved by:	re (scottl)
2006-03-05 00:48:05 +00:00
Marcus Alves Grando 988817f976 MFC 1.23:
- Print message about cpufreq and timecounter TSC

Approved by:	re (scottl)
2006-03-05 00:03:29 +00:00
Marcus Alves Grando 1306cb3b81 MFC 1.12:
- Add entry about using timecounter TSC and cpu frequency changing.

Approved by:	re (scottl)
2006-03-05 00:00:57 +00:00
Hajimu UMEMOTO 9289f64a57 MFC:
- Just query 'as is', if there is a trailing dot in the name.
- Don't query 'as is' twice.

	lib/libc/net/getaddrinfo.c:	1.71
	lib/libc/net/res_query.c:	1.31

Approved by:	re (scottl)
2006-03-04 17:44:27 +00:00
Hajimu UMEMOTO 0e5681435f MFC 1.5: Add definitions of SWIDTH. It fixes the problem that
tcsh 6.14 doesn't work correctly with ko_KR.eucKR locale.

Approved by:	re (scottl)
2006-03-04 17:36:27 +00:00
Ceri Davies c0eec9bc92 Correct yypo in the last commit.
Submitted by:	maxim
Approved by:	re (implicit; the last commit was not what they approved)
2006-03-04 17:27:08 +00:00
Ceri Davies 68bf79fd0d MFC revision 1.416:
Add new NTP servers for Taiwan.

Approved by:	re (scottl)
2006-03-04 17:24:10 +00:00
Ceri Davies df5476f682 MFC revision 1.23:
Add a note explaining what the rescue/ directory is for.

Approved by:	re (scottl)
2006-03-04 17:13:47 +00:00
David Malone 6ee1d44cca MFC: Make quot skip unallocated inodes.
Approved by:	re (scottl)
2006-03-04 16:59:09 +00:00
Oleg Bulyzhin 6f305d0f2a MFC rev. 1.38
- If PHY changes it's state fast enough, we can miss (under certain conditions)
  link event. Fix it.

Approved by:	re (scottl)
2006-03-04 09:36:13 +00:00
Oleg Bulyzhin 868b4ab9bf MFC rev. 1.121-1.124
- Synchronize status block on every call of bge_poll_locked() (rev. 1.121)
- Return immediately out of bge_rxeof()/bge_txeof() if there are no packets
  to process. This could save some pci register accesses. (rev. 1.122)
- Enable 'complete' (including tcp/udp pseudo header) hardware rx checksum
  offloading. (rev. 1.123)
- Ignore link events for MII/GMII cards if MI auto-polling disabled.(rev. 1.124)
- Clear bge_link flag in bge_stop() (rev. 1.124)
- Force link state check after bge_ifmedia_upd(). Otherwise we can miss link
  event if PHY changes it's state fast enough.(rev. 1.124)
- Fix some comments.

Approved by:	re (scottl)
2006-03-04 09:34:48 +00:00
Oleg Bulyzhin e1ebaada29 MFC if_ethersubr.c rev. 1.214, if_bridge.c rev. 1.54
Properly initialize args structure before passing it to ipfw_chk(): having
uninitialized args.inp is unhealthy for uid/gid/jail ipfw rules.

PR:		kern/92589
Approved by:	re (scottl)
2006-03-04 09:24:30 +00:00
Oleg Bulyzhin 3b52ad5554 MFC rev. 1.315
Fix five years old bug in ip_reass(): if we are using 'full' (i.e. including
pseudo header) hardware rx checksum offloading ip_reass() fails to calculate
TCP/UDP checksum for reassembled packet correctly.

Reviewed by:	sam (earlier version), bde
Approved by:	re (scottl)
2006-03-04 09:16:11 +00:00
Maksim Yevmenkin 2e8c25dc76 MFC:
Integrate kbdmux(4) into syscons(4) and kbd code.

By default syscons(4) will look for the kbdmux(4) keyboard first, and then,
if not found, look for any keyboard.

Current kbd code is modified so if kbdmux(4) is the current keyboard, all
new keyboards are automatically added to the kbdmux(4).

Switch to kbdmux(4) can be done at boot time, by loading kbdmux module at
the loader prompt, or at runtime, by kldload'ing the kbdmux module and
releasing current active keyboard.

If, for whatever reason, kbdmux(4) is not required/desired then just do
not load it and everything should work as before. It is also possible to
kldunload kbdmux at runtime and syscons(4) will automatically switch to
the first available keyboard.

Approved by:	re (scottl)
2006-03-04 00:41:28 +00:00
Maksim Yevmenkin a6ab4b3c85 MFC kbdmux.c rev 1.8
Provide ability to disable kbdmux(4) with the hint.kbdmux.0.disabled="1" hint.
Document hint in the kbdmux(4) man page.

Fix endian bugs accessing ioctl arguments that are passed by value.

Approved by:	re (scottl)
2006-03-04 00:08:20 +00:00
Yaroslav Tykhiy 4a9bfceb02 MFC sys/coda/coda.h rev. 1.14, sys/modules/coda5/Makefile rev. 1.7:
CODA_COMPAT_5 may not be defined unconditionally in the coda5 module.
  Otherwise a kernel build would break in the coda5 module if the main
  kernel conf file enabled CODA_COMPAT_5, too.  Redefined symbols are
  strictly disallowed by -Werror.

  To overcome this issue, introduce a different symbol indicating coda5
  build, CODA5_MODULE, and translate it to CODA_COMPAT_5 appropriately
  in /sys/coda/coda.h.

Approved by:	re (scottl)
2006-03-03 22:05:23 +00:00
Yaroslav Tykhiy a38af79895 MFC rev. 1.13:
Move the hard-coded ETHER_* options to where they belong --
  inside !if defined(KERNBUILDDIR).

  Utilize the fact the module will support all frames by default --
  it needs no ETHER_* options unless some frames need to be disabled.

  Fix the comment respectively.

  Don't forget to create fake opt_ef.h if no ETHER_* are set.

Approved by:	re (scottl)
2006-03-03 22:02:44 +00:00
Andrew Thompson c8e1a43c1e MFC r1.11: Fix up the Bridge Identifier field in the BPDU packet.
Approved by:	re (scottl)
2006-03-03 21:36:26 +00:00
Scott Long 2ba267a4f6 Disable some code that isn't ready for prime time.
Approved by: re
2006-03-02 06:17:52 +00:00
Ariff Abdullah b917a915fe MFC (revision 1.5):
- Fix severe crackling after long running and abusive module load / unload
  by forcing DMA alignment to default buffer size.
- Make sure DMA pointer properly aligned to avoid being truncated by caller
  which causing severe underruns and random popping (especially in 32bit
  playback / recording).
- Add AC97 inverted external amplifier quirk for Maxselect x710s
  - http://maxselect.ru/
- Trim unnecessary pointer alignment.

Approved by:	re (scottl)
2006-03-02 00:11:29 +00:00
Ariff Abdullah 076e644119 Fix random popping while playing in 32bit by increasing default buffer size
from 4096 to 8192.

Approved by:	re (scottl)
2006-03-02 00:09:30 +00:00
Ariff Abdullah f4a9c0fb38 MFC (revision 1.60):
Fix possible DMA leak and locking violation especially
during suspend <-> resume and module load <-> unload.

PR:		kern/92764
Approved by:	re (scottl)
2006-03-02 00:08:28 +00:00
Kris Kennaway 7fb3ee83e9 MFC r1.35: Don't refer to obsolete loader method for setting dumpdev.
Approved by:	re (mux)
2006-03-01 22:35:15 +00:00
Gleb Smirnoff 558c2d4e4b MFC 1.20 by ambrisko:
Grab the media from the passed in structure to put it into the
  global structure.

PR:		bin/91399, bin/93727
Approved by:	re (scottl)
2006-03-01 22:24:23 +00:00
Wojciech A. Koszek 24721f257b MFC:
Connect zlib to the build.

  This patch fixes a problem, which exists if you have IPSEC in your kernel
  and want to have crypto support loaded as KLD. By moving zlib to separate
  module and adding MODULE_DEPEND directives, it is possible to use such
  configuration without complication. Otherwise, since IPSEC is linked with
  zlib (just like crypto.ko) you'll get following error:

          interface zlib.1 already present in the KLD 'kernel'!

  Approved by:    cognet (mentor)

Approved by:	re (scottl)
2006-03-01 21:40:14 +00:00
Andre Oppermann 895572798a MFC: Have TCP Inflight disable itself if the RTT is below a certain
threshold.

The sysctl net.inet.tcp.inflight.rttthresh specifies the threshold
in milliseconds below which inflight will disengage.  It defaults
to 10ms.

Sponsored by:	TCP/IP Optimization Fundraise 2005
Approved by:	re (scottl)
2006-03-01 21:13:29 +00:00
Andre Oppermann 122955f020 MFC: Make sysctl_msec_to_ticks(SYSCTL_HANDLER_ARGS) generally available instead
of being private to tcp_timer.c.

Sponsored by:	TCP/IP Optimization Fundraise 2005
Approved by:	re (scottl)
2006-03-01 21:08:53 +00:00
Andre Oppermann 1d46c1d543 MFC uipc_domain.c rev. 1.45 and uipc_mbuf.c rev. 1.162:
Make kern.ipc.[max_linkhdr|max_protohdr|max_hdr|max_datalen] read-only.

Sponsored by:	TCP/IP Optimization Fundraise 2005
Approved by:	re (scottl)
2006-03-01 20:58:36 +00:00
John Baldwin 605db033b6 MFC: Change pfs_visible() to optionally return with the process still
locked to simplify some locking and close some races.

Approved by:	re (scottl)
2006-03-01 20:54:33 +00:00
Andre Oppermann 78ac035e40 MFC rev. 1.49 to 1.51: Print statistics on jumbo clusters and improve
packet zone information.

Sponsored by:	TCP/IP Optimization Fundraise 2005
Approved by:	re (scottl)
2006-03-01 20:54:21 +00:00
John Baldwin 61841878e3 MFC: Remove extraneous PHOLD() in kthread_create().
Approved by:	re (scottl)
2006-03-01 20:53:24 +00:00
John Baldwin 5ebf96c276 MFC: Hold the proc lock while calling proc_sstep().
Approved by:	re (scottl)
2006-03-01 20:52:10 +00:00
Wojciech A. Koszek 3410f521dc Forced commit in order to note, that I brought style(9) changes together with
functional changes. It was done by accident. Proper comment to the previous
commit should be:

MFC:
   Extend kldunload(8) functionality and fix minor problems:
   o multiple modules can be unloaded at once (specified either by id or be
     module name)
   o exit with EX_USAGE after usage() is called.
   o remove unused variables, since we keep command line flags as bitmask,
     in 'opt'.
   o 'kldload -n ...' does nothing. Add comment to this options.

   Additionally:
   o Update manual page to conform new functionality.
   o Increace WARNS to 6. Because we can.

   o Bump a date in .Dd field. Spotted by brueffer@.

   Approved by:	cognet (mentor)

Approved by:	re (scottl)
2006-03-01 20:51:53 +00:00
Andre Oppermann 16d61e98b3 MFC: Replace 4k mbuf clusters with PAGE_SIZE clusters.
Note: The jumbo mbuf cluster API has been MFC'd only recently and
never shipped in a release.  Thus the API change does not violate
our stable branch guidelines with regard to API compatibility.

Requested by:	glebius, gallatin
Sponsored by:	TCP/IP Optimization Fundraise 2005
Approved by:	re (scottl)
2006-03-01 20:51:49 +00:00
John Baldwin cfa403282d MFC: Change the x86 interrupt code to allocate IDT vectors on-demand.
Approved by:	re (scottl)
2006-03-01 20:50:10 +00:00
John Baldwin 51602e0cbd MFC: Various apic fixes and tweaks from io_apic.c 1.16 and
local_apic.c 1.18.

Approved by:	re (scottl)
2006-03-01 20:46:52 +00:00
Wojciech A. Koszek 45149f7ff7 MFC:
Big style(9) fix. This commit brings no functional change.

   Approved by:	cognet (mentor)

Approved by:	re (scottl)
2006-03-01 20:29:50 +00:00
Søren Schmidt 6bd42d28d1 MFC:
Keep the parent device (in this case the channel) around in ata_request,
so we dont panic device removal or failure.
Clean up ata_fail_requests to prevent the queue munging to fail.
Fix ata_reinit so it does things in the right order to prevent panic's.
Lock the channel so master/slave setups wont trash during reinit.
Work around the deadlock that occours when ATA waits for the taskqueue
to call back for completition and something else is holding the taskqueue
waiting for ATA to return data.
This should clear up the "semaphore timeout !! DANGER Will Robinson !!"
in most situations, and log "taskqueue timeout - completing request directly"
instead, with a delayed "WARNING - freeing taskqueue zombie request" when
the taskqueue finally calls us back with the now stale request.
(It would have been nice if there was a way to remove a scheduled item from
the taskqueue finally calls us back with the now stale request.

Approved by:	re@ (scottl)
2006-03-01 18:36:43 +00:00
Warner Losh 78b949bc05 Back out latest cardbus MFC. This breaks stuff in a lot of weird and
unknown ways.  Until that breakage is sorted out, be conservative.  I'm
not backing this out in current so I can track down the issues.

I'm also not backing out the pci parts of this commit because with the
old cardbus code they work perfectly as far as I've been able to test.
I'm leaving cardbus_device.c in place as well since I anticipate being
able to reconnect it when I resolve this issue in head and cvs rm +
cvs add on branches can be a pita...

Approved by: re@ (scottl)
2006-03-01 18:19:33 +00:00
Pawel Jakub Dawidek 76de362f9b MFC: sys/nfsclient/nfs_diskless.c 1.12,1.13
Add boot.nfsroot.options loader tunable.
It allows to specify options for NFS root file system.
Currently supported options are: soft, intr, conn, lockd.

I'm adding this functionality mostly for 'lockd' option, which is only
honored when performing the initial mount and will be silently ignored
if used while updating the mount options.

This will allow to use flock(2) without the need of using varmfs or
rpc.lockd and friends.

Example of use:
boot.nfsroot.options="intr,lockd"

Approved by:	re (scottl)
2006-03-01 18:01:28 +00:00
Pawel Jakub Dawidek 3ec4fb469f MFC: sys/geom/geom_slice.c 1.59
sys/geom/geom_slice.h	1.18

Allow to use g_slice_orphan() from outside.

Approved by:	re (scottl)
2006-03-01 17:57:11 +00:00
Pawel Jakub Dawidek b512d5106d MFC: Sync with HEAD.
Approved by:	re (scottl)
2006-03-01 17:55:29 +00:00
John Baldwin 59aea33594 MFC: Fix the hw.realmem sysctl on alpha, ia64, and sparc64.
Approved by:	re (scottl)
2006-03-01 16:30:51 +00:00
Simon L. B. Nielsen 2eef9a3a60 Add FreeBSD-SA-06:10.nfs.
Approved by:	re (scottl)
2006-03-01 15:36:41 +00:00
Simon L. B. Nielsen 17a5188234 Correct a remote kernel panic when processing zero-length RPC records
via TCP. [06:10]

Security:	FreeBSD-SA-06:10.nfs
Approved by:	re (scottl)
2006-03-01 14:18:10 +00:00
Wojciech A. Koszek 95e9e44f91 MFC:
Use 'ipfw list' instead of 'ipfw l', since it's deprecated (and warning is
  printed on system startup).

  Approved by:    cognet (mentor)

Approved by:	re (scottl)
2006-03-01 11:36:01 +00:00
Sam Leffler 7f58bcf97e MFC ncpus: test program to check cpu counting
Approved by:	re (scottl)
2006-03-01 06:03:55 +00:00
Sam Leffler 48d615ed4b guard function decls with _KERNEL so user code can include this file
Approved by:	re (scottl)
2006-03-01 06:02:42 +00:00
Sam Leffler a51bc341c9 MFC 1.223: guard function decls with _KERNEL so user code can include this file
Approved by:	re (scottl)
2006-03-01 05:57:15 +00:00
Maksim Yevmenkin 7bcc0bf1f5 MFC: Make ukbd(4) to not delay break scancodes in "raw" mode.
Developed with:		Norbert Koch < NKoch at demig dot de >
No response from:	freebsd-current@
Tested by:		Norbert Koch < NKoch at demig dot de >
Approved by:		re (scottl)
2006-03-01 02:34:16 +00:00
Ian Dowse 79dc4ff140 MFC: save and restore the data toggle value when a pipe to an
endpoint is closed and then reopened. This is reported to fix
timeouts with USB scanners and some other USB devices that were
seen since the recent removal of the clear-stall-on-open code.

Approved by:	re (scottl)
2006-03-01 01:59:05 +00:00
Ed Maste b2d8b28a9a Belatedly add a note about the i386 loader defaulting to the serial
rate set by the previous boot stage, if the console is already set
to the comconsole.

Approved by:    re (scottl)
2006-02-28 19:15:36 +00:00
Joseph Koshy 1629108174 MFC r1.17, r1.18:
- Fix a memory leak (Found by: Coverity).
 - Plug a memory leak: free up per-cpu sample buffers at module unload
   time.
 - Correct a few style nits.

Approved by:	re (scottl)
2006-02-28 18:32:57 +00:00
cvs2svn 4fb55e90ec This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-02-28 17:48:34 +00:00
Maksim Yevmenkin cc994b20f0 MFC
Disable custom locking in the vkbd(4) for now and make it rely on the
Giant mutex (just like the rest of keyboard drivers and syscons(4) do).

Approved by:	re (scottl)
2006-02-28 02:37:47 +00:00
Maksim Yevmenkin 4ceb1d2c5a MFC: Plug memory leak
Approved by:	re (scottl)
2006-02-28 02:36:13 +00:00
Sam Leffler 3c0114dd1b MFC 1.9: use the specified key index for non-group keys
Approved by:	re (scottl)
2006-02-28 02:04:14 +00:00
Sam Leffler 027277fba8 MFC 1.45: honor user-specified key index for global key slots
Approved by:	re (scottl)
2006-02-28 02:02:43 +00:00
Wojciech A. Koszek fd8d4a60c8 MFC:
src/tools/tools/ministat/ministat.c:
  1. rev. 1.6 -> 1.7
     Add option -w to specify graph width.
     Use COLUMNS, terminal width for default graph width.
  2. rev 1.7 -> 1.8
     Fix the way in which median is calculated. If the data source has even
     number of data points, value should be calculated by adding two middle
     elements and dividing them by 2.

[1] Reviewed by:	rwatson
[2] Approved by:	cognet (mentor)

Approved by:	re (scottl)
2006-02-27 22:34:36 +00:00
Jung-uk Kim ebd76269e4 MFC: src/gnu/usr.bin/dialog/dialog.1 1.8
src/gnu/usr.bin/dialog/dialog.c	1.15

- Add default choice option for --yesno box.
- Reduce trivial code duplications.

Approved by:	re (scottl)
2006-02-27 20:10:09 +00:00
Jung-uk Kim 505be89345 MFC: usr.sbin/sysinstall/disks.c 1.156
- Back out 1.155.  I mismerged my ancient local patch.  Luckily it was
completely noop.
- Geometry sanitization for non-interactive mode is moved to correct place.

Approved by:	re (scottl)
2006-02-27 20:01:31 +00:00
Joseph Koshy 7f1dafe0a4 MFC r1.6: Fix pmccontrol(8) on Intel Xeon's running in 64 bit mode.
Approved by:	re (mux)
PR:		kern/93773
2006-02-27 17:36:01 +00:00
Dmitry Morozovsky b84c9232ac MFC:
Remove &release.prev.historic;.

	This should fix www build.

Approved by:	re (hrs)
2006-02-27 13:21:37 +00:00
Maksim Yevmenkin abaf575cc6 MFC recent changes to kbdmux(4)
Fix hard lockup caused by kbdmux(4) when kbdmux(4), PS/2 keyboard
(atkbd(4)) and PS/2 mouse (psm(4)) are used together.

Turns out that atkbd(4) check_char() method may return "true" while
read_char() method returns NOKEY. When this happens kbdmux(4) was
simply stuck in the dead loop. Avoid dead loop in kbdmux(4) by breaking
out of the loop if read_char() method returns NOKEY.

It almost seems like a bug in atkkbd(4), atkbd_check_char() calls
kbdc_data_ready(), and, the later will return "true" if there are
pending data in either kbd or aux queue. However, because both aux
and kbd are on the same controller, I'm not sure if this is a bug
or feature.

While I'm here fix a couple of whitespaces.

Tested by:	markus
Approved by:	re (scottl)
2006-02-27 06:24:26 +00:00
Bruce A. Mah a18b3258b9 MFC: GNOME 2.12.3, KDE 3.5.1, Perl 5.8.8, X.org 6.9.0.
Approved by:	    re (scottl)
2006-02-27 01:15:59 +00:00
Olivier Houchard 0da73ce946 MFC rev 1.6:
revision 1.6
date: 2006/01/23 14:03:14;  author: cognet;  state: Exp;  lines: +5 -3
Donc recompute the io port address if it's already the good one.

Approved by:	re (mux)
2006-02-27 01:12:16 +00:00
Olivier Houchard 45ae072eb8 Partially MFC rev 1.23/1.24:
revision 1.23
date: 2005/10/03 14:07:57;  author: cognet;  state: Exp;  lines: +47 -4
Don't try to dereference map if it's NULL.

Approved by:	re (mux)
2006-02-27 01:11:43 +00:00
Markus Brueffer c9c6a8ef8e MFC recent updates to hccontrol:
- Use official version strings for LMP and HCI version reporting and add
    version strings up to Bluetooth 2.0
  - Update manufacturer list

Revisions:

	hccontrol.h	rev. 1.5
	info.c		rev. 1.4
	link_control.c	rev. 1.10
	util.c		rev. 1.6

Approved by:	re (scottl), emax
2006-02-27 00:38:02 +00:00
David Xu 968138d4e4 MFC revision 1.325.
Approved by: re (scottl)
2006-02-27 00:22:04 +00:00
David Xu 82618c7389 MFC following revisions to fix sleep queue and thread
suspension race:
    sys/proc.h                  revision 1.453
    sys/sleepqueue.h            revision 1.7
    kern/subr_sleepqueue        revision 1.24 - 1.26
    kern/kern_sig.c             revision 1.321, 1.323, 1.324
    kern/kern_synch.c           revision 1.276, 1.278
    kern/kern_condvar.c         revision 1.54, 1.55
    kern/kern_kse.c             revision 1.325
    kern/kern_thread.c          revision 1.228, 1.229

Approved by: re (scottl)
2006-02-27 00:19:40 +00:00
David Xu a8eb65cf82 MFC revision 1.219.
Approved by: re (scottl)
2006-02-27 00:01:15 +00:00
David Xu 2f2a6335da MFC revision 1.42.
Approved by: re (scottl)
2006-02-26 23:59:00 +00:00
Ian Dowse 4689566250 MFC: when deregistering a bus, attempt to flush out all outstanding
operations before returning, and point the bus at a dummy cam_sim
structure. This avoids crashes in camisr() when umass devices are
unplugged during probing.

It may however be better to simply sleep in xpt_bus_deregister()
until all operations have completed, but it is still useful to have
this MFC'd in the meantime.

Approved by:	re (scottl)
2006-02-26 22:38:39 +00:00
Yaroslav Tykhiy 0bcf7c6d4b MFC rev. 1.17:
Tell the truth about a) how to get the first fileid, and
  b) what return values from kldstat(2) can be expected.

Approved by:	re (mux)
2006-02-26 16:18:29 +00:00
Yaroslav Tykhiy 2e83e0f60d MFC rev. 1.9: Document the relation between $command and $foo_program.
Approved by:	re (mux)
2006-02-26 16:11:54 +00:00
Hajimu UMEMOTO cd6af2b37a MFC: Mention NO_NLS_CATALOGS.
share/examples/etc/make.conf:	1.274
	share/man/man5/make.conf.5:	1.133

Approved by:	re (hrs)
2006-02-26 14:52:33 +00:00
Ceri Davies 325c8cf87c Sync with -HEAD.
Approved by:	re (hrs)
2006-02-26 13:21:27 +00:00
Hajimu UMEMOTO 7f64c1b56b MFC: Enable NLS catalog of csh(1).
The tcsh 6.14 uses libiconv to convert catalogs to appropriate charset
dynamically.  However, we don't have libiconv in our tree.  So, I made
some hack to load libiconv dynamically.  If libiconv is available, you
can use catalogs for more locales than the locales which catalog is
actually installed.
To use this feature, you need to symlink catalogs to appropriate
locales.  You can do this by installing ports/shells/tcsh_nls.

	bin/csh/Makefile:			1.38
	bin/csh/config.h:			1.13
	bin/csh/iconv.h:			1.1
	bin/csh/iconv_stub.c:			1.1
	contrib/tcsh/nls/C/charset:		1.1.1.1
	contrib/tcsh/nls/et/charset		1.1.1.1
	contrib/tcsh/nls/finnish/charset	1.1.1.1
	contrib/tcsh/nls/french/charset		1.1.1.1
	contrib/tcsh/nls/german/charset		1.1.1.1
	contrib/tcsh/nls/greek/charset		1.1.1.1
	contrib/tcsh/nls/italian/charset	1.1.1.1
	contrib/tcsh/nls/ja/charset		1.1.1.1
	contrib/tcsh/nls/pl/charset		1.1.1.1
	contrib/tcsh/nls/russian/charset	1.1.1.1
	contrib/tcsh/nls/spanish/charset	1.1.1.1
	contrib/tcsh/nls/ukrainian/charset	1.1.1.1

Approved by:	re (hrs)
2006-02-26 06:17:59 +00:00
Marcus Alves Grando d07cb13c8e - Change dumpdev default to "NO". Only HEAD is set to "AUTO"
Discussed with:	re
Approved by:	re (scottl)
2006-02-25 22:53:40 +00:00
John-Mark Gurney b0fdd712c5 MFC: sleep.9 v1.47
>  allow timo to be 0 when mtx is not NULL (KASSERT allowed this as
>  pointed out by jhb)

Approved by:	re (scottl)
2006-02-25 21:50:20 +00:00
Ceri Davies caf35802a1 MFC:
devices.c	revision 1.164
	tcpip.c 	revision 1.135

  s/lp/plip/ for PLIP interfaces.

Approved by:	re (mux)
2006-02-25 18:51:13 +00:00
Ceri Davies 50851995e1 MFC revision 1.14:
The interface for PLIP has been plip0 rather than lp0 for a long time.
  Update to match.

Approved by:	re (mux)
2006-02-25 18:21:06 +00:00
Sam Leffler cb240e0427 MFC 1.36: use s/w bmiss facility
Approved by:	re (scottl)
2006-02-25 00:51:11 +00:00
Sam Leffler 40625d0cf0 MFC 1.25: use s/w bmiss facility
Approved by:	re (scottl)
2006-02-25 00:50:19 +00:00
Sam Leffler 178c034a6d MFC 1.24: stop device so we don't panic on card eject
Approved by:	re (scottl)
2006-02-25 00:48:01 +00:00
Doug Barton f8b8bf119e MFC 1.339, fix for running inside a jail
Approved by:	re (mux)
2006-02-24 21:42:43 +00:00
Sam Leffler e746e37256 MFC ath changes up to and including the v0.9.16.16 hal import
Approved by:	re (scottl, mux)
2006-02-24 19:51:11 +00:00
Sam Leffler 240440203b MFC v0.9.16.16 hal
Approved by:	re (mux)
2006-02-24 19:49:50 +00:00
Robert Watson 91e686b2fc Merge Makefile:1.4 from HEAD to RELENG_6:
Add missing shared library interdependencies.

Approved by:	re (mux)
2006-02-24 17:17:09 +00:00
Giorgos Keramidas f9e2047950 MFC 1.73:
Revert a minor glitch of revision 1.69

    Submitted by:   Andriy Tkachuk <[email protected]>
    X-MFC after:    RE approval

Approved by:	re (mux)
2006-02-24 15:13:33 +00:00
Yoshihiro Takahashi 3a65de25ec MFC: revision 1.26
- Initialize the port_bst and port_bsh variables.

Approved by:	re (mux)
2006-02-24 14:36:22 +00:00
Ruslan Ermilov f4a8384228 MFC: 1.58: Clear csum_flags after reading from the socket buffer.
Approved by:	re (scottl)
2006-02-24 11:23:05 +00:00
Doug Barton de53714177 MFC significant overhaul of rc.d/named script, including
addition of named_uid default rc.conf variable.

etc/defaults/rc.conf		1.275
etc/rc.d/named			1.24
share/man/man5/rc.conf.5	1.286

Approved by:	re (scottl)
2006-02-24 09:43:33 +00:00
Christian Brueffer a831cb7eb6 MFC: rev. 1.6
Update for the 9550 series of controllers.

Approved by:	re (scottl)
2006-02-24 08:43:04 +00:00
Markus Brueffer bb91f638d2 MFC: rev 1.2
Fix scancode translation table

Approved by:	re (scottl), emax
2006-02-23 15:37:43 +00:00
cvs2svn 0d19a9ee55 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-02-23 15:03:43 +00:00
David Malone 7b716a567c MFC: Print Virtual Machine Extensions feature and remove stale comment.
Approved by: re (scottl)
2006-02-23 15:03:42 +00:00
David Malone e233883fdf MFC: Make column roundup to the next tab.
Approved by:	re (scottl)
2006-02-23 11:34:45 +00:00
Hajimu UMEMOTO 4f5ef92487 MFC: Obey opt_inet6.h in kernel build directory.
sys/modules/dummynet/Makefile:	1.5
	sys/netinet/ip_dummynet.c:	1.100

Approved by:	re (scottl)
2006-02-23 08:28:15 +00:00
cvs2svn 74a14f3c54 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-02-23 06:21:48 +00:00
Hiroki Sato 897e2679c9 Update version numbers in &release.*;.
Approved by:	re (implicitly)
2006-02-23 06:21:47 +00:00
Max Laier 85928b3e5d Forgot to "cvs add" the man-page.
Approved by:	re (implicit)
2006-02-23 05:51:08 +00:00
David Xu 6966ecddf9 MFC revision 1.6.
Approved by: re (scottl)
2006-02-23 03:56:03 +00:00
Max Laier be5bd246e3 MFC:
firmware(9) is a subsystem to load binary data into the kernel via a
  specially crafted module.  There are several handrolled sollutions to this
  problem in the tree already which will be replaced with this.  They
  include iwi(4), ipw(4), ispfw(4) and digi(4).

Approved by: re(scottl)
2006-02-23 02:13:32 +00:00
Sam Leffler 967d12d5c5 MFC 1.28: correct check for whether wpa is enabled
Approved by:	re (scottl)
2006-02-23 02:06:46 +00:00
Sam Leffler 1f82fe10da MFC 1.44: treat setting the optional ie to a zero-length datum to
mean "delete the ie"

Approved by:	re (scottl)
2006-02-23 02:03:39 +00:00
cvs2svn 428e018383 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-02-22 21:51:10 +00:00
Kirill Ponomarev 42b51b4665 MFC: perform.c: 1.15
date: 2006/02/12 16:09:33;  author: krion;  state: Exp;  lines: +5 -4
  Fix pkg_version with the -o argument to print the origin.

Approved by:	re (scottl)
2006-02-22 16:28:42 +00:00
Yaroslav Tykhiy 21bf019aae MFC rev. 1.6: This module would be meaningless w/o CODA_COMPAT_5.
Approved by:	re (mux)
2006-02-22 11:55:26 +00:00
Yaroslav Tykhiy 5bcf10daeb MFC rev. 1.439: build-time options of kernel modules.
Approved by:	re (mux)
2006-02-22 11:51:57 +00:00
Sam Leffler 78166508af MFC 1.128: close race between ath_tx_start and ath_tx_processq
Approved by:	re (scottl)
2006-02-22 01:17:12 +00:00
Yaroslav Tykhiy 9532958d9c MFC rev. 1.32:
Work around the fact that nfsclient SRCS must include
  nfs_diskless.c if NFS_ROOT is in effect, e.g., present
  in the kernel config file.  Otherwise the built module
  won't load due to an undefined reference to nfs_setup_diskless.

Approved by:	re (scottl)
2006-02-21 17:22:57 +00:00
Sam Leffler 2f51a765e4 MFC: Change default build of wpa_supplicant to include EAPOL support
Approved by:	re (scottl, hrs)
2006-02-21 17:19:54 +00:00
Bruce A. Mah ca2dba684b New release notes: SA-06:01, SA-06:02, SA-06:03, SA-06:04, SA-06:05,
SA-06:06, SA-06:07, BIND 9.3.2, tzdata2005r.

While here, bump copyright date.

Approved by:	re (hrs)
2006-02-21 07:33:41 +00:00
Yaroslav Tykhiy c40d132979 Work around the shortness of the size argument to
vnode_create_vobject() while preserving the binary ABI
to filesystem modules in RELENG_6: introduce a new function
vnode_create_vobject_off() that takes the size argument
as off_t; move all stock file systems to it; re-implement
the old vnode_create_vobject() using vnode_create_vobject_off()
so that old or binary-only FS modules can work w/o hitting the
bug.  The trick is to pass a size of 0 to vnode_create_vobject_off()
so that it will call VOP_GETATTR() and thus get the actual,
untruncated file size even if the calling module still uses
the old vnode_create_vobject().

PR:		kern/92243
Approved by:	re (scottl)
2006-02-20 00:53:15 +00:00
Ceri Davies a4ade0b006 MFC revision 1.49:
Update a comment to match functionality changed in r1.39 (allow square
  brackets in process names).

Approved by:	re (scottl)
2006-02-19 18:36:20 +00:00
Christian Brueffer ed7a90eeb0 MFC: rev. 1.29
Xref chkgrp(8).

Approved by:	re (mux)
2006-02-19 18:35:39 +00:00
Christian Brueffer 2652d83d4a MFC: rev. 1.9
JMicron RAID metadata support.

Approved by:	re (mux)
2006-02-19 18:33:07 +00:00
Christian Brueffer 7d71a1378b MFC: rev. 1.63
JMicron JMB363 support.

Approved by:	re (mux, the new kid on the block)
2006-02-19 18:32:12 +00:00
Markus Brueffer 7a8b3df876 MFC: rev. 1.6
- Grammar fixes
- Reword one sentence

Approved by:	re (scottl), brueffer
2006-02-19 15:44:51 +00:00
Markus Brueffer 1887ae94cb MFC: rev. 1.2
- Fix attribute id of HIDBatteryPower
- Fix two typos in comments

Approved by:	re (scottl), emax
2006-02-19 15:39:31 +00:00
Søren Schmidt e3e9aa29b4 MFC:
Add support for the JMicron JMB363 dual SATA + single PATA controller.
	Add r/w support for JMicron ATA RAID metadata.
	Add a reset of the AHCI machinery to the ICH6/ICH7 support.
	Unbreak Promise SATAII/150 controllers caused by the DMA dump changes.
	Unbreak DMA dump on Intel 31224.

Approved by:	re@ (scottl)
2006-02-19 15:18:23 +00:00
Hajimu UMEMOTO 851c543279 MFC 1.20: The libwrap built with NO_INET6=yes cannot parse
an IPv6 address.  So, mention it in comment.

Approved by:	re (scottl)
2006-02-19 14:59:00 +00:00
Christian Brueffer 2832210853 MFC: rev. 1.268
A better, more correct explanation of NO_SHARED.

Approved by:	re (scottl)
2006-02-19 08:14:14 +00:00
Christian Brueffer f1196d755f MFC: rev. 1.124 + 1.129
A better, more correct explanation of NO_SHARED.

Approved by:	re (scottl)
2006-02-19 08:12:57 +00:00
Hajimu UMEMOTO 03adae3ec0 MFC: The wcwidth(3) should return 2 about characters in JISX0208 codeset.
But it returned 1.
It fixes the problem reported by many Japanese people that tcsh 6.14
doesn't work correctly with ja_JP.eucJP and ja_JP.SJIS locale.

	share/mklocale/ja_JP.SJIS.src:	1.5
	share/mklocale/ja_JP.eucJP.src:	1.4

Approved by:	re (scottl)
2006-02-19 05:47:14 +00:00
Sam Leffler 3a27db6892 MFC 1.114: add missing args to mac:del and mac:kick
Approved by:	re (scottl)
2006-02-19 00:20:39 +00:00
Yaroslav Tykhiy 9ba731c946 MFC 1.98: Avoid toggling IFF_UP from the driver because
it's an administrative flag.

Approved by:	re (scottl)
2006-02-18 22:48:16 +00:00
Dmitry Morozovsky f87b3a31ca MFC r1.33:
Default number of direct access devices had been changed from three to two.
Reflect this in other paragraphs.

PR:             93201
Submitted by:   Marian Cerny
Approved by:	re (scottl)
2006-02-17 22:25:02 +00:00
Christian Brueffer 22f12a40b6 MFC: rev. 1.8 - 1.11
- mdoc sweep.
- s/5.5/6.0/ in HISTORY section.
- Document the latest changes for controlling the fan
- s/Thinklight/ThinkLight/
- Xref led(4)

Approved by:	re (scottl)
2006-02-17 20:43:12 +00:00
Christian Brueffer ad3792d30c MFC: rev. 1.285
Correct references to ipnat(8).

Approved by:	re (murray)
2006-02-17 20:18:19 +00:00
Ruslan Ermilov 333a4bf8e9 MFC: Fix a bug that prevented passing IP fragments through a dummynet.
Approved by:	re (scottl)
2006-02-17 16:46:47 +00:00
Andre Oppermann d2369e0e03 MFC ip_icmp.c rev. 1.103-1.106+1.108:
Rework icmp_error() and always quote the entire TCP header, fixes
  issues in draft-gont-icmp-payload-00.txt.
 New net.inet.icmp.reply_from_interface and net.inet.icmp.quotelen.

Sponsored by:	TCP/IP Optimization Fundraise 2005
Approved by:	re (scottl)
2006-02-16 17:50:57 +00:00
Sam Leffler fb9ae4f79d MFC: s/w beacon miss facility
Approved by:	re (scottl)
2006-02-16 16:57:24 +00:00
Gleb Smirnoff d13670a041 MFC 1.107:
Fix two important typos in watchdog handling:
  - Restart watchdog if we *did* processed any descriptors. [1]
  - Log the watchdog event if the link is *up*. [2]

  PR:		kern/92948 [1]
  Submitted by:	Mihail Balikov <mihail.balikov interbgc.com> [1]
  PR:		kern/92895 [2]
  Submitted by:	Vladimir Ivanov <wawa yandex-team.ru> [2]

Approved by:	re (kensmith)
2006-02-16 12:45:12 +00:00
Gleb Smirnoff f67363fcd7 MFC 1.62:
Refuse to install invalid ARP entries.

  Submitted by:		Vitaliy Ovsyannikov <V.Ovsyannikov kr.ru>

Approved by:	re (kensmith)
2006-02-16 12:41:18 +00:00
Gleb Smirnoff 7b540023dd MFC 1.9:
- Increase maximum number of interfaces to 2048.
  - Regroup softc so that frequently used elements are
    grouped in the beginning, while the interfaces
    array is at the end.

Approved by:	re (kensmith)
2006-02-16 12:37:14 +00:00
Tai-hwa Liang b9b04543e2 MFC: (1.27) s/bin/sbin/ for mount_nwfs, mount_portalfs and mount_smbfs.
Also document the removal time of these utilities.

Approved by:	re (scottl)
2006-02-16 07:25:23 +00:00
David Xu 4a9e6b1176 Partially MFC revision 1.14:
> Eliminate compile warnings.

This allows me to debug threaded program on Pentium-D machine.

Approved by:	re (scottl)
2006-02-16 02:40:56 +00:00
Jim Rees 93b831722b MFC rev 1.135:
Don't log an error on tcp connection reset, even if we don't get ECONNRESET.

Submitted by:	[email protected]
Approved by:	re (scottl)
2006-02-16 02:39:52 +00:00
Qing Li 0e750c32f1 MFC: rev 1.38
Approved by:	re (scottl)
2006-02-16 01:10:44 +00:00
Qing Li 77aba752a8 MFC: rev 1.40
Approved by:	re (scottl)
2006-02-16 01:08:40 +00:00
Qing Li 07f0ce0bab MFC: rev 1.84
Approved by:	re (scottl)
2006-02-16 01:06:22 +00:00
Ian Dowse 06028cdff5 MFC: don't perform an endpoint stall clear every time a pipe is
opened.  This should not be necessary, and it is known to confuse
certain devices.

Remove the UQ_NO_OPEN_CLEARSTALL quirk, as this is now the default
behaviour for all devices.

Approved by:	re (scottl)
2006-02-15 22:51:08 +00:00
Sam Leffler 7b60d34d66 sync with HEAD:
o mcast rate addition
o malloc size off-by-one fixes
o long ssid handling

Approved by:	re (scottl)
2006-02-15 17:44:18 +00:00
Ruslan Ermilov 79bfb693b3 MFC: 1.58: -mdoc sweep.
Approved by:	re (scottl)
2006-02-15 15:10:55 +00:00
Ruslan Ermilov 40c2c44954 MFC: 1.15: Only install boot_i386.8 on i386 and amd64.
Approved by:	re (scottl)
2006-02-15 15:10:07 +00:00
Ruslan Ermilov 2945f93f4e MFC: -S option for boot2, already documented to work in boot(8).
Approved by:	re (scottl)
2006-02-15 15:08:51 +00:00
Jesus R. Camou 9fc0c0cf89 MFC: rev.1.113.
Approved by:	re (scottl)
2006-02-15 15:03:04 +00:00
Jesus R. Camou 980c7f6f18 MFC: rev.1.3
Approved by:	re (hrs)
2006-02-15 14:58:59 +00:00
Yoshihiro Takahashi 53e357b19e MFi386: revision 1.31.2.1
Approved by:	re (kensmith)
2006-02-15 13:55:13 +00:00
Yoshihiro Takahashi 88751e5a8a MFC: revision 1.371
> Clear carry flag in get_mcontext so that setcontext does not
> return a bogus error.

Approved by:	re (kensmith)
2006-02-15 13:54:06 +00:00
Marius Strobl 838d071a36 MFC: 1.12
Enable getty(8) on ttyu2 by default in order to get machines that use a
RSC (Remote System Control) connected via uart2 as console working out
of the box.

Approved by:	re (scottl)
2006-02-15 09:17:03 +00:00
Marius Strobl 0992935d03 MFC: src/sys/dev/puc/puc_ebus.c 1.6, sys/dev/uart/uart_bus_ebus.c 1.9,
sys/dev/uart/uart_cpu_sparc64.c 1.20, 1.22

- Add support for using LOM (Lights Out Management) and RSC (Remote System
  Control) devices as console.
- Add my copyright to uart_cpu_sparc64.c.
- Recognize the SAB82532 in USIII machines. This is MFC'ed for consistency
  as one part of the original commit, sys/dev/uart/uart_bus_ebus.c rev. 1.7,
  was already MFC'ed to RELENG_6 (in rev. 1.6.2.2).

Approved by:	re (scottl)
2006-02-15 09:16:01 +00:00
Paul Saab 4af0928992 MFC:
Implement SIOCGIFCONF for 32bit binaries.

Approved by:	re
2006-02-15 03:37:15 +00:00
Sam Leffler 006a0f5eca MFC 1.38: set the mgt frame tx timer before dispatching the frame to the driver
Approved by:	re (scottl)
2006-02-15 03:21:15 +00:00
Florent Thoumie 039f523515 MFC:
Don't include geli devices in list when noauto is specified in the options field.

      src/etc/rc.subr: rev 1.47 -> 1.48

Approved by:	re (hrs)
2006-02-15 00:56:06 +00:00
John Baldwin b20640bd12 MFC: Correctly set the MPSAFE flag based on the lower vnode's mount.
Approved by:	re (scottl)
2006-02-14 23:15:16 +00:00
John Baldwin 23e21e8f90 MFC: Sync up to rev 1.80 from HEAD:
- Use a dedicated kthread to call acctwatch() periodically rather than
  a callout from softclock().
- Validate new values for the kern.acct_chkfreq sysctl.
- Whitespace and include sorting.

Approved by:	re (scottl)
2006-02-14 23:13:17 +00:00
John Baldwin 94a394d2a7 MFC: Use the correct BAR for the UPCI 32 adapter.
Approved by:	re (scottl)
2006-02-14 23:09:10 +00:00
Robert Watson 76e7ae770e Merge in_pcb.c:1.167 from HEAD to RELENG_6:
Convert remaining functions to ANSI C function declarations; remove
  'register' where present.

Approved by:	re (scottl)
2006-02-14 22:09:27 +00:00
Robert Watson fad101452e Merge coda_vnops.c:1.67 from HEAD to RELENG_6:
Convert last four functions in coda_vnops.c to ANSI C function
  declarations.  I knew I would get to fix something in Coda
  eventually.

Approved by:	re (scottl)
2006-02-14 21:59:07 +00:00
Robert Watson f756f2ea92 Merge vfs_mount.c:1.213 from HEAD to RELENG_6:
Cast VFS_STATFS() in vfs_domount() to (void) to indicate that ignoring the
  return value is intentional: this is simply an attempt to pre-cache the
  statfs state.

  Found with:     Coverity Prevent (tm)

Approved by:	re (scottl)
2006-02-14 21:57:09 +00:00
Robert Watson bf769a7766 Merge ncp_conn.c:1.28 from HEAD to RELENG_6:
In ncp_sysctl_connstat(), the SLIST_FOREACH() logic to check 'error'
  resulted in deadcode, as 'error' could never be 0.  What this logic
  was originally meant to handle is not clear -- it's been this way
  (broken) since at least RELENG_4.

  Found with:     Coverity Prevent(tm)

Approved by:	re (scottl)
2006-02-14 21:55:15 +00:00
Robert Watson 248b5de012 Merge udp_usrreq.c:1.181 from HEAD to RELENG_6:
Remove dead code: 'opts' is not used in udp_append(), only in udp_input(),
  so no need to assign it to NULL or conditionally free it.

  Found with:     Coverity Prevent(tm)

Approved by:	re (scottl)
2006-02-14 21:40:21 +00:00
Robert Watson af499b277c Merge ip6_output.c:1.101 from HEAD to RELENG_6:
When storing the results of malloc() in a pointer to a pointer, check
  the pointer to a pointer for NULL, not the pointer for NULL.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 21:38:46 +00:00
Robert Watson 57ff474c03 Merge ipcomp_input.c:1.9 from HEAD to RELENG_6:
In ipcomp6_input(), check 'md' not 'm' after a call to m_pulldown(): 'm'
  may be a stale pointer at this point, and we're interested in whether or
  not m_pulldown() failed.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 21:36:23 +00:00
Robert Watson 39a71b82d3 Merge ipx_input.c:1.52 from HEAD to RELENG_6:
Remove dead code associated with 'mcopy' in ipx_forward(): at no point
  are the contents of the forwarded mbuf ever copied into mcopy, so there's
  no need to have mcopy, conditionally look at mcopy, or conditionally free
  it.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 21:35:07 +00:00
Robert Watson 24f57be689 Merge if_ef.c:1.38 from HEAD to RELENG_6:
Check the right ifnet pointer to see if if_alloc() failed or not in
  ef_clone(); we were testing the original ifnet, not the one allocated.

  When aborting ef_clone() due to if_alloc() failing, free the allocated
  efnet structure rather than leaking it.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 21:11:19 +00:00
Robert Watson f1198d8cf0 Merge if_ef.c:1.37 from HEAD to RELENG_6:
When freeing the chain of if_ef devices on an aborted load, use
  SLIST_FOREACH_SAFE() rather than SLIST_FOREACH(), as elements are
  freed on each iteration of the loop.  This prevents use-after-free.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 21:09:46 +00:00
Luigi Rizzo 7c891b6fba MFC: manpage for the updated picobsd script
Approved by: re
2006-02-14 16:59:17 +00:00
Brooks Davis 560382e1c7 MFC syscons.c rev 1.441 and documentation:
When SC_DISABLE_KDBKEY or SC_DISABLE_REBOOT are not defined allow the
same behavior to be controlled by the sysctls, hw.syscons.kbd_kbdkey
and hw.syscons.kbd_reboot respectively.

PR:		kern/72728
Submitted by:	Luca Morettoni <morettoni at libero dot it>
Approved by:	re (scottl)
2006-02-14 16:41:27 +00:00
Hajimu UMEMOTO 0069263811 MFC 1.63: avoided the use of purged address structure when an
address became invalid in nd6_timer().

Approved by:	re (hrs)
2006-02-14 16:29:22 +00:00
Colin Percival a5e9d3ad0c MFC gbde.8 rev. 1.14, gbde.c rev. 1.31:
Teach gbde(8) to use a key file in addition to a passphrase.  This
  makes it practical to use GBDE for "something you have plus something
  you know" security together with a USB flash drive.

Approved by:	re (scottl)
2006-02-14 16:15:48 +00:00
Luigi Rizzo 871b85c0d8 MFC: produce a buildable 'bridge' image
Approved by: re
2006-02-14 14:47:12 +00:00
Luigi Rizzo 2ec6443b68 MFC: make sure the start and end markers are contiguous and
not suppressed by the optimizer.

Approved by: re
2006-02-14 14:46:22 +00:00
Luigi Rizzo e99bb8a164 MFC: fixed picobsd script.
upcoming, tweaks for other config files and sys/dev/md/md.c

Approved by: re
2006-02-14 13:16:13 +00:00
Paul Saab 373b7f8f3c MFC: rev 1.33
Enable 64bit SGL's on PERC 4/DC

Approved by:	re
2006-02-14 08:05:29 +00:00
Paul Saab c3e84c874f MFC: amr.c 1.75, amrvar.h 1.30
- Move the command setup from amr_start1 into the card specific submit
  routines.
- Add or replace cpu_spinwait() with DELAY(1) to a few of the busy
  loops when reading from the controller to work around firmware bugs
  which can crash the controller.

Approved by:	re
2006-02-14 08:04:39 +00:00
Ruslan Ermilov 1005a4aac9 MFC: 1.36: Fix output byte and error counting.
Approved by:	re (scottl)
2006-02-14 06:21:47 +00:00
Ruslan Ermilov 5ce6174b07 MFC:
- Add loader(8) variables for RB_DFLTROOT, RB_MUTE, and RB_PAUSE:
  "boot_dfltroot", "boot_mute", and "boot_pause" respectively.

- Cause all flags passed by boot2 to set the respective loader(8)
  boot_* variable.  The end effect is that all flags from boot2
  are now passed to the kernel.

Approved by:	re (scottl)
2006-02-14 06:20:16 +00:00
Marcel Moolenaar 8ac02f3842 MFC fixes for MCA MPSAFEness:
mca.c:1.11
	mp_machdep.c:1.60

Approved by: re (scottl, thanks!)
2006-02-14 03:40:49 +00:00
Robert Watson 072eb4b1c8 Merge mbuf.c:1.48 from HEAD to RELENG_6:
Sort sfbuf allocation counters with other sfbuf information.

Approved by:	re (scottl)
2006-02-14 03:39:04 +00:00
Robert Watson bf27b703fe Merge memstat_uma.c:1.17 from HEAD to RELENG_6:
Update copyright for 2006.

Approved by:	re (scottl)
2006-02-14 03:38:31 +00:00
Robert Watson 24f1e08090 Merge uma_core.c:1.136 from HEAD to RELENG_6:
Skip per-cpu caches associated with absent CPUs when generating a
  memory statistics record stream via sysctl.

Approved by:	re (scottl)
2006-02-14 03:37:58 +00:00
Robert Watson 74e0491b17 Merge memstat_uma.c:1.16 from HEAD to RELENG_6:
The uma_zone data structure defines the size of its uz_cpu[] array as 1,
  but then sizes the containing data structure at run-time to make room
  for per-cpu cache data.  Modify libmemstat to separately allocate a
  buffer to hold per-cpu cache data, sized based on the run-time mp_maxid
  variable when using libkvm to access UMA data.  This avoids reading
  invalid cache data from beyond the end of the uma_zone data structure
  on the stack, which can result in invalid statistics and/or reads from
  invalid kernel addresses.

Approved by:	re (scottl)
2006-02-14 03:37:12 +00:00
Robert Watson 01d5cc112d Merge memstat_uma.c:1.15 from HEAD to RELENG_6:
When reporting an error reading from UMA per-cpu cache pointers using KVM,
  return a KVM error rather than an out of memory error, so that the caller
  reports the KVM error state.  This replaces a misleading error message
  with a more accurate although equally confusing one.

Approved by:	re (scottl)
2006-02-14 03:36:21 +00:00
Robert Watson dd63b1cc0e Merge memstat_uma.c:1.14 from HEAD to RELENG_6:
Read all_cpus variable out of kmem, and validate CPUs against the all_cpus
  cpu mask before looking at the cache entries for the CPU.  For systems
  with sparse CPU id arrays, this skips otherwise uninitialized cache
  structures.

Approved by:	re (scottl)
2006-02-14 03:35:26 +00:00
Robert Watson b4cc5f1ab1 Merge mbuf.c:1.47 from HEAD to RELENG_6:
Un-#if 0 the printing of allocation failure counts for mbufs, clusters,
  and packets in netstat -m.

Approved by:	re (scottl)
2006-02-14 03:33:49 +00:00
Robert Watson 044ae68495 Merge memstat_uma.c:1.13 from HEAD to RELENG_6:
Correct a typo in the extraction of zone information from UMA using kmem:
  bytes = allocated - freed, not bytes = allocated = freed.

Approved by:	re (scottl)
2006-02-14 03:33:06 +00:00
Robert Watson 370b4c1092 Merge login_ok.c:1.12 from HEAD to RELENG_6:
Fix typo in comment.

Approved by:	re (scottl)
2006-02-14 03:32:15 +00:00
Robert Watson adff298cca Merge subr_disk.c:1.86 from HEAD to RELENG_6:
When calling bioq_first() to see if a queue is empty in bioq_disksort(),
  don't save the return value as we won't use it.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 03:29:31 +00:00
Robert Watson 45a6144562 Merge kdump.1:1.13, kdump.c:1.27, as well as some of the mdoc cleanups
present in kdump.1:1.15:

  Add a "-H" argument to kdump, which causes kdump to print an additional
  field holding the threadid.  This is more useful for libthr than
  libpthread, but still quite useful in libpthread as it can be used to
  process interlaced records from multiple threads over the course of a
  system call.

  Detect old ktr_buffer values using the heuristic "if it's negative,
  then it must not be a valid threadid".  This may leave something to be
  desired.

  Reviewed by:    davidxu

Approved by:	re (scottl)
2006-02-14 03:28:31 +00:00
Hiroki Sato 0ea8e3e29f standard-supfile on RELENG_6 is for 6.x-STABLE now, not -current.
Spotted by:	yar
Approved by:	re (implicitly)
2006-02-14 02:32:25 +00:00
Hiroki Sato d64ebb551a MFC: Fix a bug which puts an incorrect checksum of CHECKSUM.MD5
into the CHECKSUM.MD5 file itself.

Approved by:	re (scottl)
2006-02-14 02:00:24 +00:00
Robert Watson e089ccf178 Merge memstat_uma.c:1.12 from HEAD to RELENG_6:
Remove unnecessary and undesirable 'static' from function-local keg
  list, which could cause problems for multi-threaded applications
  using libmemstat to monitor UMA in more than one thread
  simultaneously.

Approved by:	re (scottl)
2006-02-14 00:07:17 +00:00
Robert Watson e8968d1b65 Merge nfs_lock.c:1.43 from HEAD to RELENG_6:
In nfs_dolock(), GC now under-used ioflg, rendered obsolete when we moved
  from using a fifo to talk to rpc.lockd to using a special device node.

Approved by:	re (scottl)
2006-02-14 00:06:32 +00:00
Robert Watson b40dab40e8 Merge vnode.h:1.312 from HEAD to RELENG_6:
Rename uid and gid arguments to vaccess() prototype to match vaccess()
  implementation in vfs_subr.c.  No functional change.

Approved by:	re (scottl)
2006-02-14 00:03:00 +00:00
Robert Watson 8603502cb1 Merge kern_ktrace.c:1.103, ktrace.h:1.31 from HEAD to RELENG_6:
Reuse ktr_unused field in ktr_header structure as ktr_tid; populate
  ktr_tid as part of gathering of ktr header data for new ktrace
  records.  The continued use of intptr_t is required for file layout
  reasons, and cannot be changed to lwpid_t at this point.

  Reviewed by:    davidxu

Approved by:	re (scottl)
2006-02-14 00:02:01 +00:00
Robert Watson 013aa4085a Merge atm_signal.c:1.14 from HEAD to RELENG_6:
Convert function declarations to ANSI C.

Approved by:	re (scottl)
2006-02-13 23:54:48 +00:00
Robert Watson ab872c2061 Merge fnmatch.c:1.20 from HEAD to RELENG_6:
Convert function declarations to ANSI C.

Approved by:	re (scottl)
2006-02-13 23:52:29 +00:00
Robert Watson bfc737043b Merge uipc_sem.c:1.22 from HEAD to RELENG_6:
Convert remaining functions to ANSI C function declarations.

Approved by:	re (scottl)
2006-02-13 23:51:19 +00:00
Robert Watson 83299913f7 Merge Makefile:1.4 from HEAD to RELENG_6:
Correct help line: list targets, not names of files generated by targets
  when no argument is provided to make.

Approved by:	re (scottl)
2006-02-13 23:48:26 +00:00
Robert Watson cea5dddffe Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:
Add a -A argument to mergemaster to allow explicitly specifying an
  architecture to pass through to the underlying makefiles.  This is
  quite useful when building on an i386 box to populate an amd64 NFS
  root.

  Head nod:       dougb

Approved by:	re (scottl)
2006-02-13 23:47:48 +00:00
Robert Watson e13ab5c4eb Merge ip_input.c:1.311 from HEAD to RELENG_6:
Modify the IP fragment reassembly code so that it uses a new UMA zone,
  ipq_zone, to allocate fragment headers from, rather than using cast mbuf
  storage.  This was one of the few remaining uses of mbuf storage for
  local data structures that relied on dtom().  Implement the resource
  limit on ipq's using UMA zone limits, but preserve current sysctl
  semantics using a sysctl proc.

Approved by:	re (scottl)
2006-02-13 23:46:31 +00:00
Robert Watson 3f0fa84449 MFC ip_input.c:1.310:
Staticize ipqlock, since it is local to ip_input.c.

Approved by:	re (scottl)
2006-02-13 23:44:20 +00:00
Ceri Davies 4df856cf42 MFC revision 1.10:
Another update for reality: "dangerously dedicated" mode is
  now achieved by hitting 'F', which is no longer undocumented.

Approved by:	re (scottl)
2006-02-13 21:03:55 +00:00
Ceri Davies 404e7b70ec MFC revision 1.414:
Correct a user-visible typo.

Approved by:	re (scottl)
2006-02-13 21:02:35 +00:00
Ceri Davies b457ce3b53 MFC the following revisions of the help files:
Bring these files somewhat into the present.
  Perform some rewording while here.

  Remove register.hlp, since the code that deals with it was removed
  nearly 7 years ago.

  Revision  Changes    Path
  1.2       +2 -0      src/usr.sbin/sysinstall/help/anonftp.hlp
  1.15      +9 -10     src/usr.sbin/sysinstall/help/distributions.hlp
  1.5       +1 -5      src/usr.sbin/sysinstall/help/fixit.hlp
  1.3       +1 -1      src/usr.sbin/sysinstall/help/html.hlp
  1.9       +75 -18    src/usr.sbin/sysinstall/help/options.hlp
  1.14      +2 -2      src/usr.sbin/sysinstall/help/partition.hlp
  1.6       +0 -76     src/usr.sbin/sysinstall/help/register.hlp (dead)
  1.3       +2 -2      src/usr.sbin/sysinstall/help/securelevel.hlp
  1.12      +15 -12    src/usr.sbin/sysinstall/help/shortcuts.hlp
  1.9       +1 -7      src/usr.sbin/sysinstall/help/slice.hlp
  1.10      +10 -2     src/usr.sbin/sysinstall/help/tcp.hlp
  1.7       +5 -5      src/usr.sbin/sysinstall/help/usermgmt.hlp

Approved by:	re (scottl)
2006-02-13 21:01:23 +00:00
Marius Strobl e92ef3edf1 MFC: 1.2
Add a reference to le(4) as the SBus-based Ultra 1 have on-board LANCE.

Approved by:	re (scottl)
2006-02-13 11:47:47 +00:00
Marius Strobl 517b0e52b5 MFC: 1.29
Add le(4) to the list of devices supporting VLAN-sized frames natively.

Approved by:	re (scottl)
2006-02-13 11:46:51 +00:00
Marius Strobl d4ebf2984a MFC: share/man/man4/Makefile 1.337, src/share/man/man4/le.4 1.2
Add a man page for le(4).

Approved by:	re (scottl)
2006-02-13 11:45:21 +00:00
Marius Strobl c8064ce8cc MFC: sys/conf/NOTES 1.1349, sys/conf/files 1.1090,
sys/conf/files.sparc64 1.78, sys/modules/Makefile 1.471,
     sys/modules/le/Makefile 1.1, sys/sparc64/conf/GENERIC 1.105

Hook up le(4) to the build.

Approved by:	re (scottl)
2006-02-13 11:39:02 +00:00
Marius Strobl 0f75e00ad9 MFC: sys/dev/le/am7990.c 1.1, sys/dev/le/am79900.c 1.1,
sys/dev/le/am79900reg.h 1.1, sys/dev/le/am79900var.h 1.1,
     sys/dev/le/am7990reg.h 1.1, sys/dev/le/am7990var.h 1.1,
     sys/dev/le/if_le_ledma.c 1.1, sys/dev/le/if_le_pci.c 1.1,
     sys/dev/le/lance.c 1.1, sys/dev/le/lancereg.h 1.1,
     sys/dev/le/lancevar.h 1.1

Add le(4), a driver for AMD Am7900 LANCE and Am79C9xx PCnet NICs,
ported from NetBSD.
This version differs from HEAD in that if_le_ledma.c inlines
lsi64854_enet_intr() from rev. 1.8 of sys/sparc64/sbus/lsi64854.c
in le_dma_hwintr() in order to not break the API of the LSI64854
driver in RELENG_6.

Approved by:	re (scottl)
2006-02-13 11:30:40 +00:00
Marius Strobl 817ee68141 MFC: 1.17
- Don't shift the clock frequency in MHz left by 8 before assigning it
  to sbus_mdvec.dv_clock as sbus_mdvec.dv_clock is meant to be specified
  in MHz. While this was a bug it shouldn't have affected FreeBSD/sparc64
  as sbus_mdvec.dv_clock is used to limit the clock rate of chips when
  a machine isn't able to support them at maximum speed which isn't the
  case for sun4u machines.
- Remove the code that checks whether the clock frequency returned by
  sbus_get_clockfreq() is 0 and falls back to 25MHz if it is as that's
  already done in sbus(4).

Approved by:	re (scottl)
2006-02-12 22:57:04 +00:00
Marius Strobl e66325663a MFC: 1.15
- Sync the list of supported chips with pcn_probe() as of sys/pci/if_pcn.c
  rev. 1.77 (also applies to RELENG_6), i.e. remove Am53C974/Am79C970/
  Am79C974 PCnet-PCI and Am79C970A PCnet-PCI II.
- Change the entry of the PCnet-Home in the list of supported chips to
  match the other ones, i.e. s,PCnet/Home HomePNA,Am79C978 PCnet-Home,.
- s,familly,family

Approved by:	re (scottl)
2006-02-12 22:20:09 +00:00
Florent Thoumie 51b6501d84 MFC:
- Add a startup script for hostapd.
  - Document associated variable in rc.conf(5).

      src/etc/rc.d/Makefile: rev 1.64 -> 1.65
      src/share/man/man5/rc.conf.5: rev 1.283 -> 1.284
      src/etc/rc.d/hostapd: rev 0 -> 1.1
      src/etc/defaults/rc.conf: rev 1.273 -> 1.274

Approved by:	re (hrs)
2006-02-12 22:13:16 +00:00
Sam Leffler b3205eb793 pad embedded structs so we can preserve abi's moving forward
Reviewed by:	scottl, dwhite, kensmith, avatar
Approved by:	re
2006-02-12 19:00:39 +00:00
Xin LI 8eb5ae02b3 MFC a set of changes that fixes DHCP handling in sysinstall(8)
* network.c,v 1.53 (by ceri):
   Fixes DHCP handling to use a more robust way to determine whether
   DHCP should be used.
 * tcpip.c,v 1.134:
   Avoid adding unnecessary tailing space when no media option(s) is
   specified.

Approved by:	re (scottl)
2006-02-12 15:23:50 +00:00
Yaroslav Tykhiy 68a6cb3ba4 MFC rev. 1.95:
Set IFF_BROADCAST and IFF_MULTICAST on vlan interfaces from the
  beginning and simply refuse to attach to a parent without either
  flag.  Our network stack doesn't like those flags changing and
  there is no need in them doing so.

Approved by:	re (scottl)
2006-02-12 12:19:06 +00:00
Marcel Moolenaar da2c5dbe10 MFC:
src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml:1.295
	src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml:1.10
	src/release/doc/share/misc/dev.archlist.txt:1.77

Approved by: re (hrs; thanks!)
2006-02-11 18:54:19 +00:00
Hajimu UMEMOTO 86fe6aec95 MFC 1.168: Never select the PCB that has INP_IPV6 flag and is bound
to :: if we have another PCB which is bound to 0.0.0.0.  If a PCB has
the INP_IPV6 flag, then we set its cost higher than IPv4 only PCBs.

Approved by:	re (scottl)
2006-02-11 09:02:59 +00:00
Christian Brueffer 81277ffa07 MFC: rev. 1.18
Clean up some sysctl descriptions, debug messages etc.

Approved by:	re (scottl)
2006-02-11 08:25:22 +00:00
Hajimu UMEMOTO bb15cb0da5 MFC: obey opt_inet6.h and opt_ipsec.h in kernel build directory.
src/sys/modules/ipfw/Makefile:	1.22, 1.23
	src/sys/netinet/ip_fw2.c:	1.117
	src/sys/netinet/ip_fw_pfil.c:	1.20

Approved by:	re (scottl)
2006-02-11 08:19:37 +00:00
Warner Losh 9968bcc703 MFC: add cardbus_device.c. This file was left out when the rest of the
changes were merged, resulting in load errors at boot time.

Approved by: re@ (scottl)
2006-02-11 06:55:50 +00:00
Marcel Moolenaar 96e4d73bf0 MFC rev. 1.6, 1.7: Add HARDWARE section.
Approved by: re (hrs)
2006-02-11 06:30:41 +00:00
Yaroslav Tykhiy f6ee291305 MFC:
Avoid creating (and subsequently using) fake opt_*.h files
when the modules are built with the kernel and hence actual
opt_*.h files are available in ${KERNBUILDDIR}.  Fix a few
small bugs that would prevent this from working.

At last the build options of the modules become consistent
with those of the kernel unless the MODULES_WITH_WORLD way
still is used.

Approved by:	re (kensmith, scottl)
Requested by:	ru
Tested on:	amd64 i386 sparc64
Tested by:	md5
2006-02-10 00:38:08 +00:00
Ruslan Ermilov 55d6ab0535 MFC: 1.35: Fix interface output queue handling.
Approved by:	re (scottl)
2006-02-09 16:59:37 +00:00
Yaroslav Tykhiy dad24db7d4 MFC ifconfig.c rev. 1.117:
Do address assignment/removal operations after callbacks.  Presently,
ifconfig callbacks are used for L2 configuration, media and vlan,
so actions associated with address assignment, like sending out a
gratuitous ARP, should go when L2 is running already.

Return ifvlan.c to the state of rev. 1.7.2.2 -- undo the last
back-out.  The above change to ifconfig.c lets us use a callback
for vlan set-up without facing the evil side-effects from IP
assignment to an orphaned vlan interface.

Approved by:	re (scottl)
2006-02-09 10:48:43 +00:00
Hajimu UMEMOTO d4ad8b1ba4 MFC 1.56: make IPV6_V6ONLY socket option work for UDP as well.
Approved by:	re (scottl)
2006-02-09 02:33:14 +00:00
Ruslan Ermilov 67adf01626 MFC: 1.97: axe unused function, 1.98: fix locking.
Approved by:	re (scottl)
2006-02-08 16:22:45 +00:00
Ruslan Ermilov 469df37cb0 MFC: Bump copyright year.
Approved by:	re (scottl)
2006-02-08 09:11:58 +00:00
Paul Saab 1e2be7eaab MFC:
Remove GIANT from device random.

Approved by:	re (scottl)
2006-02-08 05:58:17 +00:00
Matt Jacob 49affefb01 MFC 1.21: update man page for boot stuff plus remove some cards described.
Approved by:	re
2006-02-07 22:01:59 +00:00
David Xu 7b6b69469c MFC amd64/amd64/machdep.c revision 1.646, i386/i386/machdep.c
revision 1.622
>
> Clear carry flag in get_mcontext so that setcontext does not
> return a bogus error.
>
> PR: misc/92110

Approved by:	re (scottl)
2006-02-07 00:29:33 +00:00
Alexander Leidinger c6232883e5 MFC rev 1.79 and 1.80:
Allow to use more than 7 buttons (31 in case you don't want to look
  at the code) with USB mice.

Requested by:	Seán C. Farley <[email protected]>
Approved by:	re (kensmith)
2006-02-06 20:29:17 +00:00
Ruslan Ermilov 7af323ff12 MFC: 1.3: RELENG_6_* commit constraints.
Approved by:	re (kensmith)
2006-02-06 16:39:06 +00:00
Bruce A. Mah e1fb2f2476 Fix misspelling: s/Janurary/January/
Approved by:	re (scottl)
2006-02-05 20:45:04 +00:00
Oleg Bulyzhin 65e783f715 MFC 1.120:
1) Fix link state detection for cards operating in TBI mode (fiber ones)
2) add missing bus_dmamap_sync() call in bge_intr()

Approved by:	re (scottl)
2006-02-05 18:07:15 +00:00
Matt Jacob e77c61293e MFC overflow bug fixes and disable ISP_DAC_SUPPORTED for now
Approved by: re
2006-02-04 23:53:08 +00:00
Alexander Leidinger 3ee1577834 MFC
- rev 1.31 of maestro.c
 - rev 1.93 of dsp.c

Both fix potential NULL pointer dereferencing.

Found with:	Coverity Prevent(tm)
Approved by:	re (kensmith)
2006-02-04 11:58:28 +00:00
Sam Leffler 9897d401fc add DEFAULTS and remove entries in GENERIC now duplicated
Approved by:	re (scottl)
2006-02-03 23:37:21 +00:00
Ruslan Ermilov 80234dd2b7 MFC: 1.119: Make sure we reprogram multicast filter on IFF_ALLMULTI.
Approved by:	re (kensmith)
2006-02-03 15:56:42 +00:00
Ruslan Ermilov b5344f85bf MFC: 1.25, 1.26: Fix multicast routing on 64-bit platforms.
Approved by:	re (kensmith)
2006-02-03 15:51:17 +00:00
Scott Long c6917ec5bc MFC: Move inlined functions into a library.
Approved by: re
2006-02-03 14:43:57 +00:00
Andrew Thompson bf23eda5f0 MFC r1.150, do not send two ARP replies if the bridge has an address.
Approved by:	re (scottl)
2006-02-03 08:07:42 +00:00
Andrew Thompson 6317cad96b MFC r1.52, fix inconsistencies with the bridge route table.
Approved by:	re (scottl)
2006-02-03 08:06:11 +00:00
cvs2svn 23d064f7bf This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-02-03 01:35:37 +00:00
Tom Rhodes 7f6ec51dff MFC:
Work around an mdoc bug.

Actually MFC the enhanced SYNOPSIS section, wasn't a real bug according
to ru.

Requested/reminded by:  marius
Approved by:            re (scottl)
2006-02-02 07:50:02 +00:00
Christian Brueffer ce8959c904 MFC: rev. 1.62
Document JMicron JMB360.

Approved by:	re (scottl)
2006-02-02 06:06:27 +00:00
Ken Smith e4e8146bb3 Note that we've entered code freeze and the 6.1-RELEASE cycle has
begun but we're not ready to branch yet so we call it PRERELEASE
between now and when we're ready to branch.

Approved by:	re (implicit)
2006-02-01 18:04:43 +00:00
Stefan Farfeleder 82854cc2de Unbreak building RELENG_6 on RELENG_5 by providing a __format_arg macro if
it's not defined in <sys/cdefs.h>.  This situation happens early when building
the bootstrap-tools, where the new <nl_types.h> is mixed with the old
<sys/cdefs.h>.

Submitted by:	imp
Reviewed by:	ru
2006-02-01 12:24:39 +00:00
Yoshihiro Takahashi 6e3244afbd MFC: Remove unsupported hardware. 2006-02-01 11:12:34 +00:00
Roman Kurakin dea55409be MFC: -j 1.9 -j 1.10
----------------------------
	revision 1.10
	date: 2006/01/29 22:06:51;  author: rik;  state: Exp;  lines: +1 -0
	Fix module from panic.
	Pointy hat:	brooks
	MFC after:	3 days
2006-02-01 04:50:07 +00:00
Jung-uk Kim c96c7d62bd MFC: usr.sbin/sysinstall/disks.c 1.155
- Hide 'incorrect geometry warning' in non-interactive mode. Users should
know what they are doing in non-interactive mode.  Less scarier warning
goes to debugging info instead.
- Print sanitized geometry to debugging info.
2006-01-31 22:07:18 +00:00
Jung-uk Kim 2bb33085ac MFC: Add `mediaOpen' function. This function mounts selected media device.
For example, you can dynamically generate and load configuration file
depending on the hardware configuration with the following template:

	mediaSetCDROM
	mediaOpen
	command=/dist/scripts/install.sh
	system
	mediaClose
	configFile=generated.cfg
	loadConfig

Now we have full access to files on the media before installation begins.
2006-01-31 22:03:19 +00:00
Pawel Jakub Dawidek b6917193c9 MFC: sbin/geom/class/eli/geom_eli.c 1.6
Remove unused argument.
2006-01-31 21:24:36 +00:00
Sam Leffler 0e9cbb90a9 MFC: reorg tools to simplify use with crunchgen and rename net80211
tools as originally intended
2006-01-31 20:48:21 +00:00
Brad Davis 2ade83218e MFC 1.37
- Mention that users need to be in the wheel group to `su - root' by default, and how to change it.

PR:		docs/70616
Submitted by:	Jilles Tjoelker <jilles at stack dot nl>
Reviewed by:	ru@
Approved by:	ceri@
2006-01-31 20:32:36 +00:00
John Baldwin 59889b2ff8 MFC: Note that the device names in /dev for rp(4) and si(4) have changed.
Requested by:	scottl (sorta, these aren't release notes)
2006-01-31 20:29:43 +00:00
John Baldwin 35eebc743d MFC: Update rp(4) filenames due to the changes to fix support for machines
with multiple rp(4) cards.

Requested by:	scottl
2006-01-31 20:13:58 +00:00
Joel Dahl a803026f80 MFC r1.5:
Make the SYNOPSIS section a bit more informative.
2006-01-31 18:39:35 +00:00
Kirill Ponomarev 67a809454b MFC: pkg_add.1:1.70
date: 2006/01/29 20:30:55;  author: krion;  state: Exp;  lines: +1 -1
  Fix typo.
2006-01-31 18:33:59 +00:00
Joel Dahl aa4feea478 MFC r1.46:
-  Remove the comment about WSS/MSS cards being the best supported
     cards on the market.
  -  Remove the entire HARDWARE section.  It's superfluous since all
     snd_* manual pages have their own HARDWARE sections these days.
2006-01-31 18:31:34 +00:00
Joel Dahl ae3f552dec MFC:
Remove sound since the sound(4) manual page no longer have a
  HARDWARE section.
2006-01-31 18:30:41 +00:00
John Hay 7764b52f48 MFC:
Add AfriNIC as a RIR.

PR:		80421
Submitted by:	Adrian Frith <adrian at frith.homelinux.org>
2006-01-31 18:16:04 +00:00
Andrey A. Chernov 4d587111a7 MFC: 1.21 (don't update to current time on error) 2006-01-31 18:02:56 +00:00
Stefan Farfeleder 77879cd70b MFC: Add the macro __format_arg which expands to the format_arg attribute if
supported.
2006-01-31 17:57:17 +00:00
Warner Losh 692d05c618 MFC: 1.114
Add some sanity checking for cards being inserted multiple times.
	Be more careful about initializing lists to prevent resource leaks.
2006-01-31 17:10:02 +00:00
Hajimu UMEMOTO d5a29eeec5 MFC 1.85: don't embed scope id before running packet filters. 2006-01-31 16:36:11 +00:00
Andre Oppermann 1980cf0299 MFC 1.110 & 1.111: Simplify ip_next_mtu(). 2006-01-31 16:21:43 +00:00
Andre Oppermann 07c703e0b5 MFC 1.312: In ip_forward() compute MTU always if it hasn't been done before. 2006-01-31 16:17:22 +00:00
Andre Oppermann 4e9f6143b2 MFC 1.117: In ip_mdq() compute TV_DELTA the correct way around. 2006-01-31 16:13:22 +00:00
Andre Oppermann 01291a338b MFC 1.93: In in_control() only remove in_ifaddr from ia_hash if it is an
AF_INET address.
2006-01-31 16:11:37 +00:00
Andre Oppermann e88d344dcd MFC 1.286 & 1.287: Check the correct TTL in both the IPv6 and IPv4 cases. 2006-01-31 16:09:34 +00:00
Andre Oppermann 954e8b294b MFC 1.253: In in_delayed_cksum() don't perform m_pullup() because we can't
pass the new mbuf pointer to the callers.
2006-01-31 16:06:05 +00:00
Andre Oppermann a2e44c13e1 MFC 1.81: In syncache_expand() fix a case that currently can't be triggered. 2006-01-31 16:03:42 +00:00
Andre Oppermann 14c794b689 MFC 1.252: Prevent dereferencing NULL route pointer when trying to update
the route MTU.
2006-01-31 16:01:38 +00:00
Gleb Smirnoff 1886047006 MFC:
Add some initial locking to gif(4), that covers output path.
2006-01-31 15:56:47 +00:00
cvs2svn 5c64b67372 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-01-31 15:56:34 +00:00
Poul-Henning Kamp c3dd8ac45e MFC:
Updated flash library
	ramdisk sizes and last orders.
2006-01-31 15:56:33 +00:00
Gleb Smirnoff 79719b8d4e MFC:
- In pipe() return the error returned by pipe_create(), rather then
    hardcoded ENFILES, which is incorrect. pipe_create() can fail due
    to ENOMEM.
  - Update manual page, describing ENOMEM return code.

  Reviewed by:    arch
2006-01-31 15:44:51 +00:00
Gleb Smirnoff 5513530c0d MFC 1.182:
Implement 'ipfw fwd laddr,port' feature for UDP. According to ipfw(8)
  it should work, however it never did. People expect it to work.

  PR:		kern/90834
2006-01-31 15:40:15 +00:00
Gleb Smirnoff a3c6788139 MFC 1.27:
Simplify ng_source_send() removing temporary queue and merging two
  cycles into one.
2006-01-31 15:39:05 +00:00
Gleb Smirnoff 7251ab3627 Sync ng_pppoe with HEAD, merging:
- ktr(4) instead of printfs.
- D-Link compat mode.
- style(9) cleanup.
2006-01-31 15:36:11 +00:00
Oleg Bulyzhin e06aa4c2a6 MFC 1.124:
Fix minor bug in uRPF: if net.link.ether.inet.useloopback=1 and we send
broadcast packet using our own source ip address it may be rejected by
uRPF rules.

PR:		kern/76971
2006-01-31 14:48:03 +00:00
Warner Losh 25cf6c52ec I haven't yet merged back the defines from -current for
__PCI_REROUTE_INTERRUPT, so merging it was in error.  I thought I'd
specifically checked before the commit, but it looks like I was wrong.

Thanks to Peter Pentchev (roam@) for his help in finding this...
2006-01-31 14:42:43 +00:00
Pawel Jakub Dawidek 75e51c7ef3 MFC: sbin/geom/core/geom.8 1.18
Add a reference to geli(8).
2006-01-31 12:39:26 +00:00
Suleiman Souhlal 0221c27e87 MFC r1.215:
Don't try to load KLDs if we're mounting the root. We'd otherwise panic.

  Tested by:      kris
2006-01-31 06:00:32 +00:00
Pawel Jakub Dawidek ed1122c91c MFC: etc/rc.d/ipsec 1.14,1.15
- Use $ipsec_file instead of hardcoded /etc/ipsec.conf.
- Remove stale comment.
2006-01-31 00:28:01 +00:00
Ariff Abdullah 5e10f68a8a MFC: revision 1.3
Native 32bit recording is turned on, although broken on some hardware.
2006-01-31 00:10:09 +00:00
Jung-uk Kim c230ca16c4 Move dev/amr/amr_linux.c to where it belongs. 2006-01-30 23:56:44 +00:00
Warner Losh c1eff913df MFC: add cardbus_device.c 2006-01-30 23:25:01 +00:00
Marcel Moolenaar e9cf8c5a15 MFC rev 1.897: Fix the missing CD_VOLUME=1 in the cdrom.inf file on
disc1 for the livecd != disc1 case.
2006-01-30 23:09:51 +00:00
Pawel Jakub Dawidek 22f4532b3d MFC: sys/dev/md/md.c 1.161
Call NDFREE() only when vn_open() succeeded.
2006-01-30 23:03:44 +00:00
Bernd Walter 551cadab9d MFC: 1.18 Remove spl / Restart request on USBD_IOERROR. 2006-01-30 22:47:45 +00:00
Marius Strobl a5a6bb9380 MFC: sys/sparc64/central/central.c 1.11, sys/sparc64/ebus/ebus.c 1.25 (partial),
sys/sparc64/fhc/fhc_central.c 1.10, sys/sparc64/fhc/fhc_nexus.c 1.9,
     sys/sparc64/pci/psycho.c 1.59, sys/sparc64/sbus/dma_sbus.c 1.3 - 1.4,
     sys/sparc64/sbus/sbus.c 1.37

- Register the generic implementations for the device shutdown, suspend
  and resume methods so these events propagate through the device driver
  hierarchy.
- Remove dma_setup_intr() (was commented out in RELENG_6).
2006-01-30 22:30:51 +00:00
Marius Strobl ac82b19e49 MFC: 1.5
- Only touch the LED bit of the (LED) AUXIO register when turning the
  system LED on or off. Unlike the EBus LED AUXIO register where the
  remaining bits are unused the upper bits of the SBus AUXIO register
  are used to control other things like the link test enable pin of
  the on-board NIC which we don't want to change as a side-effect.
- Remove the superfluous bzero()'ing of the softc obtained from
  device_get_softc().
2006-01-30 21:47:48 +00:00
Warner Losh f1b90792d8 MFC: Catchup to HEAD
o Move resource allocation into pci layer, rather than duplicating
	  it in this layer (poorly at that).
	o Provide preliminary support for dumping of CardBus card's CIS.
	o Simplify I/O memory range allocations
	o Use PCI layer symbols rather than cardbus layer symbols
	o Improve cis tuple callbacks
2006-01-30 20:04:59 +00:00
Warner Losh c5f9010a85 MFC:
1.308, 1.307, 1.306: expose pci_add_resources to the outside
	world.  Implement force in pci_add_map.  Write values of allocated
	resources to the BARs.
	1.304: Improve diagnostic messages
	1.303: Improved resource allocation.
	1.302: Use symbolic names
	1.301: Minor style(9) nitage
	1.296: Allow code to access cached values for CMDREG, CACHLNSZ, MINGNT,
	MAXLAT and LATTIMER.
2006-01-30 18:42:10 +00:00
Warner Losh 6d1256149d MFC: 1.16 expose pci_add_resources to the outside world (well, pci busses) 2006-01-30 18:38:08 +00:00
Warner Losh 89253ecab9 MFC:
1.69: Remove #ifdef alpha vestige
	1.67: Accessors for CMDREG, CACHELNSZ, MINGNT, MAXLAT and LATTIMER
2006-01-30 18:34:41 +00:00
Scott Long 110859560d MFC: Diff reduction with HEAD. Whitespace, time_second -> time_uptime,
TAILQ initialization, PCI code refactoring.
2006-01-30 17:56:07 +00:00
Gleb Smirnoff e871178d52 MFC 1.116:
Check for BGE_RXBDFLAG_IP_CSUM flag before marking mbuf as with valid
  checksum. This fixes operation of PPPoE and other non-IP Ethernet
  protocols.
MFC 1.117:
  Use m_getcl() instead of getting mbuf, and then getting a cluster.
2006-01-30 13:17:44 +00:00
Søren Schmidt 7f2ddf4e39 MFC:
Add support for the JMicron JMB360 SATAII controller.
2006-01-30 10:32:40 +00:00
Søren Schmidt 176ca4c8a6 MFC:
Remove accidental debug leftovers.
2006-01-30 10:20:28 +00:00
Scott Long 8a3080c74e MFC rev 1.31: Allow the fast taskqueue to run without Giant 2006-01-30 07:51:10 +00:00
Colin Percival 44951ef425 MFC rev. 1.14:
Replace "fetch" with "fetch -r" when downloading the initial ~38MB
  snapshot in order to avoid unnecessary re-downloading.

  Remove the earlier "rm -f ${SNAPSHOTHASH}.tgz" to make this work.
2006-01-30 04:18:12 +00:00
Joseph Koshy cc65bf5e80 MFC r1.282: Note that options are set using sh(1) syntax. 2006-01-30 03:17:33 +00:00
Philip Paeps f2478d9070 MFC:
Add [-J jid_file] option to write out a JidFile, similar to a PidFile,
  containing the jailid, path, hostname, ip and the command used to start
  the jail.

      src/usr.sbin/jail/jail.8: rev 1.71 -> 1.72
      src/usr.sbin/jail/jail.c: rev 1.20 -> 1.21

PR:		misc/89883
Submitted by:	L. Jason Godsey <lannygodsey -at- yahoo.com>
Reviewed by:	phk
2006-01-30 00:38:37 +00:00
Philip Paeps d5df025d08 MFC:
Add "yet another" moused(8) hack: suspend handling mouse events when SIGUSR1
  is caught.  Can be assigned to a window manager shortcut to prevent accidents
  with touchpads.

      src/usr.sbin/moused/moused.8: rev 1.57 -> 1.58
      src/usr.sbin/moused/moused.c: rev 1.74 -> 1.75

PR:		bin/89357
Submitted by:	Nick Hibma <nick -at- van-laarhoven.org>
2006-01-30 00:32:40 +00:00
Philip Paeps b6e714ddfb MFC:
Catch up with 64bit time_t on sparc64.  The rstat packet expects a 32bit
  time_t and times will look incorrect on machines with 64bit time_t.

      src/usr.bin/rup/rup.c: rev 1.18 -> 1.19

PR:		88788
Submitted by:	Keith White <Keith.White -at- site.uottawa.ca>
2006-01-30 00:29:15 +00:00
Andrew Thompson 511bbdf6d8 InstaMFC:
Back out of r1.148, it causes two arp replies to be sent with different mac
 addresses.
2006-01-29 23:22:42 +00:00
Warner Losh 33bf28a2a9 MFC: PCIR_CARDBUSCIS -> PCIR_CIS 2006-01-29 21:14:28 +00:00
Warner Losh dfb9c554b1 MFC 1.46-1.51: more defines for capabilities and Cardbus CIS things. 2006-01-29 21:03:46 +00:00
Damien Bergamini 546da45c9f sync with HEAD. 2006-01-29 15:21:46 +00:00
cvs2svn 9df22c0f76 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-01-29 15:13:02 +00:00
Damien Bergamini a1663a5eb8 sync with HEAD. 2006-01-29 15:13:01 +00:00
Damien Bergamini 5ac4b5c889 sync ural with HEAD.
Brings automatic rate control in BSS mode and other goodies.
2006-01-29 14:16:36 +00:00
Damien Bergamini 70668c49a7 sync with HEAD:
r1.27:
o Re-enable scatter/gather
o Change MEM_READ_1/MEM_READ_4 into macros (move them to if_iwireg.h)
o Add support for association LED
o Silently discard f/w notifications that are unknown (fixes spurious
  "unknown notification 15" in logs with latest firmware)
o Fix scanning of 5GHz channels

r1.23:
Fix endianness issues.  iwi now works on big endian architectures too.

r1.22
Be more robust when handling Rx interrupts.  If we can't allocate and DMA map
a new mbuf, just discard the received frame and reuse the old mbuf.
This should fix kernel panics on high network traffic.

r1.20:
o Use firmware extended scan command; this one doesn't crash when scanning
  the 5GHz band.
o Enable 802.11a channels scanning for 2915ABG adapters.
o Fix a typo (negociated->negotiated).
2006-01-29 13:54:19 +00:00
Yaroslav Tykhiy 53cae8cc80 MFC the addition of an rc.d script for stand-alone ftpd:
etc/defaults/rc.conf		1.271
etc/rc.d/Makefile		1.63
etc/rc.d/ftpd			1.1 (new)
share/man/man5/rc.conf.5	1.281, 1.282

Also MFC the addition of a missing xref to geli.8 in
SEE ALSO on rc.conf.5 as a part of rev. 1.282.
2006-01-29 13:52:34 +00:00
Yaroslav Tykhiy 95eb73539b MFC recent ftpd fixes related to handling the pidfile and unneeded
open sockets when in stand-alone daemon mode:

ftpd.c    1.207-1.209
ftpd.8    1.70-1.71
2006-01-29 13:21:05 +00:00
Maxim Konovalov ad4bf6d532 MFC rev. 1.103: InterBase Database Remote Protocol 3050/tcp/udp. 2006-01-29 11:32:48 +00:00
Sam Leffler f2b450a1cd MFC: switch beacon miss threshold from a time to the number of beacon frames 2006-01-29 07:33:27 +00:00
Sam Leffler dc7690b5ec MFC 1.86: bounds check each ie's length when parsing 2006-01-29 07:28:02 +00:00
Sam Leffler 382b790e53 MFC 1.68: propagate current bss state on sta join 2006-01-29 07:20:23 +00:00
Sam Leffler ba97453c3c MFC 1.72: bump the scan generation number before iterating 2006-01-29 07:18:09 +00:00
Sam Leffler aa07850db5 MFC: update monitoring support 2006-01-29 07:17:02 +00:00
Sam Leffler f2e53a229d MFC 1.6: add flag to tag frames w/ a known bad FCS 2006-01-29 07:13:58 +00:00
Sam Leffler bbd4616eb8 MFC 1.27:
enable "aggressive mode" only when operating in ap or station mode; in
  particular this fixes use of wme in adhoc demo mode, it wasn't possible
  to set the txop limit because the aggressive mode logic would override
2006-01-29 07:13:03 +00:00
Sam Leffler 98c7e4c25d MFC: update erp information element in the beacon frame to reflect
changes in the bss
2006-01-29 07:11:24 +00:00
Sam Leffler a4b919d11c MFC: add LINT build 2006-01-29 06:56:27 +00:00
Sam Leffler ffbefa9297 MFC 1.15: don't assume char is signed 2006-01-29 06:55:03 +00:00
Sam Leffler 7be0afd47d MFC 1.18: bandaid assumption that char is signed 2006-01-29 06:52:35 +00:00
Ariff Abdullah 2a3cbdaefc MFC: Enable full duplex operation since it works and to solve panic issue.
PR:	kern/91992
2006-01-29 02:35:19 +00:00
Ariff Abdullah 9df0e61171 MFC: Turn on native 32bit recording (at 48000hz).
It works perfectly on my Compaq Presario M2000Z, but my last attempt
on Acer Ferrari 4000 only produce garbled sound.
2006-01-29 02:33:17 +00:00
Ariff Abdullah 4359c49a4f MFC: Various fixups:
feeder.h:
feeder.c:
        - Implement scoring mechanisme to select best format for conversion.
          This is actually part of newer format chaining procedures which
          will be commited someday. Confusion during chaining process solved
          by this scoring since it will try to reduce list of from/to formats
          to a single, best format.
          Related PR:   kern/91683
channel.c:
        - Simplify feeder building process since we have smarter format
          chaining.
	- (1) Fix DMA alignment, based on bytes per sample.

feeder_fmt.c:
        - Add few more sign conversion feeders for 24 and 32 bit format.

feeder_rate.c:
        - Force buffer / bytes allignment. Unaligned buffer may cause
          panics during recording on pure 32bit sample format if it
          involves feeder_rate as part of feeders chain. Handle strayed
	  bytes (mostly caused by #1) better.
          Tested on: ATI IXP, force 32bit recording.

This DMA alignment issues are extremely hard to reproduce unless the user
happen to have a 32bit capable soundcards (ATI IXP) and knowledgeable enough
to force it to operate under pure 32bit operations on both record and play
directions.
2006-01-29 02:27:28 +00:00
Ian Dowse 89862d2d8e MFC: synchronise the OHCI driver with HEAD:
o Add some identification strings and vendor IDs
 o Set sc_dying to 1 when detaching
2006-01-29 01:26:46 +00:00
Florent Thoumie 4e30fccdb4 MFC:
Add Product IDs :
  - Sandisk Cruzer Micro 128MB [5]
  - DANE-ELEC zMate 512MB USB flash drive [7]
  - Attache 256MB USB 2.0 Flash Drive [8]
  - Sandisk Cruzer Micro 256MB [9]

  Add scsi_da.c quirks :
  - Samsung USB key 128Mb [1]
  - Kingston DataTraveler 2.0 [2]
  - Creative MuVo Slim [3]
  - United MP 5512 Portable MP3 Player [4]
  - Sandisk Cruzer Micro 128MB [5], [9]
  - PNY USB Flash keys [6], [7], [8]

  Add umass.c quirks :
  - Sandisk Cruzer Micro 128MB [5]
  - DANE-ELEC zMate 512MB USB flash drive [7]
  - Attache 256MB USB 2.0 Flash Drive [8]
  - Sandisk Cruzer Micro 256MB [9]

      src/sys/dev/usb/usbdevs: rev 1.249 -> 1.250
      src/sys/cam/scsi/scsi_da.c: rev 1.184 -> 1.185
      src/sys/dev/usb/umass.c: rev 1.128 -> 1.130

PR:		usb/90081 [1],
		usb/89196 [2],
		kern/86131 [3],
		usb/80487 [4],
		usb/75970 [5],
		usb/75578 [6],
		usb/72344 [7],
		usb/65436 [8],
		usb/70835 [9]
Submitted by:	Henri-Pierre CHARLES <[email protected]> [1],
		Andrey Simonenko <[email protected]> [2],
		Erich Rickheit KSC <[email protected]> [3],
		[email protected] [4],
		Bram Abbekerk <[email protected]> [5],
		Thomas Pornin <[email protected]> [6],
		parv <[email protected]> [7],
		Peter D. Quilty <[email protected]> [8],
		Raymundo M. Vega <[email protected]> [9]
2006-01-29 00:46:57 +00:00
Marcel Moolenaar 66f0e9fc6d MFC ia64 psABI conformance changes:
s/R_IA64_/R_IA_64_/
	s/DT_IA64_/DT_IA_64_/

	libexec/rtld-elf/ia64/reloc.c:1.17,1.18
	libexec/rtld-elf/ia64/rtld_start.S:1.4
	sys/boot/ia64/efi/start.S:1.9,1.10
	sys/ia64/ia64/elf_machdep.c:1.23
	sys/ia64/ia64/genassym.c:1.42
	sys/ia64/ia64/locore.S:1.39
	sys/ia64/include/elf.h:1.12,1.13,1.14
	usr.bin/elfdump/elfdump.c:1.14
2006-01-28 18:40:55 +00:00
Yaroslav Tykhiy 07eeceebe7 Temporarily back out the last change, rev. 1.7.2.2.
The problem with it was that it swapped the relative order of IP
assignment and parent interface attachment.  The present if_vlan
code gets certain flags from the parent, including those meaningful
to the upper layers.  E.g., IP assignment to an interface with
IFF_BROADCAST goes somewhat differently from that to a non-broadcast
interface.  Consequently, assigning IP before attaching the parent
results in a bogus or missing broadcast address on the vlan interface.
This bug is still here, but at least it won't be triggered by doing
both vlanX configuration steps, IP and vlan+vlandev, in a single
ifconfig invocation, which is usual to setting up vlans via rc.conf.

Work at the global issue is under way.
2006-01-28 16:38:28 +00:00
Yoshihiro Takahashi 7a6c98f47a MFi386: revision 1.10.10.1 2006-01-28 07:55:19 +00:00
Kris Kennaway 3fc25ab5ea MFC: Correct spelling of T_TAG_OFERFLOW
Approved by:	re
2006-01-28 04:02:54 +00:00
Don Lewis 7ba5efcae4 MFC kern_sysctl.c 1.168
Touch all the pages wired by sysctl_wire_old_buffer() to avoid PTE
  modified bit emulation traps on Alpha while holding locks in the
  sysctl handler.
2006-01-28 00:31:56 +00:00
Tom Rhodes 652e5bff7b Fix a fat fingered revision number in my cvs diff.
Not my month.
2006-01-27 23:05:38 +00:00
Bjoern A. Zeeb e340147830 MFC:
rev. 1.39 sys/net/if_gre.c
  rev. 1.21 sys/netinet/ip_gre.c      rev. 1.4  sys/netinet/ip_gre.h
  rev. 1.12 sys/netipsec/keysock.c    rev. 1.3  sys/netipsec/keysock.h
  rev. 1.32 sys/netkey/keysock.c      rev. 1.9  sys/netkey/keysock.h

  Fix stack corruptions on amd64.

  Vararg functions have a different calling convention than regular
  functions on amd64. Casting a varag function to a regular one to
  match the function pointer declaration will hide the varargs from
  the caller and we will end up with an incorrectly setup stack.

  Entirely remove the varargs from these functions and change the
  functions to match the declaration of the function pointers.
  Remove the now unnecessary casts.

  Lots of explanations and help from:     peter
  PR:                                     amd64/89261
2006-01-27 21:50:11 +00:00
Bjoern A. Zeeb 03f90b2f79 MFC rev. 1.115:
Remove unused code.
Found with:	Coverity Prevent(tm)
2006-01-27 21:37:56 +00:00
Jim Rees a9941b27eb MFC rev 1.23
Use nfs4_disconnect for connections opened with nfs4_connect.
2006-01-27 18:22:53 +00:00
Jim Rees d7f5d0c705 MFC rev 1.16
Use thread0 instead of user's thread for sobind.
This fixes reconnect after, for example, tcp idle disconnection.
Previously this would fail if a normal user tried to bind to a privileged
port.
2006-01-27 18:22:11 +00:00
Doug Ambrisko ee4e224e53 MFC: When the RAID firmware returns a failure, don't hard error the result. 2006-01-27 17:41:37 +00:00
Doug Ambrisko 0b6444f492 Regen 2006-01-27 17:17:23 +00:00
Doug Ambrisko ecab07c7df MFC: 32bit lutimes 2006-01-27 17:17:05 +00:00
Hartmut Brandt f66ec38272 MFC the HOSTRES-MIB. This is exactly the same version as in HEAD except for
a slightly different mechanism to load geom_md (g_me) which was renamed at
some point. This has been tested on RELENG_6 by erwin and glebius.

Reviewed by:	erwin, glebius
2006-01-27 16:27:34 +00:00
Christian Brueffer 533aa9dd9c MFC: rev. 1.53, 1.60, 1.61
- hw.ata.wc can cause data loss on crashes too.  This brings the
  description of the hw.ata.wc in sync with tuning(7)
- Via VT8251 support.
- Support for Marvell chipsets.
2006-01-27 15:58:01 +00:00
Christian Brueffer b798cfd1b3 MFC: rev. 1.5 - 1.8
- SiS read/write support.
- Intel MatrixRAID write support.
- VIA Tech V-RAID write support.
2006-01-27 15:55:07 +00:00
Colin Percival 754ecedc7a MFC rev. 1.8:
Correctly identify the host and port values on a failed
  getaddrinfo lookup.
2006-01-27 14:44:15 +00:00
Matteo Riondato f5d46252c5 Allow the use of wildcarded device names in devfs.conf
PR:             conf/90760
Submitted by:   Darren Pilgrim <darren.pilgrim at gmail.com>
Approved by:    philip (mentor,implicit)
2006-01-27 13:20:48 +00:00
Tom Rhodes 05dd95926a MFC:
Add a64l(), l64a(), and l64a_r() XSI extentions.  These functions convert
  between a 32-bit integer and a radix-64 ASCII string.  The l64a_r() function
  is a NetBSD addition.

  PR:             51209 (based on submission, but very different)
  Reviewed by:    bde, ru
2006-01-27 05:17:25 +00:00
Christian S.J. Peron f0367935b3 MFC revision 1.122
date: 2006/01/20 03:21:25;  author: csjp;  state: Exp;  lines: +1 -0
Destroy the dynamic rule zone in the event that we fail to insert the
initial default rule.

MFC revision 1.123
date: 2006/01/20 05:35:27;  author: csjp;  state: Exp;  lines: +25 -10
- Change the return type for init_tables from void to int so we can propagate
  errors from rn_inithead back to the ipfw initialization function.
- Check return value of rn_inithead for failure, if table allocation has
  failed for any reason, free up any tables we have created and return ENOMEM
- In ipfw_init check the return value of init_tables and free up any mutexes or
  UMA zones which may have been created.
- Assert that the supplied table is not NULL before attempting to dereference.

This fixes panics which were a result of invalid memory accesses due to failed
table allocation. This is an issue mainly because the R_Zalloc function is a
malloc(M_NOWAIT) wrapper, thus making it possible for allocations to fail.

Found by:	Coverity Prevent (tm)
Coverity ID:	CID79
MFC after:	1 week
2006-01-27 02:39:46 +00:00
Ed Maste f0e7954c7c MFC loader.8:1.83 loader.conf:1.99 loader.conf.5:1.24 comconsole.c:1.11
from HEAD to RELENG_6:

  Add a "comconsole_speed" loader variable that can be used to change
  the serial console speed (i386 and amd64 only). If the previous
  stage boot loader requested a serial console (RB_SERIAL or RB_MULTIPLE)
  then the default speed is determined from the current serial port
  speed. Otherwise it is set to 9600 or the value of BOOT_COMCONSOLE_SPEED
  at compile time.

Approved by:    rwatson (mentor)
2006-01-27 01:36:24 +00:00
Oleg Bulyzhin b4280addd5 MFC 1.211:
1) remove useless check of loop_copy
2) convert loop_copy to "non-negative" flag
2006-01-26 23:18:11 +00:00
Gleb Smirnoff 87e7742a94 MFC 1.85 - 1.87: Some diagnostic nitpicking and cleanup.
MFC 1.88:
  Improve handling flags that must be propagated
  to the parent interface, such as IFF_PROMISC and
  IFF_ALLMULTI.  In addition, vlan(4) gains ability
  to migrate from one parent to another w/o losing
  its own flags.

  PR:             kern/81978
2006-01-26 22:21:37 +00:00
Doug Ambrisko e9fd251d63 MFC glue to build LSI Linux ioctl shim static and as a module. 2006-01-26 22:12:32 +00:00
Doug Ambrisko 6c9c9bc882 Sync to -current Scott's Mega Update, fixes and Linux ioctl wrapper.
Mega update to the LSI MegaRAID driver:

  1.  Implement a large set of ioctl shims so that the Linux management apps
  from LSI will work.  This includes infrastructure to support adding, deleting
  and rescanning arrays at runtime.  This is based on work from Doug Ambrosko,
  heavily augmented by LSI and Yahoo.

  2.  Implement full 64-bit DMA support.  Systems with more than 4GB of RAM
  can now operate without the cost of bounce buffers.  Cards that cannot do
  64-bit DMA will automatically revert to using bounce buffers.  This option
  can be forced off by setting the 'hw.amr.force_sg32" tunable in the loader.
  It should only be turned off for debugging purposes.  This work was sponsored
  by Yahoo.

  3.  Streamline the command delivery and interrupt handler paths after
  much discussion with Dell and LSI.  The logic now closely matches the
  intended design, making it both more robust and much faster.  Certain
  i/o failures under heavy load should be fixed with this.

  4.  Optimize the locking.  In the interrupt handler, the card can be checked
  for completed commands without any locks held, due to the handler being
  implicitely serialized and there being no need to look at any shared data.
  Only grab the lock to return the command structure to the free pool.  A
  small optimization can still be made to collect all of the completions
  together and then free them together under a single lock.

  Items 3 and 4 significantly increase the performance of the driver.  On an
  LSI 320-2X card, transactions per second went from 13,000 to 31,000 in my
  testing with these changes.  However, these changes are still fairly
  experimental and shouldn't be merged to 6.x until there is more testing.

  Thanks to Doug Ambrisko, LSI, Dell, and Yahoo for contributing towards
  this.

These have now had more testing and Scott requested them to be merged
before the freeze.
2006-01-26 22:04:21 +00:00
cvs2svn 5a217614cd This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-01-26 12:19:11 +00:00
Hartmut Brandt 9e1158243d MFC: IFDATA_DRIVERNAME support.
if_mib.h: 1.8
	if_mib.c: 1.18
2006-01-26 07:46:28 +00:00
Matt Jacob 4269a276d8 MFC current 2322 (and maybe 2422) support plus current target mode state. 2006-01-26 06:22:40 +00:00
Matt Jacob 43cb6f3147 (MFC 1.106)
Incorporate the O_NONBLOCK open semantics of Linux and Solaris.
2006-01-26 04:57:04 +00:00
Ian Dowse aa445563de MFC: synchronise the EHCI driver with HEAD:
o Add workaround for dropped interrupts on VIA and ATI controllers
 o Add various identification strings and vendor IDs
 o Set sc_dying to 1 when detaching
 o Don't bother clearing the unused transfer `hcpriv' field
2006-01-26 01:43:13 +00:00
Doug Barton ed406cf8d5 MFC version 1.6 of the Makefile, crank WARNS up to 6
MFC version 1.2 of rcorder.c, fix for "chunk is already free" error
2006-01-26 01:34:00 +00:00
Simon L. B. Nielsen cb1dd6c1d9 MFC rev 1.31:
Use the .Fx macro.
2006-01-25 20:56:17 +00:00
Pawel Jakub Dawidek ead796aa3c MFC: sys/geom/uzip/g_uzip.c 1.9
Fix bio leak in case of malloc(9) failure.

Found by:	Coverity Prevent(tm)
Coverity ID:	CID794
2006-01-25 15:55:27 +00:00
Pawel Jakub Dawidek 2632f0545e MFC: sys/geom/mirror/g_mirror.c 1.69
sys/geom/raid3/g_raid3.c	1.45

Remove dead code.

Found by:	Coverity Prevent(tm)
Coverity ID:	CID104, CID105
2006-01-25 15:54:02 +00:00
Hartmut Brandt 4596d95fc0 MFC: SNMP module build infrastucture:
share/man/man7/Makefile:1.30
	share/mk/Makefile:1.47
	usr.sbin/bsnmpd/modules/Makefile.inc:1.12
	usr.sbin/bsnmpd/modules/snmp_atm/Makefile:1.4
	usr.sbin/bsnmpd/modules/snmp_mibII/Makefile:1.6
	usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile:1.7
	usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c:1.6
	usr.sbin/bsnmpd/modules/snmp_pf/Makefile:1.2
	share/man/man7/bsd.snmpmod.mk.7:1.4
	share/mk/bsd.snmpmod.mk:1.2
2006-01-25 13:22:59 +00:00
Simon L. B. Nielsen fb6375d7b8 Add FreeBSD-SA-06:0[67]. 2006-01-25 10:35:54 +00:00
Colin Percival 78eae60808 Make sure buffers in if_bridge are fully initialized before copying
them to userland. [1]

MFC rev. 1.16 of sys/contrib/pf/net/pf_norm.c: Correct an error in pf
handling of IP packet fragments which could result in a kernel panic.
[2]

Security:	FreeBSD-SA-06:06.kmem [1]
Security:	FreeBSD-SA-06:07.pf [2]
2006-01-25 10:00:59 +00:00
Søren Schmidt 71496dbe42 MFC:
Bring ATA up to -current standards:

Fix SiS SATA support, the SATA registers was off.
Update the ICH7 support so it deals better with chips without AHCI.
Unbreak hotplug support on the ICH6 and ICH7 chipsets.
Add support for VIA VT8251 southbridge.
Add new nVidia nForce4 chips.
Add support for the Marvell 88SX[56]0[48][01] series of SATA chips.
Fix the promise modesetting for old chips.
Get rid of the advertising clause in the copyright.
Add support for using DMA on dump, greatly speeds up the dump process.
When IOCATAGPARM is called, update the capabilities page that is stored
in the kernel and return the new values.
Fix rebuilds of arrays that got stuck.
Add dump support in ataraid.
Add support for for reading and writing SiS metadata.
Add support for writing VIA metadata.
Add support for writing Intel metadata.
Correct calculation of RAID0 sizes on VIA RAID arrays.
Update Intel MatrixRAID support to be able to pick up RAID0+1 (RAID10)
2006-01-25 08:13:46 +00:00
Matteo Riondato 1ae2044b04 MFC:
Honour the "uuid" directive in adduser.conf

      src/usr.sbin/adduser/adduser.sh: rev 1.26 -> 1.27

PR:		conf/87914

Approved by:	philip (mentor, implicit)
2006-01-25 07:43:48 +00:00
Matteo Riondato c866f4e9db MFC:
Add gettytab entry for 3wire 19200 baud console

      src/etc/gettytab: rev 1.22 -> 1.23

PR:		conf/90346
Submitted by:	Gavin Atkinson <[email protected]>

Approved by:	philip (mentor, implicit)
2006-01-25 07:39:42 +00:00
Garance A Drosehn 2035ca0d08 MFC 1.103: Improve the handling of errors that might happen with the fork()
done to compress files after they have been rotated.
2006-01-25 04:10:59 +00:00
Don Lewis 12c2b2a164 MFC rmdir.2 1.14 and 1.15, and undelete.2 1.16 and 1.17
rmdir() fails with EINVAL if the last component of the path is "..".
 Document the previously undocumented behaviour of rmdir(".") returning
 EINVAL as required by POSIX and SUSv3.  Bump the man page change date.

 undelete() fails with EINVAL if the last component of the path is "..".
 Bump the man page change date.
2006-01-25 02:19:35 +00:00
Don Lewis 05b2f2f41c MFC vfs_lookup.c 1.84 and 1.85, and vfs_syscalls.c 1.400
Return EINVAL from lookup() if cn_nameiop is DELETE or RENAME and
the last component of the path name is "..".  This keeps VOP_LOOKUP()
from locking vnodes in reverse order.

In kern_unlink(), remap EINVAL errors returned from namei() to EPERM
to match existing (and POSIX required) behaviour.
2006-01-25 02:12:09 +00:00
Joel Dahl 8556d89e47 MFC r1.15: Sort list of modules. 2006-01-24 18:56:11 +00:00
Joel Dahl cc62e75675 MFC: Remove unused pointer. 2006-01-24 18:54:22 +00:00
Ceri Davies d03a30acbe MFC revision 1.280:
It's perfectly valid to run rpc_statd and rpc_lockd as an NFS
	client, so update the documentation to reflect that.
2006-01-24 18:41:30 +00:00
Joel Dahl d99f29bd2f MFC:
-  Add comments about snd_au88x0.
  -  Clarify that snd_audiocs is for sparc64 only.
  -  Expand snd_ich and snd_t4dwave comments.
2006-01-24 18:39:43 +00:00
Ceri Davies 2a0b8e0e16 MFC revision 1.30:
Fix the location of the initdiskless rc script.
	Lose pointers to where these files were two major releases ago.
2006-01-24 18:26:21 +00:00
Joel Dahl ad6fb047b2 MFC: s/5.5/6.0/ in HISTORY section. 2006-01-24 17:02:39 +00:00
Pawel Jakub Dawidek 133eae554b Document the move of setkey from /usr/sbin/ to /sbin/.
A bit late, but better than never.

Reminded by:	bz
2006-01-24 15:58:10 +00:00
Ceri Davies b8f4e92157 MFC revision 1.150:
On i386, 7.0 requires 106MB on /usr.  6.0 requires 101MB.
  Bump USR_MIN_SIZE to 128MB, so that an auto-layout install won't fail
  due to /usr being too small.
2006-01-24 15:51:33 +00:00
Pawel Jakub Dawidek ab98e4a810 MFC: sbin/mount/mount.c 1.80
Resolve the mount point's path with realpath(2) before checking if file
system is mounted. This prevevents duplicated mounts.

The change I made against the original patch is to fall back to the given
path on realpath(2) failure instead of exiting with an error.

Submitted by:	Andreas Kohn <[email protected]>
PR:		bin/89782
2006-01-24 15:27:25 +00:00
Matteo Riondato 08503e59fb MFC:
Remove some duplicated entries

      src/games/fortune/datfiles/fortunes: rev 1.202 -> 1.203

PR:		conf/81924
Submitted by:	Gavin Atkinson <[email protected]>
Approved by:	philip (mentor, implicit)
2006-01-24 07:50:08 +00:00
Brooks Davis e7bf2276f6 Backout ill considered MFC of 1.20. It doesn't compile.
Pointy hat:	brooks
2006-01-24 06:30:51 +00:00
Brooks Davis 82d8d41648 MFC revs:
1.17: convert from network byte order to host byte order not to reverse.
  1.19: Get rid of the bogus IFP2FC() macro and use IFP2FWC().
  1.20: Fix ip_fastforward() return handling.

PR:		kern/91307 (1.19)
Found by:	Coverity Prevent(tm) (1.20)
2006-01-24 06:28:22 +00:00
Brooks Davis 31620233b4 MFC rev 1.5: Mention the -b flag in the SYNOPSIS. 2006-01-24 06:03:16 +00:00
Brooks Davis 97f755b3bf MFC rev 1.11:
When we give up on an interface, use the arp(8) command to remove all
  entries from the interface rather than using ifconfig's delete command.
  This preserves non-dhclient configured addresses (though they are wiped
  out when dhclient is restarted).
2006-01-24 06:01:59 +00:00
Brooks Davis f5c441e22b MFC rev 1.13: Allow users to add aliases to the interface.
PR:		bin/87465
2006-01-24 05:59:27 +00:00
Brooks Davis 67f3286ff3 MFC rev 1.49: Don't create memory backed file systems with soft-updates
enabled, it's pointless and potentially dangerous.

PR:		conf/85558
Submitted by:	Ralf Wenk <RZ dash FreeBSD0605 at hs dash karlsruhe dot de>
2006-01-24 05:49:58 +00:00
Brooks Davis ce0c643796 MFC the ability to restrict deletions to a particular inteface in the -a
case.
2006-01-24 05:39:22 +00:00
Sam Leffler 720be1282a catch up to driver changes 2006-01-24 05:35:03 +00:00
Christian S.J. Peron bb1e529fa6 MFC revision 1.214
date: 2006/01/15 20:14:11;  author: csjp;  state: Exp;  lines: +1 -1
vfs_busy can only return something useful if MNTK_UNMOUNT has been set.
Since we are using vfs_busy() on a freshly allocated mount structure, use
(void) to show that we do not care about the return value.
2006-01-24 04:20:24 +00:00
Christian S.J. Peron fd45db65f5 MFC revision 1.20
date: 2005/12/30 20:10:21;  author: csjp;  state: Exp;  lines: +1 -1
mkstemp(3) and friends use a combination of base 10 digits, along
with upper and lower case letters from the English alphabet. Change
the number of possible file names mktemp will return from 26**6
to (10+26+26)**6 instead. This keeps things consistent with mkstemp(3)
2006-01-24 04:13:02 +00:00
Christian S.J. Peron f029adc9f2 MFC revision 1.27
date: 2006/01/15 01:02:20;  author: csjp;  state: Exp;  lines: +1 -1
Fix potential overrun of static stack allocated array which stores
the rules. If an array is N elements large, we can only access
elements 0..(N-1).
2006-01-24 04:11:45 +00:00
Christian S.J. Peron ca1e983adf MFC the security.mac.biba.interfaces_equal sysctl variable 2006-01-24 04:10:25 +00:00
Christian S.J. Peron 9fd861d8e5 MFC revision 1.20
date: 2006/01/16 17:03:21;  author: csjp;  state: Exp;  lines: +6 -2
Although we check the return value of copyin(9) while determaining how
long the string is in userspace, afterwards we call malloc(M_WAITOK),
which could sleep for an unknown amount of time. Check the return
value of copyin(9) just to be sure that nothing has changed during that
time.
2006-01-24 04:08:48 +00:00
Christian S.J. Peron a2f01c1a12 MFC revision 1.18
date: 2005/12/30 06:16:20;  author: csjp;  state: Exp;  lines: +5 -0
Document the LOGIN_SETMAC setusercontext(3) flag. While we are here, drop
in an external reference to mac_set_proc(3).
2006-01-24 04:07:07 +00:00
Christian S.J. Peron 8638017918 MFC revision 1.28
date: 2006/01/15 20:30:13;  author: csjp;  state: Exp;  lines: +5 -0
Validate that the supplied file is not empty before trying mmap(2) it
and access the pages associated with it.
2006-01-24 04:05:47 +00:00
David Xu 0ad00af837 MFC:
Add missing symbol pthread_set_name_np.
2006-01-24 02:04:21 +00:00
Matteo Riondato 2d3375ecbb MFC:
Add myself to the list (Ehi, I'm not the youngest!)

      src/usr.bin/calendar/calendars/calendar.freebsd: rev 1.173 -> 1.174

(tomorrow is my birthday..)

Approved by:	philip (mentor, implicit)
2006-01-23 21:11:23 +00:00
Marius Strobl bcfc648997 Revert the hack introduced in rev. 1.6.2.1, a fix/workaround for the
underlying problem was committed in sys/sparc64/pci/psycho.c 1.55 and
MFC'ed to RELENG_6 in 1.53.2.1.
2006-01-23 16:32:29 +00:00
Marius Strobl 739f302d63 MFC: sys/sparc64/pci/psycho.c 1.54 - 1.57,
sys/sparc64/pci/psychoreg.h 1.10 - 1.11,
     sys/sparc64/pci/psychovar.h 1.13 - 1.14

Sync psycho(4) with HEAD expect for the UPA_RANGE_* -> OFW_PCI_RANGE_*
and PCI_CS_* -> OFW_PCI_CS_* changes in order to mainly obtain the
following changes:
- Add a workaround for the incorrect interrupt map entry for the EBus
  bridge on E250 machines. [1]
- Register an interrupt handler for the spare hardware interrupt which
  according to OpenSolaris is used as the over-temperature interrupt in
  systems with Psycho bridges.

PR:		88279 [1]
2006-01-23 16:21:30 +00:00
Andre Oppermann d403929287 MFC rev 1.185+1.186: m_getjcl() returning address of mbuf, not cluster. 2006-01-23 15:31:20 +00:00
Marius Strobl 528554a636 MFC: sys/sparc64/include/ktr.h 1.6, sys/sparc64/sparc64/genassym.c 1.59
Use <sys/ktr.h> directly in .S files instead of exporting the
KTR_* class macros via genassym.c. Together with sys/sys/ktr.h 1.34
(MFC'ed in 1.32.2.2) this has the desired side-effect of providing a
default value for KTR_COMPILE. Thus this fixes warnings from -Wundef
regarding KTR_COMPILE not being defined for .S files.
2006-01-23 15:04:09 +00:00
Marius Strobl 5baf1981c8 MFC: 1.34
Extend the scope of #ifndef LOCORE to also cover the prototype of
ktr_tracepoint() and the macros using it. This allows this header
to be included in .S files for obtaining the KTR_* class macros
directly and providing a default value for KTR_COMPILE in case it's
not specified in the kernel config file including defining it to 0
when not using 'options KTR' at all.
2006-01-23 14:56:33 +00:00
Marius Strobl 81aa8d0088 MFC: 1.3
- The inline asm in this file uses output operands before all input
  operands are consumed so use the appropriate constraint modifier.
  Before this change GCC used one register for both an input and an
  unrelated output operand of in_addword(), causing the input to be
  overwritten before it was consumed and thus breaking in_addword().
  For in_cksum_hdr() and in_pseudo() this change is more or less
  cosmetic.
- Fix a misspelling in a nearby comment.
2006-01-23 14:45:24 +00:00
Marius Strobl 261a428063 MFC: 1.26
In moduledir_readhints() cast the value returned by sizeof() to ssize_t
when checking whether it's greater than a struct stat st_size in order
to also catch the case when st_size is -1. Previously this check didn't
trigger on sparc64 when st_size is -1 (as it's the case for a file on
a bzipfs, TFTP server etc.), causing the content of the linker hints
file to be copied to memory referenced by a null-pointer.

PR:		91231
2006-01-23 14:33:53 +00:00
Marius Strobl b1f40df698 MFC: 1.438
Remove the commented out entry of the old ISA-only le(4) driver which
was retired 22 months ago.
2006-01-23 14:19:36 +00:00
Ceri Davies 9655c1a7c4 MFC revision 1.4:
Add nofification events to the list of event types.
2006-01-23 14:13:41 +00:00
Ariff Abdullah 39a5c6f113 MFC:
Restore old compatibility of feeding directly into /dev/dsp at 8000 hz
  while preserving the New World Order.

Discussed with: [1] Michael W. Oliver <michael at gargantuan.com>

[1] http://lists.freebsd.org/pipermail/freebsd-multimedia/2006-January/003562.html
2006-01-23 05:06:53 +00:00
cvs2svn f7f4886142 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-01-23 00:32:04 +00:00
Kris Kennaway 156841622a MFC: Remove big scary warning about nullfs state 2006-01-23 00:32:03 +00:00
Yaroslav Tykhiy ddf3f14b18 MFC rev. 1.9, 1.10:
Use a callback to set up a vlan interface so that "vlan"
and "vlandev" commands can be specified in any order.
This makes the code more compact and clear as well.

Improve error check on vlan argument.

Eliminate some unneeded code bits.
2006-01-22 19:22:53 +00:00
Yaroslav Tykhiy 9976352fc8 MFC manpage fixes related to make.conf(5) and, in make.1,
to included makefiles at large.

	sbin/reboot/boot_i386.8		1.56
	share/man/man5/make.conf.5	1.122
	share/man/man5/style.Makefile.5	1.16
	share/man/man7/build.7		1.37
	share/man/man7/development.7	1.16
	share/man/man7/release.7	1.55
	share/man/man8/diskless.8	1.27
	usr.bin/make/make.1		1.94-1.96
2006-01-22 16:33:46 +00:00
Yaroslav Tykhiy a1d80e107b MFC rev. 1.3:
Spotted a call to a cdev-related function not wrapped
in "#ifdef KBD_INSTALL_CDEV".
2006-01-22 14:54:24 +00:00
Diomidis Spinellis d8d2b19b7c MFC: Return EINVAL if the tv_usec part of the utimes(2) arguments
contains incorrect fractional second values (outside the range
0-999999).
Prior to this change users could create files with values outside
that range.  Moreover, on 32-bit machines tv_usec offsets larger than
4.3s would result in an unnormalized AND wrong timestamp value,
due to overflow.
2006-01-22 13:52:10 +00:00
Yaroslav Tykhiy e9f0a225a5 MFC rev. 1.8, 1.10:
Simplify the code by making use of 'kldstat -q -m <mod>'.

Use available rc.subr features.
Reduce code duplication.
Follow the current style of rc.d scripting.
2006-01-22 13:45:28 +00:00
Yaroslav Tykhiy 2c4158dbf5 MFC rev. 1.6, 1.7:
Simplify the code by making use of 'kldstat -q -m <mod>'.

Use rc.subr(8) appropriately.
2006-01-22 13:40:47 +00:00
Yaroslav Tykhiy db9bd438e3 MFC rev. 1.5:
Set $command to indicate that the script wants to use
the default rc.subr(8) methods.  This is mandatory now.
2006-01-22 13:24:58 +00:00
Yaroslav Tykhiy d38fc47c99 MFC rev. 1.7, 1.8:
Document that `reload' is not provided by default
yet it can be enabled when applicable.

Use consistent punctuation and vertical indenting around .Dl's.
Wrap a too long line.
2006-01-22 13:19:13 +00:00
Gleb Smirnoff 89a9eae470 Remove another bogus KASSERT(). Examination of mb_free_ext() shows
that RELENG_6 is not yet ready for this KASSERT.
2006-01-22 13:16:13 +00:00
Yaroslav Tykhiy e0ef8db8e4 MFC main.c#1.15, mail.1#1.46:
Minor man page and help screen fixes.
2006-01-22 12:40:06 +00:00
Diomidis Spinellis e8feae08db MFC change 2005-09-19 10:11:47 UTC
Setting .nofinger will not hide you from root.
2006-01-22 11:56:15 +00:00
Diomidis Spinellis e8ac9aa317 MFC 1.47: Document the TMPDIR environment variable. 2006-01-22 11:41:18 +00:00
Yaroslav Tykhiy 452bd313a8 MFC:
Record renaming rc.d/ppp-user to rc.d/ppp.
2006-01-21 22:51:40 +00:00
Yaroslav Tykhiy 311a3de4e8 MFC:
Rename the rc.d script "ppp-user" to just "ppp".
2006-01-21 22:42:43 +00:00
Yaroslav Tykhiy e4bd2d5699 MFC r1.12 -- back out r1.7.2.2.
As rse@ agreed, "status" should stay in $extra_commands
if an rc.d script doesn't use $command and default methods
associated with it.  This is true since rc.subr r1.42.
With r1.42 merged to rc.subr on RELENG_6 (thanks Doug!),
it's right time to re-add "status" to $extra_commands in
this script.
2006-01-21 22:09:32 +00:00
Tor Egge 01dcf86256 MFC: Set flag in needsbuffer while still holding bqlock to avoid lost wakeup. 2006-01-21 20:41:42 +00:00
Marcus Alves Grando 22b6bb5b95 MFC: share/man/man4/umass.4 1.42
Add Time DPA20B MP3 Player (1Gb) [1]
Add Qware BeatZkey! Pro [2]
Add Merlin SM300 MP3/WMA Player (256Mb)

PR:		usb/81846 [1], usb/79164 [2]
Approved by:	njl (implict)
2006-01-21 20:39:21 +00:00
Wes Peters 70f5877cf3 MFC r1.13: Tell nextboot to clean up after itself. 2006-01-21 17:25:00 +00:00
Alexander Leidinger f60b557e57 MFC: sync with reality / add some cards to the hardware list 2006-01-21 15:00:14 +00:00
Gleb Smirnoff 0dde6cd627 This KASSERT() shouldn't have been merged. It checks the stuff done
in mb_free_ext() in HEAD, that wasn't merged.
2006-01-21 12:08:03 +00:00
Gleb Smirnoff 7b40e351f9 MFC 1.26 - 1.29:
Fix several bugs found by Coverity.
2006-01-21 10:15:00 +00:00
Gleb Smirnoff 7c0ce1edc1 MFC 1.25:
Initialize variable.

  Found with:     Coverity Prevent(tm)
2006-01-21 10:13:03 +00:00
Gleb Smirnoff 87eb443363 MFC 1.25:
Remove dead code.

  Found with:     Coverity Prevent(tm)
2006-01-21 10:12:16 +00:00
Gleb Smirnoff 57b2b941e8 MFC 1.12:
Correct off-by-one errors.

  Found with:     Coverity Prevent(tm)
2006-01-21 10:11:01 +00:00
Gleb Smirnoff 11ce29cbb1 MFC 1.18:
When sending export datagram from interrupt thread, use NG_QUEUE
  in flags. When sending export datagram from expiry thread, then
  use default zero flags. This removes unpleasant contention of the
  interrupt thread on mutexes (usually ng_ksocket's socket buffer
  mutex).
2006-01-21 10:09:18 +00:00
Gleb Smirnoff 73f05d6d10 MFC 1.14:
Skip format flags, when parsing ktr_desc.
2006-01-21 10:08:15 +00:00
Gleb Smirnoff 92b0539007 MFC 1.58:
Do not force queueing on peer hooks. This was important only for
  5.0-CURRENT. And it looks like this didn't work before Julian's
  revamp of netgraph queue code.

  Reviewed by:    julian
2006-01-21 10:07:25 +00:00
Gleb Smirnoff efb456656c MFC 1.8:
Mark appropriate commands with NGM_READONLY and NGM_HASREPLY and
  bump type cookie.

  This fixes flowctl(8) exiting without any output under high load on SMP.
2006-01-21 10:06:15 +00:00
Gleb Smirnoff 3da024bf99 Partial MFC of NGM_HASREPLY flag. The flag is introduced, but message
codes and netgraph cookie are not altered, to preserve ABI compatibility.
2006-01-21 10:04:40 +00:00
Gleb Smirnoff e7800ff049 MFC 1.65:
Provide additional macros for sending netgraph items, which allow
  to use non-default flags for netgraph functions. Implement current
  macros via new ones.
2006-01-21 10:00:51 +00:00
Gleb Smirnoff a94c60052e Sync with HEAD:
- Some whitespace and style(9) cleanup.
  - Add ktr(4) debugging.
2006-01-21 09:59:43 +00:00
Colin Percival fa58f7ada1 MFC rev. 1.3:
Add a warning pointing out that incomplete ports trees are not
  supported and that users of REFUSE directives should update their
  entire ports tree before asking for help on the mailing lists.
2006-01-21 09:59:07 +00:00
Colin Percival fe33ac02cd MFC rev 1.5:
Mention that the random time slept by "portsnap cron" is between 1 and
  3600 seconds.
2006-01-21 09:56:28 +00:00
Maxime Henrion da5e0e5977 MFC ugraphire_rdesc.h r1.3, uhid.c r1.80, usbdevs r1.245:
Add support for the Wacom Graphire 3 4x5.  Like the Graphire 3, it has a
  broken report descriptor.  While I'm here, make all the other report
  descriptors const to match the newly added one.
2006-01-20 22:55:45 +00:00
Maxime Henrion 5e7d8e131b MFC uhid.c r1.79, usb.h r1.40, uxb360gp_rdesc.h r1.1:
Add support for Xbox 360 gamepads.  They are HID-capable devices, but
  lack a report descriptor and don't use the standard interface class.
  This patch works around these deficiencies so that the uhid(4) driver
  can recognize and use those broken devices.
2006-01-20 22:47:49 +00:00
Marcus Alves Grando 0f4590b5a1 MFC: src/sys/cam/scsi/scsi_da.c 1.184
Allow to use Time DPA20B 1GB MP3 Player [1]
Allow to use Qware BeatZkey! Pro [2]

PR:		usb/81846 [1], usb/79164 [2]
Submitted by:	Ruben de Groot <[email protected]> [1], Radek Kozlowski <[email protected]> [2]
Approved by:	njl (implict)
2006-01-20 19:23:47 +00:00
Ceri Davies 6f9bdb7354 MFC revision 1.133:
Preserve any additional arguments to ifconfig that were specified in
  the DHCP case too.
2006-01-20 18:46:06 +00:00
Hartmut Brandt cd6767f1cd MFC revision 1.3 (disable default write community). 2006-01-20 16:41:11 +00:00
Hartmut Brandt 9e288ad203 MFC: Vendor release BEGEMOT_1_11 2006-01-20 16:36:43 +00:00
Hartmut Brandt 706558027f MFC: BEGEMOT_1_11 and vendor patches:
config.c: 1.1.1.7
	main.c: 1.1.1.10, 1.1.1.11
	snmpd.config: 1.1.1.6
2006-01-20 16:34:37 +00:00
Hartmut Brandt d42762176f MFC: BEGEMOT_1_11 and vendor fixes:
mibII.c: 1.1.1.9
	mibII_interfaces.c: 1.1.1.7
2006-01-20 16:27:36 +00:00
Hartmut Brandt 61ecc88911 MFC: BEGEMOT_1_11 and vendor fixes:
asn1.h: 1.1.1.5
	asn1.c: 1.1.1.5
	snmpclient.c: 1.1.1.6
2006-01-20 16:07:04 +00:00
Hartmut Brandt be89bf4504 MFC: BEGEMOT_1_11 and vendor fix from Rev 1.1.1.9 2006-01-20 15:55:57 +00:00
Hartmut Brandt 9a04fcc42a MFC: Vendor release BEGEMOT_1_11 2006-01-20 15:51:04 +00:00
Pawel Jakub Dawidek 4b1730a1e3 MFC: share/man/man4/umass.4 1.41
sys/cam/scsi/scsi_da.c	1.182
	sys/dev/usb/umass.c	1.125
	sys/dev/usb/usbdevs	1.238

Allow to use TransFlash drive, which can be found in Motorola E398 Mobile Phone.

PR:		usb/89889
Submitted by:	Wojciech A. Koszek <[email protected]>
2006-01-20 14:52:13 +00:00
Matteo Riondato ee8b49a84b MFC: don't check for /dev/mdctl and let mdconfig load the module if needed
Approved by:	philip
2006-01-20 14:24:34 +00:00
Ceri Davies 61cfa07549 MFC revision 1.413:
Add ntp.cgi.cz.
2006-01-20 13:03:13 +00:00
Ceri Davies 88fb2a12d2 MFC revisions 1.36 and 1.37:
r1.36:
	  Correct obsolete chown syntax.

	r1.37:
	  If sysinstall was used to configure an anonymous FTP area, it
	was possible for information to be copied from the group file to
	the group file in the FTP area.  This patch based on a patch
	from Zak Johnson <zakj at nox dot cx>.
2006-01-20 13:00:32 +00:00
Vasil Dimov df786808eb Add myself to the calendar
Approved by:	garga (mentor)
2006-01-20 12:57:58 +00:00
Pyun YongHyeon 035a04c894 MFC rev. 1.48 to RELENG_6:
Prefer NULL to 0.
  Add missing lock/unlock in sysctl handler.
2006-01-20 07:38:01 +00:00
Pyun YongHyeon f73ded31c3 MFC if_hme.c:1.46 to RELENG_6:
fix Rx checksum computation on little endian systems.
2006-01-20 06:27:49 +00:00
Ariff Abdullah 3d26eca315 MFC:
- Workaround for sb16 behave poorly when running at 45000 hz while
    vchan is enabled.
    Ruthless vchan speed workaround against the dreaded sb16 / sb16x.
    It appear that nothing else using this weird 45k / 49k speed upper
    limit.
  - Raise VCHAN_DEFAULT_SPEED from 44100 to 48000.

Reported by:	many sb16, AWE64 users.
2006-01-20 03:55:58 +00:00
Christian Brueffer 7f95dbda58 MFC: rev. 1.26 + 1.27
Mention the fire screensaver.
2006-01-19 22:14:20 +00:00
Gleb Smirnoff f2b1815e51 Sync driver with HEAD merging all revisions from 1.96 to 1.115. The most
markable changes are:

 o Suspend/resume methods.
 o Link state detection fixes.
 o Utilization of jumbo allocator and extended RX descriptors.
 o busdma(9) cleanup and support for big-endian architectures.
 o Improved checksum offloading support.
 o Reduced number of PCI register writes in bge_start().
 o Counting RX/TX errors as input/output interface errors.
2006-01-19 13:36:26 +00:00
Ariff Abdullah ed6318ce51 Fix broken capabilites. There are possible calculation errors within
ess_calcspeed8() and ess_calcspeed9() that need to be fixed as well
(TODO).

Reported by:	[1] Claude Buisson <cbuisson at nerim.net>

[1] http://lists.freebsd.org/pipermail/freebsd-multimedia/2006-January/003566.html
2006-01-19 01:17:00 +00:00
Andrew Thompson 5143253c67 MFC r1.148:
Include the bridge interface itself in the special arp handling.
2006-01-19 00:38:00 +00:00
Andrew Thompson aa19621375 MFC: if_bridge.c, r1.50; if_bridgevar.h, r1.10
Clear IFCAP_TXCSUM from member interfaces while bridging.
2006-01-18 20:49:21 +00:00
Andre Oppermann a547ffa2c9 MFC jumbo mbuf cluster allocation API providing 4k, 9k and 16k clusters:
struct mbuf *m_getjcl(int how, short type, int flags, int size)
 void *m_cljget(struct mbuf *m, int how, int size)

For size both take MCLBYTES, MJUM4BYTES, MJUM9BYTES, MJUM16BYTES.

Tested by:	glebius
Sponsored by:	TCP/IP Optimization Fundraise 2005
2006-01-18 13:24:24 +00:00
Gleb Smirnoff 2b685ef59d Check ifp before dereferencing it in xl_detach(). xl_detach() can be called
from xl_attach(), when ifp is not defined yet.

Found with:	Coverity Prevent(tm)
2006-01-18 09:42:21 +00:00
Simon L. B. Nielsen 33b13c6e08 Add FreeBSD-SA-06:05.80211. 2006-01-18 09:20:22 +00:00
Colin Percival 1358f48f81 Correct a buffer overflow when scanning for 802.11 wireless networks.
Security:	FreeBSD-SA-06:05.80211
2006-01-18 09:03:15 +00:00
Ariff Abdullah 2d7c770cbc MFC:
- Locking fixes. Release lock while chn_intr().
  - Mark MPSAFE since most of the locking procedures already implemented.
  - Turn on inverted external amplifier sense flag for selected boards.

Tested by:	bland
2006-01-18 01:05:34 +00:00
Joseph Koshy cbfb2e7516 MFC r1.9: xref da(4) and sa(4). 2006-01-17 15:26:28 +00:00
Max Laier 6fd307aebc MFC: pf_norm.c, 1.15:
Move m_adj after checking that m_dup succeeded.

    Found with:	Coverity Prevent(tm)
2006-01-17 13:05:32 +00:00
Simon L. B. Nielsen 83d7b14914 - Add FreeBSD-SA-06:0[1234].
- Bump copyright year.
2006-01-17 13:00:31 +00:00
Pawel Jakub Dawidek 36e78712c3 MFC: Sync with HEAD. 2006-01-17 11:49:09 +00:00
Pawel Jakub Dawidek 171cb44e5c MFC: sys/kern/kern_malloc.c 1.150
In realloc(9), determine size of the original block based on
UMA_SLAB_MALLOC flag.
In some circumstances (I observed it when I was doing a lot of reallocs)
UMA_SLAB_MALLOC can be set even if us_keg != NULL.

If this is the case we have wonderful, silent data corruption, because less
data is copied to the newly allocated region than should be.
2006-01-17 10:19:37 +00:00
Pawel Jakub Dawidek 4f7cb4ef49 MFC: sys/kern/kern_malloc.c 1.149
Detect memory leaks when memory type is being destroyed.
This is very helpful for detecting kernel modules memory leaks on unload.
2006-01-17 10:17:37 +00:00
Pawel Jakub Dawidek bc6114a919 MFC: Sync with HEAD. 2006-01-17 09:28:57 +00:00
Pawel Jakub Dawidek d59c613687 MFC: Sync with HEAD. 2006-01-17 09:11:30 +00:00
Pawel Jakub Dawidek 9e5ad6f9e8 MFC: Sync with HEAD. 2006-01-17 08:59:55 +00:00
Doug Barton a783159eff MFC 1.8 - bring into conformance with rc.d standards
MFC 1.9 - Use hw.machine_arch instead of hw.machine
2006-01-17 07:12:38 +00:00
Doug Barton 99d50046c2 MFC 1.279, use NETWORKING for early_late_divider in a jail 2006-01-17 07:04:31 +00:00
Doug Barton 6d4e48c27e MFC rc.conf 1.269 and rc.conf.5 1.275 - clear_tmp_X variable,
to support the cleanup of etc/rc.d/cleartmp
2006-01-17 07:02:04 +00:00
Doug Barton 197008f9f7 MFC mechanism to include files added by ports which contain
names of directories to include in the base ldconfig script.

Bump __FreeBSD_version to recognize this change
2006-01-17 06:53:18 +00:00
Doug Barton 94c29d6842 MFC newsyslog 1.5, syslogd 1.11 - Swap REQUIRE and BEFORE 2006-01-17 06:46:54 +00:00
Doug Barton 7a36228e91 MFC ntpd 1.12 and ntpdate 1.14 - use of REQUIRE rather than BEFORE,
MFC ntpd 1.12 - REQUIRE devfs to help users with serial GPS interfaces
MFC ntpdate 1.15 - REQUIRE named
2006-01-17 06:45:05 +00:00
Doug Barton 15edab623d MFC changes to have these scripts follow proper rc.d syntax
PR:		conf/84574
Submitted by:	Alexander Botero-Lowry
2006-01-17 06:37:48 +00:00
Ariff Abdullah 8d53edfd9c MFC: Add another inverted EAPD quirk for Gateway 7326GZ.
Tested by:	Jeff Cross <jeff.cross at averageadmins.com>
2006-01-17 05:13:37 +00:00
Florent Thoumie b88e46b8ff MFC:
Enable NO_GETMAXLUN quirk.

      src/sys/dev/usb/umass.c: rev 1.127 -> 1.128

PR:		usb/81073
Submitted by:	James E. Flemer <[email protected]>
2006-01-16 22:34:20 +00:00
Florent Thoumie bfbedc5de6 MFC:
Add -K option to pkg_add and pkg_info.
  This option saves packages to PKGDIR (if defined or current directory by default)
  as they are downloaded.
  Silent a warning when -n is used and package has a +DISPLAY file.

      src/usr.sbin/pkg_install/info/perform.c: rev 1.53 -> 1.54
      src/usr.sbin/pkg_install/add/main.c: rev 1.65 -> 1.66
      src/usr.sbin/pkg_install/lib/lib.h: rev 1.56 -> 1.57
      src/usr.sbin/pkg_install/info/pkg_info.1: rev 1.55 -> 1.56
      src/usr.sbin/pkg_install/add/add.h: rev 1.12 -> 1.13
      src/usr.sbin/pkg_install/add/pkg_add.1: rev 1.68 -> 1.69
      src/usr.sbin/pkg_install/add/perform.c: rev 1.78 -> 1.79
      src/usr.sbin/pkg_install/info/info.h: rev 1.28 -> 1.29
      src/usr.sbin/pkg_install/lib/url.c: rev 1.4 -> 1.5
      src/usr.sbin/pkg_install/info/main.c: rev 1.48 -> 1.49
2006-01-16 19:51:41 +00:00
Bruno Ducrot 7620e7b9d6 MFC 1.4: fix bst.status and bst.rate to display correct informations.
Approved by:	njl
2006-01-16 09:13:53 +00:00
David Xu 77628c6dcf MFC revision 1.40:
Add a new feature to thr_kill, if thread ID argument is -1, send
	signals to all threads except current sender.
2006-01-16 06:25:32 +00:00
David Xu 50d0f380eb MFC following revisions:
sys/umtx.h		revision 1.17
	kern/kern_umtx.c	revision 1.34
	kern/kern_thr.c		revision 1.36

	call kern_umtx_wake on thread exit.
2006-01-16 05:48:40 +00:00
David Xu aea0220d8f MFC:
Sync with HEAD.
2006-01-16 05:36:30 +00:00
Ariff Abdullah f270dd260b MFC: Joyport blacklist. Either we're facing with broken hardware
or because this hardware need special (unknown) initialization
     procedures.

Reported by:    [1] Rob Clark <vx2 at tds.net>

[1] http://lists.freebsd.org/pipermail/freebsd-multimedia/2006-January/003535.html
2006-01-16 02:08:56 +00:00
cvs2svn d0595c8f44 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-01-15 17:50:39 +00:00
Xin LI 6d94903ba0 MFC pidfile(3) function, and convert several applications to make use
of it.

Bump __FreeBSDversion for the MFC.

Discussed with:	pjd
2006-01-15 17:50:38 +00:00
Gleb Smirnoff 6b37779ee4 MFC 1.183:
Forget about ipfw1 and ipfw2. We aren't in RELENG_4 anymore.
2006-01-15 01:05:21 +00:00
Gleb Smirnoff 4f2b862cb4 MFC:
Add a new feature for optimizining ipfw rulesets - substitution of the
  action argument with the value obtained from table lookup. The feature
  is now applicable only to "pipe", "queue", "divert", "tee", "netgraph"
  and "ngtee" rules.
2006-01-15 01:00:55 +00:00
Gleb Smirnoff ac8cf7035d MFC 1.118:
Optimize parallel processing of ipfw(4) rulesets eliminating the locking
  of the radix lookup tables. Since several rnh_lookup() can run in
  parallel on the same table, we can piggyback on the shared locking
  provided by ipfw(4).
    However, the single entry cache in the ip_fw_table can't be used lockless,
  so it is removed. This pessimizes two cases: processing of bursts of similar
  packets and matching one packet against the same table several times during
  one ipfw_chk() lookup. To optimize the processing of similar packet bursts
  administrator should use stateful firewall. To optimize the second problem
  a solution will be provided soon.

  Details:
    o Since we piggyback on the ipfw(4) locking, and the latter is per-chain,
      the tables are moved from the global declaration to the
      struct ip_fw_chain.
    o The struct ip_fw_table is shrunk to one entry and thus vanished.
    o All table manipulating functions are extended to accept the struct
      ip_fw_chain * argument.
    o All table modifing functions use IPFW_WLOCK_ASSERT().
2006-01-15 00:55:04 +00:00
Gleb Smirnoff 1306413d7a Cleanup _FreeBSD_version. 2006-01-15 00:52:15 +00:00
Gleb Smirnoff 4abea8003b MFC:
Catch up with ip_dummynet.h rev. 1.38.
2006-01-15 00:51:02 +00:00
Gleb Smirnoff fd74158271 MFC:
First step in removing welding between ipfw(4) and dummynet.

  o Do not use ipfw_insn_pipe->pipe_ptr in locate_flowset(). The
    _ipfw_insn_pipe isn't touched by this commit to preserve ABI
    compatibility.
  o To optimize the lookup of the pipe/flowset in locate_flowset()
    introduce hashes for pipes and queues:
    - To preserve ABI compatibility utilize the place of global list
      pointer for SLIST_ENTRY.
    - Introduce locate_flowset(queue nr) and locate_pipe(pipe nr).
  o Rework all the dummynet code to deal with the hashes, not global
    lists. Also did some style(9) changes in the code blocks that were
    touched by this sweep:
    - Be conservative about flowset and pipe variable names on stack,
      use "fs" and "pipe" everywhere.
    - Cleanup whitespaces.
    - Sort variables.
    - Give variables more meaningful names.
    - Uppercase and dots in comments.
    - ENOMEM when malloc(9) failed.
2006-01-15 00:46:17 +00:00
Gleb Smirnoff 874c6dcf19 Fix build. 2006-01-15 00:20:31 +00:00
Xin LI 295cfaf9d7 MFC revision 1.185
date: 2005/12/16 18:32:39;  author: delphij;  state: Exp;  lines: +2 -0
In pipe_write(): when uiomove() fails, do not spin on it forever.

Submitted by:   Kostik Belousov <kostikbel at gmail.com> on -current@
Message-ID:     <[email protected]>
Security:	Local DoS
2006-01-14 19:57:48 +00:00
Alexander Leidinger ce91719c5c MFC r1.12:
Emit USB_EVENT_DRIVER_DETACH on detach.

  PR:             83247
  Submitted by:   Sangwoo Shim <[email protected]>
2006-01-14 14:21:59 +00:00
Alexander Leidinger 2a0fa76421 MFC bktr_card.c 1.35, bktr_card.h 1.12, bktr_tuner.c 1.20, bktr_tuner.h 1.7:
Add some cards:
   - several TerraTec TValue [1]
   - PixelView PlayTV Pro REV-4C [2]

  In case you have the PixelView card, please tell us the "pciconf -v -l"
  output on [email protected] if it works. There are revisions out there
  which may not work and we need to know which ones work.

  PR:             53383 [1], 76002 [2]
  Submitted by:   Tanja Wittke <[email protected]> [1], barner [1],
                  Dan Angelescu <[email protected]> [2]
2006-01-14 14:18:34 +00:00
Pav Lucistnik 74caa91f3f MFC 1.34: mention the size of the additional header 2006-01-14 12:13:04 +00:00
Doug Barton 41ecb87b06 MFC import of BIND 9.3.2 2006-01-14 10:13:50 +00:00
Gleb Smirnoff 958288d021 - Restore VLAN_INPUT_TAG() macro to preserve API compatibility for
third party drivers.
- Fix bugs destribed in previous revision using macro with
  another name.
2006-01-14 10:05:07 +00:00
Joel Dahl 14d48db34c MFC r1.1343: Fix minor sorting issue. 2006-01-14 10:00:13 +00:00
Doug Barton 46d71b0707 These files are only relevant in HEAD, where the imports are done. 2006-01-14 06:13:17 +00:00
Tor Egge a8cdaa5a2c MFC: Add marker vnodes to ensure that all vnodes associated with the mount
point are iterated over when using MNT_VNODE_FOREACH.
2006-01-14 01:18:03 +00:00
Tor Egge dd64c3652b MFC: Close race where wakeup after background write could be lost. 2006-01-14 01:09:10 +00:00
Tor Egge a392d54ab1 MFC: Broaden scope of softdep_worklist_busy rwlock protection. 2006-01-14 01:07:14 +00:00
Tor Egge c690b3dae5 MFC: Obtain mount point lock before restarting sync loop if vget() failed. 2006-01-14 01:05:22 +00:00
Ariff Abdullah 721ffd7f49 MFC: Fix broken playback capabilities to prevent impending disaster.
The minimum / maximum speed was way too low / high!

     minspeed =   2000 - is this for real ?
     maxspeed = 767999 - is this for real ?????

     Wrap everything into 8000 - 48000 boundary, just to be safe.
2006-01-14 00:35:18 +00:00
Pav Lucistnik a6b7a32df9 MFC 1.74: xref mount_reiserfs(8) 2006-01-13 20:05:59 +00:00
Pav Lucistnik d151b42163 MFC 1.16: fix: documentation for -m option was inserted halfway thru the text
of -l option.
2006-01-13 20:02:56 +00:00
John Baldwin c2d0909d45 MFC: Fix description of si2 firmware and update the si3 firmware to the
latest version in the SDK.
2006-01-13 19:27:35 +00:00
John Baldwin 8ec67ba0ed MFC: Fix /dev entries for cards with multiple modules. 2006-01-13 19:26:08 +00:00
Gleb Smirnoff 4f29a1a7ad - Restore VLAN_INPUT_TAG() macro to preserve API compatibility for
third party drivers.
- Fix bugs destribed in previous revision using macro with
  another name.
2006-01-13 19:21:45 +00:00
Joel Dahl cdc49e4f6d MFC: Remove references to snd_vortex1(4). 2006-01-13 14:56:51 +00:00
Gleb Smirnoff 320551f33b MFC:
- Use VLAN_TAG_VALUE() not only to read a dot1q tag
    value from an m_tag, but also to set it.  This reduces
    complex code duplication and improves its readability.
  - Fix VLAN_INPUT_TAG() macro, so that it doesn't touch mtag in
    case if memory allocation failed.
  - Remove fourth argument from VLAN_INPUT_TAG(), that was used
    incorrectly in almost all drivers. Indicate failure with
    mbuf value of NULL.
2006-01-13 11:51:11 +00:00
Robert Watson 2c6192958c MFC smb_dev.c:1.29 from HEAD to RELENG_6:
Prevent module unloading if there are active connections.

   PR:             kern/89085
   Submitted by:   Rostislav Krasny

Requested by:	Rostislav Krasny <rosti dot bsd at gmail dot com>
2006-01-13 10:23:39 +00:00
Dag-Erling Smørgrav dd0f9530de MFC: (1.76) reflect progress in proctitle (1.77) fix mirror mode 2006-01-13 09:07:49 +00:00
Ariff Abdullah a186d3b2ad MFC: Another major fixes and enhancements:
- MPSAFE
     - Fix / reorganize attach routine. Device specific initialization must
       be done after generic bus / DMA setup. At last, Virtual Channels
       (vchan) works as expected.

Tested by:	barner
2006-01-13 05:24:41 +00:00
Ariff Abdullah 2077c4f656 MFC: More thorough fixes to enable inverted external amplifier sense flag.
Instead of dragging the entire ICH4/82801DB into this mess, select
     only few boards based on pci subdevice / subvendor.

Tested by:	Daisuke Orikasa <luxury-acura-3.5rl at nifty.com>
2006-01-13 04:26:48 +00:00
Marcel Moolenaar dbda5a1d17 MFC rev 1.20: Fix FD_ISSET() on LP64 platforms.
PR: ia64/91421
Submitted by: Tanaka Akira (akr at m17n dot org)
2006-01-13 03:11:16 +00:00
Colin Percival ffea914d53 MFC:
Make "portsnap extract" automatically create ${PORTSDIR} if necessary
  instead of complaining that "Directory does not exist or is not
  writable".
2006-01-13 00:53:53 +00:00
Ruslan Ermilov ea37399d45 MFC: Present new BSD releases to -mdoc. 2006-01-12 15:44:42 +00:00
Ruslan Ermilov 2dac19bc5a MFC: 1.3: Remove public declaration of static. 2006-01-12 10:35:24 +00:00
Ruslan Ermilov 37c698d923 MFC: Fix creation of smb devices. 2006-01-12 10:34:38 +00:00
Maxim Konovalov 8a316059fc MFC rev. 1.70: deal with the overridden SIGCHLD handler. 2006-01-12 05:24:46 +00:00
Florent Thoumie 81f073235e MFC:
Fix -r causing SIGSEGV due to parse_args() being called before font_current is set.

      src/usr.sbin/kbdmap/kbdmap.c: rev 1.4
2006-01-12 01:26:34 +00:00
Gleb Smirnoff 237f9c0a5d Merge rev. 1.130 that I though was merged long time ago. Thanks to emaste
for noticing this.

  Drop current rtentry lock before calling rt_getifa(). This fixes a LOR
  and a possible recursive use of rtentry mutex.
2006-01-12 00:22:12 +00:00
cvs2svn 67f61c5faf This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-01-11 20:27:24 +00:00
Jean-Sébastien Pédron 77671e3889 MFC:
src/sys/dev/atkbdc/psm.c; revision 1.88
  date: 2006/01/05 19:24:01;  author: dumbbell;  state: Exp;  lines: +2 -1

  Fix a bug in Synaptics Touchapd support where psm(4) will enter an infinite
  loop if it receives an out of sync packet.

  Reviewed by:	mux (mentor)
2006-01-11 20:27:23 +00:00
Xin LI b6671d5fbd MFC revision 1.131
date: 2005/12/13 15:32:52;  author: delphij;  state: Exp;  lines: +5 -5
In Linux, kernel parameters passed to ioctl are by value, while in FreeBSD
they are passed by reference.  Handle the difference within the
linux_ioctl_termio on the LINUX_TCFLSH path.

Submitted by:   Jaroslav Drzik <jaro_AT_coop-voz_dot_sk>
Reminded by:	glebius
2006-01-11 15:40:00 +00:00
Pav Lucistnik d7413c7997 MFC 1.28: fix timeouted probes in pretty print of multipath routes 2006-01-11 12:59:39 +00:00
Robert Watson e43ff577ba MFC devfs_rule.c:1.21 from HEAD to RELENG_6:
When returning EIO from DEVFSIO_RADD ioctl, drop the exclusive rule
  lock.  Otherwise the system comes to a rather sudden and grinding
  halt.

As the underlying devfs locking changes that lead to this bug have not
been merged to RELENG_5, this fix to those locking changes does not
need to be merged.
2006-01-11 10:15:57 +00:00
Colin Percival b4200e38a8 Correct insecure temporary file usage in texindex. [06:01]
Correct insecure temporary file usage in ee. [06:02]
Correct a race condition when setting file permissions, sanitize file
names by default, and fix a buffer overflow when handling files
larger than 4GB in cpio. [06:03]
Fix an error in the handling of IP fragments in ipfw which can cause
a kernel panic. [06:04]

Security:	FreeBSD-SA-06:01.texindex
Security:	FreeBSD-SA-06:02.ee
Security:	FreeBSD-SA-06:03.cpio
Security:	FreeBSD-SA-06:04.ipfw
2006-01-11 08:02:16 +00:00
Brooks Davis 4e69eb9ac7 MFC revs 1.27 and 1.28.
1.27: don't crash when given an invalid nwkey string
 1.28: parse SSIDs correctly and bail immediatly when invalid

PR:		misc/88159, bin/74509
2006-01-11 05:56:02 +00:00
Florent Thoumie 8928f0e71c MFC:
- Add an entry for Acer Acerscan 1240U.

      src/share/man/man4/uscanner.4: rev 1.21
2006-01-11 00:37:32 +00:00
Florent Thoumie 32de811b91 MFC:
Add Product ID for Acerscan 1240u and the corresponding entry in uscanner.c.

      src/sys/dev/usb/usbdevs: rev 1.247
      src/sys/dev/usb/uscanner.c: rev 1.67
2006-01-11 00:29:16 +00:00
Kirill Ponomarev bc6c125d4e MFC: add/extract.c:1.44 create/perform.c:1.82 create/pkg_create.1:1.70 create/pl.c:1.28
info/show.c:1.40 lib/plist.c:1.51

  date: 2006/01/07 22:10:57;  author: krion;  state: Exp;  lines: +10 -3
  When using @cwd %%FOO%%, we must ensure to return in the original
  prefix later, but doing so with @cwd %%OLDPREFIX%% (having
  PLIST_SUB+="OLDPREFIX=${PREFIX}") hardcodes the value in the packing
  list. That's not really a problem when dealing with ports but that's
  a problem with packages since pkg_add -p option only overrides the
  first @cwd occurrence.

  This patch allow us to use @cwd without any argument. If no
  directory argument is given, it will set current working directory
  to the first prefix given by the @cwd command.

  PR:             bin/77212
  Submitted by:   flz
2006-01-10 22:17:08 +00:00
John Baldwin 61b0c3831a MFC: Fix a couple of issues with the ibcs2 module event handler. 2006-01-10 21:44:58 +00:00
John Baldwin 28fcc41477 MFC: Fix issues with various Compaq boxes such as some DL360s (and possibly
some DL380s):
- Release the pci_link acpi serial lock if a link device has no actual
  links.
- Don't panic if a _PRT entry references an invalid link on a link device
  unless we actually try to route an interrupt using that _PRT entry.
2006-01-10 21:37:18 +00:00
Wilko Bulte c365b0c69e MFC: add geom_fox.4 2006-01-10 18:08:55 +00:00
Gleb Smirnoff 0cddddf414 MFC:
Check for IFF_DRV_RUNNING in the interrupt loop.

  Reported & tested by:   Martin P. Hansen <mph lima.dyndns.dk>
2006-01-10 10:24:05 +00:00
Gleb Smirnoff ff0e303023 MFC 1.11:
In ng_netflow_disconnect() check whether we are working with "iface"
  or with "out" hook, and clear the right pointer.

  Reported by:    Vitaliy Ovsyannikov <V.Ovsyannikov kr.ru>
2006-01-10 10:22:22 +00:00
Gleb Smirnoff e9c8a6af77 MFC 1.55:
When in rev. 1.47 cardbus_alloc_resources() function was moved from
  cardbus_cis.c to this file, some code was not merged and thus resource
  list entries were invalid. They didn't have a resources attached to
  them.
    However, the problem was masked for some time later, because newer
  resources list entries were added to the head of the list, and
  resource_list_find() always returned the first matching resource list
  entry. Usually the underlying driver allocated a valid resource and
  added it to the head of the list, and invalid one wasn't used.
    In rev. 1.174 of subr_bus.c the sorting of resource list entries was
  reversed demasking the problem in cardbus_alloc_resources().
    This commit fixes the problem returning back some code from
  cardbus_cis.c, pre-1.49 revisions.

  PR:                     kern/87114
  PR:                     kern/90441
  Hardware provided by:   Vasily Olekhov <olekhov yandex.ru>
  Reviewed by:            imp
2006-01-10 10:17:56 +00:00
Gleb Smirnoff bd1124a46d MFC 1.62:
Add \n to log() message.
2006-01-10 10:13:43 +00:00
Gleb Smirnoff 39c686cfdf MFC:
Implement an upper limit for packets per second sent by node.
2006-01-10 10:11:48 +00:00
Gleb Smirnoff b2b90263e2 MFC 1.93 - 1.97, fixing suspend/resume on some laptops.
PR:		kern/89825
2006-01-10 10:09:03 +00:00
Joel Dahl 9a8bc86c08 MFC r1.9:
Kill empty line.
2006-01-10 08:25:15 +00:00
Yoshihiro Takahashi f9752fe13f MFC: revision 1.56
- Add EXTDOCDIR and EXTPORTSDIR.
2006-01-10 03:48:42 +00:00
Yoshihiro Takahashi 666822f254 MFC: revision 1.894 and 1.895
- Request boot floppy after loading mfsroot floppy.
 - Add EXTPORTSDIR.
2006-01-10 03:47:27 +00:00
Ariff Abdullah 532c603474 MFC: Fix obvious capabilities (rate) violation. Should be 5500, not 4000. 2006-01-10 01:01:24 +00:00
Maxim Sobolev a816be8835 MFC: allow execution of ET_DYN elf binaries (aka shared libraries) when
emulating architectures that allow this (Linux so far).

To preserve kernel modules ABI, unlike the version commited into the trunk,
which adds new flag field into Brandinfo structure for this purpose, this
one checks if brand field of Brandinfo matches ELFOSABI_LINUX.

PR:		kern/87615
Submitted by:	Marcin Koziej <[email protected]>
2006-01-10 00:52:07 +00:00
Stefan Farfeleder 88f4abd991 MFC: refresh.c 1.11: A refresh bug.
editline.3 1.26-1.29: Man page update and cleanup.
     editrc.5: 1.19: Man page cleanup.
2006-01-09 15:14:57 +00:00
Joel Dahl 9f8b9bb760 MFC:
snd_ad1816.4    1.5-1.6
snd_als4000.4   1.5-1.7
snd_cmi.4       1.6-1.7
snd_cs4281.4    1.5-1.6
snd_csa.4       1.15
snd_ds1.4       1.5-1.6
snd_emu10k1.4   1.7-1.8
snd_ess.4       1.6-1.7
snd_fm801.4     1.2-1.3
snd_gusc.4      1.13
snd_ich.4       1.7-1.8
snd_maestro.4   1.3
snd_maestro3.4  1.8
snd_neomagic.4  1.4-1.5
snd_sbc.4       1.16
snd_solo.4      1.5
snd_t4dwave.4   1.2-1.3
snd_uaudio.4    1.6
snd_via8233.4   1.3-1.4
snd_via82c686.4 1.2-1.3
snd_vibes.4     1.2-1.3
2006-01-09 12:48:39 +00:00
Ariff Abdullah 772e80024d MFC: Add codec id support for Analog Device AD1986 AC'97 codec.
Submitted by:	UMENO Takashi <umeno at rr.iij4u.or.jp>
PR:		kern/80234
2006-01-09 02:06:42 +00:00
Ariff Abdullah 75e2c94c7d MFC: Fix locking violation, causing frantic diagnostic messages during boot.
Reported by:	[1] julian

[1] http://lists.freebsd.org/pipermail/freebsd-multimedia/2006-January/003408.html
2006-01-09 02:06:17 +00:00
Maxim Konovalov f74826009b MFC rev. 1.41: typo fix. 2006-01-08 20:28:48 +00:00
Maxim Konovalov d5d5977fe8 MFC rev. 1.8: typo fix. 2006-01-08 20:25:24 +00:00
Ralf S. Engelschall c3e9f739d4 MFC r1.13:
1. Add missing semicolon between "warn" and "return" to make sure
   the line continuation backslash doesn't cause "warn" to print "return".
2. Group "warn" and "return" together as the "return 1" should be
   performed only if the "kldload nfsclient" also failed (and not
   already if the "vfs.nfs" sysctl(8) check failed).
2006-01-08 09:21:53 +00:00
Ralf S. Engelschall 0e1c5056a8 MFC r1.16:
Remove superfluous line continuation backslash.
2006-01-08 09:20:47 +00:00
Ralf S. Engelschall 5f9b8b2251 MFC r1.276:
Fix semantics in the documentation of the "jail_socket_unixiproute_only"
variable ("YES" vs. "NO") and be more precise and intuitive on what is
actually allowed/restricted by this variable ("UNIX/IP/route sockets"
vs. "TCP/IP protocols").
2006-01-08 09:17:03 +00:00
Alexander Leidinger 5b869e5c0f MFC:
The ObsoleteFiles removal/test targets
	  - check-old
	  - delete-old
	  - delete-old-libs
	and the corresponding docs.

Note:	Someone may want to have a look at the man-page and perhaps MFC
	some other parts (unrelated to ObsoleteFiles).

Tested by:	bz
2006-01-07 19:40:08 +00:00
Ceri Davies ac40ea2297 MFC revision 1.82:
inetd(8) requires that /etc/netconfig be present, and contain entries
  for each of udp and tcp (and their IPv6 equivalents when INET6 is
  enabled).  Note that dependency here.

  PR:             docs/90435
  Submitted by:   Dmitry Kazarov <kazarov at mcm dot ru>
  Pointed out by: Daniel Gerzo <danger at rulez dot sk>
2006-01-07 13:57:58 +00:00
David Xu f498fc72fc MFC following revisions:
kern_sig.c	revision 1.319
	sys_process.c	revision 1.134

	Avoid kernel panic when attaching a process which
	may not be stopped by debugger, e.g process is dumping core.
2006-01-07 11:53:49 +00:00
Ceri Davies 5a9123d0fd MFC revision 1.364:
An i386 machine with 32MB of RAM requires a 700MB disk for auto-layout to
  succeed, whilst an i386 with 256MB of RAM requires more.  Up the amount
  of disk hinted at as a minimum requisite for auto-layout.
2006-01-06 20:10:41 +00:00
cvs2svn 9f1d0acc8a This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-01-06 20:02:45 +00:00
Don Lewis 9920bb2a19 Diff reduction to HEAD:
Call fill_kinfo_proc_only() instead of fill_kinfo_proc()
        before calling fill_kinfo_thread(), because fill_kinfo_proc()
        calls both fill_kinfo_proc_only() and fill_kinfo_thread().
        This is a minor optimization and there should be no change
        in functionality.

        Leading whitespace cleanup.
2006-01-05 20:23:10 +00:00
Jean-Sébastien Pédron ec34cf55e2 MFC:
revision 1.2
  Don't hold a reference to the disk vnode for each inode.

Reviewed by:	mux (mentor)
2006-01-05 19:37:39 +00:00
Florent Thoumie 5403b76cc3 MFC:
Add a hid blacklist quirk.

      src/sys/dev/usb/usbdevs: rev 1.240
      src/sys/dev/usb/usb_quirks.c: rev 1.45
      src/sys/dev/usb/uhid.c: rev 1.78
      src/sys/dev/usb/usb_quirks.h: rev 1.20

Approved by:	pjd
2006-01-05 16:46:10 +00:00
Kelly Yancey 0fb2d11079 MFC:
kbyanc      2005-12-28 20:36:55 UTC

      FreeBSD src repository

      Modified files:
        usr.bin/netstat      Makefile ipsec.c main.c netstat.h
      Added files:
        usr.bin/netstat      pfkey.c
      Log:
      Add support for printing IPSEC protocol stats if the kernel was
      compiled with FAST_IPSEC rather than the KAME IPSEC stack.

    Note that the output of "netstat -s -p ipsec" differs depending on
    which stack is compiled into the kernel since they each keep different
    stats.  This delta also adds the "esp", "ah", and "ipcomp" protocol
    stats, which are also available when the kernel is compiled with the
    FAST_IPSEC stack (e.g. "netstat -s -p esp").

      Submitted by:   Matt Titus <titus at nttmcl dot com>

      Revision  Changes    Path
      1.31      +2 -1      src/usr.bin/netstat/Makefile
      1.13      +266 -94   src/usr.bin/netstat/ipsec.c
      1.81      +29 -0     src/usr.bin/netstat/main.c
      1.47      +6 -0      src/usr.bin/netstat/netstat.h
      1.1       +184 -0    src/usr.bin/netstat/pfkey.c (new)
2006-01-05 03:47:24 +00:00
Joseph Koshy d4a5fb0716 MFC r1.1340: "Refer readers to the hwpmc(4) manual page where the additional
architecture specific kernel configuration options needed for
 hwpmc are documented."
2006-01-05 03:05:38 +00:00
Ariff Abdullah f6e3588db0 MFC: Fix broken capabilities, causing failure during channel reset.
Its min/max speed were off by -/+ 1000.

Reported by:	[1] Ion-Mihai Tetcu <[email protected]>
            	[2] barner

[1] http://lists.freebsd.org/mailman/htdig/freebsd-multimedia/2005-December/003189.html
[2] http://lists.freebsd.org/mailman/htdig/freebsd-multimedia/2006-January/003422.html
2006-01-05 00:29:20 +00:00
Sam Leffler 82ca259882 parse nmount options enough to use a current mount binary; this
allows people to boot releng_6 kernels with a current user install
(for now at least)

Reviewed by:	rodrigc
2006-01-04 22:18:10 +00:00
Don Lewis 2dea14ca77 MFC cd9660_lookup.c 1.42
Original commit message:
  Log:
  Apply the same fix to a potential race in the ISDOTDOT code in
  cd9660_lookup() that was used to fix an actual race in ufs_lookup.c:1.78.
  This is not currently a hazard, but the bug would be activated by
  marking cd9660 as MPSAFE.

  Requested by:   bde
2006-01-04 19:35:24 +00:00
Don Lewis bb86a98516 MFC ext2_lookup.c 1.51
Original commit message:
  Log:
  Apply the same fix to a potential race in the ISDOTDOT code in
  ext2_lookup() that was used to fix an actual race in ufs_lookup.c:1.78.
  This is not currently a hazard, but the bug would be activated by
  marking ext2fs as MPSAFE.

  Requested by:   bde
  MFC after:      2 weeks
2006-01-04 19:32:00 +00:00
Don Lewis 5696e2601e MFC subr_witness.c 1.198 and 1.200.
Original commit messages:

  Log:
  Track all lock relationships instead of pruning direct relationships
  if an indirect relationship exists (keep both A->B->C and A->C).
  This allows witness_checkorder() to use isitmychild() instead of
  the much more expensive isitmydescendant() to check for valid lock
  ordering.

  Don't do an expensive tree walk to update the w_level values when
  the tree is updated.  Only update the w_level values when using the
  debugger to display the tree.

  Nuke the experimental "witness_watch > 1" mode that only compared
  w_level for the two locks.  This information is no longer maintained
  at run time, and the use of isitmychild() in witness_checkorder
  should bring performance close enough to the acceptable level that
  this hack is not needed.

  Report witness data structure allocation statistics under the
  debug.witness sysctl.

  Reviewed by:    jhb
  MFC after:      30 days

  Log:
  Relocate witness_levelall(), witness_leveldescendents(), and
  witness_displaydescendants() so that they are protected by
  "#ifdef DDB/#endif" to unbreak kernels not using "option DDB".

  MFC after:      3 weeks
2006-01-04 19:27:22 +00:00
Christian Brueffer 811cfaa94d MFC: rev. 1.70
snd_es137x now works on sparc64.
2006-01-04 17:13:18 +00:00
Ariff Abdullah e7989c881e MFC: Fix another xruns counting logic, this time, for recording. 2006-01-04 00:51:01 +00:00
Ariff Abdullah 45dc754c1f MFC:
- Fix possible memory leak due to repetetive strdup(3) without matching
     free(3).
   - print_recsrc() should honor shortflag and give appropriate output for
     later consumption by /etc/rc.d/mixer. This will ensure that recording
     device selections survived across reboot. Output everything to stdout
     instead of stderr.
2006-01-04 00:32:14 +00:00
cvs2svn 9a690c947d This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2006-01-03 21:55:26 +00:00
Andrew Thompson 875ab237a9 MFC: document the net.link.bridge.pfil_onlyip sysctl 2006-01-03 21:55:25 +00:00
Andrew Thompson 74205260c6 MFC: sync code to HEAD
- whitespace
 - add net.link.bridge.pfil_onlyip
 - use time_uptime
2006-01-03 21:47:34 +00:00
John Baldwin b97a889329 MFC: Fix a deadlock in the recently added printf to warn about spin locks
that are not in the static order list.
2006-01-03 20:43:01 +00:00
Ed Maste 3534edd890 MFC kern_clock.c:1.181
In watchdog_config enable the software watchdog iff the WD_ACTIVE flag
  is set.  When watchdogd(1) is terminated intentionally it clears the
  bit, which should then disable it in the kernel.

PR:             kern/74386
Submitted by:   Alex Hoff <ahoff at sandvine dot com>
Approved by:    rwatson (mentor)
2006-01-03 16:43:33 +00:00
Andrew Thompson ccfc206d83 MFC: EtherIP support, adding gif interfaces to bridges. 2006-01-03 08:15:33 +00:00
Pyun YongHyeon 762b693c18 MFC 1.20 to RELENG_6.
Remove "nodevice snd_es137x" as it is supported now.
2006-01-03 06:35:16 +00:00
Ceri Davies 2506be396e MFC r1.111:
Document the pfsync(4) specific maxupd parameter, with text mostly taken
  from OpenBSD's manpage.
2006-01-02 12:53:48 +00:00
Sam Leffler d6a667c824 MFC 1.26: unbreak handling of turboG channels 2006-01-01 22:33:45 +00:00
David Xu 4f0849014a MFC revision 1.236:
Add code to report zombie state.
2006-01-01 08:31:48 +00:00
Christian Brueffer 4e37a92f5e MFC: rev. 1.8 + 1.9
Update list of supported bridges and controllers, use markup similar to
ata.4 to display them and replace an XFree86 xref with Xorg.
2005-12-31 13:55:08 +00:00
Xin LI 4c66b7a03c MFC revision 1.10:
Suggest the user to use 'diff -urN' instead of 'diff -crN'.

Submitted by:	Jimmie James  <[email protected]>
PR:		docs/88427
2005-12-31 05:36:42 +00:00
Ariff Abdullah 2f3e9275a6 MFC: Fix LOR #174.
Tested with:	WITNESS, INVARIANTS and DIAGNOSTICS
2005-12-31 02:03:48 +00:00
Christian Brueffer 3436434ba4 MFC:
Autogenerate hardware notes for snd_mss(4).
2005-12-30 23:07:23 +00:00
Christian Brueffer eb9f315b42 MFC: rev. 1.43 + 1.44
- Xref snd_mss(4).
- Remove a few items from the HARDWARE list.  This support is
  already described in the snd_mss(4) manual page.
- Xref snd_atiixp.4
2005-12-30 23:03:40 +00:00
Christian Brueffer d904dc04f5 MFC:
Add manual page for snd_mss(4) and hook it up to the build.
2005-12-30 22:59:07 +00:00
Marcel Moolenaar 02362a78c3 Bump __FreeBSD_version after MFC of ELF types and constants. 2005-12-30 22:25:15 +00:00
Marcel Moolenaar 46e815f309 MFC standardization of the ELF types and update of the ELF constants:
lib/libc/gen/nlist.c:1.19
	libexec/rtld-elf/rtld.c:1.108
	libexec/rtld-elf/rtld.h:1.36
	libexec/rtld-elf/alpha/reloc.c:1.21
	libexec/rtld-elf/amd64/reloc.c:1.16
	libexec/rtld-elf/ia64/reloc.c:1.16
	libexec/rtld-elf/sparc64/reloc.c:1.11
	share/man/man5/elf.5:1.32-1.33
	sys/alpha/alpha/elf_machdep.c:1.20
	sys/amd64/amd64/elf_machdep.c:1.24
	sys/boot/common/bootstrap.h:1.42
	sys/boot/common/load_elf.c:1.33
	sys/boot/common/load_elf_obj.c:1.2
	sys/boot/common/reloc_elf.c:1.2
	sys/ia64/ia64/elf_machdep.c:1.21
	sys/kern/link_elf.c:1.87
	sys/kern/link_elf_obj.c:1.90
	sys/sparc64/sparc64/elf_machdep.c:1.20
	sys/sys/elf32.h:1.9-1.10
	sys/sys/elf64.h:1.11-1.13
	sys/sys/elf_common.h:1.16
	sys/sys/elf_generic.h:1.7
	sys/sys/imgact_elf.h:1.28
	sys/sys/linker.h:1.40
	usr.bin/elf2aout/elf2aout.c:1.10
	usr.bin/elfdump/elfdump.c:1.13
	usr.sbin/crunch/crunchide/exec_elf32.c:1.15
	usr.sbin/kldxref/ef.c:1.9
	usr.sbin/kldxref/ef.h:1.6
	usr.sbin/kldxref/ef_amd64.c:1.3
	usr.sbin/kldxref/ef_i386.c:1.3
	usr.sbin/kldxref/ef_obj.c:1.4
	usr.sbin/kldxref/ef_powerpc.c:1.3
	usr.sbin/kldxref/ef_sparc64.c:1.4-1.5
2005-12-30 22:13:59 +00:00
Ariff Abdullah 66e1bac242 MFC: Few codec such as Conexant CX20468-21 does have AC97_MIX_BEEP
control register, although the only usable part is the mute bit.

Noticed by:	Hans Petter Selasky <[email protected]>
2005-12-30 20:44:37 +00:00
Alexander Leidinger cfe9a56f94 MFC snd_atiixp entry 2005-12-30 20:35:39 +00:00
Ariff Abdullah 695123428d Should be "snd_atiixp" (without ".c").
Sorry Alex.
2005-12-30 20:33:06 +00:00
Bjoern A. Zeeb 550b33e5d7 MFC:
rev. 1.111 date: 2005/10/11 22:55:16; author: yar  sys/pci/if_sk.c
rev. 1.28  date: 2005/10/11 22:59:01; author: yar  share/man/man4/vlan.4

Mark sk(4) capable of handling extended VLAN frames.

PR: kern/79998
2005-12-30 20:13:46 +00:00
cvs2svn e27c93b86f This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-12-30 19:55:57 +00:00
cvs2svn f2f408770e This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-12-30 19:55:56 +00:00
Alexander Leidinger 17a7bb3ed8 MFC nearly everything of the soundsystem except recent commits and
most of the sysctl's (those which would introduce a new interface).
The spdif_enabled sysctl is still there (or more correctly: added
to another driver).

A rough overview what's there now:
 - new driver for ATI chips (snd_atiixp)
 - support for some Intel HDA chips in AC97 mode (no real HDA
   support!), this doesn't work with every mainboard and is
   subject to the wiring on the mainboard (no servicable parts
   inside)
 - MPSAFE and fixes for snd_als4000(4), snd_es137x(4),
   snd_via82c686(4), snd_via8233(4) and snd_ich(4)
 - 24bit and 32bit sound format support
 - feeder infrastructure (format, rate) has been reworked, new
   feeder (volume) has been introduced
 - lots of LOR and panic issues fixed
 - and a lot of small or not so small fixes I may have forgotten...

As noted in UPDATING: you may want to recompile mplayer (after booting
into the new world) to get all new features.

Tested by:	a lot of people
Requested by:	ariff
Submitted by:	ariff
2005-12-30 19:55:55 +00:00
cvs2svn 2154ae8a7d This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-12-30 16:45:32 +00:00
Max Laier f77ea25054 MFC: pf.c 1.39+1.40 and pfvar.h 1.13+1.14
Move PFSTATE_EXPIRING from sync_flags to a new local_flags.  sync_flags
  has special handling when zero.  This caused no PFSYNC_ACT_DEL message and
  thus disfunction of pfflowd and state synchronisation in general.

  Discovered by:  thompsa
  Good catch by:  thompsa

and

  Only decrement the max-src-conn counter for tcp connections that reached
  "established" state.

  Similar to OpenBSD's rev. 1.499 by joel but not breaking ABI.

  Obtained from:  OpenBSD (with changes)
  Reported by:    Bruno Afonso

ok reyk@
2005-12-30 00:50:18 +00:00
Martin Cracauer b50172a9ab I didn't remember to commit the style-fixes for my previous
commit.
2005-12-29 21:32:06 +00:00
Maxim Sobolev e7e579f23b MFC: provide example of how to make two keyboards working at the same time
using kbdmux(4).
2005-12-29 20:15:27 +00:00
Maxim Sobolev 79ba9a9f0c MFC: mention NTFS support.
Reminded by:	pjd
2005-12-29 17:21:46 +00:00
Paul Saab d7080dc55e MFC: rev 1.67
It seems ciss should ignore overrun and underrun on a SCSI INQUIRY
command.  This fixes some weird booting issues on newer versions
of the firmware on the MSA20.
2005-12-29 08:28:01 +00:00
Maxim Sobolev 02256e4fdf MFC: NTFS label recognition module for geom_label(4). 2005-12-29 06:22:38 +00:00
Maxim Sobolev bf758fa0db MFC: fix logic error which causes <null> to be printed instead of the
actual file name in error message.
2005-12-29 06:04:51 +00:00
Maxim Sobolev 4f921099fe MFC: check for g_read_data(9) errors properly. 2005-12-29 05:59:51 +00:00
Maxim Sobolev fc5ed0b7b6 MFC: kill leading witespace. 2005-12-29 05:34:46 +00:00
Maxim Sobolev 82f2d808a8 MFC: add dummy support for ifmedia subsystem. This allows devd to see cdce as
an ethernet device and configure IP etc.
2005-12-29 05:30:39 +00:00
Maxim Sobolev 3f93bb009d MFC: in the re_shutdown() mark interface as down since otherwise we will panic
if interrupt comes in later on, which can happen in some uncommon cases.
2005-12-29 05:25:40 +00:00
Paul Saab 6df58a1b9b MFC:
- rate limit vnode_pager_putpages printfs to once a second.
- rate limit filesystem full and out of inodes messages to once a
  second.
2005-12-28 20:11:51 +00:00
Paul Saab 396d24f195 regen for 32bit futimes 2005-12-28 19:50:22 +00:00
Paul Saab 380f521727 MFC: 32bit futimes 2005-12-28 19:50:09 +00:00
Paul Saab 70162ef24e Correct white space issues that were introduce in 1.38.2.2. 2005-12-28 19:41:48 +00:00
Paul Saab 26dd389bc9 MFC: rev 1.40
Use the constants for the syscall names from syscall.h rather than
hardcoding the numbers for the SYSVIPC syscalls.
2005-12-28 19:39:55 +00:00
Paul Saab c040aa5255 regen 2005-12-28 19:31:57 +00:00
Paul Saab b895569eb9 MFC: 32bit compat for recvmsg, sendmsg, osigaction, osigprocmask,
osigpending, osigvec, osigblock, osigsetmask, osigsuspend, osigstack,
clock_gettime, clock_settime, and clock_getres.

Also correct the prototype for freebsd32_nanosleep in syscalls.master.
2005-12-28 19:30:41 +00:00
Paul Saab 3f1121442d MFC: rev 1.250
Allow 32bit get/setsockopt with SO_SNDTIMEO or SO_RECVTIMEO to work.
2005-12-28 18:05:13 +00:00
Paul Saab f97d584ab0 MFC: rev 1.150
Calling setrlimit from 32bit apps could potentially increase certain
limits beyond what should be capiable in a 32bit process, so we
must fixup the limits.

This is slightly different than HEAD to not change the ABI.
2005-12-28 17:35:55 +00:00
John Baldwin 15d9df1e3f MFC: Destroy the /dev device before destroying the mutex or
releasing resources.
2005-12-28 16:52:45 +00:00
Gleb Smirnoff 326da582cf MFC 1.251:
When we drop packet due to no space in output interface output queue, also
  increase the ifp->if_snd.ifq_drops.

  PR:             72440
  Submitted by:   ikob
2005-12-28 13:37:25 +00:00
Gleb Smirnoff 819f06bedb MFC:
Add a knob to suppress logging of attempts to modify
  permanent ARP entries.

  Submitted by:   Andrew Alcheyev <buddy telenet.ru>
2005-12-28 13:33:41 +00:00
Maxim Konovalov fc7cc231da MFC rev. 1.99: NetBSD 3.0. 2005-12-28 10:06:28 +00:00
Maxim Konovalov a6bb82f9ec MFC rev. 1.16: kill debug printf(3) leftovers. 2005-12-28 10:01:46 +00:00
Maxim Konovalov a17da79aac o MFC rev. 1.13: typo fix and CMSG_LEN() macro. 2005-12-28 09:58:42 +00:00
Ade Lovett 3ab4aabe0c MFC: 1.171 2005-12-28 08:42:54 +00:00
Andrew Thompson ae988a69f4 MFC r1.39-40, whitespace and M_ZERO fixes 2005-12-28 06:27:52 +00:00
Andrew Thompson 0656a460a7 MFC: Add support for creating span ports
sbin/ifconfig/ifbridge.c	r1.3
 sbin/ifconfig/ifconfig.8	r1.109
 sys/net/if_bridge.c		r1.36, 1.38
 sys/net/if_bridgevar.h		r1.7, 1.8
 sys/net/if_ethersubr.c		r1.210
2005-12-28 04:12:58 +00:00
Christian S.J. Peron 9e753ecc3d MFC bpf stats functionality into netstat 2005-12-27 23:34:13 +00:00
Ruslan Ermilov efbf5a9985 MFC: 1.23: Fix mysterious parallel build failures. 2005-12-27 21:35:40 +00:00
Garrett Wollman 4bced3a091 Merge tzdata2005r from vendor branch. 2005-12-27 19:57:37 +00:00
Xin LI fcab5c08b5 MFC revision 1.5
date: 2005/08/29 15:18:04;  author: yar;  state: Exp;  lines: +1 -1
Unbreak stand-alone build of the de(4) module.

Reported by:	Boris Samorodov <bsam ipt.ru>
Requested by:	Roman V. Palagin  <romanp unshadow.net>
2005-12-27 02:39:44 +00:00
George V. Neville-Neil f4c5ad61e9 MFC of SCTP protocol number. 2005-12-27 00:52:24 +00:00
Pav Lucistnik 4f072dfbdc MFC umass.c 1.126,1.127 and usbdevs 1.239:
- Ignore incorrect CSW signatures on my PURE PocketDAB 2000 player
2005-12-27 00:35:38 +00:00
Remko Lodder 7bbff38cc1 MFC v1.28 by ru:
fix a markup nit.

PR:             docs/88848
Prodded by:     remko
2005-12-26 19:02:53 +00:00
Sam Leffler 1f5ccdeb65 MFC: deftxkey explanation 2005-12-26 18:19:40 +00:00
Stefan Farfeleder 78952251bd MFC:
- Add the times builtin.
- Correctly quoted output of trap.
- Man page updates.
- Cleanup of builtins.def.
2005-12-26 15:43:54 +00:00
Diomidis Spinellis c4978601e8 MFC changes from 2005.10.26:
Move execve's access time update functionality into a
new vfs_mark_atime() function, and use the new function
for performing efficient atime updates in mmap().
2005-12-26 13:47:20 +00:00
David Xu 47b560357b Sync version number with libpthread. 2005-12-26 12:30:53 +00:00
SUZUKI Shinsuke 1b370e0a34 MFC 1.57 (Raw IPv6 checksum must use the protocol number of the last header,
instread of the first next-header value)
2005-12-26 00:59:12 +00:00
Wilko Bulte f0c8029f94 We will not be responsible for damage to equipment, your ego, county wide
power outages, spontaneously generated mini (or larger) black holes,
planetary disruptions, or personal injury or worse that may result from the
use of this material.
                -- taken from Samuel M. Goldwasser's
                   Sam's Strobe FAQ Notes on the Troubleshooting
                   and Repair of Electronic Flash Units and Strobe Lights
2005-12-25 23:29:59 +00:00
Wilko Bulte 996b2fcb2e Add an example for WEP.
OK-ed by: sam
2005-12-25 22:31:54 +00:00
Max Laier 328e5073f8 MFC: ip_carp.c, 1.33
Fix build after in6_joingroup change.  It remains unclear if DAD breaks
  CARP or not.

Unbreaks build after massive netinet6 MFC.
2005-12-25 21:59:20 +00:00
Bjoern A. Zeeb 9edfc63c53 MFC rev. 1.20
Make nve(4) work for people with nf3/nf4 who never got it
working at all and only saw "nve0: device timeout (N)" messages.
- Setup PHY before handing control to NVidia API setting
  speed, duplex, enabling interrupts, etc.
- Add restriction of MAXADDR_32BIT for high address to contigmalloc
  to make the driver work on machines with 4+GB of memory.
2005-12-25 21:57:03 +00:00
Diomidis Spinellis 3e27df44e8 MFC 1.19
Use the appropriate error function for displaying the error,
instead of printing it to stdout.
2005-12-25 16:26:40 +00:00
SUZUKI Shinsuke 56b055e19c MFC: sync with KAME regarding NDP
- introduced fine-grain-timer to manage ND-caches and IPv6 Multicast-Listeners
- supports Router-Preference <draft-ietf-ipv6-router-selection-07.txt>
- better prefix lifetime management
- more spec-comformant DAD advertisement
- updated RFC/internet-draft revisions
- renamed a macro IPV6_DADOUTPUT to IPV6_UNSPECSRC
- plugged a possible memory leak

	share/doc/IMPLEMENTATIONS	Rev.1.9
	sys/netinet/icmp6.h		Rev.1.20
	sys/netinet6/icmp6.c		Rev.1.69
	sys/netinet6/in6.c		Rev.1.57,58
	sys/netinet6/in6.h		Rev.1.41,42
	sys/netinet6/in6_ifattach.c	Rev.1.31
	sys/netinet6/in6_ifattach.h	Rev.1.7
	sys/netinet6/in6_src.c		Rev.1.36
	sys/netinet6/in6_var.h		Rev.1.27
	sys/netinet6/ip6_var.h		Rev.1.36
	sys/netinet6/ip6_output.c	Rev.1.99,100
	sys/netinet6/mld6.c		Rev.1.24,25
	sys/netinet6/mld6_var.h		Rev.1.7
	sys/netinet6/nd6.c		Rev.1.59,61,62
	sys/netinet6/nd6.h		Rev.1.21
	sys/netinet6/nd6_nbr.c		Rev.1.34,37,38,39
	sys/netinet6/nd6_rtr.c		Rev.1.30,31
2005-12-25 14:03:38 +00:00
SUZUKI Shinsuke e85563f7aa MFC: changes malloc type (M_IPMADDR->M_IP6MADDR, M_IPMOPTS->M_IP6MOPTS, M_MRTABL
E->M_MRTABLE6)

 Rev.1.54 in6.c
 Rev.1.64 in6_pcb.c
 Rev.1.25 in6_var.h
 Rev.1.33 ip6_mroute.c
 Rev.1.98 ip6_output.c
 Rev.1.23 mld6.c
2005-12-25 12:44:12 +00:00
SUZUKI Shinsuke 97e1915e06 MFC Rev.1.68 (don't respond to NI_QTYPE_IPV4ADDR) 2005-12-25 12:21:55 +00:00
SUZUKI Shinsuke 3acaaa3fa3 MFC the following KAME sync work.
- fixed typos
  - improved some comment descriptions
  - use NULL, instead of 0, to denote a NULL pointer
  - avoid embedding a magic number in the code
  - use nd6log() instead of log() to record NDP-specific logs
  - nuked an unnecessay white space

  Revision  Path
  1.67      src/sys/netinet6/icmp6.c
  1.55      src/sys/netinet6/in6.c
  1.29      src/sys/netinet6/in6_ifattach.c
  1.56      src/sys/netinet6/nd6.c
  1.35      src/sys/netinet6/nd6_nbr.c
  1.29      src/sys/netinet6/nd6_rtr.c
2005-12-25 12:15:13 +00:00
Wilko Bulte 87a0d70f07 "A life lived in fear is a life half lived" 2005-12-24 17:55:33 +00:00
Andrew Thompson 522d74708d MFC r1.41, do not BPF_MTAP the packet twice 2005-12-24 01:13:17 +00:00
David Xu af0a5842ec MFC following revisions to fix mutex memory leak for threaded program:
local.h		revision 1.28
	fread.c		revision 1.13
	vfscanf.c	revision 1.39
2005-12-23 06:07:43 +00:00
Garrett Wollman cdbd834c6a Merge tzdata2005l, tzdata2005m, and tzdata2005q from vendor branch.
Too many zones change to summarize here.
2005-12-22 23:47:26 +00:00
John Baldwin ddae17371c MFC: Remove linux_mib_destroy() since MTX_SYSINIT's gaining of a SYSUNINIT
that called mtx_destroy() made it obsolete.
2005-12-22 21:25:20 +00:00
John Baldwin 09bfce3132 MFC: Install nextboot in /rescue as /rescue/nextboot rather than
/rescue/nextboot.sh to match the name in /sbin.
2005-12-22 21:17:12 +00:00
Sam Leffler d2d5051021 MFC: add multicast rate support
display a bssid that's zero with the -v option
     add control for packet bursting
2005-12-22 19:32:11 +00:00
Sam Leffler 53c2bd8bf8 MFC: 802.11 layer sta mode beacon miss handling 2005-12-22 19:22:51 +00:00
Sam Leffler 33ed9362d9 MFC: make packet bursting configurable (default to on if device is capable) 2005-12-22 19:18:23 +00:00
Sam Leffler 666a4faacc MFC 1.70: apply local settings when creating neighbor entries in ahdemo mode 2005-12-22 19:14:46 +00:00
Sam Leffler 9591abe5d9 MFC: 1.69: when creating an ahdemo bss use any requested bssid; otherwise use zero 2005-12-22 19:12:50 +00:00
Sam Leffler cf12be1525 MFC: 1.40: allow setting the bssid in any mode 2005-12-22 19:10:58 +00:00
Sam Leffler ad230bbaf3 MFC 1.36: correct handling of dtim for periods > 1 2005-12-22 19:08:39 +00:00
Sam Leffler 213190cef2 MFC: add fixed rate for sending multicast frames 2005-12-22 19:05:53 +00:00
Sam Leffler ca90432469 MFC: disallow module unload when there are dynamic references 2005-12-22 19:02:08 +00:00
Sam Leffler 0e09f7a0b1 MFC 1.24:
o correct auto mode logic for avoiding turbo channels
  o correct assumption that a static turbo channel is also
      usable in 11a; the opposite is true
2005-12-22 18:45:40 +00:00
Sam Leffler c0cbd42f1d MFC 1.67: Bandaid ieee80211_set_chan to handle a channel parameter of "any" 2005-12-22 18:44:58 +00:00
Sam Leffler 2a6e08b219 MFC 1.38: change malloc when setting an optional ie to use M_NOWAIT 2005-12-22 18:25:10 +00:00
Sam Leffler 2670b139f9 MFC 1.37: correct parameter check when retrieving the current channel list 2005-12-22 18:22:15 +00:00
Doug Barton 153c28c6db The new rc.subr requires explicit declaration of the command, and this
was fixed in the new ppp script, but I did not merge the ppp-user -> ppp
change, so this got missed. Mea culpa.

Submitted by:	Greg Rivers <[email protected]>
2005-12-22 09:06:07 +00:00
Ed Maste a1998a613f MFC r1.160:
When using m_dup(9) to copy more than MHLEN bytes of data, don't
  create an mbuf chain that starts with a cluster containing just MHLEN
  bytes.  This happened because m_dup called m_get or m_getcl depending
  on the amount of data to copy, but then always set the size available
  in the first mbuf to MHLEN.

Approved by:	jmg
Silence from:	rwatson (mentor)
2005-12-22 04:23:10 +00:00
Brooks Davis f48817f4e5 MFC trimdomain(3) regression tests. 2005-12-22 03:47:05 +00:00
David Xu a13c69370e MFC revision 1.20:
Clear return code to zero if joiner successfully waited joinee.
2005-12-22 01:50:44 +00:00
Brooks Davis 17e18f40ae Note that an MFC of a fix to trimdomain(3) may result in changes to host
names in log files under certain circumstances.
2005-12-22 00:43:18 +00:00
Brooks Davis 4b0c52ce4b MFC rev 1.6:
When removing the local domain, only do so when the result
	will be a host name.  This is matches the documented behaviro.
	The previous behavior would remove the domain name even if
	the result retained a dot.

	This fixes rsh connections from a.example.com to example.com.

This is also reported to fix rsh connections from host xxx to
yyy.example.com.

PR:		88301
2005-12-22 00:34:48 +00:00
Florent Thoumie 6c348d2040 MFC: Add ProductID for the iPod Nano.
usb_quirks.c:	1.44
	usbdevs:	1.237

Approved by:	ssouhlal
2005-12-21 23:11:14 +00:00
Andrew Thompson 49d3b26678 MFC r1.37: use m_dup rather than m_copypacket 2005-12-21 22:52:48 +00:00
Ruslan Ermilov c6beffb068 MFC: 1.523: Don't create a hierarchy before installing a kernel. 2005-12-21 15:55:17 +00:00
Dag-Erling Smørgrav 899ffe3808 MFC: add a -0 option for interoperability with xargs -0 2005-12-21 12:17:49 +00:00
Dag-Erling Smørgrav 7b28a1173a MFC: (1.35) wording tweaks 2005-12-21 12:16:39 +00:00
Dag-Erling Smørgrav 0c00b42a29 MFC: (1.58) add -r option for GNU compatibility 2005-12-21 12:15:52 +00:00
Ruslan Ermilov 80e8dbe920 MFC: 1.17: Fix PCI ID of the AMD-8111 System Management controller
that provides SMBus 1.0 function that this driver supports.
2005-12-21 11:00:53 +00:00
Doug Barton 24c2a55a17 MFC 1.52, do not delete stale /etc/rc.d files by default 2005-12-21 09:04:24 +00:00
Maxim Konovalov f2db4c2828 MFC rev. 1.38: fix usage(). 2005-12-21 08:12:28 +00:00
Doug Barton 0dfae5a31f MFC the inclusion of scripts from the local_startup directories
into the base rcorder, and related changes.
2005-12-21 07:11:35 +00:00
Doug Barton 44ee89bfef MFC of 1.28, -mdoc sweep 2005-12-21 06:03:31 +00:00
Doug Barton 4ab6003706 MFC 1.27, s#/etc/make.conf#make.conf(5)# 2005-12-21 06:01:30 +00:00
Doug Barton 85213f1446 MFC 1.38, 1.4[1-3], and 1.46; excellent work done by yar to clean
up and improve this file.
2005-12-20 21:17:20 +00:00
Brooks Davis 76b647261c MFC 1.5: we now support BPF write filters unconditionally. 2005-12-20 21:11:16 +00:00
Brooks Davis de75ba7404 MFC 1.12:
When we get a bogus hostname in an option, drop the option
	rather than refusing the lease.  This allow obtaining leases
	on misadministered networks that use host names with
	underscores in them.

Reminded by:	avatar
2005-12-20 21:02:22 +00:00
Doug Barton bf0d426512 MFC 1.56, make install of sshd conditional on NO_OPENSSH 2005-12-20 20:56:21 +00:00
John Baldwin 1b0796d499 MFC: Add a new 'show lock' command to ddb that can dump information about
mutexes and sx locks including current owners, etc.
2005-12-20 19:28:24 +00:00
Gleb Smirnoff 1a88b5af68 MFC 1.26:
Suppress logging about unimplemented syscalls to one time per process. This
  prevents hard flood of the system console.

  Reviewed by:	bde
2005-12-19 17:06:51 +00:00
Bruno Ducrot e67cd39a1a MFC: don't flood kernel logs with "invalid _PSS package" messages.
Approved by:	njl, imp (mentor)
2005-12-19 11:19:26 +00:00
Joseph Koshy c72aab7c8c MFC {devd.8 r1.15,1.16; devd.cc r1.29}
"Add a -f configfile option to devd(8), based on a patch submitted by
  Wojciech A. Koszek."
2005-12-19 03:33:05 +00:00
Ian Dowse 2acdbf7fb8 MFC 1.70: provide the USB device release number along with other
parameters so that devd can match on it.
2005-12-18 15:51:31 +00:00
Bill Paul c5849c9b88 Ok, let's try that again. MFC recent changes from -current, this time
to the right branch (interrupt handler API fixes, Ralink RT2500 deadlock
with wpa_supplicant).
2005-12-16 17:33:47 +00:00
Maxime Henrion 64ebf926cd MFC r1.252:
date: 2005/12/12 14:30:13;  author: mux;  state: Exp;  lines: +1 -0
  Add the device ID of fxp(4) NICs found in Sony Vaio VGN-TX1XP laptops.
2005-12-16 03:26:37 +00:00
Doug Barton c916a995a0 Diff reduction to HEAD:
MFC yar's cleanup of command=*/foo -> command=*/${name},
and related changes.
2005-12-16 01:42:54 +00:00
Doug Barton ea31620bcb Diff reduction to HEAD.
MFC 1.253 - Mention special behaviour of init(8) when kern_securelevel="0"
MFC 1.265 - Add a devd_flags variable
2005-12-16 01:19:21 +00:00
Pawel Jakub Dawidek 6455c142eb MFC: etc/rc.d/geli 1.3
Simplify the code a bit by using '-q' option for kldstat(8).

Prodded by:	dougb
2005-12-15 23:32:35 +00:00
Pawel Jakub Dawidek 04d67d4ecd MFC: Move setkey(8) from usr.sbin/ to sbin/ and make rc.d/ipsec to run
before rc.d/mountcritremote, so it is possible to mount /usr/ over
	IPsec.

Discussed on:	arch@
Suggested by:	Tomasz Pi³at <[email protected]>
Prodded by:	dougb
2005-12-15 23:30:12 +00:00
Doug Barton 9b1e758be2 MFC 1.11, update of flags to mount for switching to RW. 2005-12-15 18:59:21 +00:00
Doug Barton c9ac03bf02 Diff reduction to HEAD, MFC 1.7 which removes a needless FILEMODE line
Approved by:	ru
2005-12-15 18:57:11 +00:00
Maxim Konovalov 6086bd17df MFC rev. 1.134: fix for a bug where NFS/TCP would
not reconnect (in the case where the server FIN'ed).

PR:		kern/88833
Requested by:	Roman V. Palagin
Approved by:	Mohan Strinivasan
2005-12-15 18:10:37 +00:00
Maxim Sobolev 93dbf504b0 Fix problems introduced by the botched MFC.
Submitted by:	Kostik Belousov <[email protected]>
Pointy hat to:	sobomax
2005-12-15 17:47:15 +00:00
David E. O'Brien b1e6a02dad MFC: rev 1.254: minor comment re-alignment. 2005-12-15 16:49:19 +00:00
David E. O'Brien f0c2146781 MFC: rev 1.8: depends having awk(1) and it needs syslogd due to using logger(1). 2005-12-15 16:47:06 +00:00
David E. O'Brien 6aee8608ae MFC: rev 1.7: depends on syslogd due to logger(1). 2005-12-15 16:46:02 +00:00
David Xu 21e1f0364d MFC revision 1.35:
Remove unused _get_curthread() call.
2005-12-15 07:28:19 +00:00
David Xu 33e9390023 MFC Revision 1.16:
Export following functions:
	_pthread_condattr_getpshared
	_pthread_condattr_setpshared
	_pthread_mutexattr_getpshared
	_pthread_mutexattr_setpshared
	pthread_condattr_getpshared
	pthread_condattr_setpshared
	pthread_mutexattr_getpshared
	pthread_mutexattr_setpshared
2005-12-15 07:25:00 +00:00
David Xu 740665e926 MFC:
Add file thr_mattr_pshared.c and thr_condattr_pshared.c.
2005-12-15 07:22:24 +00:00
David Xu 8388b7f682 MFC revision 1.40:
Add prototype for following functions:
	pthread_condattr_getpshared
	pthread_condattr_setpshared
	pthread_mutexattr_getpshared
	pthread_mutexattr_setpshared
2005-12-15 06:50:39 +00:00
David Xu fdfacd373a MFC Revision 1.8:
Put pthread_condattr_init sorted order.
    Revision 1.7:
	Export following functions:
	_pthread_mutexattr_getpshared
	_pthread_mutexattr_setpshared
	pthread_condattr_getpshared
	pthread_condattr_setpshared
	pthread_mutexattr_getpshared
	pthread_mutexattr_setpshared
    Revision 1.6:
	Sort function names.
    Revision 1.5:
	Add function pthread_timedjoin_np.
2005-12-15 06:43:18 +00:00
David Xu 5123016d67 MFC:
thr_exit.c:
	Revision 1.19
	Fix code for user stack recycling.

    thr_join.c:
	Revision 1.18
	Fix code for user stack recycling.

	Revision 1.17
	Add function pthread_timedjoin_np.
2005-12-15 06:36:57 +00:00
David Xu 9c538f7de7 MFC revision 1.3:
Add functions pthread_mutexattr_setpshared and
	pthread_mutexattr_getpshared.
2005-12-15 06:31:43 +00:00
Maxim Sobolev bb453de600 MFC: add new option q to surpress any output in the normal case. 2005-12-15 04:03:05 +00:00
Maxim Sobolev 1f404aea28 Extend utility to allow recovering single file from the deffective
media.
2005-12-15 03:50:03 +00:00
Brooks Davis d6feed7964 MFC rev 1.258
remove removable_interfaces example.  It's been dead since 6.0-RELEASE,
but I forgot to MFC this.

Reminded by:	dougb
Pointy hat:	brooks
2005-12-15 02:13:15 +00:00
Doug Barton 3d55c2cc98 MFC 1.6, REQUIRE cleanvar, instead of BEFORE. 2005-12-15 01:13:39 +00:00
Doug Barton 596078b97d MFC 1.37, run this script after mountcritremote to handle
cases where /tmp is on a remote filesystem.
2005-12-15 01:10:10 +00:00
Ian Dowse 97df2f1503 MFC 1.92: rorder the calling of the completion callback and the
transfer "done" method for non-repeat transfers to avoid problems
if the transfer gets recycled by the callback. In particular this
fixes page faults seen when using OHCI controllers with ucom devices.
2005-12-15 00:36:00 +00:00
Wilko Bulte c64c27e19d Spelling fixes and minor nit.
PR: doc/9035
Submitted by: Gavin Atkinson <[email protected]>
2005-12-14 19:50:55 +00:00
Max Laier 846fd77b91 MFC: 1.91
Fix calculation of meminfo's swaptotal and swapfree on at least amd64.
2005-12-14 19:07:38 +00:00
Dag-Erling Smørgrav 357525db88 MFC: implement the full range of ISO9660 number conversion routines in iso.h. 2005-12-14 09:20:30 +00:00
Dag-Erling Smørgrav 4fcd4e0e1c MFC: (1.25, 1.26) whitespace cleanup, parser improvements 2005-12-14 09:13:46 +00:00
Dag-Erling Smørgrav 64f5bf6ca4 MFC: (1.77) ignore HTTP_PROXY if it is defined but empty 2005-12-14 09:10:13 +00:00
Florent Thoumie 2e89732c5b MFC: USB Quirk for iPods (should work with some other devices).
usb_quirks.c:	1.43
	usb_quirks.h:	1.19
	usb_subr.c:	1.78
	usbdevs:	1.236

While this might not be the best solution, this has been considered good enough
to be MFC'ed.

Approved by:	ssouhlal
Discussed on:	src-committers@
2005-12-14 01:27:45 +00:00
Eric Anholt e9f2f971a9 MFC DRM. Notable changes:
- i915 (i830-i915) driver ported.
- S3 Savage driver ported.
- Added support for ATI_fragment_shader registers for r200.
- Improved r300 support, needed for latest r300 DRI driver.
- (possibly) r300 PCIE support, needs X.Org server from CVS.
- Added support for PCI Matrox cards.
- Software fallbacks fixed for Rage 128, which used to render badly or hang.
- Some issues reported by WITNESS are fixed.
2005-12-14 00:52:59 +00:00
Eric Anholt 53141424b5 MFC i915 GMCH AGP support. 2005-12-14 00:47:25 +00:00
Eric Anholt 7b246d6ebc MFC r1.28: Add support for the i855GM. 2005-12-14 00:46:23 +00:00
Sam Leffler d036115432 MFC: athctrl script 2005-12-13 21:34:55 +00:00
Jim Rees 6f94881ca7 MFC: nfs_socket.c 1.132, nfs_subs.c 1.142, nfsm_subs.h 1.37
fix a problem with XID re-use when a server returns NFSERR_JUKEBOX.
2005-12-13 21:29:26 +00:00
John Baldwin a34a23d620 MFC: Slam the door more forcefully on mixed mode. 2005-12-13 16:47:33 +00:00
Christian Brueffer cf2f5e97a9 MFC: rev. 1.6
Xref padlock(4), also fast_ipsec(4) and geli(8) as consumers of this device.
2005-12-13 06:05:26 +00:00
Christian Brueffer 6c9e29d40c MFC:
Manpage for the padlock driver (VIA C3/Eden AES support and RNG).
2005-12-13 06:03:58 +00:00
Maksim Yevmenkin bb222dc0b7 MFC: Teach sdpd(8) to check peer's credentials before accepting request to
register, remove or change services in the local database. For now only
accept the request if the peer has effective user ID the same as 'root'
user ID.
2005-12-13 00:38:28 +00:00
Maksim Yevmenkin 8a7beb1863 MFC: Fix typo in rfcomm_pppd(8) man page.
Noticed by:	Ronald Klop
2005-12-13 00:31:03 +00:00
Bruce A. Mah 64ca81073b MFC: Add Sony TJ37 to the uvisor manpage.
uvisor.4	1.6 -> 1.7
2005-12-12 19:54:14 +00:00
Bruce A. Mah 6eff47224c MFC: Recognize the Sony Clie PEG-TJ37.
usbdevs		1.234 -> 1.235
	uvisor.c	1.24 -> 1.25
2005-12-12 19:52:52 +00:00
John Baldwin 59672073cf MFC: Sync up with locking changes in HEAD:
- Add locked variants of nve_start(), nve_init(), and nve_ifmedia_upd().
- Use callout_* to manage callouts rather than timeout(9).
- Mark interrupt handler MPSAFE (IFF_NEEDGIANT was already clear).
- Lock the driver lock in driver entry points such as the interrupt
  handler, if_start, and if_init rather than locking the driver mutex
  in the various work functions called by the binary blob.
- Use IFQ_DRV_IS_EMPTY() macro rather than doing it by hand.
- Fix locking in detach.
- Remove some unused fields from the softc.
- Don't make the driver lock recursive, it shouldn't be recursively
  acquired anywhere in the driver now.
- Axe the spin mutex used for the nve_oslock*() routines.  The driver lock
  already provides sufficient synchronization.
- Don't mess around with IFF_UP when the link state changes.  IFF_UP is
  an administrative flag, not a link status indicator.
2005-12-12 19:40:04 +00:00
John Baldwin b3bd5aac13 MFC: Don't panic if IRQ 13 doesn't exist, only if it doesn't exist and we
actually need it.
2005-12-12 19:36:50 +00:00
John Baldwin 98f47342c4 Fix a panic if "pci_link" is disabled via the acpi disable tunable. 2005-12-12 19:35:11 +00:00
John Baldwin c19db7800f MFC: Force any hardwire-routed interrupts to level trigger and active low
polarity.
2005-12-12 19:33:32 +00:00
Maksim Yevmenkin f5be8f434f MFC: Teach rfcomm_sppd(8) to recognize "lan" (for LAN Access Using PPP) service
name in '-c' (RFCOMM channel) option.
2005-12-12 18:00:03 +00:00
Gleb Smirnoff aa4ff917e8 MFC 1.93:
Take if_baudrate from the parent. This fixes problem with SNMP
  daemons reporting zero speed for vlan(4) interfaces.
2005-12-12 11:18:15 +00:00
cvs2svn c66f6cb75d This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-12-11 23:15:25 +00:00
Sam Leffler 619d0abc2e MFC: adhoc mode fixups 2005-12-11 22:58:43 +00:00
Sam Leffler 9af2d8930d MFC: fix dynamic changes in short slottime for 11g sta mode: set the
slot time based on the rcvd capabilities, not the existing ones
2005-12-11 22:49:43 +00:00
Sam Leffler a97f9036e4 MFC: nuke special handling to extend cts when bursting; it was race prone 2005-12-11 22:45:38 +00:00
Sam Leffler 10581e4379 sync with HEAD 2005-12-11 22:27:58 +00:00
Bjoern A. Zeeb 08a45348f9 MFC rev. 1.267
Document that changes to nsswitch.conf might be needed when
compiling with NO_NIS.
[ also see make.conf(5) and nsswitch.conf(5) ]

MFC rev. 1.270 by keramida
Add extra '#' comment characters at the beginning of two
lines that started with TABs, to avoid make(1) warnings introduced
in rev. 1.267.
2005-12-11 20:41:26 +00:00
Bjoern A. Zeeb 0faf9ea5a9 MFC rev. 1.123
Document that changes to nsswitch.conf might be needed when
compiling with NO_NIS.
2005-12-11 20:32:09 +00:00
SUZUKI Shinsuke 52193a0dc9 MFC Rev 1.35
fixed a kernel crash at the initialization time of PIM-SM register interface
2005-12-11 06:18:42 +00:00
Christian S.J. Peron 081c302cd0 MFC revision 1.272
Giant clean up for exit(2)
2005-12-10 20:14:42 +00:00
Lukas Ertl d080dd5cc1 MFC:
Since we want a vinum geom created anytime the module loads, move the
  geom creation to a seperate init function and ignore the tasting.

  The config is now parsed only in the vinumdrive geom, which hopefully
  fixes the problem, that the drive class tasted before the vinum class
  had a chance, for good.

  Also restore the behaviour that the module can be loaded at boot time
  and on a running system.

--

  Check for g_read_data(9) errors properly;  don't pass error value
  pointer to g_read_data(9) at all if we don't have any use of it.
2005-12-10 14:36:17 +00:00
Brooks Davis 5f29cb6f50 Sync with HEAD.
- bump the date to represent the addition of ipv4_addrs_<ifn>.
 - ru's -mdoc sweep
 - bring in documentation of NOAUTO
 - remove obsolete documentation of dead removable_interfaces
2005-12-10 02:24:47 +00:00
Brooks Davis c64407a2d8 MFC the addition of the ipv4_addrs_<ifn> which allows the addition of
multiple aliases using ranges and CIDR notation.

Submitted by:	Philipp Wuensche <cryx dash freebsd at h3q dot com>
2005-12-10 02:20:14 +00:00
Brooks Davis a0514136c8 MFC revs 1.46-1.48 (sync with HEAD):
1.46, 1.47: switch from pax to tar for cpio archive handling.
	1.48: umount in reverse order to allow nested mounts.
2005-12-10 02:14:35 +00:00
Brooks Davis c54f8d10f3 MFC 1.47 and 1.48:
1.47:	Be less IPv4 centric.  When checking if the interface is
	already configured, check if the UP flag is set instead of
	checking for the netmask keyword.

1.48:	Use more rc.subr bits to clean up pccard_ether and implement
	new features.  Both the presence of a NOAUTO keyword and an
	interface being up can be ignored is the forcestart option
	is used.  Additionally, a restart option has been added.
2005-12-10 02:11:07 +00:00
Brooks Davis da8ef1c7c8 MFC rev 1.11: remove dhclient dependancy 2005-12-10 02:06:12 +00:00
John Baldwin 72239dca9a MFC: Add a missing newline to a printf. 2005-12-09 20:24:09 +00:00
Jean-Sébastien Pédron c3a357f42c MFC:
revision 1.2
  date: 2005/10/21 09:15:26;  author: dumbbell;  state: Exp;  lines: +3 -1
  Apply the same fix to a potential race in the ISDOTDOT code
  in reiserfs_lookup() that was used to fix an actual race in
  ufs_lookup.c:1.78. This is not currently a hazard, but the
  bug would be activated by marking reiserfs as MPSAFE.

Reviewed by:	mux (mentor)
2005-12-09 14:55:39 +00:00
Ruslan Ermilov 8ccdfcd8bf MFC: Fix memory leak. 2005-12-09 07:13:06 +00:00
Hajimu UMEMOTO 3e200c898d MFC 1.40: the response NS to a DAD NS was not sent correctly due to the
invalid destination address.
2005-12-09 02:50:40 +00:00
Gleb Smirnoff 61c28bf6a6 MFC 1.427:
- Mention also the COMPAT_FREEBSD5 option along with COMPAT_FREEBSD4.
  - Notice that 20050227 entry is also applicable to packages, not only
    to world.
2005-12-08 14:09:50 +00:00
Gleb Smirnoff 6dcb2f92ab MFC 1.91:
On the 82571 and newer chipset the ICR register is meaningful only
  if the E1000_ICR_INT_ASSERTED bit is set.

  Submitted by:   Jack Vogel
2005-12-08 14:06:12 +00:00
Marius Strobl d2a0722d67 MFC: sys/conf/files 1.1066, sys/conf/files.powerpc 1.47
Move zs.c from files to files.powerpc as zs(4) by now is only supported
on powerpc (more or less...). That way people updating from FreeBSD 5 to
FreeBSD 6 and beyond on sparc64 will get an error from config(8) rather
than a mysterious compile error when they have a stale 'device zs' in
their kernel config file.
2005-12-08 10:56:46 +00:00
Jesus R. Camou 34297ee76a MFC: fix couple typos.
Approved by:	trhodes (mentor)
2005-12-08 01:55:53 +00:00
Scott Long b2e904bd32 MFC: another iteration in making this page match reality. 2005-12-08 01:41:54 +00:00
David E. O'Brien bc7e097ec3 MFC: rev 1.9: remove bsdiff. 2005-12-07 22:27:49 +00:00
David E. O'Brien 3be5039abf Fix a 'vi' typo.
Reported by:	ru
2005-12-07 22:24:11 +00:00
David E. O'Brien 3c779ff0c4 MFC: rev 1.8: remove portsnap. 2005-12-07 21:46:05 +00:00
Doug Barton 4f058e4e35 MFC the paragraph about major version upgrades from 1.428 2005-12-07 20:52:35 +00:00
Vinod Kashyap 9a8f2789d0 MFC: twa corresponding to the 9.3.0.1 release on the 3ware website. This driver
has support for the 9xxxSX controllers, along with the earlier 9xxxS series
controllers.
2005-12-07 18:18:06 +00:00
Jean-Yves Lefort f0324e855d MFC: Unbreak second joystick (joy1) support.
Approved by:	ssouhlal
2005-12-07 15:14:59 +00:00
Andrew Thompson 6de7f45227 MFC r1.35, set IFF_BROADCAST on the interface 2005-12-07 03:10:42 +00:00
Gleb Smirnoff 0162eb99c4 MFC 1.17:
- Update the flow sequence before converting count to
    network byte order.
  - Update the flow sequence in one atomic op instead of two.

  Reported by:    Denis Shaposhnikov <dsh vlink.ru>
  Reported by:    Daniil Kharoun <kdl chelcom.ru>
  PR:             kern/89417
2005-12-06 09:51:10 +00:00
Hajimu UMEMOTO db772d8260 MFC: We couldn't specify the rule for filtering tunnel traffic since an
IPv6 support was committed:

- Stop treating `ip' and `ipv6' as special in `proto' option as they
  conflict with /etc/protocols.

- Disuse `ipv4' in `proto' option as it is corresponding to `ipv6'.

- When protocol is specified as numeric, treat it as it is even it is
  41 (ipv6).

- Allow zero for protocol as it is valid number of `ip'.

	sbin/ipfw/ipfw.8:	1.180
	src/sbin/ipfw/ipfw2.c:	1.80
2005-12-06 02:51:41 +00:00
Wilko Bulte f89c2ee7c4 s/Adolph Hitler/Adolf Hitler/ 2005-12-05 22:32:03 +00:00
John Baldwin 72497c64f3 MFC: Use >= rather than > to check for a process exceeding its time limit. 2005-12-05 20:14:40 +00:00
John Baldwin 8feead88b3 MFC: Restore the previous state after a FILL operation in
properties_read().
2005-12-05 20:10:44 +00:00
John Baldwin b6f597b195 MFC:
- mdoc sweep
- Use .fn to markup untimeout.
- Reword a confusing sentence.
2005-12-05 20:07:33 +00:00
John Baldwin f509345643 MFC: Clarify that si(4) doesn't support the newer SX+ cards from
Specialix/Perle currently.
2005-12-05 20:03:48 +00:00
John Baldwin ab4513690c MFC: Add MLINK for execvP(3). 2005-12-05 19:59:20 +00:00
Maksim Yevmenkin b5e5068960 MFC: Add bluetooth.device.conf(5) man page 2005-12-05 18:59:43 +00:00
Colin Percival c915bc71cd MFC revision 1.5:
Make "missing dependency" errors more useful by indicating which port
  is trying to depend upon the non-existent port.

  Suggested by:   kris
2005-12-05 05:07:44 +00:00
David E. O'Brien dcd052bb0b MFC: rev 1.13: clear pending_txs when not "RUNNING". 2005-12-05 01:05:58 +00:00
David E. O'Brien 5ae0fdb359 MFC: rev 1.12: make sure that we call if_free(ifp) after bus_teardown_intr.
This eliminates the possibility of a crash due to getting an interrupt after
we free the ifp and the interrupt handler depending on ifp being still alive.
2005-12-05 01:05:09 +00:00
Ian Dowse bd71c0a81f MFC: fix a number of bugs in the handling of the transfer descriptor
done queue.
2005-12-04 05:52:23 +00:00
Ian Dowse 795a89d414 MFC 1.124: pad RBC commands to 12 bytes for Sony DSC camereas. 2005-12-04 05:48:31 +00:00
Philip Paeps 32861b73f2 MFC: moused.c r1.71 and r1.74
moused.8 r1.54 to r1.57

moused.c r1.71:
  Add a -H option to enable horizontal virtual scrolling, much like -V for
  vertical virtual scrolling.  This also respects -U for the distance.

moused.c 1.74:
  Add an option to stop 'mouse drift' in some defective/cheap mice.  This
  stops the pointer slowly wandering away on its own in an annoying way when
  the mouse isn't physically moved.

moused.8:
  Documentation of above and ru's mdoc magic.

Procrastinator of the year:	philip
2005-12-04 00:48:33 +00:00
Philip Paeps 2efbeb26cf MFC r1.7:
Check for altq presence during module init, and allow module to work even if
  altq is not present (just disable the altq bits in that case).
2005-12-03 14:45:05 +00:00
Philip Paeps d59d2f389e MFC r1.85:
Preserve /etc/sysctl.conf when doing a binary update.  This prevents, for
  instance, the dreaded shared memory problem in PostgreSQL coming back to
  haunt you after a binary update.
2005-12-03 14:37:24 +00:00
Christian Brueffer c1b646346c MFC: rev. 1.26
Document 82571 and 82572 support.
2005-12-02 16:49:36 +00:00
Christian Brueffer c11e71d7a6 MFC: rev. 1.4
Add a CAVEATS section that mentions missing RAID5 support.
2005-12-02 16:48:42 +00:00
Christian Brueffer b27c7c5d6b MFC:
In preparation for automatic hardware notes generation, reword the
hardware section text to include the driver name.
2005-12-02 16:47:27 +00:00
Christian Brueffer 9baac2c898 MFC: rev. 1.9 + 1.10
Update the list of drivers that need wlan(4).
2005-12-02 16:45:03 +00:00
cvs2svn 1ee1326b0b This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-12-02 00:17:35 +00:00
Ruslan Ermilov e59c670849 MFC: "nocpu" and "nomakeoptions" directives. 2005-12-01 17:43:09 +00:00
Pyun YongHyeon 52763f3c91 MFC 1.461 to RELENG_6
Connect em(4) build on sparc64.
2005-12-01 02:43:13 +00:00
Pyun YongHyeon 8b6427a6ae MFC 1.66 to RELENG_6
Uncomment em(4) as it's now working.
2005-12-01 02:38:44 +00:00
David Xu 41e321ee1d MFC Revision 1.11:
In raise(), use a shortcut to directly send signal to current thread.
MFC Revision 1.12:
	Remove a redundant _get_curthread() call.
2005-12-01 00:49:45 +00:00
Maksim Yevmenkin 818092ece5 MFC: Teach rfcomm_sppd(1) about service names, so it is possible to specify
service name instead of channel number with -c command option. Supported
service names are: DUN (Dial-Up Networking), FAX (Fax) and SP (Serial Port).
2005-11-30 18:34:13 +00:00
John Baldwin 84ca360dc4 MFC: Add locking and mark MPSAFE. 2005-11-30 16:04:52 +00:00
John Baldwin 841d87baea MFC: Quiet the pci_link(4) devices and only lookup BIOS IRQs for links that
are routed via ISA IRQs.
2005-11-30 16:03:55 +00:00
Marius Strobl eb9bc32027 MFC: 1.13
- Add a workaround for the fact that OFW doesn't guarantee that
  devices can be opened multiple times simultaneously but we're
  expected to be able to do so by the rest of the loader.
  This fixes booting from disks attached to the on-board SCSI
  controller of Sun Ultra 1 (previously this triggered a trap)
  and probably also of AX1115 boards.
- While here, remove unused variables and add empty lines where
  style(9) requires such.
2005-11-30 13:37:22 +00:00
Marius Strobl f13f4aba69 MFC: 1.16
In ofw_parsedev() check the return value of malloc() and protect
against a NULL pointer dereference when ofw_parsedev() is called
with a NULL path argument.
2005-11-30 13:24:53 +00:00
Marius Strobl 0ff3a247a5 MFC: 1.11
Use an ihandle_t to store the instance handle of an opened device
instead of a phandle_t (package handle). Since both are typedefed
to unsigned int, this is more or less cosmetic.
2005-11-30 13:19:03 +00:00
Marius Strobl cfc79a40ec MFC: elf_freebsd.c 1.10, ofw_console.c 1.11, ofw_memory.c 1.7, openfirm.c 1.12
Remove unused variables.
2005-11-30 13:13:53 +00:00
Tom McLaughlin 1573aeeb1b MFC: Revision 1.60
Misspelling in Poul-Henning Kamp's email address under AUTHORS

Approved by:	ade
2005-11-30 04:19:40 +00:00
Pyun YongHyeon 61c82ba1c8 MFC if_hme.c:1.44, if_hmereg.h:1.7, if_hmevar.h:1.9 to RELENG_6:
- Convert hme(4) to use TX side bus_dmamap_load_mbuf_sg(9).
  - Move hardware counter reading/zeroing to hme_tick(). This saves
     8 register access per interrupt. [1]
  - Use imax macro for getting max. argument between two integers.
  - Invoke bus_dmamap_sync(9) first before freeing mbuf.
  - Check driver queue first to reduce locking operation in hme_start_locked()
    and interrupt handler.
  - Simplyfy watchdog timer setup in interrupt handler.
  - Don't log normal errors such as RX overrun. If we have DMA stuck
    condition, reinitialize the driver and log it.
2005-11-30 02:23:53 +00:00
Marcel Moolenaar 57e84955e0 MFC rev 1.40: Improve inittodr(). 2005-11-29 00:18:56 +00:00
John Baldwin 3ae4c08211 MFC: Always print the trap number for fatal traps and add trap messages
for T_XMMFLT and T_RESERVED.
2005-11-28 20:03:15 +00:00
John Baldwin 1c32f356d6 MFC: Correctly ask the PCI bridge device for its child PCI bus number
when trying to determine the BIOS IRQ for a given link.
2005-11-28 19:45:30 +00:00
John Baldwin 6d929909e8 MFC: Let ether_ioctl() handle SIOCSIFMTU. 2005-11-28 19:43:57 +00:00
John Baldwin baa7f33289 MFC: More fully setup the ATPICs including setting up spurious interrupt
handlers if 'device atpic' is not in the kernel.
2005-11-28 19:42:10 +00:00
John Baldwin dddf918c35 MFC: Include the size of the DL_serpath structures in the total size used
in the RTLD_DI_SERINFOSIZE and RTLD_DI_SERINFO requests.
2005-11-28 19:19:39 +00:00
Ruslan Ermilov 9a98ff7c91 MFC: Added NO_INCS, use it to prevent overwriting of native
headers with i386 copies when installing lib32.
2005-11-28 19:08:51 +00:00
Robert Watson 1b9cb2ade8 Merge mbuf.c:1.46 from HEAD to RELENG_6: trim accidentally committed
debugging printfs from netstat -m.
2005-11-28 18:07:36 +00:00
Hidetoshi Shimokawa 069c95b511 MFC: revision 1.81
Fix panic when we cannot find self-id of probing nodes.
2005-11-28 06:41:40 +00:00
Hiroki Sato 01e68a8d61 MFC: Apply arch= selection to the qandatoc mode. This fixes
link generation with no actual target.

Reported by:	Tim Witthoeft (tim.witthoeft at gmail.com)
2005-11-28 06:26:56 +00:00
Robert Watson 9d8270cebd Merge kern_acct.c:1.76 from HEAD to RELENG_6:
Significant refactoring of the accounting code to improve locking and VFS
  happiness, as well as correct other bugs:

  - Replace notion of current and saved accounting credential/vnode with a
    single credential/vnode and an acct_suspended flag.  This simplifies the
    accounting logic substantially.

  - Replace acct_mtx with acct_sx, a sleepable lock held exclusively during
    reconfiguration and space polling, but shared during log entry
    generation.  This avoids holding a mutex over sleepable VFS operations.

  - Hold the sx lock over the duration of the I/O so that the vnode I/O
    cannot occur after vnode close, which could occur previously if
    accounting was disabled as a process exited.

  - Write the accounting log entry with Giant conditionally acquired based
    on the file system where the log is stored.  Previously, the accounting
    code relied on the caller acquiring Giant.

  - Acquire Giant conditionally in the accounting callout based on the file
    system where the accounting log is stored.  Run the callout MPSAFE.

  - Expose acct_suspended via a read-only sysctl so it is possibly to
    programmatically determine whether accounting is suspended or not without
    attempting to parse logs.

  - Check both acct_vp and acct_suspended lock-free before entering the
    accounting sx lock in acct().

  - When accounting is disabled due to a VBAD vnode (i.e., forceable unmount),
    generate a log message indicating accounting has been disabled.

  - Correct a long-standing bug in how free space is calculated and compared
    to the required space: generate and compare signed results, not unsigned
    results, or negative free space will cause accounting to not be suspended
    when required, or worse, incorrectly resumed once negative free space is
    reached.
2005-11-27 19:09:10 +00:00
cvs2svn 1a8777bb63 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-11-27 17:11:22 +00:00
Hiroki Sato 2035addd22 Bump release documentation version and trim the old relnotes entries. 2005-11-27 17:11:21 +00:00
Gleb Smirnoff eb341e7bad MFC 1.61:
Check IFF_DRV_RUNNING in the re_intr() loop. It can disappear,
  since re_rxeof() drops the lock for some time.

  Reported & tested by:   XueFeng Deng <dsnofe yahoo.com.cn>
2005-11-27 02:56:42 +00:00
Doug Barton ba40e78ad3 MFC 1.7, which fixes the failed transfer semantics for BIND 9.3.x,
and cleans up the code slightly.
2005-11-27 00:38:57 +00:00
John Polstra 3fb100010d MFC: Fix a bug that caused some /dev entries to continue to exist after
the underlying drive had been hot-unplugged from the system.

This merges the following revisions:

  Revision  Path
  1.94      src/sys/cam/scsi/scsi_cd.c
  1.181     src/sys/cam/scsi/scsi_da.c
  1.98      src/sys/geom/geom_disk.c
  1.5       src/sys/geom/geom_disk.h
  1.88      src/sys/geom/geom_subr.c
2005-11-26 22:55:20 +00:00
Hiroki Sato 721a964cdb New errata item:
problems of ipfw IPv6 support on 6.0R.
2005-11-26 21:57:27 +00:00
Xin LI 747caa39ba MFC 1.83: Slightly reorganize to reduce duplicated code.
Reviewed by:	rwatson
2005-11-26 21:20:05 +00:00
Xin LI acda8a6dba MFC 1.65:
Remove an unneeded "a" from comment.
2005-11-26 21:19:20 +00:00
Kirill Ponomarev 2079c999a2 MFC: pkg_info.1:1.55
date: 2005/11/23 10:31:59;  author: krion;  state: Exp;  lines: +4 -1
  Document PKG_PATH enviroment variable.

  Prodded by:     Mark Andrews <Mark_Andrews AT isc DOT org>
2005-11-26 20:58:43 +00:00
John Polstra 886188edea MFC 1.151: Fix a bug in the loop in sonewconn that makes room on the
incomplete connection queue for a new connection.  It was removing
connections from the wrong list.
2005-11-26 19:32:30 +00:00
Marcel Moolenaar eb06965c3e MFC rev 1.203: Fix bug introduced in revision 1.186:
Iterate over the mounted file systems to find the largest time
  stamp and call inittodr() exactly once with that time stamp.
2005-11-26 19:13:41 +00:00
Lukas Ertl 7be254653f MFC:
Finally bring in what was produced during Google SoC 2005:

   Add functions to rename objects and to move a subdisk from one drive
   to another.

   Add manual page (finally).

   Bring up-to-date the online help.

Plus several cleanups and whitespace fixes.
2005-11-26 11:10:37 +00:00
Lukas Ertl bf82121806 MFC:
Finally bring in what was produced during Google SoC 2005:

  Add functions to rename objects and to move a subdisk from one drive
  to another.

Plus several whitespace/style fixes.
2005-11-26 11:06:11 +00:00
Gleb Smirnoff 9f9e1c2d2f Previous commit merged 1.145 and _a part of_ 1.142, and this part
broke ARP in RELENG_6. At this time merge 1.142 entirely.

Pointy hat to:	glebius
2005-11-26 10:51:23 +00:00
Nate Lawson 95bb1a1baa MFC 1.43: Acquire locks around call to acpi_cmbat_get_bif() 2005-11-26 07:37:40 +00:00
Gleb Smirnoff ddb26fdf4b MFC 1.34 by yar:
Since carp(4) interfaces presently are kinda fake yet possess
  IP addresses, mark them with LOOPBACK so that routing daemons
  take them easy for link-state routing protocols.

  Reviewed by:    glebius
2005-11-25 14:57:38 +00:00
Gleb Smirnoff 6224e210dc MFC 1.24:
Document tunables.
2005-11-25 14:56:03 +00:00
Gleb Smirnoff 4b39694ad7 MFC 1.38: MFOpenBSD 1.62:
Prevent backup CARP hosts from replying to arp requests, fixes strangeness
    with some layer-3 switches. From Bill Marquette.

  Tested by:      Kazuaki Oda <kaakun highway.ne.jp>
2005-11-25 14:54:59 +00:00
Gleb Smirnoff e2cc03a413 MFC 1.12:
Xref ng_ether(4) and ng_iface(4) nodes, which are used in examples.
2005-11-25 14:49:04 +00:00
Gleb Smirnoff 7ddcf98c00 MFC 1.23, 1.24:
BCM5752 support
2005-11-25 14:46:42 +00:00
Gleb Smirnoff a950752975 MFC:
Recognize Broadcom BCM5752 chip, that can be found in HP DC7600.

  PR:		kern/88940
  Submitted by:	Alexander Hausner
2005-11-25 14:43:12 +00:00
Gleb Smirnoff 904aa9def2 MFC 1.51:
Force this interface to be RUNNING.
2005-11-25 14:41:31 +00:00
Gleb Smirnoff 3b76d1e906 MFC 1.18 - 1.21:
- Document last change to ARP behavior.
  - Document several undocumented sysctl variables.
  - Fix spelling of few diagnostics.
  - Improve the documentation of "proxyall" knob, somewhat: we do not
    proxy for hosts that are reachable through the same interface the
    request came in from.  This feature is mainly for hosts reachable
    through some P2P link, e.g. the gif(4) tunnel.
2005-11-25 14:40:38 +00:00
Gleb Smirnoff 67f00a855c MFC 1.145:
Rework ARP retransmission algorythm so that ARP requests are
  retransmitted without suppression, while there is demand for
  such ARP entry. As before, retransmission is rate limited to
  one packet per second. Details:
    - Remove net.link.ether.inet.host_down_time
    - Do not set/clear RTF_REJECT flag on route, to
      avoid rt_check() returning error. We will generate error
      ourselves.
    - Return EWOULDBLOCK on first arp_maxtries failed
      requests , and return EHOSTDOWN/EHOSTUNREACH
      on further requests.
    - Retransmit ARP request always, independently from return
      code. Ratelimit to 1 pps.

MFC 1.142:
  Use monotonic 'time_uptime' instead of 'time_second' as timebase
  for rt->rt_rmx.rmx_expire.
2005-11-25 14:38:19 +00:00
Gleb Smirnoff 7eb54ea76a MFC 1.89:
- Do not raise IFF_DRV_OACTIVE flag in vlan_start, because this
    can lead to stalled interface
  - Explain this fact in a comment.

  Reviewed by:    rwatson, thompsa, yar
2005-11-25 14:34:05 +00:00
Gleb Smirnoff dfbf1afa6f MFC 1.157:
Keep locks consistent before goto.

  Reported by:    pho
  Reviewed by:    mohans
2005-11-25 14:32:38 +00:00
Gleb Smirnoff 22711ab88f MFC 1.70:
Fix several races between socket closure and node/hook
  destruction:
    - Backout 1.62, since it doesn't fix all possible
    problems.
    - Upon node creation, put an additional reference on node.
    - Add a mutex and refcounter to struct ngsock. Netgraph node,
      control socket and data socket all count as references.
    - Introduce ng_socket_free_priv() which removes one reference
      from ngsock, and frees it when all references has gone.
    - No direct pointers between pcbs and node, all pointing
      is done via struct ngsock and protected with mutex.
2005-11-25 14:26:40 +00:00
Gleb Smirnoff 53214a5672 Sync with HEAD, merging the following:
revision 1.117
date: 2005/11/02 15:23:47;  author: glebius;  state: Exp;  lines: +47 -8
Fix two races which happen when netgraph is restructuring:
  - Introduce ng_topo_mtx, a mutex to protect topology changes.
  - In ng_destroy_node() protect with ng_topo_mtx the process
    of checking and pointing at ng_deadnode. [1]
  - In ng_con_part2() check that our peer is not a ng_deadnode,
    and protect the check with ng_topo_mtx.
  - Add KASSERTs to ng_acquire_read/write, to make more
    understandible synopsis in case if called on ng_deadnode.

Reported by:    Roselyn Lee [1]
----------------------------
revision 1.116
date: 2005/11/02 14:27:24;  author: glebius;  state: Exp;  lines: +106 -121
Rework the ng_item queueing on nodes:
  - Introduce a new flags NGQF_QREADER and NGQF_QWRITER,
    which tell how the item should be actually applied,
    overriding NGQF_READER/NGQF_WRITER flags.
  - Do not differ between pending reader or writer. Use only
    one flag that is raised, when there are pending items.
  - Schedule netgraph ISR in ng_queue_rw(), so that callers
    do not need to do this job.
  - Fix several comments.

Submitted by:   julian

As well as some lesser changes: ng_base.c 1.114, 1.113, 1.107, 1.118.
2005-11-25 14:23:27 +00:00
Gleb Smirnoff 94a87297cf Sync em(4) driver with HEAD, merging the following changes:
revision 1.83
date: 2005/11/09 08:43:18;  author: yongari;  state: Exp;  lines: +41 -38
Make em(4) work on big-endian architectures.
 - disable jumbo frame support on strict alignment architectures due
   to the limitation of hardware. The driver needs a fix-up code for
   RX side. The fix will show up in near future.
 - fix endian issue for 82544 on PCI-X bus. I couldn't test this as
   I don't have the NIC/hardware.
 - prefer PCIR_BAR to hardcoded EM_MMBA.
 - Properly checks for for 64bit BAR [1]
 - replace inl/outl with bus_space(9) [1]
 - fix endian issue on VLAN handling.
 - reorder header files and remove unnecessary one.

Reviewed by:		cognet
No response from:	pdeuskar, tackerman
Obtained from:		OpenBSD [1]

revision 1.84
date: 2005/11/09 15:23:54;  author: glebius;  state: Exp;  lines: +7 -3
- Introduce two more stat counters, counting number of RX
  overruns and number of watchdog timeouts.
- Do not log(9) RX overrun events, since this pessimizes
  things under load [1].
- Do not increase if->if_oerrors in em_watchdog(), since
  this leads to counter slipping back, when if->if_oerrors
  is recalculated in em_update_stats_counters(). Instead
  increase watchdog counter in em_watchdog() and take it
  into account in em_update_stats_counters().

revision 1.86
date: 2005/11/11 16:04:51;  author: ru;  state: Exp;  lines: +1 -1
- Store pointer to the link-level address right in "struct ifnet"
  rather than in ifindex_table[]; all (except one) accesses are
  through ifp anyway.  IF_LLADDR() works faster, and all (except
  one) ifaddr_byindex() users were converted to use ifp->if_addr.

- Stop storing a (pointer to) Ethernet address in "struct arpcom",
  and drop the IFP2ENADDR() macro; all users have been converted
  to use IF_LLADDR() instead.

revisions 1.85, 1.87
- Introduce tunables em.hw.txd and em.hw.rxd, which allow administrator
  to configure number of transmit and receive descriptors.
- Check em.hw.txd and em.hw.rxd against hardware limits [*] and require
  them to be multiple of 128.

revision 1.88
date: 2005/11/21 04:17:43;  author: yongari;  state: Exp;  lines: +121 -83
busdma cleanup for em(4).
 - don't force busdma to pre-allocate bounce pages for parent tag.
 - use system supplied roundup2 macro instead of rolling its own version.
 - TX/RX decriptor length should be multiple of 128. There is no
   no need to expand the size with the multiple of 4096.
 - don't create/destroy DMA maps in TX/RX handlers. Use pre-allocated
   DMA maps. Since creating DMA maps on sparc64 is time consuming
   operations(resource mananger overhead), this change should boost
   performance on sparc64. I could get > 2x speedup on Ultra60.
 - TX/RX descriptors could be aligned on 128 boundary. Aligning them
   on PAGE_SIZE is waste of resource.
 - don't blindly create TX DMA tag with size of MCLBYTES * 8. The size
   is only valid under jumbo frame environments. Instead of using the
   hardcoded value, re-compute necessary size on the fly.
 - RX side bus_dmamap_load_mbuf_sg(9) support.
 - remove unused macro EM_ROUNDUP and constant EM_MMBA.

Reviewed by:	scottl
Tested by:	glebius

revision 1.89
date: 2005/11/24 01:44:48;  author: glebius;  state: Exp;  lines: +131 -77
Merge in new driver version from Intel - 3.2.18.

The most important change is support for adapters based on
82571 and 82572 chips.

Tested on:	82547EI on i386
Tested on:	82540EM on sparc64

revision 1.90
date: 2005/11/24 15:13:47;  author: cognet;  state: Exp;  lines: +3 -1
Remember the bus_dmamap_t where we loaded the mbuf, and sync this map instead
of tx_buffer->map, or we could end up syncing the wrong map.
2005-11-25 14:11:59 +00:00
Xin LI 2f340895e6 MFC 1.260 (by ps): Fixed a panic that can happen when nfs_lookup() hits
an error.

RELENG_6_0 errata candidate.
2005-11-25 13:27:22 +00:00
Colin Percival c0e5c969c4 Synchronize with version of portsnap in HEAD:
1. make_index no longer coredumps if input has zero lines.
2. phttpget no longer enters an infinite loop if the TCP connection is
closed while phttpget is reading HTTP headers.
2005-11-25 12:56:51 +00:00
Robert Watson a11ad5dde5 Merge uipc_usrreq.c:1.159 from HEAD to RELENG_6:
Correct a number of serious and closely related bugs in the UNIX domain
  socket file descriptor garbage collection code, which is intended to
  detect and clear cycles of orphaned file descriptors that are "in-flight"
  in a socket when that socket is closed before they are received.  The
  algorithm present was both run at poor times (resulting in recursion and
  reentrance), and also buggy in the presence of parallelism.  In order to
  fix these problems, make the following changes:

  - When there are in-flight sockets and a UNIX domain socket is destroyed,
    asynchronously schedule the garbage collector, rather than running it
    synchronously in the current context.  This avoids lock order issues
    when the garbage collection code reenters the UNIX domain socket code,
    avoiding lock order reversals, deadlocks, etc.  Run the code
    asynchronously in a task queue.

  - In the garbage collector, when skipping file descriptors that have
    entered a closing state (i.e., have f_count == 0), re-test the FDEFER
    flag, and decrement unp_defer.  As file descriptors can now transition
    to a closed state, while the garbage collector is running, it is no
    longer the case that unp_defer will remain an accurate count of
    deferred sockets in the mark portion of the GC algorithm.  Otherwise,
    the garbage collector will loop waiting waiting for unp_defer to reach
    zero, which it will never do as it is skipping file descriptors that
    were marked in an earlier pass, but now closed.

  - Acquire the UNIX domain socket subsystem lock in unp_discard() when
    modifying the unp_rights counter, or a read/write race is risked with
    other threads also manipulating the counter.

  While here:

  - Remove #if 0'd code regarding acquiring the socket buffer sleep lock in
    the garbage collector, this is not required as we are able to use the
    socket buffer receive lock to protect scanning the receive buffer for
    in-flight file descriptors on the socket buffer.

  - Annotate that the description of the garbage collector implementation
    is increasingly inaccurate and needs to be updated.

  - Add counters of the number of deferred garbage collections and recycled
    file descriptors.  This will be removed and is here temporarily for
    debugging purposes.

  With these changes in place, the unp_passfd regression test now appears
  to be passed consistently on UP and SMP systems for extended runs,
  whereas before it hung quickly or panicked, depending on which bug was
  triggered.

  Reported by:    Philip Kizer <pckizer at nostrum dot com>
2005-11-25 11:22:39 +00:00
Nate Lawson 61134d18d7 MFC: acpi_battery.c 1.22, acpi_cmbat.c 1.42, acpi_smbat.c 1.2 and 1.3
Cache smbat battery states like cmbat (Original by ume@).  Only re-evaluate
_BIF when there is a notify and on boot.
2005-11-24 05:29:15 +00:00
Wilko Bulte 2e54ff1de8 sync with HEAD.
fix typo while here
2005-11-23 19:14:19 +00:00
John Baldwin 45cda988c7 MFC: Check for -1 using 0xffffffff rather than 0xffffff. 2005-11-23 19:06:53 +00:00
Maksim Yevmenkin 736e16a316 MFC: Start Bluetooth integration into rc.d system.
Introduce /etc/rc.d/bluetooth script to start/stop Bluetooth devices. It
will be called from devd(8) in response to device arrival/departure events.
It is also possible to call it by hand to start/stop particular device
without unplugging it.

Introduce generic way to set configuration parameters for Bluetooth devices.
By default /etc/rc.d/bluetooth script has hardwired defaults compatible
with old rc.bluetooth from /usr/share/netgraph/bluetooth/examples. These
can be overridden using /etc/defaults/bluetooth.device.conf file (system
wide defaults). Finally, there could be another device specific override
file located in /etc/bluetooth/$device.conf (where $device is ubt0, btccc0
etc.)

The list of configuration parameters and their meaning described in the
/etc/defaults/bluetooth.device.conf file. Even though Bluetooth device
configuration files are not shell scripts, they must follow basic sh(1) syntax.

Add rc.d scripts for the hcsecd(8) and sdpd(8) daemons. Put defaults into
/etc/defaults/rc.conf. Both daemons can run even if no Bluetooth devices
are attached to the system. Both daemons depend on Bluetooth socket layer.

Fix Bluetooth assigned numbers URL in /etc/bluetooth/protocols file.
2005-11-23 18:03:33 +00:00
Christian Brueffer f5bf0e130a MFC: rev. 1.6
Mention that this driver does not work on i386+PAE.
2005-11-22 21:04:22 +00:00
Ruslan Ermilov 26a41259e6 MFC: Reimplement the -I option. 2005-11-22 20:58:58 +00:00
cvs2svn 84fc7756f2 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-11-22 19:17:43 +00:00
Simon L. B. Nielsen d1ab3d7379 MFC 1.46:
Do not explicitly state how many bytes an argument list can be in the
description of E2BIG, since it's now larger on some platforms.
2005-11-22 19:13:09 +00:00
Christian S.J. Peron ea409b08d0 MFC revision 1.119
Giant push down
2005-11-22 02:12:08 +00:00
Christian S.J. Peron 5816e43c51 MFC revision 1.111
MFC revision 1.110
MFC revision 1.109

- Lock the object while traversing the list of it's backing objects
- Use the correct object while calculating offsets
- Conditionally pickup Giant if debug.mpsafevfs == 0 or if the file
  system is not marked as being MP safe.
2005-11-22 02:06:59 +00:00
Boris Popov 1f6d41bc4b MFC:
Allow overriding of remote port numbers.
2005-11-22 02:01:01 +00:00
Ruslan Ermilov d50c58f676 MFC: Markup and misc. fixes. 2005-11-21 19:41:52 +00:00
John Baldwin 514007004d MFC: If we get a source index in a _PRT entry that is not zero, assume that
it is really a hard-wired IRQ and not a source index.
2005-11-21 19:33:23 +00:00
Christian S.J. Peron 7b62ea56ad Regenerate "generated from" portions of various files after a:
make sysent
2005-11-21 01:36:28 +00:00
Christian S.J. Peron 9ab1a141cf MFC sycalls.master revision 1.199
MFC vfs_syscalls.c revision 1.395

- Push Giant down in for extended attributes
- Mark extended attribute related system calls as being MP safe
2005-11-21 01:12:37 +00:00
Ian Dowse 8cf1434ef0 MFC 1.68: fix a typo that caused crashes and other problems when
reading from ulpt devices.
2005-11-20 03:18:22 +00:00
Robert Watson b728574005 Merge pstat.c:1.96 from HEAD to RELENG_6:
Print (total - used) as the amount of available swap for a swap device
  when printing swapinfo output, rather than (total), as that is (strictly
  speaking) more accurate.

  Pointed out by: Rob <spamrefuse at yahoo dot com>
2005-11-20 00:40:03 +00:00
Robert Watson 3cf4639198 Merge main.c:1.80, mbuf.c:1.45, netstat.h:1.46 from HEAD to RELENG_6:
Modify netstat -mb to use libmemstat when accessing a core dump or live
  kernel memory and not using sysctl.  Previously, libmemstat was used
  only for the live kernel via sysctl paths.

  This results in netstat output becoming both more consistent between
  core dumps and the live kernel, and also more information in the core
  dump case than previously (i.e., mbuf cache information).

  Statistics relating to sfbufs still rely on a kvm descriptor as they
  are not currently exposed via libmemstat.  netstat -m operating on a
  core is still unable to print certain sfbuf stats available on the live
  kernel.
2005-11-20 00:38:06 +00:00
cvs2svn c616b534e9 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-11-19 20:31:32 +00:00
Alan Cox 1d0aa3e2d3 MFC
Begin and end the initialization of pvzone in pmap_init().
  Previously, pvzone's initialization was split between pmap_init() and
  pmap_init2().  This split initialization was the underlying cause of
  some UMA panics during initialization.  Specifically, if the UMA boot
  pages was exhausted before the pvzone was fully initialized, then UMA,
  through no fault of its own, would use an inappropriate back-end
  allocator leading to a panic.  (Previously, as a workaround, we have
  increased the UMA boot pages.)  Fortunately, there is no longer any
  reason that pvzone's initialization cannot be completed in
  pmap_init().

  Eliminate a check for whether pv_entry_high_water has been initialized
  or not from get_pv_entry().  Since pvzone's initialization is
  completed in pmap_init(), this check is no longer needed.

  Use cnt.v_page_count, the actual count of available physical pages,
  instead of vm_page_array_size to compute the maximum number of pv
  entries.

  Introduce the vm.pmap.pv_entries tunable on alpha and ia64.

  Eliminate some unnecessary white space.
2005-11-19 20:31:31 +00:00
Hiroki Sato 359182019b New errata item:
ipfw.ko does not support IPv6 on 6.0R.
2005-11-19 19:20:56 +00:00
Robert Watson d009d5d07a Merge kdump.1:1.14 and kdump.c:1.28 from HEAD to RELENG_6:
Add "-s" argument to kdump to suppress the display of I/O data.
2005-11-19 11:55:50 +00:00
Hajimu UMEMOTO c97e49a790 MFC 1.48: don't match packets other than IPv4 against divert rule.
divert supports only IPv4.
2005-11-19 06:06:59 +00:00
Alan Cox 8239438e15 MFC revision 1.517
When support for 2MB/4MB pages was added in revision 1.148 an error was
  made in pmap_protect(): The pmap's resident count should not be reduced
  unless mappings are removed.

  The errant change to the pmap's resident count could result in a later
  pmap_remove() failing to remove any mappings if the errant change has set
  the pmap's resident count to zero.

MFC revision 1.518
  Decouple the unrefing of a page table page from the removal of a pv entry.
  In other words, change pmap_remove_entry() such that it no longer unrefs
  the page table page.  Now, it only removes the pv entry.

MFC revision 1.519
  Eliminate unneeded diagnostic code.

MFC revision 1.520
  Eliminate unneeded diagnostic code.

  Eliminate an unused #include.  (Kernel stack allocation and deallocation
  long ago migrated to the machine-independent code.)

MFC revision 1.521
  Simplify the page table page reference counting by pmap_enter()'s change of
  mapping case.

  Eliminate a stale comment from pmap_enter().

MFC revision 1.522
  Correct a performance bug in revision 1.462.  The effect of the bug is to
  execute the outer loop in procedures such as pmap_protect() many more times
  than necessary.

MFC revision 1.523
  Introduce pmap_pml4e_to_pdpe() and pmap_pdpe_to_pde() and use them to avoid
  recomputation of the pml4e and pdpe in pmap_copy(), pmap_protect(), and
  pmap_remove().

MFC revision 1.524
  Change pmap_extract() and pmap_extract_and_hold() to use PG_FRAME rather
  than ~PDRMASK to extract the physical address of a superpage from a PDE.
  The use of ~PDRMASK is problematic if the PDE has PG_NX set.  Specifically,
  the PG_NX bit will be included in the physical address if ~PDRMASK is used.

MFC revision 1.525
  Pass the PDE from pmap_remove() to pmap_remove_page() so that the latter
  procedure doesn't have to recompute it.

MFC revision 1.526
  Remedy the following three problems:

  1. The amd64 pmap, unlike the i386 pmap, maintains a reference count
     for each page directory (PD) page.  However, in the transformation
     of the i386 pmap into the amd64 pmap, operations, such as
     pmap_copy() and pmap_object_init_pt(), that create 2MB "superpage"
     mappings by setting the PG_PS bit in a PD entry were not modified
     to adjust the underlying PD page's reference count.  Consequently,
     superpage mappings could disappear prematurely.

  2. pmap_object_init_pt() could crash or corrupt memory if either the
     virtual address range being mapped crosses a 1GB boundary in the
     virtual address space or nothing is mapped in the 1GB area.

  3. When pmap_allocpte() destroys a 2MB "superpage" mapping it does not
     reduce the pmap's resident count accordingly.  It should.  (This
     bug is inherited from i386.)

MFC revision 1.528
  Eliminate unnecessary TLB invalidations by pmap_enter().  Specifically,
  eliminate TLB invalidations when permissions are relaxed, such as when a
  read-only mapping is changed to a read/write mapping.  Additionally,
  eliminate TLB invalidations when bits that are ignored by the hardware,
  such as PG_W ("wired mapping"), are changed.
2005-11-19 05:06:32 +00:00
John Baldwin 95c0cbc7cf Document the -32 flag and add it to usage(). 2005-11-18 19:47:41 +00:00
Hajimu UMEMOTO bedc2c410b MFC 1.55: The KAME's getipnodebyaddr() code honor the
MULTI_PTRS_ARE_ALIASES define also, but res_config.h was not
included into libc/net/name6.c.  So getipnodebyaddr() ignored
the multiple PTRs.
2005-11-18 02:32:32 +00:00
Wilko Bulte baf4f47148 MFC:
No CAVEAT about EISA attachment given that there is no EISA support

Sort of submitted by: jhb
Forgotten in previous commit by: wilko
2005-11-17 21:07:39 +00:00
Kirill Ponomarev 52c6bd5653 MFC: add.h:1.12, main.c:1.65, perform.c:1.78, pkg_add.1:1.67
date: 2005/11/12 11:45:01;  author: krion;  state: Exp;  lines: +9 -2
  Add -P flag, it does the same as the -p option, except that the
  given prefix is also used recursively for the dependency packages,
  if any.  If the -P flag appears after any -p flag on the
  command line, it overrides it's effect, causing pkg_add to use the
  given prefix recursively.

  PR:             bin/75742
  Submitted by:   Frerich Raabe <raabe AT kde DOT org>
2005-11-17 18:08:58 +00:00
Christian Brueffer b7dfdcca53 MFC: rev. 1.5 by delphij
Mention that hptmv(4) actually works for the amd64 platform as well.
2005-11-17 16:26:31 +00:00
Robert Watson ec8dfe6f20 Merge kern_descrip.c:1.286, 1.287, 1.288 from HEAD to RELENG_6:
Add a DDB "show files" command to list the current open file list, some
  state about each open file, and identify the first process in the process
  table that references the file.  This is helpful in debugging leaks of
  file descriptors.

  Expand the set of details printed for each file descriptor to include
  it's garbage collection flags.  Reformat generally to make this fit and
  leave some room for future expansion.

  Add the f_msgcount field to the set of struct file fields printed in show
  files.
2005-11-17 13:11:36 +00:00
Ruslan Ermilov 2c770c96fa MFC: Document ${loader_logo} and ${beastie_disable}. 2005-11-17 06:59:53 +00:00
Hiroki Sato 28b3ab4860 New errata item:
if_bridge + packet filter = mbuf leak.
2005-11-17 03:34:47 +00:00
Hiroki Sato 22d3f99336 New errata item:
ipfw divert rule matches IPv6 packets and discards them.
2005-11-17 02:25:10 +00:00
Peter Wemm c8cfdca92d MFC: Label the apic timer interrupt as 'cpuN: timer' like on i386 2005-11-17 01:16:23 +00:00
David Xu b90b0a2a61 MFC Revsion 1.50:
Update SIGTHR's comment.
MFC Revision 1.52:
	Define SIGLWP.
2005-11-16 12:44:10 +00:00
Ruslan Ermilov 0638f39782 MFC: Bring /dev/speaker support to amd64. 2005-11-16 10:50:12 +00:00
Ruslan Ermilov 525709be36 MFC: 1.56: Make IFP2NG() usable as lvalue. 2005-11-16 10:33:53 +00:00
Ruslan Ermilov e370c86c02 MFC: Use sparse initializers for "struct domain" and "struct protosw". 2005-11-16 10:31:23 +00:00
Andrew Thompson b12400df82 MFC: Sync bridge code up with HEAD
- plug mbuf and refcnt leak
 - make funtions static
2005-11-16 10:17:15 +00:00
Ruslan Ermilov ed766c60e6 MFC: 1.34: Simplify setting the link-level address. 2005-11-16 10:14:25 +00:00
Ruslan Ermilov 360ac45918 MFC: All recent fixes. 2005-11-16 10:13:34 +00:00
Ruslan Ermilov 3fa2c0b44b MFC: 1.55: Restore part of the code mistakenly dropped in rev. 1.25. 2005-11-16 10:09:51 +00:00
Ruslan Ermilov 64665865ec MFC: Use variable-sized arrays where appropriate. 2005-11-16 10:08:02 +00:00
Ruslan Ermilov 078b79d485 MFC: 1.88: Use ${S} to pass ${SYSDIR} to ports. 2005-11-16 10:03:02 +00:00
Ruslan Ermilov 00c7204e94 MFC: 1.5: Make the cookie constant name canonical. 2005-11-16 10:01:27 +00:00
Ruslan Ermilov 03d8523988 MFC: 1.1059: Remove duplicate entry. 2005-11-16 09:44:56 +00:00
Ruslan Ermilov 03ab640efa MFC: Sort ath_rate_* entries. Mark ath_rate_sample as the desired algorithm. 2005-11-16 08:59:51 +00:00
Ruslan Ermilov ad09f1fdce MFC: 1.196: Get rid of duplicate -I's in CFLAGS. 2005-11-16 08:54:29 +00:00
Ruslan Ermilov 5a3eef0419 MFC: 1.459: Sorting. 2005-11-16 08:50:59 +00:00
Ruslan Ermilov d6a5b2c1b3 MFC: 1.203: Remove a stale comment. 2005-11-16 08:49:22 +00:00
Ruslan Ermilov 2e79189475 MFC: 1.194: Fix genassym.o dependencies. 2005-11-16 08:46:14 +00:00
Ruslan Ermilov 01e439f1cf MFC: 1.30: The default fill byte is 0xf6, not 0xf5. 2005-11-16 08:36:10 +00:00
Ruslan Ermilov 29768da92a MFC: 1.10: Remove now redundant NO_SHARED. 2005-11-16 08:35:22 +00:00
Ruslan Ermilov 66e62f8cdf MFC: 1.7: Style. 2005-11-16 08:33:02 +00:00
Ruslan Ermilov 3245e8c659 MFC: 1.337: Sort SUBDIR. 2005-11-16 08:31:52 +00:00
Ruslan Ermilov ceab991cb9 MFC: 1.64: Align output. 2005-11-16 08:27:46 +00:00
Ruslan Ermilov e7c6654f7b MFC: 1.110: Fix .include <> to match documented behavior. 2005-11-16 08:25:19 +00:00
Ruslan Ermilov 3ed2489b14 MFC: 1.12: Style. 2005-11-16 08:21:06 +00:00
Robert Watson fed2ecd522 Merge Makefile:1.5 from HEAD to RELENG_6:
Add symlinks for kvm access methods for memstat(3).
2005-11-16 08:20:44 +00:00
Ruslan Ermilov 2710b44207 MFC: 1.3: Fix vgrind(1) indexing. 2005-11-16 08:19:26 +00:00
Ruslan Ermilov cca0c035a9 MFC: 1.21: Document NGM_KSOCKET_ACCEPT ("accept") control message. 2005-11-16 08:14:27 +00:00
Ruslan Ermilov 630e8685e6 MFC: 1.3: Drop redundant include. 2005-11-16 08:13:22 +00:00
Robert Watson 97a9b6b259 Merge kern_descrip.c:1.284 from HEAD to RELENG_6:
In closef(), remove the assumption that there is a thread associated
  with the file descriptor.  When a file descriptor is closed as a result
  of garbage collecting a UNIX domain socket, the file descriptor will
  not have any associated thread, so the logic to identify advisory locks
  held by that thread is not appropriate.  Check the thread for NULL to
  avoid this scenario.  Expand an existing comment to say a bit more about
  this.
2005-11-16 08:12:11 +00:00
Ruslan Ermilov 7698318756 MFC: 1.87: Drop outdated check. 2005-11-16 08:12:03 +00:00
Robert Watson 404d9760f4 Merge kern_ktrace.c:1.102, ktrace.h:1.30 from HEAD to RELENG_6:
Replace ktr_buffer pointer in struct ktr_header with a ktr_unused
  intptr_t.  The buffer length needs to be written to disk as part
  of the trace log, but the kernel pointer for the buffer does not.
  Add a new ktr_buffer pointer to the kernel-only ktrace request
  structure to hold that pointer.  This frees up an integer in the
  ktrace record format that can be used to hold the threadid,
  although older ktrace files will have a garbage ktr_buffer field
  (or more accurately, a kernel pointer value).

  Space requested by:     davidxu
2005-11-16 08:11:06 +00:00
Ruslan Ermilov 95833bf8fe MFC: 1.8: Fix malloc size. 2005-11-16 08:08:48 +00:00
Ruslan Ermilov c73d39eac9 MFC: 1.26: err() -> errx() where appropriate. 2005-11-16 08:08:07 +00:00
Ruslan Ermilov e0f2fec8d1 MFC: Simplified markup. 2005-11-16 08:06:23 +00:00
Ruslan Ermilov 1dd4ac3fc0 MFC: 1.892: Be cross-arch friendly. 2005-11-16 08:03:33 +00:00
Ruslan Ermilov 44fa4da7cf MFC: 1.5: Style. 2005-11-16 08:01:07 +00:00
Ruslan Ermilov 048b657c26 MFC: Finish the removal of threads support in ../config.mk,v 1.15. 2005-11-16 07:59:50 +00:00
Ruslan Ermilov 5ca368154c MFC: 1.9: Recognize all current standard node types. 2005-11-16 07:56:37 +00:00
Ruslan Ermilov de2f915f25 MFC: 1.6: Apply the .PHONY attribute to the ../make*/make* targets. 2005-11-16 07:53:16 +00:00
Ruslan Ermilov c1deb5ef2a MFC: 1.28: Expand tabs. 2005-11-16 07:50:36 +00:00
Ruslan Ermilov a8be1419a0 MFC: Sync calendar up with HEAD, including adding the Ukrainian calendar. 2005-11-16 07:47:44 +00:00
Ruslan Ermilov 7e8db17a34 MFC: 1.2: Remove redundant include. 2005-11-16 07:39:24 +00:00
Ruslan Ermilov db8663bd31 MFC: 1.58: Fix up comment. 2005-11-16 07:36:51 +00:00
Ruslan Ermilov d247f1c559 MFC: 1.146: Long overdue, keep up with mbuf.h,v 1.148. 2005-11-16 07:34:44 +00:00
Ruslan Ermilov 7ba36b4b67 MFC: 1.7: teach lorder(8) to work with .a libraries. 2005-11-16 07:30:02 +00:00
Ruslan Ermilov 3a955041d5 MFC: 1.13: Drop useless here SHLIB_MAJOR. 2005-11-16 07:26:26 +00:00
Ruslan Ermilov 7018d9ec43 MFC:
- Pass -i to pwd_mkdb(8) to ignore locking failures.  This can be useful
  for NFS installing world/kernel to another machine.

- Require that DESTDIR be set before running "make distribution".
2005-11-16 07:24:02 +00:00
Ruslan Ermilov ff7e2e5064 MFC the following:
o Makefile: 1.319, 1,320
o Makefile.inc1: 1.500, 1.508, 1.509, 1.513, 1.515, 1.517

- Embed the "buildkernels" target into the "universe" target so that
  the "make -n universe" output looks more builder (human) friendly.

- Wrap the "universe" target into a ".if make(universe)"; it's only
  intended to be called directly so it should be safe to do it.

- Make the `distrib-dirs' target official and working properly
  when cross-building (installing).  (This is useful for NFS
  installing world/kernel to another architecture machine.)

- Remove duplicate settings from LIB32MAKE definition.
- Install lib32 bits using the real install(1) program.
- clean ${LIB32TMP} in _worldtmp
- clean ${OBJTREE}/lib32 in _cleanobj
- ensure that ${WORLDTMP} exists in build32

- Require DESTDIR to be set when cross-installing.

- Force a full Groff upgrade during the build.
2005-11-16 06:56:09 +00:00
Ruslan Ermilov 413463cd1e MFC: Groff 1.19.2. 2005-11-15 22:07:00 +00:00
John Baldwin a0f5da704b MFC: Fixup locking and mark MPSAFE. 2005-11-15 19:59:04 +00:00
John Baldwin 7b337ae7a8 MFC: Sync driver up with head (mostly) including adding locking and marking
MPSAFE.
2005-11-15 19:54:10 +00:00
Damien Bergamini 7c8c23f0ee er, backout my last commit.
committed to the wrong branch.
2005-11-15 17:52:35 +00:00
Damien Bergamini bd269ec247 Add some initial bits (currently unused) for upcoming AMRR support.
AMRR = Adaptive Multi Rate Retry algorithm
More information: http://www-sop.inria.fr/rapports/sophia/RR-5208.html
2005-11-15 17:48:49 +00:00
Alan Cox b1b14dc62d MFC revision 1.525
When support for 2MB/4MB pages was added in revision 1.148 an error was
  made in pmap_protect(): The pmap's resident count should not be reduced
  unless mappings are removed.

  The errant change to the pmap's resident count could result in a later
  pmap_remove() failing to remove any mappings if the errant change has set
  the pmap's resident count to zero.

MFC revision 1.526
  Decouple the unrefing of a page table page from the removal of a pv entry.
  In other words, change pmap_remove_entry() such that it no longer unrefs
  the page table page.  Now, it only removes the pv entry.

MFC revision 1.527
  Eliminate unneeded diagnostic code.

MFC revision 1.528
  Eliminate unneeded diagnostic code.

  Eliminate an unused #include.  (Kernel stack allocation and deallocation
  long ago migrated to the machine-independent code.)

MFC revision 1.529
  Simplify the page table page reference counting by pmap_enter()'s change of
  mapping case.

  Eliminate a stale comment from pmap_enter().

MFC revision 1.530
  When pmap_allocpte() destroys a 2/4MB "superpage" mapping it does not
  reduce the pmap's resident count accordingly.  It should.

MFC revision 1.532
  Eliminate unnecessary TLB invalidations by pmap_enter().  Specifically,
  eliminate TLB invalidations when permissions are relaxed, such as when a
  read-only mapping is changed to a read/write mapping.  Additionally,
  eliminate TLB invalidations when bits that are ignored by the hardware,
  such as PG_W ("wired mapping"), are changed.
2005-11-15 05:54:54 +00:00
Peter Wemm f86208b545 MFC: compensate for removal of pcb->pcb_rflags. 2005-11-15 00:26:31 +00:00
Peter Wemm 69a5b72521 MFC: eliminate pcb_rflags, replacing it with padding. It just wastes
cpu cycles.
2005-11-15 00:26:00 +00:00
Jung-uk Kim 23aaa9a526 MFC: agp_amd64 1.8, 1.9 and agpreg.h 1.15.
- Add a work-around for nForce3, ULi, and VIA chipsets.  Aperture base
address encoded in misc. control register and AGP bridge seems to be
inconsistent with some BIOSes.  Instead of relying on BIOS settings,
we just take the initial aperture size and encode them for both
miscellaneous control register and AGP bridge.

- Add preliminary ULi M1689 chipset support.  The idea was taken from Linux
because hardware and documentation are unavailable.  Not tested.

- Add one more VIA chipset PCI ID taken from Linux driver.
2005-11-14 22:48:30 +00:00
SUZUKI Shinsuke b3acfe45e9 MFC 1.115
fixed a bug that uRPF does not work properly for an IPv6 packet bound for the sending machine itself
  (this is a bug introduced due to a change in ip6_input.c:Rev.1.81.2.2)
2005-11-14 22:33:35 +00:00
Andrew Thompson 455b971a2b MFC r1.59, List IFT_BRIDGE as a valid type. 2005-11-14 22:25:33 +00:00
Eric Anholt 716b733933 MFC: ATI IGP AGP driver. 2005-11-14 21:14:14 +00:00
Eric Anholt 610b826a4d MFC r1.9: Fix nforce2 with Radeon DRI by setting bits to set the mappings
active, and use volatile in a necessary place.
2005-11-14 21:10:39 +00:00
Wilko Bulte cdb6c90342 MFC: Listen to jhb, and remove bogus claim of support of DE425. 2005-11-14 20:40:00 +00:00
John Baldwin 2de02cdee4 MFC: Sync this driver up with HEAD including bus-dma support and some other
cleanups such as removing some more old cruft and using kernel functions
like m_defrag() and m_devget() rather than homerolling our own.
2005-11-14 19:29:56 +00:00
cvs2svn 59d87157f2 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-11-14 18:38:00 +00:00
Robert Watson 1e83d7f6f5 Merge if_em.c:1.82 from HEAD to RELENG_6:
Put probe-time printf of adapter speed and duplex behind bootverbose:
  since the link takes a bit to negotiate, the information is pretty
  much never available during the probe.  As such, the boot output
  pretty much always prints N/A for speed and duplex.  Since we print
  out the output of ifconfig during the user space boot, this early
  boot information is also generally redundant, and added to the noise.
2005-11-14 10:40:10 +00:00
Alan Cox 9b05a92679 MFC
Pass a value of type vm_prot_t to pmap_enter_quick() so that it determine
  whether the mapping should permit execute access.

  Revision  Changes    Path
  1.179     +2 -2      src/sys/alpha/alpha/pmap.c
  1.527     +4 -2      src/sys/amd64/amd64/pmap.c
  1.37      +3 -3      src/sys/arm/arm/pmap.c
  1.531     +2 -2      src/sys/i386/i386/pmap.c
  1.163     +4 -3      src/sys/ia64/ia64/pmap.c
  1.100     +3 -2      src/sys/powerpc/powerpc/pmap.c
  1.149     +3 -2      src/sys/sparc64/sparc64/pmap.c
  1.72      +1 -1      src/sys/vm/pmap.h
  1.207     +2 -1      src/sys/vm/vm_fault.c
  1.368     +2 -2      src/sys/vm/vm_map.c
2005-11-13 21:45:49 +00:00
Maxime Henrion cdb5544c5a MFC:
ls.c r1.81 and ls.1 r1.92:
  date: 2005/11/10 00:02:32;  author: mux;  state: Exp;  lines: +16 -8
  Add a -I option to disable the automatic -A flag for the super-user.

  ls.1 r1.93:
  date: 2005/11/10 14:26:50;  author: mux;  state: Exp;  lines: +2 -1
  Mention the non-standardness of the -I option in ls(1).
2005-11-13 17:06:49 +00:00
Maxim Konovalov b92c986d01 MFC revs. 1.2, 1.3: fix the path to aac_ioctl.h and style. 2005-11-13 16:37:57 +00:00
Maxim Konovalov fafc440b52 MFC rev. 1.3: update list of holidays in Russia. 2005-11-13 16:35:50 +00:00
Alan Cox e9af2cd3a0 MFC
Introduce the vm.boot_pages tunable and sysctl, which controls the number
  of pages reserved to bootstrap the kernel memory allocator.
2005-11-13 08:44:25 +00:00
Alan Cox 524169ffa2 MFC revisions 1.307 and 1.308
Consider the zero-copy transmission of a page that was wired by mlock(2).
  If a copy-on-write fault occurs on the page, the new copy should inherit
  a part of the original page's wire count.

  If a physical page is mapped by two or more virtual addresses, transmitted
  by the zero-copy sockets method, and written to before the transmission
  completes, we need to destroy all of the existing mappings to the page,
  not just the one that we fault on.  Otherwise, the mappings will no longer
  be to the same page and changes made through one of the mappings will not
  be visible through the others.
2005-11-13 07:38:15 +00:00
Colin Percival 34f0136a40 MFC documentation and example configuration for portsnap REFUSE directives. 2005-11-13 06:48:50 +00:00
Colin Percival 1f688afb07 Merge HEAD's portsnap into RELENG_6. Significant changes are:
1. phttpget (and thus portsnap) now understands the HTTP_PROXY_AUTH
environment variable and basic HTTP proxy authentication.
2. portsnap.8 now contains a privacy notice.
3. portsnap can now ignore parts of the tree (similar to cvsup
"refuse" directives).
4. portsnap reacts sensibly if host(1) does not exist.
2005-11-13 06:45:36 +00:00
Alan Cox 9ff166891b MFC revision 1.130
Introduce a new lock for the purpose of synchronizing access to the
  UMA boot pages.

  Disable recursion on the general UMA lock now that startup_alloc() no
  longer uses it.

  Eliminate the variable uma_boot_free.  It serves no purpose.

  Note: This change eliminates a lock-order reversal between a system
  map mutex and the UMA lock.  See
  http://sources.zabbadoz.net/freebsd/lor.html#109 for details.
2005-11-13 06:22:34 +00:00
Christian S.J. Peron 9e15136a7a MFC revision 1.47
Giant push down
2005-11-13 03:14:00 +00:00
Christian S.J. Peron e8457a02e9 MFC revision 1.51
Giant push down.
2005-11-13 03:12:32 +00:00
Christian S.J. Peron 7c2f3fd712 MFC Log:
Attempt to complete the userspace integration of POSIX.1e extended ACLs.
  This includes adding support for ACLs into cp(1) and mv(1) userspace
  utilities.

  For mv(1), if _PC_ACL_EXTENDED is in effect for the source AND destination
  operands, the destination file's ACLs shall reflect the source.

  For cp(1), if _PC_ACL_EXTENDED is in effect for both source and destination
  operands, and -p has been specified, the ACLs from the source shall be
  preserved on the destination.
2005-11-12 21:21:46 +00:00
Doug White ad700b49ad MFC:
src/sys/fs/devfs/devfs_vnops.c		1.128
 src/sys/kern/vfs_subr.c		1.652

This is a workaround for a complicated issue involving VFS cookies and devfs.
The PR and patch have the details. The ultimate fix requires architectural
changes and clarifications to the VFS API, but this will prevent the system
from panicking when someone does "ls /dev" while running in a shell under the
linuxulator.

PR:		88249
Submitted by:   "Devon H. O'Dell" <[email protected]>
2005-11-12 21:21:27 +00:00
Christian S.J. Peron 3231f6fc10 Sync with head:
-style(9) nits

MFC Log:
  Fix long standing race condition associated with how lockf uses open(2)
  for mutual exclusion:

  A brief description of the problem:

          1) Proc A picks up non-blocking lock on file X
          2) Proc B attempts to pickup lock, fails then waits
          3) Proc C attempts to pickup lock, fails then waits
          4) Proc A releases lock
          5) Proc B acquires lock, release it to pickup a non-blocking version
          6) Proc C acquires lock, release it to pickup a non-blocking version
          7) Both process B and C race each other to pickup lock again

  This occurs mainly because the processes do not keep the lock after they have
  been waiting on it. They drop it, attempt to re-acquire it. (They use the wait
  to notify when the lock has become available then race to pick it up). This
  results in additional CPU utilization during the race, and can also result
  in processes picking locks up out of order.

  This change attempts to correct this problem by eliminating the test/acquire
  race and having the operating system handle it.
2005-11-12 21:00:00 +00:00
Christian S.J. Peron 72df179f69 MFC Log:
Un-break processing of device major/minor values with fstat -n. We do
  this by accessing the cdev_priv element of the cdev structure. Looking
  forward we need a better way to handle this, as this structure shouldn't
  be frobbed by userspace.
2005-11-12 20:58:03 +00:00
Christian S.J. Peron 6ba691d712 MFC Log:
Convert the primary ACL allocator from malloc(9) to using a UMA zone instead.
  Also introduce an aclinit function which will be used to create the UMA zone
  for use by file systems at system start up.
2005-11-12 20:55:59 +00:00
John Baldwin bc77ca5a17 MFC: Include the mp_maxid'th CPU in 'show allpcpu'. 2005-11-11 18:50:45 +00:00
Kirill Ponomarev 95605cfb50 MFC: create.h:1.26, main.c:1.37, perform.c:1.81, pkg_create.1:1.69
date: 2005/11/08 20:48:26;  author: krion;  state: Exp;  lines: +1 -0
  Introduce 3 new options for pkg_create(1), -x for using basic regular
  expressions for pkg-name, -E for extended regexps and -G for exact matching.
  These new options are only meaningful when using the -b flag of pkg_create(1),
  and that the default for the -b parameter is now to do glob matching, as in
  other pkg_foo utilities that support package patterns.

  Submitted by:   mux
2005-11-11 08:08:04 +00:00
Peter Grehan 48d512b814 MFC locore.S:r.1.22, ofw_machdep.c:1.14
>  Copy SPRG0-3 registers at boot-time and restore when calling into
>  OpenFirmware. FreeBSD/ppc uses SPRG0 as the per-cpu data area pointer,
>  and SPRG1-3 as temporary registers during exception handling. There
>  have been a few instances where OpenFirmware does require these to
>  be part of it's context, such as cd-booting an eMac.
2005-11-11 05:21:08 +00:00
Peter Grehan f2f56b6f9a MFC r1.102
>  Finally (!?) get to the bottom of the mysterious G3 boot-time panics.
>  After a number of tests using nop's to change the alignment, it was
>  confirmed that the mtibat instructions should be cache-aligned.
>  FreeScale app note AN2540 indicates that the isync before and after
>  the mtdbat is the right thing to do, but sync/isync isn't required
>  before the mtibat so it has been removed.
>
>  Fix by using a ".balign 32" to pull the code in question to the correct
>  alignment.
2005-11-11 02:06:53 +00:00
Ruslan Ermilov f7b7cc8c20 MFC: Canonize the include of acpi.h. 2005-11-10 11:22:11 +00:00
Tom Rhodes 3bc032bad0 MFC:
revision 1.4
	date: 2005/11/01 21:16:39;  author: trhodes;  state: Exp;  lines: +0 -6
	Quick kill links to the nsmb(8) manual page, there is no such
	utility that I can find.
2005-11-10 10:11:06 +00:00
Ian Dowse 5d19a23911 MFC 1.111: improve the logic for automatically sizing partitions
to take into account the new default of starting the first partition
after the boot blocks instead of at sector 0.
2005-11-10 09:52:56 +00:00
Ralf S. Engelschall 0ab31eca9c MFC r1.11:
| There is no need to explicitly add "status" to $extra_commands in
| the /etc/rc.d/pf script as it is implicitly added by /etc/rc.subr's
| run_rc_command() because of the existing $pf_program.
|
| Submitted by:   Christoph Schug <[email protected]>
2005-11-10 07:32:35 +00:00
Ralf S. Engelschall 0fee95ef9a MFC r1.12:
| Update list of controllers ciss(4) driver
| actually supports according to implementation.
|
| Submitted by: Christoph Schug <[email protected]>
2005-11-10 07:28:54 +00:00
Bill Paul 4de5da3ff2 MFC: add RtlZeroMemory() and RtlCopyMemory() for Broadcom amd64 driver. 2005-11-10 02:24:07 +00:00
Christian Brueffer 774fac9744 MFC: rev. 1.22
Xref polling(4).
2005-11-09 22:03:10 +00:00
Robert Watson 352a39bd26 Merge vmstat.c:1.90 from HEAD to RELENG_6:
Use libmemstat(3)'s kvm support for malloc(9) rather than hand-extracting
  this information from the core dump.
2005-11-09 13:28:50 +00:00
Robert Watson b13bf953e8 Merge vmstat.c:1.89 from HEAD to RELENG_6:
Teach vmstat's domemstat_zone() to use memstat_kvm_uma() when the kvm
  descriptor is non-NULL, restoring vmstat -z support for core dumps and
  kmem access.  These were broken with the introduction of UMA.
2005-11-09 13:28:08 +00:00
cvs2svn bad5ad5ab2 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-11-09 11:42:02 +00:00
Gleb Smirnoff f2bacf4b5a MFC polling(4) for bge(4). 2005-11-09 11:42:01 +00:00
Gleb Smirnoff 25ea3cca11 MFC ALTQ support for ng_iface(4). 2005-11-09 11:36:07 +00:00
Gleb Smirnoff 0144a6b4ee MFC 1.61 by ru:
Bail if interface is misspelled instead of falling out into the
  "all interfaces" mode.  (Only works with -w, but still better
  than nothing.)
2005-11-09 10:55:37 +00:00
Robert Watson 473b8802d5 Merge libmemstat.3:1.9 from HEAD to RELENG_6:
Document kvm(3)-related error constants, and correct minor formatting
  nits.
2005-11-09 10:23:33 +00:00
Robert Watson 3c1fcb61c5 Merge libmemstat.3:1.8, memstat.h:1.9, memstat_all.c:1.3,
memstat_malloc:1.6 from HEAD to RELENG_6:

  Teach libmemstat(3) how to extract malloc(9) statistics using kvm(3),
  so that libmemstat can be used to view full memory statistics from
  kernel core dumps and /dev/mem.  This is provided via a new query
  function, memstat_kvm_malloc(), which is also automatically invoked
  by memstat_kvm_all().  A kvm handle must be passed in.

  This will allow malloc(9)-specific code to be removed from vmstat(8).
2005-11-09 10:22:28 +00:00
Robert Watson bc80a8bced Merge libmemstat.3:1.7, memstat.c:1.7, memstat.h:1.8, memstat_all.c:1.2,
memstat_uma.c:1.10 from HEAD to RELENG_6:

  Add memstat_kvm_uma(), an implementation of a libmemstat(3) query routine
  that knows how to extract UMA(9) allocator statistics from a core dump or
  live memory image using kvm(3).  The caller is expected to provide the
  necessary kvm_t handle, which is then used by libmemstat(3).

  With these changes, it is trivially straight forward to re-introduce
  vmstat -z support on core dumps, which was lost when UMA was introduced.

  In the short term, this requires including vm/ include files that are not
  intended for extra-kernel use, requiring in turn some ugliness.

Merge memstat_uma.c:1.11 from HEAD to RELENG_6:

  Define LIBMEMSTAT so that vm_page.h won't perform a nested include of
  opt_vmpage.h.

  Remove definition of _KERNEL, it is no longer required in order to
  include uma_int.h, as the sensitive parts of uma_int.h (a number of
  inlines depending on kernel-only constants) are now protected by
  _KERNEL.

The use of LIBMEMSTAT here will be cleaned up in the future.
2005-11-09 10:20:48 +00:00
Pav Lucistnik 4c5999e8f0 Add new ports-net-im collection. 2005-11-09 10:16:26 +00:00
Scott Long 661e541b5c MFC: hptmv is not compatible with PAE.
Noticed by: alc
2005-11-08 22:28:37 +00:00
John Baldwin c39397ac67 MFC: Fix standalone module build.
Reported by:	marius
2005-11-08 17:03:55 +00:00
Max Laier f11c62ab66 MFC: rev. 1.79
Fix obvious copy'n'paste-O in rev.1.36  While here nit style.

    PR:			bin/87783
    Submitted by:	Mats Palmgren
2005-11-08 16:45:00 +00:00
Christian S.J. Peron 912ce0fd59 MFC Log:
Before we export network interface data through the ifmibdata structure,
  OR the flags bits with the driver managed status flags.
2005-11-08 16:38:21 +00:00
Christian S.J. Peron f088556995 MFC: Pickup I/O locks around aac_alloc_sync_fib(). 2005-11-08 16:28:19 +00:00
John Baldwin a41ca34841 MFC: Push down Giant into fdfree() and remove it from two of the callers. 2005-11-08 16:08:40 +00:00
John Baldwin 20662e2d61 MFC:
- Use if_printf() and device_printf() and remove vr_unit from the softc.
  I had to initialize the ifnet a bit earlier in attach so that the
  if_printf()'s in vr_reset() didn't explode with a page fault.
- Use M_ZERO with contigmalloc() rather than an explicit bzero.
- Use callout_*() to manage the callout and make it MPSAFE.
- Fix locking in detach(), we only need to lock across vr_stop().
2005-11-08 16:05:56 +00:00
John Baldwin 9ce93fc2cc MFC: Hook nve(4) up in i386 and amd64 NOTES. 2005-11-08 16:02:21 +00:00
John Baldwin b02578f901 MFC: Don't panic if a corrupted kld doesn't have a valid symbol table. 2005-11-08 16:00:42 +00:00
John Baldwin 013b34f2a2 MFC: Add the device ID for the VIA VT8235 south bridge. 2005-11-08 15:57:39 +00:00
John Baldwin d27d34e086 MFC: If the viapm device is a PCI-ISA bridge, attach a child ISA bus. 2005-11-08 15:55:30 +00:00
John Baldwin b322f6a9f5 MFC: Fix support for multiple rocketport cards in the same machine. This
is an instant MFC as it was actually tested on 5.x and 6.x.  Note that like
the change to HEAD, this renames the devices, and there is no easy way on
6.x to create compatibility names in the kernel.

Reviewed by:	phk
Tested by:	Jim Pazarena paz at qcislands dot net
2005-11-08 15:35:27 +00:00
David Xu d7e234f475 Merge cpu_swtch.S:1.154, machdep.c:1.642 from HEAD:
Micro optimization for context switch.
2005-11-08 00:55:36 +00:00
Robert Watson ed04d2152d Merge kern_malloc.c:1.148, uma_core.c:1.133 from HEAD to RELENG_6:
Change format string for u_int64_t to %ju from %llu, in order to use the
  correct format string on 64-bit systems.

  Pointed out by: pjd
2005-11-07 18:59:12 +00:00
Robert Watson 6881b86375 Merge kern_malloc.c:1.147 from HEAD to RELENG_6:
Add a "show malloc" command to DDB, which prints out the current stats for
  available kernel malloc types.  Quite useful for post-mortem debugging of
  memory leaks without a dump device configured on a panicked box.
2005-11-07 18:57:59 +00:00
Robert Watson 9d397d100c Merge uma_core.c:1.132 from HEAD to RELENG_6:
Add a "show uma" command to DDB, which prints out the current stats for
  available UMA zones.  Quite useful for post-mortem debugging of memory
  leaks without a dump device configured on a panicked box.
2005-11-07 18:57:08 +00:00
Robert Watson 44e43ab665 Merge tcp_input.c:1.284 from HEAD to RELENG_6:
Convert if (tp->t_state == TCPS_LISTEN) panic() into a KASSERT.
2005-11-07 18:54:53 +00:00
Bill Paul 9f09447f06 MFC: alias EXT_NDIS to EXT_NET_DRV 2005-11-07 16:58:23 +00:00
David E. O'Brien 6c810ecccb MFC: canonify the includes of acpica. 2005-11-07 09:55:50 +00:00
David E. O'Brien a531d12e43 MFC: canonify the include of acpi.h. 2005-11-07 09:53:25 +00:00
David E. O'Brien e2fcf1c109 MFC: for AMD dual-core processors, nullify CPUID.HTT. 2005-11-07 08:41:12 +00:00
Tim Kientzle 71225b56d5 MFC 1.65: Correct error message from incorrect use of --format.
PR: bin/86915
2005-11-06 22:27:21 +00:00
Tim Kientzle 6e432c7f50 MFC 1.17: Correctly detect NL_LANG_INFO.
PR: bin/88013
2005-11-06 22:24:27 +00:00
Stefan Farfeleder d500947325 Sync with HEAD's code:
- Support for command -v and -V.
- Fixes for the errexit option.
- A fix for a crash caused by SIGINT.
- POSIX compliant set +o ouput.
- A fix for unalias' exit code.
- Man page updates.
- Code cleanups, WARNS 3.
2005-11-06 20:39:48 +00:00
Bill Paul dd9ba0fb8c MFC: merge changes from head to pacify Intel 2200BG/2915/ABG driver. 2005-11-06 19:39:41 +00:00
Hiroki Sato a24f5674aa Add a new errata item:
fix a typo in relnotes (s/IPFIRWALL_FORWARD/IPFIREWALL_FORWARD/).

Spotted by:	brd
2005-11-06 18:37:35 +00:00
John Baldwin 45690a7830 MFC:
- Enforce an implicit lock order that Giant cannot be locked while holding
  any other non-sleepable lock.  In plain English: Giant comes before all
  other mutexes.
- Add some extra description to the lock order reversal printf's to indicate
  when a reversal is triggered by a hard-coded implicit rule.
2005-11-06 16:17:18 +00:00
John Baldwin b76be7d118 MFC: Revert most of revision 1.235 and fix the problem a different way as
we can't acquire an sx lock in ttyinfo() as it is almost always called
from an interrupt handler.
2005-11-06 16:09:32 +00:00
John Baldwin 8a29cff227 MFC: Only allow the sk(4) driver to attach to revision 2 of the LinkSys
EG1032 cards and teach the re(4) driver to attach to revision 3 cards.
2005-11-06 16:00:54 +00:00
John Baldwin dd8a1fd6cf MFC: Move the initialization of the devmtx into the mutex_init() function
called during early init before cninit().
2005-11-06 15:58:06 +00:00
John Baldwin d111286ba8 MFC: Allow the process name to be in square brackets ([]) in
_find_processes().
2005-11-06 15:54:43 +00:00
John Baldwin 981f434310 MFC: Remove spurious newline. 2005-11-06 15:51:47 +00:00
Hajimu UMEMOTO d2c9578488 MFC 1.59: Unbreak compiles with ACPI_DEBUG. 2005-11-06 13:34:06 +00:00
Yoshihiro Takahashi 124c957c55 MFC: Remove EPSON PC-386 note support. 2005-11-06 05:02:07 +00:00
Yoshihiro Takahashi 08c5b34cf3 MFC: Remove EPSON_NRDISK and EPSON PC-386 note support. 2005-11-06 05:01:03 +00:00
Yoshihiro Takahashi b51d6f08d5 MFC: Add EPSON_* defines. 2005-11-06 04:58:16 +00:00
Yoshihiro Takahashi d5077fb707 MFC: Don't include opt_pc98.h. 2005-11-06 04:55:43 +00:00
Yoshihiro Takahashi f8327f3bd5 MFC: Add '-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3' to CFLAGS. 2005-11-06 04:40:57 +00:00
Yoshihiro Takahashi e1114a8b26 MFC: Use hw.machine_arch instead of hw.machine. 2005-11-06 04:38:20 +00:00
Bill Paul 17cfe227f6 MFC recent changes, bring all 3 branches back into sync again 2005-11-06 03:52:25 +00:00
Nate Lawson 482cfe104c MFC: smart battery support 2005-11-05 23:55:56 +00:00
Nate Lawson 7bab389d34 MFC: don't spin quickly if C2/C3 don't put the CPU to sleep 2005-11-05 23:49:39 +00:00
Nate Lawson dcb50c0675 MFC: announce AC online event once on boot if no acad device. 2005-11-05 23:48:38 +00:00
Marcel Moolenaar d7115c45a6 MFC 1.10: Fix dump of the unread portion of the kernel message buffer.
PR: bin/87964
Submitted by: Frank Mayhar      frank at exit dot com
2005-11-05 19:13:08 +00:00
Marcel Moolenaar 3b7ad37cf7 MFC: uart_bus_ebus.c:1.8
uart_core:1.14

Have uart_bus_probe() return BUS_PROBE_DEFAULT when the probe is
successful.
2005-11-05 19:04:08 +00:00
Marcel Moolenaar 8540ce493a MFC rev 1.6: Update PCI IDs. 2005-11-05 18:53:42 +00:00
Marcel Moolenaar b16da2cdbe Partial MFC rev 1.11 (diff reduction):
o  Style(9) nits
o  Fix typo in comment
o  s/-100/BUS_PROBE_GENERIC/
2005-11-05 18:45:37 +00:00
Marcel Moolenaar cae4b55fae MFC rev 1.7: Recognize the SAB82532 in USIII machines (marius@) 2005-11-05 18:06:43 +00:00
Hiroki Sato 19086de8d0 Add a new errata item:
- version numbers of OpenSSH and IPFilter in 6.0-R relnotes
	  were wrong.
2005-11-05 14:01:56 +00:00
SUZUKI Shinsuke 0e84f68703 MFC Rev.1.25
changed syslog level to more appropriate ones
2005-11-05 10:57:41 +00:00
SUZUKI Shinsuke bd45e6e017 MFC: sync with KAME in the following points:
- removed compilation warnings
  - suppress a redundant error message when a default-router-list is empty

  Revision  Changes    Path
  1.18      +4 -1      src/usr.sbin/ndp/ndp.c
2005-11-05 10:56:06 +00:00
SUZUKI Shinsuke 7efd146a7b MFC: sync with KAME regarding the following clarification in RFC3542
- disable IPv6 operation if DAD fails for some EUI-64 link-local addresses.
   - export get_hw_ifid() (and rename it) as a subroutine for this process.

  Revision  Changes    Path
  1.30      +5 -6      src/sys/netinet6/in6_ifattach.c
  1.6       +1 -0      src/sys/netinet6/in6_ifattach.h
  1.36      +39 -2     src/sys/netinet6/nd6_nbr.c
2005-11-05 10:54:21 +00:00
SUZUKI Shinsuke 24af81061b MFC: added an ioctl option in kernel so that ndp/rtadvd can change some NDP-related kernel variables based on their configurations (RFC2461 p.43 6.2.1 mandates this for IPv6 routers)
Revision  Changes    Path
  1.56      +1 -0      src/sys/netinet6/in6.c
  1.26      +1 -0      src/sys/netinet6/in6_var.h
  1.57      +28 -0     src/sys/netinet6/nd6.c
  1.17      +21 -8     src/usr.sbin/ndp/ndp.8
  1.17      +31 -2     src/usr.sbin/ndp/ndp.c
  1.25      +30 -0     src/usr.sbin/rtadvd/config.c
2005-11-05 10:50:09 +00:00
SUZUKI Shinsuke c05cd84cfa MFC Rev 1.24
source link-layer address option should be marked to be checked later,
  because rs_input() need this option.
2005-11-05 10:35:13 +00:00
SUZUKI Shinsuke 6142d6de84 MFC Rev.1.19
fixed a bug that "ndp ... proxy" command does not work
2005-11-05 10:32:54 +00:00
SUZUKI Shinsuke 847aaffc03 MFC: supported an ndp command suboption to disable IPv6 in the given interface
src/sys/netinet6/ip6_input.c	1.84
  src/sys/netinet6/nd6.c	1.58
  src/sys/netinet6/nd6.h	1.20
  src/usr.sbin/ndp/ndp.8	1.18
  src/usr.sbin/ndp/ndp.c	1.20
2005-11-05 10:30:00 +00:00
Hajimu UMEMOTO bfb49fe741 MFC 1.8: Document passive cooling related sysctl MIB. 2005-11-05 06:57:32 +00:00
Hajimu UMEMOTO 7324f9bd86 MFC 1.54-1.58: Implement passive cooling. It is enabled for tz0 by
default where it is available.
2005-11-05 06:55:53 +00:00
Hajimu UMEMOTO 2a88c0240d MFC 1.17-1.19,1.22: make saved cpu level stackable. 2005-11-05 06:54:48 +00:00
Hiroki Sato 943e668844 Add a new errata item:
CHECKSUM.* include checksums of the checksum files.
2005-11-05 06:20:06 +00:00
Hiroki Sato bb3554c89b Add the following errata items:
- pmcstat(8) 32-bit executables handling problem on FreeBSD/amd64[1],
	- boot-time panic on some PowerMac G4 systems[2], and
	- incompatible change of LC_* in 6.0-RELEASE and misc/compat5x.

Submitted by:	jkoshy[1], grehan[2]
2005-11-05 06:00:37 +00:00
John Baldwin 8ed540cda0 MFC: Use device_printf() and if_printf(), use callout_*(), add M_ZERO to
initialize nge_ldata, add locking to ifmedia callouts, cleanup attach
error handling, and fixup locking in ioctl().
2005-11-05 00:53:41 +00:00
Peter Wemm 76a3f2cfc9 MFC: allow FreeBSD/amd64 to boot on certain Dell machines that have more
than 8 entries in the 0xe821 map.  This includes things like ACPI
exclusion zones, memory segments and recoverable memory segments after
the kernel has booted.
2005-11-05 00:41:12 +00:00
John Baldwin e36152be56 MFC: Clarify when the softc is added and add a xref to DEVICE_PROBE. 2005-11-04 22:10:13 +00:00
John Baldwin d9afd5a4d7 MFC: Correct a reference to microtime that was rendered as bintime. 2005-11-04 22:08:40 +00:00
Hajimu UMEMOTO 0e2a863be2 MFC 1.8: fixed a crush when either -lh or -ls option is used. 2005-11-04 21:04:30 +00:00
Hajimu UMEMOTO 031650181e MFC 1.3: AES counter mode uses 8byte IV, not 16 bytes. 2005-11-04 20:59:58 +00:00
Hajimu UMEMOTO 6b4e3ed014 MFC: added a knob to enable path MTU discovery for multicast packets.
(by default, it is disabled)

	sys/netinet6/in6.h:		1.40
	sys/netinet6/in6_proto.c:	1.36
	sys/netinet6/ip6_mroute.c:	1.32
	sys/netinet6/ip6_var.h:		1.35
2005-11-04 20:55:31 +00:00
Hajimu UMEMOTO 2c8b2d572c MFC:
- fix typo in comment.
- nuke unused code.

	sys/netinet6/icmp6.c:	1.66
	sys/netinet6/in6_src.c:	1.33
	sys/netinet6/in6_var.h:	1.24
	sys/netinet6/nd6.c:	1.54
	sys/netinet6/nd6_nbr.c:	1.32
	sys/netinet6/nd6_rtr.c:	1.28
2005-11-04 20:48:12 +00:00
Hajimu UMEMOTO 0d854b03ce MFC 1.65: removed RFC1885-related code. it was obsoleted by RFC2463,
and the code was #ifdef'ed out for a long time.
2005-11-04 20:41:08 +00:00
Hajimu UMEMOTO 635e52afcd MFC 1.96: simplied the fix to FreeBSD-SA-04:06.ipv6. The previous
one worried too much even though we actually validate the parameters.
This code also is more compatible with other *BSDs, which do copyin
within setsockopt().
2005-11-04 20:35:14 +00:00
Hajimu UMEMOTO cd0a19c5ee MFC 1.8: reflect scope change. 2005-11-04 20:30:56 +00:00
Hajimu UMEMOTO 2b6a5b6769 MFC: scope cleanup. with this change
- most of the kernel code will not care about the actual encoding of
  scope zone IDs and won't touch "s6_addr16[1]" directly.
- similarly, most of the kernel code will not care about link-local
  scoped addresses as a special case.
- scope boundary check will be stricter.  For example, the current
  *BSD code allows a packet with src=::1 and dst=(some global IPv6
  address) to be sent outside of the node, if the application do:
    s = socket(AF_INET6);
    bind(s, "::1");
    sendto(s, some_global_IPv6_addr);
  This is clearly wrong, since ::1 is only meaningful within a single
  node, but the current implementation of the *BSD kernel cannot
  reject this attempt.

	sys/net/if_gif.c:		1.53
	sys/net/if_spppsubr.c:		1.120
	sys/netinet/icmp6.h:		1.19
	sys/netinet/ip_carp.c:		1.28,1.29
	sys/netinet/ip_fw2.c:		1.107
	sys/netinet/tcp_subr.c:		1.230,1.231,1.235
	sys/netinet/tcp_usrreq.c:	1.125
	sys/netinet6/ah_core.c:		1.26
	sys/netinet6/icmp6.c:		1.63,1.64
	sys/netinet6/in6.c:		1.52
	sys/netinet6/in6.h:		1.38
	sys/netinet6/in6_cksum.c:	1.11
	sys/netinet6/in6_ifattach.c:	1.27
	sys/netinet6/in6_pcb.c:		1.63
	sys/netinet6/in6_proto.c:	1.33
	sys/netinet6/in6_src.c:		1.31,1.32
	sys/netinet6/in6_var.h:		1.22
	sys/netinet6/ip6_forward.c:	1.29
	sys/netinet6/ip6_input.c:	1.83
	sys/netinet6/ip6_mroute.c:	1.30
	sys/netinet6/ip6_output.c:	1.95
	sys/netinet6/ip6_var.h:		1.33
	sys/netinet6/ipsec.c:		1.43
	sys/netinet6/mld6.c:		1.21
	sys/netinet6/nd6.c:		1.50
	sys/netinet6/nd6_nbr.c:		1.30
	sys/netinet6/nd6_rtr.c:		1.27
	sys/netinet6/raw_ip6.c:		1.54
	sys/netinet6/route6.c:		1.12
	sys/netinet6/scope6.c:		1.13,1.14,1.15
	sys/netinet6/scope6_var.h:	1.5
	sys/netinet6/udp6_output.c:	1.23
	sys/netinet6/udp6_usrreq.c:	1.55
	sys/netkey/key.c:		1.72,1.73
2005-11-04 20:26:16 +00:00
Hajimu UMEMOTO 12cad3bdb4 MFC: always copy ip6_pktopt. remove needcopy and needfree
argument/structure member accordingly.

	sys/netinet6/ip6_output.c:	1.94
	sys/netinet6/ip6_var.h:		1.32
	sys/netinet6/raw_ip6.c:		1.53
	sys/netinet6/udp6_output.c:	1.22
2005-11-04 19:59:55 +00:00
Hajimu UMEMOTO 10f1e68d2c MFC: simplified udp6_output() and rip6_output(): do not override
in6p_outputopts at the entrance of the functions.  this trick was
necessary when we passed an in6 pcb to in6_embedscope(), within which
the in6p_outputopts member was used, but we do not use this kind of
interface any more.

	sys/netinet6/raw_ip6.c:		1.52
	sys/netinet6/udp6_output.c:	1.21
2005-11-04 19:57:31 +00:00
Ralf S. Engelschall 1cffbfddcd MFC:
| Fix parsing of mdmfs(8) option "-w <user>:<group>" in case <user> or
| <group> is a numeric user/group ID instead of a user/group name (as
| explicitly intended to be allowed by both the manual page and the
| implementation).
|
| Before this fix, mdmfs(8) aborted:
|
| | # mdmfs -s 32m -w 0:0 md /var/tmp/foo
| | Assertion failed: (mip->mi_have_uid), function extract_ugid, file /usr/src/sbin/mdmfs/mdmfs.c, line 555.
| | Abort trap (core dumped)
|
| The "mi_have_[ug]id" fields were only set in case a name lookup was
| successful. Instead they also have to be set in case the string to
| integer conversion was successful.
|
| Additionally, as a result of this fix, two assertions at the end of
| the function are now always true and hence can be just be removed. It
| is guarrantied that both the UID and the GID are set when the function
| returns regularily, else it would have been already bailed out with
| usage()/exit(3) or errx(3) before.
|
| Spotted by:     Christoph Schug <[email protected]>
2005-11-04 19:37:14 +00:00
Maxim Konovalov ab26ac387b MFC rev. 1.155 sys/netinet/raw_ip.c and rev. 1.178 sys/netinet/udp_usrreq.c:
INP_ONESBCAST is inpcb.inp_vflag flag not inp_flags.
2005-11-04 18:34:45 +00:00
Gleb Smirnoff 0af703ca2c MFC 1.91, 1.92:
- First fill in structure with valid values, and only then attach it
    to the global list.
  - In in_addprefix() compare not only route addresses, but their masks,
    too. This fixes problem when connected prefixes overlap.
2005-11-04 18:25:55 +00:00
Colin Percival 6ba677e9ed MFC rev. 1.2: Use the "builtin" shell function to make sure that the
requested command is handled as a shell function.
2005-11-04 18:22:17 +00:00
Gleb Smirnoff fd6c758f7b MFC 1.115:
- When flushing node input queue, check whether item has a callback. If
    it does, then call it suppling ENOENT as error value.
  - Add assert, that helped to catch the above error.
2005-11-04 18:20:32 +00:00
Maxim Konovalov 9f7af781ed MFC rev. 1.4: remove unfinished code and make it possible to override
bsdextended_script from rc.conf(5).
2005-11-04 18:18:20 +00:00
Warner Losh da9fa8d141 MFC: New cards recognized from head 2005-11-04 18:11:56 +00:00
Warner Losh a30fdce48e MFC: New cards, and elimination of redundant cards 2005-11-04 18:11:23 +00:00
Maxim Konovalov dc46bf1f93 MFC rev. 1.98: NetBSD 2.0.3 and NetBSD 2.1 added. 2005-11-04 18:09:39 +00:00
Warner Losh 912b4206fb MFC: Probe for RTL8019AS parts before probing for NE2000 cards. This allows
the old work horses to now have full-duplex.
2005-11-04 18:09:07 +00:00
Warner Losh 1e5dd5b7f3 MFC: Move initialization of offsets up since the ISA probe case needs to
have them reset.
2005-11-04 18:07:51 +00:00
Maxim Konovalov d787863c1d MFC rev. 1.269: s/RADUIS/RADIUS/ 2005-11-04 18:06:23 +00:00
Maxim Konovalov 16e0ccff87 MFC rev. 1.8: dcons(4) depends on "options GDB". 2005-11-04 18:03:00 +00:00
Maxim Konovalov fe70701b14 MFC rev. 1.40: typo. 2005-11-04 17:58:02 +00:00
John Baldwin 08a7596e27 MFC: Fix cleanup in some more attach failure edge cases. 2005-11-04 17:47:17 +00:00
John Baldwin 962514333f MFC: Rototill vx(4) adding locking and marking MPSAFE in the process. 2005-11-04 17:45:20 +00:00
John Polstra 31f72732c4 MFC 1.24: Fix an erroneous description of the file descriptor assignments
for the "~C" command.
2005-11-04 17:27:24 +00:00
John Polstra 216f81bf9c MFC 1.118: Don't include self-dependencies in the file's reference
count.
2005-11-04 17:05:13 +00:00
Wilko Bulte 9cc94b209d MFC:
Small changes in the AlphaStation 200 and PC14 area.  PC164 SRM does
not work with 53C896 SCSI chips.

Submitted by: Owen Mann <[email protected]>
2005-11-04 07:31:49 +00:00
Marcel Moolenaar e260ffa166 MFC rev. 1.246:
Fix an unaligned I/O memory access in the event that a SCB times out.
The FXP_SCR_FLOWCONTROL registers is at offset 0x19, but 2 bytes wide.
It cannot be read as a word without causing a panic on architectures
that enforce strict alignment.
2005-11-04 03:31:23 +00:00
Ken Smith 30cf8f5ea2 MFC v1.7:
> date: 2005/11/03 00:23:13;  author: kensmith;  state: Exp;  lines: +1 -6
> It had been noticed disc2 was overflowing earlier but committing the
> fix slipped through a crack.  Remove the apache and php packages under
> the assumption someone installing a Web server has network access and
> doesn't *need* the packages on disc2.

Approved by:	re (scottl)
2005-11-03 00:34:05 +00:00
Scott Long fe3b00f639 MFC: FreeBSD 6.0
Approved by: re
2005-11-02 00:01:08 +00:00
Scott Long fb8c5f4513 Bump up __FreeBSD_version for 6.0-STABLE.
Approved by: re
2005-11-01 23:51:19 +00:00
Scott Long d9d733b066 Welcome to 6.0-STABLE.
Approved by: re
2005-11-01 23:48:09 +00:00
Scott Long f58abfbef1 Nov = 11
Approved by: re
2005-11-01 23:44:40 +00:00
Scott Long fa7f291b0a Note that 6.0-RELEASE is about to happen.
Approved by: re
2005-11-01 23:40:10 +00:00
SUZUKI Shinsuke 486474fa47 MFC 1.59
statically configured IPv6 address is properly added/deleted now

Approved by: re(scottl)
2005-11-01 22:48:56 +00:00
John Baldwin adde52d9eb Add a deprecation warning since this driver is gone in HEAD.
Approved by:	re (scottl)
2005-10-31 20:15:58 +00:00
David E. O'Brien ea12ddf1f2 Catch up with FreeBSD 6.
Approved by:	re(scottl)
2005-10-30 17:54:39 +00:00
Yoshihiro Takahashi 3d3c322908 MFC: Enable beastie.4th.
Approved by:	re (scottl)
2005-10-30 16:36:00 +00:00
Scott Long 24205d4846 MFC
Approved by: re
2005-10-30 14:40:40 +00:00
cvs2svn 752f0597cf This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-30 05:41:43 +00:00
Kirill Ponomarev fafbb4eaa4 MFC: perform.c:1.14 test-pkg_version.sh:1.6
date: 2005/10/10 12:35:30;  author: krion;  state: Exp;  lines: +9 -4
  * pkg_version(1) exits if INDEX files is not found and -I is not
    specified.  The result is that the package will be listed with a '?'
    as if it was not found within the INDEX file, so fix this behaviour.
  * Remove trailing spaces.

  PR:             bin/87136
  Submitted by:   Sean Farley <sean-freebsd at farley dot org>

Approved by:	re
2005-10-29 15:49:01 +00:00
Kirill Ponomarev 91cd7b96f0 MFC: delete/main.c:1.27 info/main.c:1.48
Fix pkg_info(1) and pkg_delete(1) to handle properly packages which
  names start with a digit.

  PR:             bin/76858
  Submitted by:   Matthew D. Fuller <fullermd@over-yonder dot net>

Approved by:	re
2005-10-29 15:27:12 +00:00
Scott Long dd7427e427 MFC rev 1.113
Submitted by: delphij
Approved by: re
2005-10-29 15:05:25 +00:00
Scott Long 1c61e60800 MFC rev 1.497
Submitted by: tegge
Approved by: re
2005-10-29 06:45:38 +00:00
Scott Long b254516f87 MFC rev 1.158
Submitted by: tegge
Approved by: re
2005-10-29 06:43:55 +00:00
Scott Long 30339509fc MFC rev 1.294
Submitted by: tegge
Approved by: re
2005-10-29 06:42:25 +00:00
Scott Long 01eb862da5 MFC rev 1.106 - 1.110
Submitted by: tegge
Approved by: re
2005-10-29 06:40:41 +00:00
Scott Long 23d1b8f6f8 MFC rev 1.136 and 1.137
Submitted by: tegge
Approved by: re
2005-10-29 06:38:13 +00:00
Tai-hwa Liang 67f16f4393 MFC: (1.16) Fixing a name collision in module declaration by renaming
"firewire" to "if_firewire."  According to the PR originator and Cai's
test, this bug prevents a RELENG_6 GENERIC kernel from loading if_fwip.ko
and will panic the kernel if users compile "device fwip" into their
GENERIC kernel.

Approved by:	re (scottl)
2005-10-28 22:45:52 +00:00
Pawel Jakub Dawidek 79c930bbc9 Fix possible live-lock under heavy load where we can't allocate more
memory for request.
I was sure graid3 should handle such situations well, but green@ reported
it is not and we want to fix it before 6.0.

Submitted by:	green
Approved by:	re (scottl)
2005-10-28 20:27:53 +00:00
John Baldwin c4f003d855 MFC: Sync with head updating examples to match 6.x.
Approved by:	re (scottl)
2005-10-28 19:24:13 +00:00
John Baldwin 1286c2a7f2 MFC: Add DEFAULTS files for amd64, i386, and pc98.
Approved by:	re (scottl)
2005-10-28 19:21:27 +00:00
John Baldwin fca73f74fb MFC: Sync config(8) with HEAD:
- Add -V option to dump version.
- Implicitly include DEFAULTS if it exists in the current directory before
  the specified kernel config.

Approved by:	re (scottl)
2005-10-28 19:04:03 +00:00
John Baldwin 74bceb2a9b MFC: Add COMPAT_FREEBSD5.
Approved by:	re (scottl)
2005-10-28 19:02:22 +00:00
Martin Cracauer 47e5f2ec37 Fix this:
kern/87959      cracauer        ext2fs: no cp(1) possible, mmap returns EINVAL

ext2fs was missing vnode_create_vobject.

(Reisefs probably has the same problem but I want to get this in quick
for 6-release)

releng-6 branches commits approved by Scott Long.

Approved by: re
2005-10-28 18:44:26 +00:00
Scott Long 113b4d482d MFC: Fix regression with Dell PERC3/ROMB controllers
Approved by: re
2005-10-28 15:48:09 +00:00
cvs2svn ab8e7f23c3 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-28 15:30:52 +00:00
SUZUKI Shinsuke f0bc79e8e6 MFC Rev 1.60
perform NUD on an IPv6-aware point-to-point interface

Approved by: re(scottl)
2005-10-28 14:38:56 +00:00
Ade Lovett 6116ff3a3c MFC:
Specifically panic() in the case where pmap_insert_entry() fails to
get a new pv under high system load where the available pv entries
have been exhausted before the pagedaemon has a chance to wake up
to reclaim some.

Approved by:	re (scottl)
2005-10-28 06:49:49 +00:00
Xin LI c118a1d4d3 Some changes to reflect 6.0-STABLE/RELEASE:
- Mention that this is -STABLE
 - Mention that only 5.3+ is supported for source upgrade
 - When just building a kernel we assume that the user got a
   system that is fresh enough
 - The in-place update is supported for 5.x-STABLE and 6.x-STABLE
 - Since we don't support systems that is prior to 5.3, don't
   mention about mergemaster three years before.
 - Since source upgrade from 4.x is no longer supported, we
   are supposed that COMPAT_FREEBSD5X is better suited for the
   source upgrade
 - At the end, call this a -STABLE

Approved by:	re (scottl)
2005-10-28 02:58:50 +00:00
Stephan Uphoff 66a5fb9960 MFC vfs_cluster.c Revision 1.168
Only set B_RAM (Read ahead mark) on an incore buffers if we can lock it.
This fixes a race condition caused by the unlocked write access to the
b_flags field.

Approved by:    re (scottl)
2005-10-28 01:03:26 +00:00
Peter Grehan 55110d8a16 MFC r1.36
> The BCM5401 dspcode load on media changes also applies
> to the 100/1000 BCM5400 phy. This fixes the problem with
> the GEM port not syncing up on Sawtooth G4's.
>
> Obtained from:  NetBSD
> Reported by:    Ben Rosengart <ben + freebsd org at narcissus net>

Approved by:	re (scottl)
2005-10-28 00:58:43 +00:00
Ken Smith cf6460095d Temporary hack to get the hme network interface on Sun E250 servers to
work.  The code comment describes the issue, basically an as yet not
totally understood interrupt routing problem.  This hack is being done
to RELENG_6 so that the hme interface works on E250's for the release,
but is not being done in HEAD so more work on the interrupt routing
issue can be done.

Requested by:   marius
Approved by:    re (scottl)
2005-10-27 20:55:29 +00:00
Andrew Thompson c88377bd65 MFC if_bridge r1.30
> If we have been called from ether_ifdetach() then do not try and clear the
> promisc flag from the member interface, this is a no-op anyway since the
> interface is disappearing. The driver may have already released
> its resources such as miibus and this is likely to panic the kernel.

Approved by:	re (scottl)
2005-10-27 19:41:43 +00:00
Murray Stokely 9256d542ac MFC: look for packages in the packages-6-release directory when
appropriate.

Reviewed by:	portmgr (kris@)
Approved by:	re (scottl@)
2005-10-27 18:36:13 +00:00
Gleb Smirnoff 6689912aa7 MFC:
- Fix leak of struct nlminfo on process exit.
  - Fix malloc type collision, that made the above problem
    difficult to understand.

  Reported by:	Vladimir Sharun <sharun ukr.net>

Approved by:	re (scottl)
2005-10-27 18:35:19 +00:00
Xin LI 8e2435ad10 MFC 1.9: Update to sync up with latest RELENG_6 documentation.
Approved by:	re (scottl)
2005-10-27 17:53:31 +00:00
Scott Long 6d87d3d6ab MFC: Sync with HEAD. This fixes an out-of-bounds access that was caught by
INVARIANTS, and it synchronizes the license.

Approved by: re
2005-10-27 17:48:57 +00:00
Bill Paul a4e337a12b Approved by: re 2005-10-27 17:15:24 +00:00
cvs2svn 6c3bf7a1f9 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-10-27 17:08:58 +00:00
Bill Paul 46304d2c29 MFC: synchronize the NDISulator with the head and RELENG_5 branches,
add -D ndis support to wpa_supplicant

Approved by:	re
2005-10-27 17:08:57 +00:00
Bill Paul 2ef8427668 MFC: add 1 microsecond delay to pci_add_children() bus enumeration loop
to pacify certain PCI bridges ('fixes' problem with USB controllers
not being probed on some Sun AMD8111 machines, notably mine).

Approved by:	re
2005-10-27 16:41:49 +00:00
Søren Schmidt fa9316bc37 MFC:
Enclose the delayed attach in Giant so we dont loose the race with other
	drivers trying to attach ATA devices like pccard.
	Dont clear the delayed flag before we are acutally finished.

Approved by: re@ (scottl)
2005-10-27 16:41:39 +00:00
Jung-uk Kim 5e1c6d9356 MFC: Fix 'grep -Fw' for encodings other than UTF-8 (RH bug #161700).
PR:		87969
Approved by:	re (scottl)
Obtained from:	Fedora (Tim Waugh)
2005-10-27 16:26:27 +00:00
SUZUKI Shinsuke 9d4afe638f MFC rev 1.34
fixed a kernel crash when IPv6 PIM-SM routing is enabled and a PIM register message is received

Approved by: re(scottl)
2005-10-27 14:04:03 +00:00
Peter Wemm 8b9ad8f458 MFC: 1.2: don't set segment registers yet.
Approved by:  re
2005-10-26 22:07:03 +00:00
Christian S.J. Peron 784d4c0c70 MFC notes about ucred based rules and debug.mpsafenet requirements.
Approved by:	re (scottl)
2005-10-26 21:58:42 +00:00
Ariff Abdullah c775f08efe Virtual channel default speed should be based on soundcard
capabilities. This solve various mysterious slowdown especially
for fixed-rate ac97 soundcards.

Approved by:	re (scottl), netchild (mentor)
Reviewed by:	andreas
2005-10-26 21:18:41 +00:00
Ariff Abdullah 095e74c79c Rearrange sound unregister procedure to detect mixer busy
state and destroy it before anything else. This solve panic issue
during sound module unloading if the sound / mixer device being
held by external processes.

Approved by:	re (scottl), netchild (mentor)
Reviewed by:	andreas
2005-10-26 21:18:09 +00:00
Ariff Abdullah 504a4469dc Track every mixer device closing for proper refcount calculation.
This solve device busy and panic issues during sound module
unloading.

Approved by:	re (scottl), netchild (mentor)
Reviewed by:	andreas
2005-10-26 21:17:40 +00:00
Jung-uk Kim f9c0170e29 MFC: Fix a longstanding buglet in bz-prefixed grep(1).
PR:		gnu/72200
Approved by:	re
2005-10-26 21:13:30 +00:00
Xin LI 45c30abe27 MFC (by alc) changesets that addresses several race conditions that can
cause a kernel compiled with ZERO_COPY_SOCKETS to panic under certain
circumstances:
	sys/kern/uipc_cow.c:	1.24 - 1.26
	sys/vm/vm_object.c:	1.351

Approved by:	re (scottl)
2005-10-26 20:21:23 +00:00
Peter Wemm cd80f7d803 MFC: Fix fencepost error that made libkvm fail to read crashdumps.
Approved by: re
2005-10-26 00:07:25 +00:00
Nate Lawson 3a34f9d9f6 MFC rev 1.12: set to 100% on boot
Approved by:	re (scottl)
2005-10-25 20:52:44 +00:00
Nate Lawson 1551aa2b3e MFC rev 1.216: Don't disable PCI link devices even when they're !enabled
Approved by:	re (scottl)
2005-10-25 20:51:25 +00:00
Kris Kennaway 4ce856eeb4 MFC r1.650:
Default to mpsafevfs=1 on sparc64

Approved by:	re (scottl)
2005-10-25 20:42:06 +00:00
Kris Kennaway e5d5613745 MFC 1.73:
Reflect mpsafety of the underlying filesystem in the nullfs image.

Approved by:	re (scottl)
2005-10-25 20:33:31 +00:00
John Baldwin 0bb525dfad MFC: Don't panic if a spin lock is initialized that isn't in our static
order list.  Just warn about it instead.

Approved by:	re (scottl)
2005-10-25 20:14:04 +00:00
John Baldwin 9248bc1cbb MFC: Rename 'traceall' to 'alltrace' and add a 'bt' alias for 'trace'.
Approved by:	re (scottl)
2005-10-25 20:10:56 +00:00
Nate Lawson d4668a72b7 MFC: Warn, don't error out when we temporarily can't set the frequency.
Accept "maximum" and "minimum" keywords.  Set signals in the right place.

Approved by:	re (scottl)
2005-10-25 20:05:44 +00:00
Warner Losh 32f0d73d07 MFC: 1.26 remove 'string' to avoid shadowing a variable we want to change.
Approved by: re@ (scottl)
2005-10-25 19:59:22 +00:00
cvs2svn c888b750d4 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-24 05:35:41 +00:00
Warner Losh 6c88945c33 MFC: 1.2.
Mempage size needs to be 1k rather than 4k.  Prior versions of FreeBSD
used this value and it was recently increased to 4k.  This broke the
two 16-bit card at boot scenario.  Revert it back to 1k.

Approved by: re (scottl)
2005-10-23 18:22:16 +00:00
Xin LI f980e363ce Remove a note that claims that the debugging options are turned on
by default, to match the reality that these has been turned off on
the 6-STABLE branch since 6.0-BETA6.

This is a direct commit against RELENG_6 since it is not applicable
for HEAD.

Approved by:	re (scottl)
2005-10-23 03:34:43 +00:00
Andrew Thompson cb72594b4f MFC ng_ether support for if_bridge and cleanup of bridge hooks.
bridgestp.c; r1.8
 if_bridge.c; r1.25, 1.27
 if_bridgevar.h; r1.5
 if_ethersubr.c; r1.201, 1.202, 1.206
 ng_ether.c; r1.52 - 1.54

Approved by:	re (scottl)
2005-10-23 02:36:58 +00:00
Gleb Smirnoff 6c5dc6e026 Sync with HEAD. Revisions merged:
- rev. 1.76. Removed FreeBSD 4.x code.
  - rev. 1.77, 1.79. Together with rev. 1.71 (already merged) this
    fixes problems when some code is executed in driver when
    em_process_receive_interrupts() drops lock. This can occur
    at runtime, when polling(4) mode is changed to interrupt driver
    or vise versa, but more likely this can happen when administrator
    issues some ifconfig commands.
  - rev. 1.78. In em_process_receive_interrupts(), call bus_dmamap_sync()
    for the descriptors set each time we modify one descriptor, instead
    of doing it only at the function exit.
  - rev. 1.80. Loop in em_intr() until interrupt cause register is clear,
    don't mask overrun interrupt.
  - rev. 1.81. Several locking and other fixes.

See particular revision logs for more detailed information.

Approved by:	re
2005-10-22 21:20:17 +00:00
Yaroslav Tykhiy a5233af3de MFC notes on ifconfig(8): -tunnel, -vlandev.
Approved by:	re (hrs)
2005-10-21 15:44:47 +00:00
SUZUKI Shinsuke bd510d1a95 MFC 1.56 (added a missing unlock)
Approved by: re(scottl)
2005-10-20 11:49:25 +00:00
cvs2svn 68d4f22195 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-20 11:10:44 +00:00
Stephan Uphoff bb796dbec8 MFC vm_machdep.c 1.261-1.263
Rev: 1.261

  Ensure that a thread stays on same CPU when calculating per CPU
  TLB shootdown requirements. Otherwise a CPU may not get the needed
  TLB invalidation.

  The PTE valid and access flags can not be used here to avoid TLB
  shootdowns unless sf->cpumask == all_cpus.
  ( Otherwise some CPUs may still hold an even older entry in the TLB)
  Since sf_buf_alloc mappings are normally always used this is
  also not really useful and presetting accessed and modified
  allows the CPU to speculatively load the entry into the TLB.

  Both bugs can cause random data corruption.

Rev: 1.262

  Restore optimizations to reduce TLB shootdowns.
  Alan Cox pointed out that they are really useful for
  sendfile().

Rev: 1.263
  Restore the UP optimization to reduce the number of TLB
  invalidations.  The
  previous revision only restored the MP optimization.

  Describe the optimization strategy for TLB invalidations in a comment.

Approved by:	re@ (scottl)
2005-10-20 01:03:23 +00:00
Poul-Henning Kamp 9531ba4637 MFC:
Use correct criteria to determine if dirent can be removed
	right away.

Approved by:	re@ (scottl)
2005-10-19 21:25:31 +00:00
Andrew Thompson e0f2f06d1c MFC: if_bridge.c r1.26, if_ethersubr.c r1.205
>   Use bridge_ifdetach() to notify the bridge that a member has been detached.
>   The bridge can then remove it from its interface list and not try to send
>   out via a dead pointer.

Approved by:	re (scottl)
2005-10-19 20:46:16 +00:00
Don Lewis 10dd1cc1a8 MFC ufs_lookup.c 1.78 and 1.79.
Original commit messages:
  Modified files:
    sys/ufs/ufs          ufs_lookup.c
  Log:
  Close a race in the ufs_lookup() code that handles the ISDOTDOT
  case by saving the value of dp->i_ino before unlocking the vnode
  for the current directory and passing the saved value to VFS_VGET().

  Without this change, another thread can overwrite dp->i_ino after
  the current directory is unlocked, causing  ufs_lookup() to lock
  and return the wrong vnode in place of the vnode for its parent
  directory.  A deadlock can occur if dp->i_ino was changed to a
  subdirectory of the current directory because the root to leaf vnode
  lock ordering will be violated.  A vnode lock can be leaked if
  dp->i_ino was changed to point to the current directory, which
  causes the current vnode lock for the current directory to be
  recursed, which confuses lookup() into calling vrele() when it
  should be calling vput().

  The probability of this bug being triggered seems to be quite low
  unless the sysctl variable debug.vfscache is set to 0.

  Reviewed by:    jhb
  MFC after:      2 weeks

  Revision  Changes    Path
  1.78      +3 -1      src/sys/ufs/ufs/ufs_lookup.c

  Modified files:
    sys/ufs/ufs          ufs_lookup.c
  Log:
  Correct the type of the temporary variable used by ufs_lookup.c:1.78
  to fix the race condition in the ufs_lookup() ISDOTDOT code.

  Noticed by:     bde
  MFC after:      12 days

  Revision  Changes    Path
  1.79      +1 -1      src/sys/ufs/ufs/ufs_lookup.c

Approved by:	re (scottl)
2005-10-19 20:31:45 +00:00
Don Lewis f8cdfeadcd MFC nwfs_vnops.c 1.42
Original commit message:
  Modified files:
    sys/fs/nwfs          nwfs_vnops.c
  Log:
  Update nwfs_lookup() to match the current cache_lookup() API.
  cache_lookup() has returned a ref'ed and locked vnode since
  vfs_cache.c:1.96, dated Tue Mar 29 12:59:06 2005 UTC.  This change
  is similar to the change made to smbfs_lookup() in smbfs_vnops.c:1.58.

  Tested by:      "Antony Mawer" ant AT mawer.org
  MFC after:      2 weeks

  Revision  Changes    Path
  1.42      +11 -26    src/sys/fs/nwfs/nwfs_vnops.c

Approved by:	re (scottl)
2005-10-19 20:18:44 +00:00
cvs2svn fb4ae1d5b4 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-17 12:20:06 +00:00
Warner Losh f84973b2a2 MFC: Fixes for RTL8029 and qemu.
> imp         2005-10-13 22:06:02 UTC
>   Modified files:
>     sys/dev/ed           if_ed_rtl80x9.c
>   Log:
>   o Fix probing of rtl80x9 parts.  We shouldn't be calling
>     ed_probe_generic8390 where we're calling it.  It will be done as part
>     of ed_probe_Novel_generic after things are setup in a way that
>     ed_probe_generic8390 will grok.
>   o Fix operator precedence botch that causes a panic when setting the media
>     type for 10baseT connections.
>   o Save the type of device so that it prints with the rest of the probe.
>
>   # this should make it work with qemu again, but only if it has my patches
>   # to actually implement the RTL8029 specific registers.
>   Revision  Changes    Path
>   1.2       +6 -5      src/sys/dev/ed/if_ed_rtl80x9.c
>
>   Modified files:
>     sys/dev/ed           if_ed_pci.c
>   Log:
>   If we can't probe the RTL80x9 for some reason, fall back to probing it
>   as a Novell NE-2000.  This is necessary for unpatched qemu working
>   correctly.  qemu claims to be a RTL8029, but doesn't implement the
>   RTL8029 specific registers at this time.  I've created patches for
>   that, but there's no reason we can't use qemu's emulation w/o these
>   patches.  This should make life easier for those folks that boot
>   FreeBSD via qemu.
>   Revision  Changes    Path
>   1.48      +9 -2      src/sys/dev/ed/if_ed_pci.c

Approved by: re@ (kensmith)
2005-10-17 02:17:49 +00:00
Kris Kennaway c5442f79e0 MFC r1.20:
Add a default value for VM_BCACHE_SIZE_MAX of 400MB.  This is copied from
amd64, and is a factor of 3 less than the value previously auto-sized on
a 12GB machine, which would cause an overflow in calculations involving the
maxbcache int, causing bufinit() to loop forever at boot.

Approved by:	 re (kensmith)
2005-10-17 00:19:00 +00:00
Kris Kennaway 237265a6b0 MFC r1.72: Partially revert r1.67 which changed maxbcache and maxswzone
from int to long without updating the <sys/buf.h> version.  This broke the
corresponding tunables on sparc.

Approved by:	re (kensmith)
2005-10-17 00:16:54 +00:00
Xin LI f154e90c02 MFC Release Notes Language Improvements
Approved by:	re (hrs)
2005-10-16 07:31:59 +00:00
Robert Watson f9b8f07cbf Merge ufs_extattr.c:1.82 from HEAD to RELENG_6:
When performing a VOP_LOOKUP() as part of UFS1 extended attribute
  auto-start, set cnp.cn_lkflags to LK_EXCLUSIVE.  This flag must now
  be set so that lockmgr knows what kind of lock to acquire, and it
  will panic if not specified.  This resulted in a panic when using
  extended attributes on UFS1 as of locking work present in the 6.x
  branch.

  This is a RELENG_6_0 merge candidate.

  Reported by:    lofi

Approved by:	re (kensmith)
MFC after:	1 day
2005-10-15 18:32:55 +00:00
Robert Watson ec67576b96 Merge in.c:1.89,1.90 from HEAD to RELENG_6:
Acquire Giant conditionally in in_addmulti() and in_delmulti() based on
  whether the interface being accessed is IFF_NEEDSGIANT or not.  This
  avoids lock order reversals when calling into the interface ioctl
  handler, which could potentially lead to deadlock.

  The long term solution is to eliminate non-MPSAFE network drivers.

  Discussed with: jhb

  Unlock Giant symmetrically with respect to lock acquire order as that's
  generally nicer.

  Spotted by:     johan

RELENG_6_0 candidate.

MFC after:	1 day
Approved by:	re (kensmith)
2005-10-15 16:58:21 +00:00
John Baldwin 4fe21f59a2 MFC: Update the critical(9) manpage including dropping references to
cpu_critical_*() as they no longer exist.

Approved by:	re (kensmith)
2005-10-14 18:34:29 +00:00
Joel Dahl 77311231ef MFC r1.1334:
snd_ess needs snd_sbc, so add a note about that.

Approved by:	re (hrs)
2005-10-14 18:25:41 +00:00
Joel Dahl 431affd71a MFC r1.59:
Add support for ATI IXP[234]00.

Approved by:	re (hrs)
2005-10-14 18:17:13 +00:00
Gleb Smirnoff 4d6804adfa Merge the 'kldstat -q' functionality, that is required for proper
operation of the /etc/rc.d/pfsync script, that was merged before
the RELENG_6_0 has been forked.

Approved by:	re (kensmith)
2005-10-14 14:02:25 +00:00
Xin LI 7c79d877a3 MFC (by gibbs):
| Correct bug that caused the completed "recovery" scb to have its
| timer reset rather than the timer of an SCB still pending on the
| controller after recovery completed.  This should correct timeout
| loops seen in the field.
|
| Revision  Changes    Path
| 1.22      +2 -1      src/sys/dev/aic7xxx/aic79xx_osm.c
| 1.43      +2 -1      src/sys/dev/aic7xxx/aic7xxx_osm.c

Approved by:	re (kensmith)
2005-10-14 02:03:27 +00:00
cvs2svn 8a6dcc905a This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-13 18:12:47 +00:00
cvs2svn b49f388f93 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-13 17:57:35 +00:00
Xin LI e84c348fba MFC Simplified Chinese translation of Release Documentations
Approved by:	re (hrs)
2005-10-13 17:30:59 +00:00
Søren Schmidt 52a1fcbcf3 Disable RAID5 for the release.
The RIAD5 code is not complete, it does not use nor maintain the parity, so
it does actually only do RAID0. This is not wanted for a production release.

Approved by: re@ (scottl)
2005-10-13 08:15:48 +00:00
Søren Schmidt 6b8a3ec830 MFC:
Add support for ATI IXP[234]00 series chipsets.

Approved by: re@ (scottl)
2005-10-13 08:07:46 +00:00
Søren Schmidt ab11691fc4 MFC:
Properly react to allocation failures.
        Correct the former patch to the way it would have looked after review.

Approved by: re@ (scottl)
2005-10-12 20:17:34 +00:00
David Xu e78cf533c9 MFC revision 1.24:
> The pthread_attr_set_createsuspend_np was broken, fix it by
 > replacing THR_FLAGS_SUSPENDED with THR_FLAGS_NEED_SUSPEND.

Approved by: re (scottl)
2005-10-11 23:24:25 +00:00
Colin Percival 2e78fee239 Correct a man-in-the-middle SSL version rollback vulnerability.
Security:       FreeBSD-SA-05:21.openssl
Approved by:    re@ (scottl)
2005-10-11 11:53:03 +00:00
Poul-Henning Kamp d46bcf3341 MFC:
Various adjustments.

Approved by:	re@ (scottl)
2005-10-11 06:42:02 +00:00
Peter Edwards b8bcb457e9 MFC revision 1.181
When breaking up a large request into smaller ones for the strategy
	routine, create all the child bio objects before starting the
	requests, rather than starting them as created. This closes a race
	whereby some number of child operations could complete before the
	rest were ever created, and prematurely freeing the parent bio.
	This fixes the panics installing in VMWare and qemu

Approved by: re (scottl@)
2005-10-09 21:24:11 +00:00
Paul Saab fee177401c MFC:
> revision 1.277
> date: 2005/10/03 12:49:54;  author: cperciva;  state: Exp;  lines: +8 -0
> If sufficiently bad things happen during a call to kern_execve(), it is
> possible for do_execve() to call exit1() rather than returning.  As a
> result, the sequence "allocate memory; call kern_execve; free memory"
> can end up leaking memory.
>
> This commit documents this astonishing behaviour and adds a call to
> exec_free_args() before the exit1() call in do_execve().  Since all
> the users of kern_execve() in the tree use exec_free_args() to free
> the command-line arguments after kern_execve() returns, this should
> be safe, and it fixes the memory leak which can otherwise occur.
>
> Submitted by:   Peter Holm
> MFC after:      3 days
> Security:       Local denial of service

Approved by:	re (scottl)
2005-10-09 17:28:12 +00:00
Scott Long 6c4f6a449a Move on to 6.0-RC1.
Approved by: re
2005-10-09 16:59:34 +00:00
Xin LI 7f2c8767d4 MFC (by des)
| Eliminate an unnecessary bcopy().
|
| Revision  Changes    Path
| 1.57      +15 -15    src/sys/fs/pseudofs/pseudofs_vnops.c

Approved by:	re (scottl)
No objection:	des
2005-10-09 08:59:34 +00:00
Maxim Konovalov a4b011b7ce MFC rev. 1.234: teach sysctl_drop() how to deal with the sockets
in TIME_WAIT state.

Approved by:	re (scottl)
2005-10-09 08:21:34 +00:00
Roman Kurakin bdfedb5cb8 MFC:
----------------------------
	revision 1.281
	date: 2005/10/04 16:27:54;  author: rik;  state: Exp;  lines: +3 -1
	Use FILEDESC_UNLOCK(fdp) after FILE_UNLOCK(p), not before to avoid LOR.
	Slightly discussed on current@.

	LOR #055

Approved by:	re(scottl)
Requested by:	delphij
2005-10-09 08:13:56 +00:00
Alexander Leidinger 9f110b437e MFC:
Don't use the builtin vaalist for icc.

  Submitted by:	Igor Sysoev <[email protected]>

Approved by:	re (scottl)
2005-10-09 07:48:48 +00:00
Hajimu UMEMOTO c5fff20427 MFC: be consistent on naming advanced API functions; use ip6_XXXpktopt(s).
sys/netinet6/ip6_output.c:	1.93
	sys/netinet6/ip6_var.h:		1.31
	sys/netinet6/mld6.c:		1.20
	sys/netinet6/raw_ip6.c:		1.51
	sys/netinet6/udp6_output.c:	1.20

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 06:51:11 +00:00
Hajimu UMEMOTO 43df062ca7 MFC 1.92: NULL is not zero.
Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 06:46:27 +00:00
Hajimu UMEMOTO 1e4447bc9b MFC 1.49: do not hardcode if_mtu values in here, except for IFT_{ARC,FDDI} -
they need special handling.  makes it possible to take advantage of 9k ether
frames.

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 06:42:41 +00:00
Scott Long 727e45252f MFC: Support new adapters and new communication protocol.
Submitted by: Adaptec, Inc.
Approved by: re
2005-10-09 06:39:21 +00:00
Hajimu UMEMOTO 808d0f11aa MFC: move RFC3542 related definitions into ip6.h.
sys/contrib/pf/net/pf_norm.c:	1.12
	sys/netinet/ip6.h:		1.15

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 05:50:43 +00:00
Hajimu UMEMOTO 4fd1122556 MFC 1.18: add missing RFC3542 definition.
Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 05:34:33 +00:00
Hajimu UMEMOTO 328e6e5229 MFC: update comments:
- RFC2292bis -> RFC3542
    - typo fixes

	sys/netinet/icmp6.h		1.17
	sys/netinet/ip6.h:		1.14
	sys/netinet6/in6.h:		1.37
	sys/netinet6/ip6_input.c:	1.82
	sys/netinet6/ip6_mroute.h:	1.7
	sys/netinet6/ip6_output.c:	1.91

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 05:21:18 +00:00
Xin LI ff0d1f908c MFC (by stefanf)
| Fix a comment.
|
| Submitted by:   Liam J. Foy
|
| Revision  Changes    Path
| 1.20      +1 -1      src/bin/sleep/sleep.c

Approved by:	re (scottl)
2005-10-09 04:39:07 +00:00
Xin LI 65f3800836 MFC (by le)
| Set the G_PF_WITHER flag on the subdisk provider that is about to
| be destroyed.  That way the GEOM system handles all deallocations
| and we don't have to do it ourselves.
|
| Revision  Changes    Path
| 1.8       +1 -34     src/sys/geom/vinum/geom_vinum_rm.c

Approved by:	re (scottl)
2005-10-09 04:37:34 +00:00
Xin LI 994407defb MFC (by le)
|  Prevent that sync operations can be started when they are already
|  in progress, and be a bit more user friendly in terms of error
|  messages returned from the kernel.
|
|  Revision  Changes    Path
|  1.11      +81 -71    src/sys/geom/vinum/geom_vinum_init.c

Approved by:	re (scottl)
2005-10-09 04:36:44 +00:00
Xin LI ad918d93d0 MFC (by le)
| Correct the check if a plex is accessible in case it is not up.
| This makes degraded RAID5 plexes actually work.
|
| Revision  Changes    Path
| 1.10      +1 -1      src/sys/geom/vinum/geom_vinum_volume.cle

Approved by:	re (scottl)
2005-10-09 04:35:42 +00:00
Hajimu UMEMOTO 8d3ea92cb8 MFC 1.16: stop RFC 4193 address on the outside interface.
Approved by:	re (scottl)
Committed at:	CBUG Meeting meets XCAST6 Festival
2005-10-09 04:35:10 +00:00
Xin LI 0c785ccd4d MFC (by le)
| Shuffle around the order in which the components are compiled.
|
| This way, the VINUMDRIVE class is loaded before the VINUM class,
| but since geom does the tasting for newly arrived classes
| last-in-first-out, the VINUM class tastes first.
|
| This removes the need to call gv_parse_config() in the drive
| taste path.
|
| Revision  Changes    Path
| 1.20      +4 -14     src/sys/geom/vinum/geom_vinum_drive.c
| 1.2       +1 -1      src/sys/modules/geom/geom_vinum/Makefile

Approved by:	re (scottl)
2005-10-09 04:34:29 +00:00
Xin LI 7cc8689679 MFC (by jhb)
| - Add an assertion to panic if one tries to call mtx_trylock() on a spin
|   mutex.
| - Don't panic if a spin lock is held too long inside _mtx_lock_spin() if
|   panicstr is set (meaning that we are already in a panic).  Just keep
|   spinning forever instead.
|
|   Revision  Changes    Path
|   1.157     +4 -1      src/sys/kern/kern_mutex.c

Approved by:	re (scottl)
2005-10-09 04:30:31 +00:00
Xin LI 5278b7359e MFC (by andre)
| Use the correct mbuf type for MGET().
|
| Revision  Changes    Path
| 1.304     +1 -1      src/sys/netinet/ip_input.c
| 1.246     +1 -1      src/sys/netinet/ip_output.c
| 1.232     +1 -1      src/sys/netinet/tcp_subr.c
| 1.97      +1 -1      src/sys/netinet6/ip6_output.c

Approved by:	re (scottl)
2005-10-09 04:24:45 +00:00
Xin LI b28fb96865 MFC (by andre)
| Use the correct mbuf type for MGET().
|
| Revision  Changes    Path
| 1.28      +1 -1      src/sys/netatalk/ddp_output.c

Approved by:	re (scottl)
2005-10-09 04:22:03 +00:00
Xin LI 2d8727f32f MFC (by andre)
| Test the mbuf flags against the correct constant.  The previous
| version worked as intended but only by chance.
|
| MT_HEADER == M_PKTHDR == 0x2.
|
| Revision  Changes    Path
| 1.85      +1 -1      src/sys/compat/ndis/kern_ndis.c

Approved by:	re (scottl)
2005-10-09 04:21:11 +00:00
Xin LI 5dd61e6780 MFC (by ru)
| Fix "struct ifnet" leak if attach() fails in the middle.
|
| Revision  Changes    Path
| 1.39      +2 -0      src/sys/contrib/dev/oltr/if_oltr.c
| 1.94      +1 -0      src/sys/dev/fe/if_fe.c
| 1.114     +3 -1      src/sys/dev/lnc/if_lnc.c
| 1.11      +3 -1      src/sys/dev/nve/if_nve.c
| 1.12      +3 -1      src/sys/dev/patm/if_patm_attach.c

Approved by:	re (scottl)
2005-10-09 04:18:18 +00:00
Xin LI f877875263 MFC (by ru)
| Avoid deferencing NULL in if_free().
|
| Revision  Changes    Path
| 1.16      +2 -3      src/sys/dev/ral/if_ral.c

Approved by:	re (scottl)
2005-10-09 04:15:59 +00:00
Xin LI 5c087ae0e1 MFC (by ru)
| Fix "struct ifnet" leaks when attach() fails in the middle.
|
| Revision  Changes    Path
| 1.28      +4 -5      src/sys/dev/bfe/if_bfe.c
| 1.95      +3 -2      src/sys/dev/bge/if_bge.c
| 1.21      +2 -0      src/sys/dev/cnw/if_cnw.c
| 1.261     +2 -1      src/sys/dev/ed/if_ed.c
| 1.38      +9 -2      src/sys/dev/en/if_en_pci.c
| 1.59      +3 -1      src/sys/dev/ex/if_ex.c
| 1.26      +4 -3      src/sys/dev/hatm/if_hatm.c
| 1.105     +2 -1      src/sys/dev/ie/if_ie.c
| 1.17      +2 -1      src/sys/dev/vge/if_vge.c

Approved by:	re (scottl)
2005-10-09 04:15:12 +00:00
Xin LI e2056e36ed MFC (by ru)
| Fix "struct ifnet" leaks when attach() fails in the middle, e.g.
| when mii_phy_probe() or bus_setup_intr() fails.  For drivers that
| call their detach() in this case, call if_free() there to cover
| this case too.
|
| Revision  Changes    Path
| 1.168     +2 -2      src/sys/pci/if_dc.c
| 1.75      +2 -2      src/sys/pci/if_pcn.c
| 1.156     +3 -5      src/sys/pci/if_rl.c (already merged)
| 1.87      +2 -2      src/sys/pci/if_sf.c
| 1.136     +2 -3      src/sys/pci/if_sis.c
| 1.110     +2 -3      src/sys/pci/if_sk.c
| 1.89      +2 -2      src/sys/pci/if_ste.c
| 1.110     +2 -2      src/sys/pci/if_ti.c
| 1.103     +2 -2      src/sys/pci/if_tl.c
| 1.107     +2 -2      src/sys/pci/if_vr.c
| 1.83      +2 -2      src/sys/pci/if_wb.c
| 1.196     +2 -2      src/sys/pci/if_xl.c

Approved by:	re (scottl)
2005-10-09 04:11:20 +00:00
Xin LI 9ae3deddd9 MFC (by ru)
| Fix "struct ifnet" leak on detach.
|
| Revision  Changes    Path
| 1.104     +1 -0      src/sys/dev/ath/if_ath.c

Approved by:	re (scottl)
2005-10-09 04:00:47 +00:00
Xin LI 8b8807b0f0 MFC (by ru)
| Add missing mtx_destroy() when if_alloc() fails.
| Add missing if_free() when mii_phy_probe() fails.
| Put if_free() into the correct #ifdef in detach().
|
| Revision  Changes    Path
| 1.93      +6 -1      src/sys/dev/usb/if_aue.c
| 1.33      +6 -1      src/sys/dev/usb/if_axe.c
| 1.9       +2 -0      src/sys/dev/usb/if_cdce.c
| 1.60      +5 -1      src/sys/dev/usb/if_cue.c
| 1.67      +5 -1      src/sys/dev/usb/if_kue.c
| 1.17      +3 -0      src/sys/dev/usb/if_udav.c

Approved by:	re (scottl)
2005-10-09 03:59:36 +00:00
Xin LI d22234ff2b MFC (by ru)
| Add missing if_free() in rue_detach().
|
| Revision  Changes    Path
| 1.25      +1 -0      src/sys/dev/usb/if_rue.c

Approved by:	re (scottl)
2005-10-09 03:56:37 +00:00
Xin LI 55ad878013 MFC (by ps)
| Unbreak tail -f on non-local filesystems.
|
| Revision  Changes    Path
| 1.39      +10 -0     src/usr.bin/tail/forward.c

Approved by:	re (scottl)
2005-10-09 03:51:55 +00:00
Xin LI b955328d05 MFC (by dds)
| Interpret correctly the glob(3) return value.
| Previously, interactive commands specifying a non-existent file or
| directory used to display an "out of memory error".
|
| MFC after:      2 weeks
|
| Revision  Changes    Path
| 1.18      +7 -1      src/sbin/restore/interactive.c

Approved by:	re (scottl)
2005-10-09 03:50:30 +00:00
Xin LI a5423cd0d3 MFC revision 1.70
date: 2005/07/17 03:24:11;  author: obrien;  state: Exp;  lines: +0 -29
Catch up with menus.c revision 1.399.

Approved by:	re (scottl)
2005-10-09 03:48:42 +00:00
Xin LI 6332e2d0a3 MFC (by stefanf):
| Log:
| El_parse's third parameter is now const-qualified, add a cast.
|
| Revision  Changes    Path
| 1.27      +1 -1      src/bin/sh/histedit.c

Approved by:	re (scottl)
2005-10-09 03:46:26 +00:00
Xin LI cf438f9962 MFC (by stefanf):
| The libedit update made a const cast necessary.
|
| Revision  Changes    Path
| 1.30      +1 -1      src/sbin/fsdb/fsdb.c

Approved by:	re (scottl)
2005-10-09 03:45:28 +00:00
Xin LI f7e8484379 MFC stefanf's work on libedit. This includes a sync with NetBSD/OpenBSD
and some bugfixes.

Approved by:	re (scottl)
2005-10-09 03:44:01 +00:00
Xin LI faff5d19ff MFC (by obrien)
| Fix bug where GCC thought athlon-tbird had SSE support.
|
| Revision  Changes    Path
| 1.21      +4 -4      src/contrib/gcc/config/i386/i386.h

Approved by:	re (scottl)
2005-10-09 03:37:42 +00:00
Xin LI 81ccfb4700 MFC (by obrien)
| Remove WANT_FORCE_OPTIMIZATION_DOWNGRADE and out dated warnings about
| libalias(3) exposing compiler bugs.
|
| Revision  Changes    Path
| 1.266     +2 -10     src/share/examples/etc/make.conf

Approved by:	re (scottl)
2005-10-09 03:36:41 +00:00
Xin LI 7fb945be7f MFC (by obrien)
| Ensure the full value is written into inode variables.
|
| PR:             85503
| Submitted by:   Dmitry Pryanishnikov <[email protected]>
|
| Revision  Changes    Path
| 1.89      +2 -2      src/sys/fs/msdosfs/msdosfs_denode.c

Approved by:	re (scottl)
2005-10-09 03:33:52 +00:00
Xin LI 88b35bbded MFC (by phk)
| Comment typo
|
| Revision  Changes    Path
| 1.23      +1 -1      src/sys/geom/bde/g_bde_crypt.c

Approved by:	re (scottl)
2005-10-09 03:30:30 +00:00
Xin LI 3b0ad1946d MFC (by davidxu)
| Reorder statements to avoid accessing unknown memory.
| In theory, invoking kenv with very long string can panic
| kernel.
|
| Revision  Changes    Path
| 1.41      +2 -2      src/sys/kern/kern_environment.c

Approved by:	re (scottl)
2005-10-09 03:29:03 +00:00
Xin LI a39d39ded4 MFC (by netchild)
|  Add bounds checking to the setenv part of the kernel environment.
|
| PR:             83687 [1]
| Submitted by:   Harry Coin <[email protected]> [1]
| Submitted by:   Ariff Abdullah <[email protected]> [2]
|
| Revision  Changes    Path
| 1.40      +10 -1     src/sys/kern/kern_environment.c

Approved by:	re (scottl)
2005-10-09 03:27:36 +00:00
Xin LI 8c3ad08a52 MFC (by jhb):
| Trim a couple of unneeded includes.
|
| Revision  Changes    Path
| 1.153     +0 -1      src/sys/kern/subr_turnstile.c
| 1.35      +0 -1      src/sys/vm/vm_zeroidle.c

Approved by:	re (scottl)
2005-10-09 03:25:37 +00:00
Xin LI 4a7499a6ec MFC (by ps):
| Fix up the comment for MAX_SACK_BLKS.
|
| Submitted by:   Noritoshi Demizu
|
| Revision  Changes    Path
| 1.32      +1 -1      src/sys/netinet/tcp.h

Approved by:	re (scottl)
2005-10-09 03:22:51 +00:00
Xin LI 8c21b608cb MFC (by ps):
| Fixes for NFS crashes on architectures that require strict alignment.
| - Fix nfsm_disct() so that after pulling up data, the remaining data
|   is aligned if necessary.
| - Fix nfs_clnt_tcp_soupcall() to bcopy() the rpc length out of the
|   mbuf (instead of casting m_data to a uint32).
|
| Submitted by:   Pyun YongHyeon
| Reviewed by:    Mohan Srinivasan
|
| Revision  Changes    Path
| 1.118     +12 -3     src/sys/nfs/nfs_common.c
| 1.38      +6 -0      src/sys/nfs/nfs_common.h
| 1.126     +2 -1      src/sys/nfsclient/nfs_socket.c

Approved by:	re (scottl)
2005-10-09 03:21:56 +00:00
Xin LI d82f1efe64 MFC (by andre)
| Remove unnecessary IPSEC includes.
|
| MFC after:      2 weeks
| Sponsored by:   TCP/IP Optimization Fundraise 2005
|
| Revision  Changes    Path
| 1.27      +0 -11     src/sys/netinet/tcp_sack.c
| 1.126     +0 -5      src/sys/netinet/tcp_usrreq.c

Approved by:	re (scottl)
2005-10-09 03:17:41 +00:00
Xin LI 323f36148b MFC (by ps)
| In nfs_nget() if two threads race on the same filehandle, the loser
| should cause the nfsnode to get freed. This fixes a potential vnode
| (and nfsnode) leak in that path.
|
| Submitted by:   Mohan Srinivasan
| Reviewed by:    phk
|
| Revision  Changes    Path
| 1.78      +2 -1      src/sys/nfsclient/nfs_node.c

Approved by:	re (scottl)
2005-10-09 03:15:36 +00:00
Xin LI 0342bbe491 MFC (by andre)
| Remove bogous semicolons at the end of the definitions of
| 'do { ... } while (0)' macros.
|
| PR:             kern/83088
| Sumbitted by:   <antoine.brodin at laposte.net>

Approved by:	re (scottl)
2005-10-09 03:13:49 +00:00
Xin LI b37f177410 MFC (by alc)
| Eliminate an incorrect cast.
|
| Revision  Changes    Path
| 1.208     +1 -1      src/sys/vm/vm_fault.c

Approved by:	re (scottl)
2005-10-09 03:08:28 +00:00
Xin LI a49b9e6763 MFC (by alc)
| Eliminate an incorrect (and unnecessary) cast.
|
| Revision  Changes    Path
| 1.367     +1 -1      src/sys/vm/vm_map.c

Approved by:	re (scottl)
2005-10-09 03:07:29 +00:00
Xin LI 2013e71bca MFC (by peter)
| Remove unused (but initialized) variable 'objsize' from vm_mmap()
|
| Revision  Changes    Path
| 1.201     +1 -2      src/sys/vm/vm_mmap.c

Approved by:	re (scottl)
2005-10-09 03:05:23 +00:00
Seigo Tanimura 56677b139e MFC 1.35: do not derefer NULL sc in ngt_input().
Approved by:	re (scottl)
2005-10-09 00:19:28 +00:00
Craig Rodrigues a629da7218 MFC 1.58
Fix so that when a slice or a partition is removed through g_slice_config(),
  it is destroyed in GEOM, in addition to being removed from /dev.
  Before this patch, if you applied a new MBR which deleted a slice,
  the deleted slice would not be in /dev, but it would still appear
  in kern.geom.conftxt and kern.geom.confxml, which would confused
  the diskPartitionEditor in sysinstall.

Submitted by:	pjd
Requested by:	delphij
Approved by:	re (scottl)
2005-10-08 22:11:38 +00:00
Pawel Jakub Dawidek 9241f7fce6 MFC: lib/libmd/sha256.3 1.3
Correct type.

Approved by:	re (scottl)
Requested by:	delphij
OK'ed by:	cperciva
2005-10-08 21:46:23 +00:00
Andrew Thompson 4a3c9249af MFC r1.2
Display the status of the spanning tree for each port.

        member: xl0 flags=7<LEARNING,DISCOVER,STP>
        member: gem0 flags=7<LEARNING,DISCOVER,STP>
 to:
        member: xl0 flags=7<LEARNING,DISCOVER,STP>
                port 3 priority 128 path cost 55 forwarding
        member: gem0 flags=7<LEARNING,DISCOVER,STP>
                port 1 priority 128 path cost 55 learning

Approved by:	re (scottl)
2005-10-08 21:19:15 +00:00
Xin LI 7c5d388263 MFC (by ume)
| refer RFC 3542 rather than RFC 2292bis.
|
| Submitted by:   Keiichi SHIMA <keiichi__at__iijlab.net>
| Obtained from:  KAME
|
| Revision  Changes    Path
| 1.8       +2 -2      src/lib/libc/net/ip6opt.c
| 1.25      +1 -1      src/lib/libc/net/rcmd.3 (already merged)
| 1.8       +1 -1      src/lib/libc/net/rthdr.c

Approved by:	re (scottl)
2005-10-08 20:58:29 +00:00
Xin LI 7476739035 MFC (by ume)
| fixed the validation code of routing header length in inet6_rth_getaddr().
| reported by Delia Kecskemeti <delia.kecskemeti__at__windriver.com>
|
| Submitted by:   Keiichi SHIMA <keiichi__at__iijlab.net>
| Obtained from:  KAME
|
| Revision  Changes    Path
| 1.7       +3 -4      src/lib/libc/net/rthdr.c

Approved by:	re (scottl)
2005-10-08 20:52:53 +00:00
Giorgos Keramidas feb7c0bb4c MFC:
1.36	- Removal of obsolete/wrong OPTIONS section
	1.37	- Workaround for an mdoc bug by trhodes

Approved by:	re (kensmith)
2005-10-08 19:01:21 +00:00
Warner Losh 3aca131e39 MFC: Bring in support for new PC Card chipset (TC5299J) and old
ISA/PCI chipset (RTL8019 and RTL8029).  Eliminate ED_NO_MIIBUS option.
You are now required to have miibus if you have pccard in your kernel
(but not required if you don't!).  Split out register definitions for
possible future subsetting.

Approved by: re@ (scottl)
2005-10-08 18:00:41 +00:00
Xin LI 66890c43dc MFC (by deischen)
|  Add usleep to the map files.
|
|  Noticed by:     davidxu
|
|  Revision  Changes    Path
|  1.15      +2 -0      src/lib/libpthread/pthread.map
|  1.4       +2 -0      src/lib/libthr/pthread.map

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:58:11 +00:00
Xin LI 569c4357be MFC (by deischen)
|  Add a cancellation point for usleep().
|
|  Revision  Changes    Path
|  1.9       +16 -1     src/lib/libpthread/thread/thr_sleep.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:57:49 +00:00
Xin LI fb060d5d7f MFC (by deischen)
|  Add a cancellation point for usleep().
|
|  While here, fix sleep() so that it is also a cancellation point (a
|  missing weak reference prevented that).
|
|  Revision  Changes    Path
|  1.10      +19 -0     src/lib/libthr/thread/thr_syscalls.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:57:28 +00:00
Maxim Konovalov f0b9488f2f MFC rev. 1.77: restore kerneldumpheader.architectureversion bytes
swopping.

Approved by:	re (kensmith)
2005-10-08 17:57:15 +00:00
Xin LI 34e7df678e MFC (by deischen)
|  Make syslog() use the internal (non-cancellation point) _usleep().
|  Prior to this it was calling the cancellable usleep() while holding
|  a lock.
|
|  Revision  Changes    Path
|  1.36      +1 -1      src/lib/libc/gen/syslog.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:57:10 +00:00
Xin LI d8f160b880 MFC (by deischen)
| Make usleep() overridable by the thread libraries so they can provide
| cancellation points.
|
| Noticed by:     phk
|
| Revision  Changes    Path
| 1.29      +4 -1      src/lib/libc/gen/usleep.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:56:53 +00:00
Xin LI c6be1a55e9 MFC (by deischen)
| Add namespace #defines for usleep.
|
| Revision  Changes    Path
| 1.17      +1 -0      src/lib/libc/include/namespace.h
| 1.14      +1 -0      src/lib/libc/include/un-namespace.h

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:56:33 +00:00
Xin LI 28868ed18e MFC 1.50 (by keramida):
| Add a short description of how a literal colon ':' can be inlined in the
| value of capability databases, since it's not really obvious how a colon
| can be escaped, and a pointer to the getcap(3) manpage for more details.
|
| Triggered by:	a question by Ceri on -questions

Approved by:	re (kensmith)
2005-10-08 17:37:29 +00:00
Doug Barton 529cf10359 MFC rm.c 1.53 and rm.1 1.3[78], better handling of the -P flag
on a read-only file, and related doc change.

Approved by:	re (kensmith)
2005-10-08 17:27:37 +00:00
Christian Brueffer f3d2e00b36 MFC: rev. 1.66
hptmv(4) now works on amd64.

Approved by:	re (hrs)
2005-10-08 08:39:58 +00:00
Gleb Smirnoff d60b636441 This line fell out of the merge, too.
Approved by:	re (implicitly)
2005-10-08 07:35:10 +00:00
Pawel Jakub Dawidek b064dedaee MFC: sys/kern/kern_mib.c 1.76
mp_ncpus is always (properly) initialized, even on UP kernels,
so just use it.

Approved by:	re (scottl) (approval from 30 Aug 2005)
Reminded by:	delphij
2005-10-08 07:06:49 +00:00
Scott Long aa4ea9a8a0 Outwit gcc.
Submitted by: glebius, kensmith
Approved by: re
2005-10-08 05:29:27 +00:00
Yaroslav Tykhiy 71218e993a MFC:
Add an rc.d script to start the pfsync interface after all
the conventional network interfaces have been started so that
pfsync can be attached to any of the latter.

Record the dependency of rc.d/pf on the newly added rc.d/pfsync.
Also make rc.d/pf start as early as before rc.d/routing to improve
system security.

Document rc.d/pfsync on pfsync(4) and rc.conf(5).

Approved by:	re (scottl), mlaier
2005-10-08 03:32:54 +00:00
Jonathan Chen 06eddaf119 MFC of 1.34: fix innetgr() returning false positives and negatives when reverse netgroup matching is used.
PR:		35506
Approved by:	re
2005-10-07 19:38:07 +00:00
Søren Schmidt 447e94312c MFC:
Add support for setting the SG list segment size.
Use this for the SiI3112 workaround to get rid of the "oversized DMA" errors.

Approved by: re@ (scottl)
2005-10-07 19:25:05 +00:00
Brooks Davis 558a33af53 MFC rev 1.6:
Don't print anything if we can't do any localpkg shutdown (start already
does this).

Submitted by:	Andre Albsmeier <Andre dot Albsmeier at siemens dot com>
PR:		conf/86606
Approved by:	re (kensmith)
2005-10-07 17:20:35 +00:00
Yoshihiro Takahashi e74be4f4a8 MFC: Switch from OLDCARD to NEWCARD on pc98.
Approved by:	re (scottl)
2005-10-07 15:56:30 +00:00
Poul-Henning Kamp 31d14eb0d6 MFC:
make sure the type is set early enough for the kthread to know
	to grab Giant for vnode backed devices.

Approved by:	re@ (scottl)
2005-10-07 15:08:41 +00:00
Poul-Henning Kamp 24beec7c08 MFC:
close a race in waiting for all geom events to have been
	handled.

Approved by:	re@ (scottl)
2005-10-07 15:06:27 +00:00
Gleb Smirnoff 6ed190bfed Big overall MFC of polling(4) cleanup:
o First attempt on removing Giant from polling. Details:
  http://lists.freebsd.org/pipermail/cvs-src/2005-September/051848.html
o Second attempt, and big polling cleanup including:
  - Functinal approach to turning polling on/off
  - Deprecating of poll_in_trap
  - Removal of ifnet knowledge from kern_poll.c
  Details:
  http://lists.freebsd.org/pipermail/cvs-src/2005-October/053267.html
o Improved checking of user configurable sysctls. Details:
  http://lists.freebsd.org/pipermail/cvs-src/2005-October/053351.html
o Moving DEVICE_POLLING from opt_global.h to opt_device_polling.h:
  http://lists.freebsd.org/pipermail/cvs-src/2005-October/053479.html

o All related documentation fixes.

Approved by:	re (kensmith)
Thanks to:	everyone, who helped with testing
2005-10-07 14:00:06 +00:00
Gleb Smirnoff a1ffef2cf2 MFC:
Define HAVE_KERNEL_OPTION_HEADERS when building kernel and when building
  modules along with kernel.

  After this change it is possible to embrace opt_*.h includes with ifdef
  HAVE_KERNEL_OPTION_HEADERS. And thus, avoid editing a lot of Makefiles
  in modules directory each time we introduce a new opt_xxx.h.

  Requested by:   bde

Approved by:	re (kensmith)
2005-10-07 13:55:58 +00:00
Poul-Henning Kamp 9d534054be MFC:
make the kernels printf more paranoid about unknown %-formats

Approved by:	re@ (scottl)
2005-10-07 12:40:51 +00:00
Andrew Thompson 7b20d5db39 MFC r1.144
When bridging is enabled and an ARP request is recieved on a member interface,
 the arp code will search all local interfaces for a match. This triggers a
 kernel log if the bridge has been assigned an address.

 arp: ac:de:48:18:83:3d is using my IP address 192.168.0.142!

 bridge0: flags=8041<UP,RUNNING,MULTICAST> mtu 1500
         inet 192.168.0.142 netmask 0xffffff00
         ether ac:de:48:18:83:3d

 Silence this warning for 6.0 to stop unnecessary bug reports, the code will need
 to be reworked.

Approved by:	re (scottl)
2005-10-07 01:51:29 +00:00
Warner Losh 40d719d9f2 MFC: if data is NULL, don't pass that to userland as (null)
Approved by: re@ (scottl)
2005-10-06 23:15:18 +00:00
Warner Losh 35900aaad4 MFC: if no device-name, look at subsystem
Approved by: re@ (scottl)
2005-10-06 23:12:05 +00:00
Jung-uk Kim 5a7f1b24f7 MFC: Minor fixes and add amd64 support:
- Fix SMBIOS entry point structure.
- Add structure length sanity check.
- Fix revision number output.

Approved by:	re (kensmith)
2005-10-06 20:43:44 +00:00
Andrew Thompson cb8f3c434f MFC: if_bridge.c r1.23
> Do not packet filter in the bridge_start() routine, locally generated packets
> are already filtered by the higher layers.

Approved by:	re (kensmith)
2005-10-06 20:43:24 +00:00
John Baldwin 91c8538be1 MFC: Don't save and restore the ELCR across suspend and resume for a
particular Intel chipset.

Approved by:	re (scottl)
2005-10-06 20:21:03 +00:00
John Baldwin 9d73e3f4c3 MFC: Minor fixups:
- Use if_printf() and device_printf().
- Don't zero the softc.
- Cleanup error handling in attach().
- Don't double init the callout handle.

Approved by:	re (scottl)
2005-10-06 20:20:12 +00:00
John Baldwin d85fd523b7 MFC: Pin curthread longer during an interrupt so that we don't have to
ignore preemptions caused by fast interrupt handlers.

Approved by:	re (scottl)
2005-10-06 20:18:20 +00:00
John Baldwin 8014d4f746 MFC: Fixup locking in rl(4) and re(4).
Approved by:	re (scottl)
2005-10-06 20:17:17 +00:00
John Baldwin 97dee16616 MFC: Consolidate common code for assigning interrupts to PCI devices and
add a sledgehammer tunable to override PCI interrupt routing for any PCI
device.

Approved by:	re (scottl)
2005-10-06 20:05:04 +00:00
Xin LI aa82034305 MFC 1.280 (by des):
| Two minor optimizations of fdalloc():
|
|  - if minfd < fd_freefile (as is most often the case, since minfd is
|    usually 0), set it to fd_freefile.
|
|  - remove a call to fd_first_free() which duplicates work already done
|    by fdused().
|
| This change results in a small but measurable speedup for processes
| with large numbers (several thousands) of open files.
|
| PR:             kern/85176
| Submitted by:   Divacky Roman <[email protected]>
|
| Revision  Changes    Path
| 1.280     +3 -1      src/sys/kern/kern_descrip.c

Approved by:	re
2005-10-06 19:23:02 +00:00
Xin LI db96ab740e MFC (by alc):
| Handle vm_map_wire()'s failure.
|
| Revision  Changes    Path
| 1.89      +5 -1      src/sys/kern/link_elf_obj.c

Approved by:	re (scottl)
2005-10-06 19:01:42 +00:00
Xin LI 80ddd7b458 MFC (by alc):
| Correctly handle vm_map_wire()'s failure.  (See also revisions 1.81 and
| 1.82.)
|
| Reviewed by:    tegge
|
| Revision  Changes    Path
| 1.84      +5 -1      src/sys/kern/link_elf.c

Approved by:	re (scottl)
2005-10-06 19:00:39 +00:00
Xin LI 372bf7604e MFC (by alc):
| Eliminate an unneeded reference on a vm object.  If, in fact, the nearby
| vm_map_find() fails, then the excess reference causes the vm object to be
| leaked.
|
| Reviewed by:    tegge
|
| Revision  Changes    Path
| 1.83      +0 -2      src/sys/kern/link_elf.c
| 1.88      +0 -2      src/sys/kern/link_elf_obj.c

Approved by:	re (scottl)
2005-10-06 18:58:59 +00:00
Xin LI 46d0413e97 MFC 1.82:
| Revert the previous change for two reasons: (1) If vm_map_find() succeeds
| but vm_map_wire() fails, then a vm object, vm map entries, and kernel_map
| free space is leaked and (2) unwiring is handled automatically by
| vm_map_remove().
|
| Suggested by:   tegge
|
| Revision  Changes    Path
| 1.82      +10 -17    src/sys/kern/link_elf.c

Approved by:	re (scottl)
2005-10-06 18:57:13 +00:00
Xin LI 39639a0675 Forced commit to note that the previous commit was to:
MFC: Hook up the hptmv driver for amd64.

| Revision  Changes    Path
| 1.442     +1 -0      src/sys/amd64/conf/GENERIC
| 1.42      +1 -1      src/sys/amd64/conf/NOTES
| 1.76      +10 -0     src/sys/conf/files.amd64
| 1.454     +1 -0      src/sys/modules/Makefile

Approved by:    re (scottl, implicitly)
2005-10-06 18:52:26 +00:00
Xin LI 53f5bec08c MFC Import of the new version of the HPTMV driver from Highpoint.
The major change here is the support for amd64, as well as possible
support for PAE.  Many thanks to Highpoint for continuing to support
FreeBSD.

Obtained from:  Steve Chang @ Highpoint

Merged revisions:

| 1.3      dev/hptmv/access601.h
| 1.1      dev/hptmv/amd64-elf.raid.o.uu
| 1.3      dev/hptmv/array.h
| 1.3      dev/hptmv/atapi.h
| 1.3      dev/hptmv/command.h
| 1.9+1.10 dev/hptmv/entry.c
| 1.4      dev/hptmv/global.h
| 1.5      dev/hptmv/gui_lib.c
| 1.3      dev/hptmv/hptintf.h
| 1.6      dev/hptmv/hptproc.c
| 1.5      dev/hptmv/i386-elf.raid.o.uu
| 1.5      dev/hptmv/ioctl.c
| 1.3      dev/hptmv/mv.c
| 1.4      dev/hptmv/mvOs.h
| 1.3      dev/hptmv/mvSata.h
| 1.4      dev/hptmv/mvStorageDev.h
| 1.5      dev/hptmv/osbsd.h
| 1.3      dev/hptmv/raid5n.h
| 1.3      dev/hptmv/readme.txt
| 1.3      dev/hptmv/vdevice.h
| 1.4      modules/hptmv/Makefile

Approved by:	re (scottl)
2005-10-06 18:47:58 +00:00
Xin LI b2529c3c2b MFC 1.244 (by kbyanc)
| Make getsockopt(..., SOL_SOCKET, SO_ACCEPTCONN, ...) work per IEEE Std
| 1003.1 (POSIX).
|
| Revision  Changes    Path
| 1.244     +1 -0      src/sys/kern/uipc_socket.c

Approved by:	re (scottl)
2005-10-06 18:31:38 +00:00
Xin LI ec4e607ad3 MFC 1.12 (by netchild)
| The resource_xxx routines in subr_hints.c are called before and after the
| kenv environment in kern_environment.c switches to dynamic kenv. The prior
| call sets the static variable hintp to the static hints in subr_hints.c
| (hintmode==0).
|
| However, changes to the environment are not detected by the resource_xxx
| lookups after the change to dynamic kernel environment, so the lookup
| routines only report the old stuff of hintmode==0, even after the change to
| the dynamic kenv. This causes kenv users to see a different environment than
| the kernel routines.
|
| This is a problem in the mixer.c code that looks up initial mixer volume
| settings from the hints: If the hints are dynamic and not from the
| device.hints file, mixer.c doesn't see them, but kenv does.
|
| The patch from the PR (modified to comply to the style of the function)
| solves this.
|
| PR:             83686
| Submitted by:   Harry Coin <[email protected]>

Approved by:	re (scottl)
2005-10-06 18:29:30 +00:00
Xin LI 57050c84e5 MFC 1.154 (by rodrigc)
|  In ext2_mountfs(), check that the superblock size, SBSIZE,
|  is aligned with the sectorsize value returned by GEOM, before
|  doing a bread() of the superblock.
|  This eliminates a panic when trying the following on an empty CD-ROM drive:
|  mount_ext2fs /dev/acd0 /mnt
|
|  Reviewed by:    phk
|
|  Revision  Changes    Path
|  1.154     +12 -0     src/sys/gnu/fs/ext2fs/ext2_vfsops.c

Approved by:	re (scottl)
2005-10-06 18:27:27 +00:00
Xin LI 09c157b360 Complete MFC of rev. 1.215:
Fix a LOR between sched_lock and sleep queue lock.

Approved by:	re (scottl)
2005-10-06 18:24:24 +00:00
Pawel Jakub Dawidek 7581e880f3 MFC: sbin/geom/class/mirror/gmirror.8 1.17
Add a note in example as well, that last sector is used for metadata,
so it don't provoke confusions.

Noticed by:	Victor Sudakov <[email protected]>
Approved by:	re (scottl)
2005-10-06 18:19:13 +00:00
Pawel Jakub Dawidek 609352bdd9 MFC: sys/geom/eli/g_eli.h 1.4
Add a __packed keyword to g_eli_metadata struct definition, so
sizeof(struct g_eli_metadata) will return the exact number of bytes needed
for storing it on the disk.
Without this change GELI was unusable on amd64 (and probably other 64-bit
archs), because sizeof(struct g_eli_metadata) was greater than 512 bytes
and geli(8) was failing on assertion.

Reported by:	Michael Reifenberger <[email protected]>
Reminded by:	delphij
Approved by:	re (scottl)
2005-10-06 18:17:29 +00:00
John Baldwin 3fc368ac9d MFC: Add the simple refcount API.
Approved by:	re (scottl)
2005-10-06 18:13:19 +00:00
John Baldwin d18aa8f911 MFC: Add atomic_fetchadd(9) operation for types int and 32.
Other small updates to atomic(9) include:
- Note that arm and ppc don't provide 64-bit atomic ops.
- Update sample code.

Approved by:	re (scottl)
2005-10-06 18:12:06 +00:00
Stephan Uphoff 9792cc4623 MFC: 1.176
Don't pretend to be thread0 when calling sync().
It confuses the lock manager since in some places thread0 is
then used for vnode locking while curthread is used for vnode unlocking.

Approved by:    re (scottl@)
2005-10-06 17:53:46 +00:00
Warner Losh 54067f6a3a MFC: OLDCARD removal: don't build pccardd.
Approved by: re@ (scottl)
2005-10-06 16:56:45 +00:00
Warner Losh 6cc5227669 MFC: Remove references to OLDCARD
Approved by: re@ (scottl)
2005-10-06 16:36:31 +00:00
Warner Losh 611c3542c3 MFC: Remove OLDCARD. It only panics on my pc98 laptop. I'll fix cbb to attach to isa.
Approved by: re (scottl)
2005-10-06 16:34:27 +00:00
Poul-Henning Kamp 89e457aa1f MFC:
Make sure clonelists are correctly sorted.

Approved by:	re@ (scottl)
2005-10-06 15:17:41 +00:00
Yaroslav Tykhiy b361079c0e MFC:
ifconfig.c 1.116

	For the sake of consistency and easier typing,
	introduce "-tunnel" as an alias for "deletetunnel".
	The latter is overly long and prone to typos,  but
	keep it for POLA since it costs nothing.

    ifvlan.c 1.8

	Deprecate the useless argument to -vlandev.

    ifconfig.8 1.102-1.105

	Document the above changes.
	Logically group vlan- and tunnel-related parameters.

Approved by:	re (scottl)
2005-10-06 15:01:56 +00:00
Robert Watson 14d8fd6077 Merge db_command.c:1.62 from HEAD to RELENG_6:
Add a DDB "traceall" function, which stack traces all known process
  threads.  This is quite useful if generating a debug log for post-mortem
  by another developer, in which case the person at the console may not
  know which threads are of interest.  The output of this can be quite
  long.

  Discussed with: kris

Approved by:	re (scottl)
2005-10-06 13:15:21 +00:00
Joel Dahl 9df3ea96a9 MFC:
pcm.4           1.41-1.42
snd_cmi.4       1.5
snd_csa.4       1.14
snd_emu10k1.4   1.6
snd_es137x.4    1.6
snd_sbc.4       1.15

Approved by:    re (scottl)
2005-10-06 10:58:16 +00:00
Marius Strobl 1a1b6619b5 MFC: if_gem.c 1.31 + 1.35, if_gem_pci.c 1.20, if_gemvar.h 1.11
- In gem_ioctl() move the call to ether_ioctl() to the default case of
  the switch statement in order to make this driver more like other
  Ethernet NIC drivers.
- In gem_attach() call gem_stop() in addition to gem_reset() to make
  sure the chip actually is stopped and not just reset.
- In gem_stop() also stop the gem_rint_timeout() callout in case the
  driver is compiled with GEM_RINT_TIMEOUT defined.
- Remove NOP spl*() calls and add locking (making gem(4) MPSAFE).

This MFC actually brings the RELENG_6 gem(4) in line with HEAD which
means that it additionally includes a comment update regarding the
IFF_OACTIVE -> IFF_DRV_OACTIVE rename which was part of if_gem.c 1.33
but missed in the respective MFC in 1.29.2.2.

Requested by:	thompsa
Approved by:	re (scottl)
2005-10-05 22:08:17 +00:00
Marius Strobl 448a4a7870 MFC: 1.21
Fix an endianness issue in pnp_eisaformat().

Approved by:	re (scottl)
2005-10-05 21:53:17 +00:00
Marius Strobl c0f7f26cf3 MFC: creator.c 1.9, fbreg.h 1.19, gfb.c 1.8, machfb.c 1.4,
ofw_syscons.c 1.9, s3_pci.c 1.10, scgfbrndr.c 1.23, scmouse.c 1.40,
	scvgarndr.c 1.20, scvidctl.c 1.37, syscons.c 1.439, syscons.h 1.85,
	tga.c 1.8, vesa.c 1.52, vga.c 1.35

Add a font width argument to vi_load_font_t, vi_save_font_t and vi_putm_t
and do some preparations for handling 12x22 fonts (currently lots of code
implies and/or hardcodes a font width of 8 pixels). This will be required
on sparc64 which uses a default font size of 12x22 in order to add font
loading and saving support as well as to use a syscons(4)-supplied mouse
pointer image.

Approved by:	re (scottl)
2005-10-05 21:48:03 +00:00
Tai-hwa Liang 5cf9c71c3f MFC: (1.193) fixing WEP bustage in hostap mode.
Approved by:	re (scottl)
2005-10-05 13:16:29 +00:00
Tai-hwa Liang 1f6b29596c MFC: (1.27) fixing WEP bustage in hostap mode.
Approved by:	re (scottl)
2005-10-05 13:13:46 +00:00
Robert Watson c05aacfbdd Merge netisr.c:1.16 from HEAD to RELENG_6:
Rename net.isr.enable to net.isr.direct.

  No compatibility code is provided, as this will be the production name
  as of 6.0.  Previously this has been an experimental and unsupported
  feature.

  Requested by:	scottl

Approved by:	re (kensmith)
2005-10-05 12:32:23 +00:00
Robert Watson 85822579e3 Merge init_main.c:1.258, mac_vfs.c:1.110, mac_biba.c:1.89,
mac_lomac.c:1.37, mac_mls.c:1.74, mac_stub.c:1.55, mac_test.c:1.62,
mac.h:1.69, mac_policy.h:1.70 from HEAD to RELENG_6:

  Remove mac_create_root_mount() and mpo_create_root_mount(), which
  provided access to the root file system before the start of the
  init process.  This was used briefly by SEBSD before it knew about
  preloading data in the loader, and using that method to gain
  access to data earlier results in fewer inconsistencies in the
  approach.  Policy modules still have access to the root file system
  creation event through the mac_create_mount() entry point.

  Removed now, and will be removed from RELENG_6, in order to gain
  third party policy dependencies on the entry point for the lifetime
  of the 6.x branch.

  Obtained from: TrustedBSD Project
  Submitted by:  Chris Vance <Christopher dot Vance at SPARTA dot com>

Approved by:	re (scottl)
2005-10-05 10:31:05 +00:00
Tai-hwa Liang cecc5554d0 MFC: (1.192) honouring ic->ic_dtim_period.
Approved by:	re (scottl)
2005-10-05 06:54:12 +00:00
Don Lewis 64e3f63c15 MFC kern_proc.c - fix locking in sysctl_kern_proc()
Original commit message:

  FreeBSD src repository

  Modified files:
    sys/kern             kern_proc.c
  Log:
  Always wire the sysctl output buffer in sysctl_kern_proc() before
  calling sysctl_out_proc().  -- fix from jhb

  Move the code in fill_kinfo_thread() that gathers data from struct proc
  into the new function fill_kinfo_proc_only().

  Change all callers of fill_kinfo_thread() to call both
  fill_kinfo_proc_only() and fill_kinfo() thread.  When gathering
  data from a multi-threaded process, fill_kinfo_proc_only() only needs
  to be called once.

  Grab sched_lock before accessing the process thread list or calling
  fill_kinfo_thread().

PR:		kern/84684
Approved by:	re (scottl)
2005-10-05 05:30:24 +00:00
Don Lewis 7ffa5c45ff MFC ffs_alloc.c 1.135 - clear i_flag field in recycled inodes
Original commit message:

  FreeBSD src repository

  Modified files:
    sys/ufs/ffs          ffs_alloc.c
  Log:
  Initialize the inode i_flag field in ffs_valloc() to clean up any
  stale flag bits left over from before the inode was recycled.

  Without this change, a leftover IN_SPACECOUNTED flag could prevent
  softdep_freefile() and softdep_releasefile() from incrementing
  fs_pendinginodes.  Because handle_workitem_freefile() unconditionally
  decrements fs_pendinginodes, a negative value could be reported at
  file system unmount time with a message like:
          unmount pending error: blocks 0 files -3
  The pending block count in fs_pendingblocks could also be negative
  for similar reasons.  These errors can cause the data returned by
  statfs() to be slightly incorrect.  Some other cleanup code in
  softdep_releasefile() could also be incorrectly bypassed.

Reviewed by:	tegge
Approved by:	re (scottl)
2005-10-05 05:24:53 +00:00
cvs2svn c321a51806 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-05 05:21:08 +00:00
Craig Rodrigues a05ff45aa7 MFC 1.53
Fix so that color changes are not lost when the video mode changes.

PR:             bin/83553
Submitted by:   Dan Lukes <dan at obluda dot cz>
Approved by:	re (scottl)
Reminded by:	delphij
2005-10-05 04:29:59 +00:00
Craig Rodrigues eb2bfb76e7 MFC 1.81
Call gctl_free() to free resource allocated with gctl_get_handle().

PR:		bin/84664
Submitted by:	Daan Vreeken <Danovitsch at Vitsch dot net>
Approved by:	re (scottl)
2005-10-05 01:16:39 +00:00
David Xu 4af387f622 MFC kern/kern_thread.c revision 1.217
kern/kern_kse.c     revision 1.218

Fix scheduler and sleep queue LOR.

Approved by: re (scottl)
2005-10-04 22:53:56 +00:00
Ralf S. Engelschall 89d93b0fd0 MFC to RELENG_6:
| Fix system shutdown timeout handling by again supporting longer running
| shutdown procedures (which have a duration of more than 120 seconds).
|
| We have two user-space affecting shutdown timeouts: a "soft" one in
| /etc/rc.shutdown and a "hard" one in init(8). The first one can be
| configured via /etc/rc.conf variable "rcshutdown_timeout" and defaults
| to 30 seconds. The second one was originally (in 1998) intended to be
| configured via sysctl(8) variable "kern.shutdown_timeout" and defaults
| to 120 seconds.
|
| Unfortunately, the "kern.shutdown_timeout" was declared "unused" in 1999
| (as it obviously is actually not used within the kernel itself) and
| hence was intentionally but misleadingly removed in revision 1.107 from
| init_main.c. Kernel sysctl(8) variables are certainly a wrong way to
| control user-space processes in general, but in this particular case the
| sysctl(8) variable should have remained as it supports init(8), which
| isn't passed command line flags (which in turn could have been set via
| /etc/rc.conf), etc.
|
| As there is already a similar "kern.init_path" sysctl(8) variable which
| directly affects init(8), resurrect the init(8) shutdown timeout under
| sysctl(8) variable "kern.init_shutdown_timeout". But this time document
| it as being intentionally unused within the kernel and used by init(8).
| Also document it in the manpages init(8) and rc.conf(5).
|
| Reviewed by: phk
| MFC after: 2 weeks
|
| Revision  Changes    Path
| 1.48      +7 -1      src/sbin/init/init.8
| 1.61      +1 -1      src/sbin/init/init.c
| 1.264     +16 -1     src/share/man/man5/rc.conf.5
| 1.257     +11 -0     src/sys/kern/init_main.c

Approved by: re (scottl)
2005-10-04 17:29:00 +00:00
Robert Watson ff332b1cb9 Merge fifo_vnops.c:1.132 from HEAD to RELENG_6:
Second attempt at a work-around for fifo-related socket panics during
  make -j with high levels of parallelism: acquire Giant in fifo I/O
  routines.

  Discussed with: ups

Approved by:	re (scottl)
2005-10-04 15:33:06 +00:00
Diomidis Spinellis 6de5c88f67 MFC 1.28
Bug fix: a numeric flag specification in the substitute command would
cause the next substitute flag to be ignored.
While working at it, detect and report overflows.

Reported by:	Jingsong Liu
Bugged by:	Xin Li
Approved by:	re (kensmith)
2005-10-04 15:26:10 +00:00
John Baldwin de3886b88f MFC: Add interrupt counters for IPIs.
Approved by:	re (scottl)
2005-10-04 15:15:22 +00:00
John Baldwin 7a3d878283 MFC: Rename the lapic timer interrupt counter to cpuX: timer.
Approved by:	re (scottl)
2005-10-04 15:13:06 +00:00
Andrey A. Chernov 5b918fcc98 MFC: 1.26-1.28
Approved by: re
2005-10-04 14:33:09 +00:00
Andrey A. Chernov cf5b9ffda5 MFC: 1.23
Approved by: re
2005-10-04 14:31:10 +00:00
Gleb Smirnoff b86ce95715 MFC 1.73:
In em_process_receive_interrupts() store and clear adapter->fmt. This
  make function reenterable. In the runtime the race is masked by
  serializing
  of em_process_receive_interrupts() either by interrupt thread, or by
  polling. The race can be triggered when polling is switched on or off.

Approved by:	re (scottl)
2005-10-04 14:07:44 +00:00
Poul-Henning Kamp d97973829c MFC:
Add the flash device sizing subroutine.

Approved by:	re@ (scottle)
Reminded by:	simon@
2005-10-04 13:56:35 +00:00
Peter Edwards 07936fafa5 MFC BOOTSIG[23] removal:
msdosfs_vfsops.c v1.146
    bootsect.h v1.13

    Remove checks for BOOTSIG[23] from FAT32 bootblocks.
    There seems to be very little documentary evidence outside this
    implementation to suggest a these checks are neccessary, and more
    than one camera-formatted flash disk fails the check, but mounts
    successfully on most other systems.

Approved by: re (scottl@)
2005-10-04 13:13:57 +00:00
Olivier Houchard 02fa0b3973 MFC rev 1.146 (and 1.147)
revision 1.146
date: 2005/09/28 16:05:13;  author: cognet;  state: Exp;  lines: +7 -1
Use SO_REUSEADDR on the socket, to make the use of syslogd in jails easier.

Submitted by:   Jeremie Le Hen <jeremie le-hen org>
Approved by:	re
2005-10-04 12:50:11 +00:00
Don Lewis 48f273d048 MFC snaplk deadlock fix
src/sys/kern/vfs_bio.c          1.495, 1.496
        src/sys/kern/vfs_subr.c         1.648
        src/sys/sys/buf.h               1.190, 1.191
        src/sys/sys/proc.h              1.436
        src/sys/ufs/ffs/ffs_snapshot.c  1.104, 1.105, 1.106

Original commit messages:

    Log:
    Un-staticize runningbufwakeup() and staticize updateproc.

    Add a new private thread flag to indicate that the thread should
    not sleep if runningbufspace is too large.

    Set this flag on the bufdaemon and syncer threads so that they skip
    the waitrunningbufspace() call in bufwrite() rather than than
    checking the proc pointer vs. the known proc pointers for these two
    threads.  A way of preventing these threads from being starved for
    I/O but still placing limits on their outstanding I/O would be
    desirable.

    Set this flag in ffs_copyonwrite() to prevent bufwrite() calls from
    blocking on the runningbufspace check while holding snaplk.  This
    prevents snaplk from being held for an arbitrarily long period of
    time if runningbufspace is high and greatly reduces the contention
    for snaplk.  The disadvantage is that ffs_copyonwrite() can start
    a large amount of I/O if there are a large number of snapshots,
    which could cause a deadlock in other parts of the code.

    Call runningbufwakeup() in ffs_copyonwrite() to decrement runningbufspace
    before attempting to grab snaplk so that I/O requests waiting on
    snaplk are not counted in runningbufspace as being in-progress.
    Increment runningbufspace again before actually launching the
    original I/O request.

    Prior to the above two changes, the system could deadlock if enough
    I/O requests were blocked by snaplk to prevent runningbufspace from
    falling below lorunningspace and one of the bawrite() calls in
    ffs_copyonwrite() blocked in waitrunningbufspace() while holding
    snaplk.

    See <http://www.holm.cc/stress/log/cons143.html>

    Revision  Changes    Path
    1.495     +3 -3      src/sys/kern/vfs_bio.c
    1.648     +2 -1      src/sys/kern/vfs_subr.c
    1.190     +1 -0      src/sys/sys/buf.h
    1.436     +1 -1      src/sys/sys/proc.h
    1.104     +16 -4     src/sys/ufs/ffs/ffs_snapshot.c

    Log:
    Un-staticize waitrunningbufspace() and call it before returning from
    ffs_copyonwrite() if any async writes were launched.

    Restore the threads previous TDP_NORUNNINGBUF state before returning
    from ffs_copyonwrite().

    Revision  Changes    Path
    1.496     +1 -1      src/sys/kern/vfs_bio.c
    1.191     +1 -0      src/sys/sys/buf.h
    1.105     +13 -1     src/sys/ufs/ffs/ffs_snapshot.c

    Log:
    Correct previous commit to fix the sense of the TDP_NORUNNINGBUF
    check in ffs_copyonwrite() that is a precondition for calling
    waitrunningbufspace().

    Pointed out by: tegge
    Pointy hat to:  truckman
    MFC after:      3 days

    Revision  Changes    Path
    1.106     +1 -1      src/sys/ufs/ffs/ffs_snapshot.c

Approved by:	re (scottl)
2005-10-04 04:41:27 +00:00
Don Lewis 41a7db5e3f MFC kern_exec.c 1.276 (and 1.278)
Original commit messages:

  truckman    2005-10-01 08:33:57 UTC

    FreeBSD src repository

    Modified files:
      sys/kern             kern_exec.c
    Log:
    Copy new process argument list in do_execve() before grabbing PROC_LOCK
    to avoid touching pageable memory while holding a mutex.

    Simplify argument list replacement logic.

    PR:            kern/84935
    Submitted by:  "Antoine Pelisse" apelisse AT gmail.com (in a different form)
    MFC after:     3 days

    Revision  Changes    Path
    1.276     +10 -10    src/sys/kern/kern_exec.c

  truckman    2005-10-04 04:02:33 UTC

    FreeBSD src repository

    Modified files:
      sys/kern             kern_exec.c
    Log:
    Add missing word to comment.

    Revision  Changes    Path
    1.278     +1 -1      src/sys/kern/kern_exec.c

PR:		kern/84935
Submitted by:	"Antoine Pelisse" apelisse AT gmail.com (in a different form)
Approved by:	re (scottl)
2005-10-04 04:29:08 +00:00
Greg Lehey 1c6c3a953f MFC:
Initialize uninitialized variables.
  Remove one possible way of shooting yourself in the foot.

Requested by:   Dan Lukes <[email protected]>
Approved by:	RE (kensmith@)

And now for the scripts which refuse the line above:

Approved by: re
2005-10-03 23:45:01 +00:00
Colin Percival 6767577f8e MFC revision 1.11: Fix a bug introduced in revision 1.9 which causes
chkgrp to coredump on certain corrupt files.

Approved by:	re (scottl)
2005-10-03 21:39:21 +00:00
Stephan Uphoff 909620d76b MFC revision 1.9:
Fix the "fpudna: fpcurthread == curthread XXX times" problem.

Approved by: re (scottl@)
2005-10-03 20:08:00 +00:00
Peter Edwards 0c8c53f795 MFC revision 1.494:
Close a race in biodone(), whereby the bio_done field of the passed
    bio may have been freed and reassigned by the wakeup before being
    tested after releasing the bdonelock.

Approved by: re (scottl@)
2005-10-03 09:30:12 +00:00
Hiroki Sato a56eb468d3 Add KPnS (known problems and solutions) entries:
- /dev/ttyv* not found on FreeBSD/sparc64 when
   there is no framebuffer[1].

 - KLDs do not work on FreeBSD/sparc64 with >4GB RAM[2].

 - kgdb is broken for debugging panics on FreeBSD/sparc64[2].

Thanks to:	marius[1], kris[2]
Approved by:	re (implicitly)
2005-10-02 20:11:34 +00:00
Colin Percival ea5b8286db MFC revision 1.639: Don't let the upper bits of %dr6/%dr7 get set.
Submitted by:	Nate Eldredge
Approved by:	re@ (scottl)
Security:	Local denial of service
2005-10-02 16:38:12 +00:00
Andre Oppermann e7c9741b76 MFC IP_DONTFRAG IP socket option.
Approved by:	re (scottl)
2005-10-02 15:45:47 +00:00
Joel Dahl c14308d44f MFC rev 1.55-1.58:
*  Document existing support for:
  -  ALI M5229
  -  ALI M5281
  -  ALI M5287
  -  ALI M5289
  -  CMD 646U2
  -  Highpoint HPT372N
  -  Intel 6300ESB
  -  Intel ICH7
  -  Nvidia nForce2 MCP
  -  Nvidia nForce3 MCP
  -  Nvidia nForce3 Pro
  -  Nvidia nForce4
  -  Promise PDC20571
  -  Promise PDC20575
  -  Promise PDC20579
  -  Promise PDC20580
  -  Promise PDC20621
  -  Promise PDC20622
  -  Promise PDC40518
  -  Promise PDC40519
  -  Promise PDC40718
  -  Promise PDC40719
  -  SIS 180
  -  SIS 181
  -  SIS 182
  -  SIS 965
  -  VIA VT6410
  -  VIA VT6420
  -  VIA VT6421

*  Add two missing dots.

*  Remove HPT366 duplicate.

Approved by:	re (hrs)
2005-10-02 14:32:06 +00:00
Ruslan Ermilov f970ac377d MFC: 1.46: Document that -q also affects "route change".
Approved by:	re (hrs)
2005-10-02 13:44:05 +00:00
Max Khon 9a376aa640 MFC g_uzip.c rev. 1.5:
- Fix "end_blk out of range" panic when INVARIANTS.
- Do not allow rw access.

Approved by:	re (scott)
2005-10-02 11:22:28 +00:00
Robert Watson 8eb830cdb9 Merge kern_lock.c:1.95 from HEAD to RELENG_6:
Include kdb.h so that kdb_active is declared regardless of KDB being
  included in the kernel.

Approved by:	re (kensmith)
2005-10-02 10:08:29 +00:00
Robert Watson 4f510d8c77 Merge fifo_vnops.c:1.130 from HEAD to RELENG_6:
Assert v_fifoinfo is non-NULL in fifo_close() in order to catch
  non-conforming cases sooner.

  Reported by:    Peter Holm <peter at holm dot cc>

Approved by:	re (scottl)
2005-10-02 10:07:21 +00:00
Robert Watson 1186cfa1d1 Merge subr_pcpu.c:1.7 from HEAD to RELENG_6:
Add "show allpcpu" to DDB, which prints the current CPU id followed by
  the per-cpu data for all CPUs.  This is easier to ask users to do than
  "figure out how many CPUs you have, now run show pcpu, then run it
  once for each CPU you have".

Approved by:	re (scottl)
2005-10-02 10:06:49 +00:00
Robert Watson 9c667ea480 Merge subr_kdb.c:1.13 from HEAD to RELENG_6:
If KDB_STOP_NMI is compiled into the kernel, default
  debug.kdb.stop_cpus_with_nmi to 1 rather than 0.

Approved by:	re (scottl)
2005-10-02 10:06:15 +00:00
Robert Watson 6eae5d0ae2 Merge kern_lock.c:1.94 from HEAD to RELENG_6:
In lockstatus(), don't lock and unlock the interlock when testing the
  sleep lock status while kdb_active, or we risk contending with the
  mutex on another CPU, resulting in a panic when using "show
  lockedvnods" while in DDB.

  Reviewed by:    jhb
  Reported by:    kris

Approved by:	re (scottl)
2005-10-02 09:58:54 +00:00
Don Lewis 42365efcea MFC ffs_softdep.c 1.185
Original commit message:

  truckman    2005-09-29 21:50:26 UTC

   FreeBSD src repository

   Modified files:
     sys/ufs/ffs          ffs_softdep.c
   Log:
   After a rmdir()ed directory has been truncated, force an update of
   the directory's inode after queuing the dirrem that will decrement
   the parent directory's link count.  This will force the update of
   the parent directory's actual link to actually be scheduled.  Without
   this change the parent directory's actual link count would not be
   updated until ufs_inactive() cleared the inode of the newly removed
   directory, which might be deferred indefinitely.  ufs_inactive()
   will not be called as long as any process holds a reference to the
   removed directory, and ufs_inactive() will not clear the inode if
   the link count is non-zero, which could be the result of an earlier
   system crash.

   If a background fsck is run before the update of the parent directory's
   actual link count has been performed, or at least scheduled by
   putting the dirrem on the leaf directory's inodedep id_bufwait list,
   fsck will corrupt the file system by decrementing the parent
   directory's effective link count, which was previously correct
   because it already took the removal of the leaf directory into
   account, and setting the actual link count to the same value as the
   effective link count after the dangling, removed, leaf directory
   has been removed.  This happens because fsck acts based on the
   actual link count, which will be too high when fsck creates the
   file system snapshot that it references.

   This change has the fortunate side effect of more quickly cleaning
   up the large number dirrem structures that linger for an extended
   time after the removal of a large directory tree.  It also fixes a
   potential problem with the shutdown of the syncer thread timing out
   if the system is rebooted immediately after removing a large directory
   tree.

   Submitted by:   tegge
   MFC after:      3 days

   Revision  Changes    Path
   1.185     +2 -0      src/sys/ufs/ffs/ffs_softdep.c

Submitted by:	tegge
Approved by:	re (scottl)
2005-10-02 08:25:33 +00:00
Ken Smith 99d0c095dd MFC revision 1.890:
> date: 2005/09/28 12:39:00;  author: kensmith;  state: Exp;  lines: +17 -6
> Add SHA256 checksums to the release build.
>
> Requested by:           cperciva (so)
> Reviewed/improved by:   ru

Approved by:	re (scottl)
2005-10-02 05:47:04 +00:00
Christian S.J. Peron cf7856ef12 MFC bpf.c v1.159
Make stats a bit more accurate by refreshing the PID after each
descriptor operation.

Approved by:	re (scottl)
2005-10-01 18:43:16 +00:00
Poul-Henning Kamp 9ef23e7e5e MFC:
one character fix in mount option name.

Approved by:	re@ (scottl)
2005-10-01 17:39:50 +00:00
Hajimu UMEMOTO a49a1145e4 MFC: add product ID for Linux Ethernet/RNDIS gadget on pxa210/25x/26x.
sys/dev/usb/if_cdce.c:	1.11
	sys/dev/usb/usbdevs:	1.234

Approved by:	re (scottl)
2005-10-01 16:26:25 +00:00
Andre Oppermann 0a7be88571 MFC: IP_MINTTL socket option.
Approved by:	re (scottl)
2005-10-01 15:56:44 +00:00
Joseph Koshy 04774959f5 MFC r1.11-1.12:
- Correct a typo.
  - Note the requirement for 'device apic' on i386 systems.
  - Consistently use 'x86' when referring to behaviour common to the
    i386 and amd64.

Approved by:	re (hrs)
2005-10-01 15:52:13 +00:00
Joseph Koshy dc7137f378 MFC r1.5:
The 'intr_bufferfull' driver statistic actually counts the number
  of times sampling was stopped due to a space shortage; change its
  description in the output of `pmcstat -s` to match reality.

Approved by:	re (scottl)
2005-10-01 15:48:02 +00:00
Dag-Erling Smørgrav 2c9daaf535 MFC: don't take unprotected keys into account for authentication.
PR:		bin/81231
Approved by:	re (kensmith)
2005-09-30 14:02:29 +00:00
Yoshihiro Takahashi 9cdd01a143 MFC: Call gctl_free() to free resource allocated with gctl_get_handle().
Approved by:	re (kensmith)
2005-09-30 13:09:01 +00:00
Xin LI 3bd2cc9dc5 MFC sys/fs/hpfs/hpfs_vfsops.c:1.54-1.56,
sys/fs/msdosfs/msdosfs_vfsops.c:1.145,
    sys/fs/ntfs/ntfs_vfsops.c:1.79-1.80,
    sys/fs/udf/udf_vfsops.c:1.34-1.35,
    sys/gnu/fs/ext2fs/ext2_vfsops.c:1.152-1.153,
    sys/gnu/fs/reiserfs/reiserfs_vfsops.c:1.2-1.3 (by ssouhlal):

*_mountfs() (if the filesystem mounts from a device) needs devvp to be
locked, so lock it.

Approved by:	re (scottl)
2005-09-30 06:26:42 +00:00
Xin LI 7d15289b58 MFC 1.293 (by ssouhlal):
ffs_mountfs() needs devvp to be locked, so lock it.

Approved by:	re (scottl)
2005-09-30 06:14:44 +00:00
Xin LI 5836b8f5f7 MFC 1.197 (by ssouhlal):
Don't unbusy the devfs mount in vfs_mountroot_try() as it gets accessed
and unbusied in devfs_fixup(), which assumes that the devfs mount is
still locked.

Approved by:	re (scottl)
2005-09-30 06:10:59 +00:00
Christian S.J. Peron c3d79f4cd8 MFC src/contrib/pf/pflogd/pflogd.c rev 1.9
Implement BIOCLOCK

Approved by:	re (kensmith)
2005-09-29 23:50:29 +00:00
Christian S.J. Peron 4454cd3fc3 MFC privilege separation enhancements for bpf(4)
Introduce BIOCLOCK and BIOCSETWF

Revision(s)
    1.158     +81 -23    src/sys/net/bpf.c
    1.40      +2 -0      src/sys/net/bpf.h
    1.31      +4 -1      src/sys/net/bpfdesc.h

Approved by:	re (scottl)
2005-09-29 23:48:04 +00:00
Robert Watson 06a775e5aa Merge if.c:1.247, in.c:1.88, in.h:1.92 from HEAD to RELENG_6:
Take a first cut at cleaning up ifnet removal and multicast socket
  panics, which occur when stale ifnet pointers are left in struct
  moptions hung off of inpcbs:

  - Add in_ifdetach(), which matches in6_ifdetach(), and allows the
    protocol to perform early tear-down on the interface early in
    if_detach().

  - Annotate that if_detach() needs careful consideration.

  - Remove calls to in_pcbpurgeif0() in the handling of SIOCDIFADDR --
    this is not the place to detect interface removal!  This also
    removes what is basically a nasty (and now unnecessary) hack.

  - Invoke in_pcbpurgeif0() from in_ifdetach(), in both raw and UDP
    IPv4 sockets.

  It is now possible to run the msocket_ifnet_remove regression test
  using HEAD without panicking.

  Reported by:	Gavin Atkinson <gavin dot atkinson at ury dot york dot ac dot uk>

Approved by:	re (scottl)
2005-09-29 20:57:07 +00:00
John Baldwin 61d52c96a3 MFC: Use correct VFS locking in kern_alternate_path().
Approved by:	re (scottl)
2005-09-29 18:53:10 +00:00
John Baldwin 74b2e9a759 MFC various fixes to sis(4):
- Remove sis_unit and use device_printf() and if_printf() instead.
- Use callout_init_mtx() for the callout.
- Remove spls.
- Fix locking for ifmedia to happen in the ifmedia handlers rather than in
  sis_ioctl().

Approved by:	re (scottl)
2005-09-29 18:52:21 +00:00
John Baldwin 129a9ed4e2 MFC: Add the spin lock used by the binary nvidia-driver to the static lock
order list.

Approved by:	re (scottl)
2005-09-29 18:47:31 +00:00
Robert Watson 3c084fb31a Merge subr_prof.c:1.119, 1.120, 1.121, nfs_socket.c:1.130,
rpcclnt.c:1.14 from HEAD to RELENG_6:

Acquire Giant in uprintf() and tprintf() due to the non-MPSAFEty of
the tty code invoked from these functions.  In two cases, during
timeout handling in NFS-related RPC client code, acquire Giant in
the caller before other mutexes the caller might hold, in order to
avoid lock order reversals with Giant (a recursive acquire is not
a reversal as it won't ever wait).

Correct age-old comments about uprintf()/tprintf() sleeping: they
will never sleep.

Much useful feedback from:	bde
Approved by:			re (scottl)
2005-09-29 18:40:36 +00:00
Gleb Smirnoff 8d83bb6285 MFC 1.62:
- Print space character in show_stat(). Remove a lot of priuntf(" ").
  - Utilize show_stat() in sidewaysintpr() loop. This makes periodic
    statistics to honor -h flag.

Approved by:	re (kensmith)
2005-09-29 13:19:10 +00:00
Christian Brueffer 0259e20517 MFC: rev. 1.6
Fix typo.

Approved by:	re (hrs)
2005-09-28 16:51:27 +00:00
Ruslan Ermilov 790ce6a78a MFC: 1.57: Respect IFF_PROMISC.
Approved by:	re (scottl)
2005-09-28 16:46:17 +00:00
Ken Smith 0be27f3c8b MFC v1.43: Move hme_stop() BEFORE ether_ifdetach() and if_free() to
prevent a memory-referenced-after-free panic if the hme interface
fails to attach.

Patch obtained from:	marius
Suggested same thing:	brooks
Approved by:		re (scottl)
2005-09-28 14:10:00 +00:00
Ken Smith 1186cacdbd MFC v1.30: Update for RELENG_6.
Approved by:	re (scottl)
2005-09-28 14:00:13 +00:00
Robert Watson ab6b1024ea Merge fifo_vnops.c:1.129 from HEAD to RELENG_6:
Lock the read socket receive buffer when frobbing the sb_state flag on
  that socket during open, not the write socket receive buffer.

  Spotted by:	ups

Approved by:	re (scottl)
2005-09-28 06:55:02 +00:00
Robert Watson 588c26b2b1 Merge uipc_usrreq.c:1.156 from HEAD to RELENG_6:
Canonicalize the UNIX domain socket copyright layout: original holders
  before more recent holders.

Approved by:	re (scottl)
2005-09-28 06:52:10 +00:00
Robert Watson 796f6db980 Merge fifo_vnops.c:1.128 from HEAD to RELENG_6:
For reasons of consistency (and necessity), assert an exclusive vnode
  lock on the fifo vnode in fifo_open(): we rely on the vnode lock to
  serialize access to v_fifoinfo.

Approved by:	re (scottl)
2005-09-28 06:47:32 +00:00
Robert Watson d96e8533f9 Merge uipc_socket.c:1.249, socket.h:1.89 from HEAD to RELENG_6:
Add three new read-only socket options, which allow regression tests
  and other applications to query the state of the stack regarding the
  accept queue on a listen socket:

  SO_LISTENQLIMIT    Return the value of so_qlimit (socket backlog)
  SO_LISTENQLEN      Return the value of so_qlen (complete sockets)
  SO_LISTENINCQLEN   Return the value of so_incqlen (incomplete sockets)

  Minor white space tweaks to existing socket options to make them
  consistent.

  Discussed with: andre

Approved by:	re (scottl)
2005-09-27 21:14:10 +00:00
Max Laier a51c47afb9 Document bridge(4) removal.
Approved by:	re (scottl)
2005-09-27 18:51:02 +00:00
Warner Losh 5dd842418a MFC: CIS exported to userland, and a number of cosmetic fixups
Approved by: re@ (scottl)
2005-09-27 18:42:20 +00:00
Xin LI 0834b2e5bf MFC 1.64: Restore a historical ufs_inactive behavior that respect
the RDONLY option, so subsequent call of UFS_TRUNCATE (ffs_truncate)
would not panic the system.  This fixes a panic that can happen
when mounting a corrputed filesystem read-only, and reading data
from it.

Reviewed by:	mckusick
Approved by:	re (scottl)
2005-09-27 17:03:53 +00:00
Mark Peek 16c2b483ab Bump up BUFSIZE from 4k to 8k. This was requested by portmgr@ to allow
ports builds in the cluster to work correctly.

Approved by: re
2005-09-27 14:49:41 +00:00
Kirill Ponomarev 5e4f9d9f58 MFC: 1.20
date: 2005/09/24 21:41:47;  author: krion;  state: Exp;  lines: +1 -1
  Do not bitch about bsdpan modules not having origin.

  Based on PR:    bin/82269
  Submitted by:   Steven Hartland <killing at multiplay dot co dot uk>
  MFC after:      3 days

Approved by:	re (kensmith)
2005-09-27 13:39:06 +00:00
Kirill Ponomarev 21a616e063 MFC: 1.39
date: 2005/09/24 19:41:56;  author: krion;  state: Exp;  lines: +1 -1
    Remove '\n' since it's redundant in case if file doesn't exist while
    running 'pkg_info -g'

    Based on PR:    bin/42609
    Submitted by:   Jeff King <peff-freebsd at peff dot net>
    MFC after:      3 days

Approved by:	re (kensmith)
2005-09-27 13:37:53 +00:00
David Xu bf4ac3bbb4 MFC kern/sys_process.c revision 1.132
kern/kern_kse.c    revision 1.215

     > Fix a LOR between sched_lock and sleep queue lock.

Approved by: re(scottl)
2005-09-27 12:17:38 +00:00
David Xu 5eb953e90c MFC revisions 1.156 - 1.159, improve stability of ULE scheduler.
Approved by: re (scottl)
2005-09-27 12:00:31 +00:00
Warner Losh 0914839d22 MFC: 1.297 and 1.298
Split the do_powerstaes knob into do_power_resume and do_power_nodriver.
Go ahead and enable power state management for suspend/resume, but leave
the nodriver powerdown off by default.  The MFC that changed do_power_state
default to 0 broke some resume on some laptops.

Approved by: re@ (scottl)
2005-09-27 05:57:47 +00:00
John Baldwin 970639bf36 MFC: Stop using the '+' constraint modifier with memory operands in
inline assembly.  We still use it for register operands in various places.

Approved by:	re (kensmith)
2005-09-26 19:54:19 +00:00
John Baldwin bb4883920f MFC: Adjust comment to note that we now do handle the PMC LVT entry and
try to avoid recursively panicing.

Approved by:	re (kensmith)
2005-09-26 19:50:38 +00:00
John Baldwin b9f05e541c MFC: Use the new thread no sleeping facility to replace the g_xup, g_xdown,
and dont_sleep_in_callout mutexes.  Also, disallow sleeping in hardware
interrupt handlers.

Approved by:	re (kensmith)
2005-09-26 19:49:12 +00:00
John Baldwin a630fc3f14 MFC: Add a new simple facility for marking the current thread as being in a
state where sleeping on a sleep queue is not allowed.

Approved by:	re (kensmith)
2005-09-26 19:43:37 +00:00
John Baldwin d4accbfec7 MFC: Explicitly switch to the new TSS when adding one in i386_extend_pcb().
Approved by:	re (kensmith)
2005-09-26 19:38:12 +00:00
John Baldwin 57a6c2fedd MFC: Fixup locking and mark MPSAFE.
Approved by:	re (kensmith)
2005-09-26 19:36:38 +00:00
John Baldwin 2f5d3318ad MFC: Add a memory barrier for PREWRITE operations to ensure all writes by
the CPU have drained before further writes to kick off the DMA operation.

Approved by:	re (kensmith)
2005-09-26 19:35:33 +00:00
Poul-Henning Kamp 5eec9ecc16 MFC:
Fixes for various races in md.

Approved by:	re@ (scottl)
2005-09-26 18:14:38 +00:00
Damien Bergamini e3589c6371 sync with HEAD.
o Brings WME and IBSS support.
o Fix association with APs hiding their SSIDs.

Approved by:	re (scottl)
2005-09-26 17:31:36 +00:00
Damien Bergamini 886670277d sync with HEAD.
Approved by:	re (scottl)
2005-09-26 17:21:15 +00:00
Poul-Henning Kamp 721a9870c3 MFC:
nanobsd conversion to shell script.

Approved by:	re@ (scottl)
2005-09-26 15:00:49 +00:00
Gleb Smirnoff 5fa0e0af41 MFC 1.80:
- Understand EADDRINUSE, and forget EDQUOT. [1]
  - Add description for EEXIST.
  - Change description for ENOBUFS. Routing socket can return
    this error for many different reasons, including general
    memory shortage, mbuf memory shortage and rtentry zone.

  PR:	kern/64090 [1]

Approved by:	re (scottl)
2005-09-26 15:00:34 +00:00
Gleb Smirnoff 7b15fbe3a5 MFC 1.113:
Several fixes to rt_setgate(), that fix problems with route changing:

  - Rearrange code so that in a case of failure the affected
    route is not changed. Otherwise, a bogus rtentry will be
    left and later rt_check() can recurse on its lock. [1]
  - Remove comment about protocol cloning.
  - Fix two places where rtentry mutex was recursed on, because
    accessed via two different pointers, that were actually pointing
    to the same rtentry in some cases. [1]
  - Return EADDRINUSE instead of bogus EDQUOT, in case when gateway
    uses the same route. [2]

  Reported & tested by:	ps, Andrej Zverev <az inec.ru> [1]
  PR:			kern/64090 [2]

Approved by:	re (scottl)
2005-09-26 14:59:12 +00:00
Gleb Smirnoff 521c3e4cf5 MFC 1.71, 1.72:
Check IFF_DRV_RUNNING before calling em_start_locked().

Approved by:	re (scottl)
2005-09-26 14:46:10 +00:00
Poul-Henning Kamp 02eb92cc0e MFC:
DEVFS fixes of many sorts.

Approved by:	re@ (scottl)
2005-09-26 14:36:54 +00:00
Andre Oppermann da7684092a MFC 1.160: Undo optimization which broke BIOCGSEESENT handling.
Approved by:	re (scottl)
2005-09-26 12:06:18 +00:00
Andre Oppermann 512a7c42c1 MFC 1.77: Do not ignore all other TCP options when TCP_MD5.
Approved by:	re (scottl)
2005-09-26 12:03:37 +00:00
Andrew Thompson c0dc51e8fb MFC: if_bridge.c, r1.22
> Fix an alignment panic my preserving the 2byte padding (ETHER_ALIGN) on our
> copied mbuf, which keeps the IP header 32-bit aligned. This copied mbuf is
> reinjected back into ether_input and off to the IP routines.
>
> Reported and tested by: Peter van Dijk

Approved by:	re (scottl), mlaier (mentor)
2005-09-25 20:36:02 +00:00
Robert Watson 5a7539465e Merge kern_acct.c:1.75 from HEAD to RELENG_6:
Pass 'curthread' into VFS_STATFS() from acctwatch(), rather than passing
  NULL.  The NFS client expects that a thread will always be present for a
  VOP so that it can check for signal conditions, and will dereference a
  NULL pointer if one isn't present.

Approved by:	re (scottl)
2005-09-25 18:54:28 +00:00
Robert Watson 485c329e67 Merge Makefile:1.262, namei.9:1.27, and VFS_LOCK_GIANT.9:1.1 from
HEAD to RELENG_6:

  Add discussion of Giant, the MPSAFE flag, and NDHASGIANT() to namei(9).

  Add a VFS_LOCK_GIANT(9)/VFS_UNLOCK_GIANT(9) man page.

  Discussed with: jeff

Approved by:	re (hrs)
2005-09-25 18:51:45 +00:00
Robert Watson b32ccd7850 Merge rc.conf:1.260, kerberos:1.5, rc.conf.5:1.265 from HEAD to RELENG_6:
Add a new rc.conf entry, kerberos5_server_flags, which allows the
  administrator to specify additional start-up flags to the Kerberos
  5 Authentication Server.

Approved by:	re (scottl)
2005-09-25 18:45:56 +00:00
Wilko Bulte 28ed9b63af Try to avoid crashes during kernel startup by limiting the # of EISA
slots to probe.  Problems have been reported in this area, lets hope
this  bandaid helps.

	!! Owners of EISA-equipped Alpha machines are requested to at least
	!! boot-test a 6-BETA build and report back to the Alpha list. Thanks!

Approved by: re (scottl)
Suggested by: ticso
2005-09-25 18:34:18 +00:00
Olivier Houchard 742917c66a It seems I can't MFC something without forgetting half the files.
MFC rev 1.25
revision 1.25
date: 2005/09/18 19:23:35;  author: cognet;  state: Exp;  lines: +2 -4
Slightly change the API for the SNPSTTY ioctl so that the userland now
provides a file descriptor instead of a dev_t.

Approved by:	re
2005-09-24 13:19:20 +00:00
Olivier Houchard d816eaea3b MFC rev 1.27:
revision 1.27
date: 2005/09/19 13:48:45;  author: ru;  state: Exp;  lines: +8 -5
Restore the ability to detach from a tty via SIOCSTTY and document
recent changes in a manpage.

Approved by:	re
2005-09-24 13:17:33 +00:00
Christian Brueffer a0a0b1f21a MFC:
- Sort the list of ethernet devices by driver-name.
- Sort the list of disk controllers by driver-name.  The notable exception is
  ata(4), which should stay on top.
- Add esp(4).

Approved by:	re (hrs)
2005-09-24 10:46:38 +00:00
Christian Brueffer 5356783f26 MFC: rev. 1.286
Don't claim matcd(4) support, it was removed long ago.

Approved by:	re (hrs)
2005-09-24 07:45:21 +00:00
Christian Brueffer e8f561bd8f MFC: rev. 1.2
Use the correct function name as .Nm argument.

Approved by:	re (hrs)
2005-09-24 07:13:37 +00:00
Giorgos Keramidas 140e3c10dc MFC: a lot of manpage fixes from HEAD.
Approved by:	re (hrs)
2005-09-24 01:59:40 +00:00
Olivier Houchard 3500d47121 MFC rev 1.32, 1.33, 1.34:
revision 1.32
date: 2005/09/18 19:24:05;  author: cognet;  state: Exp;  lines: +8 -2
Open the tty device and pass the fd for SNPSTTY.

revision 1.33
date: 2005/09/19 13:48:45;  author: ru;  state: Exp;  lines: +3 -3
Restore the ability to detach from a tty via SIOCSTTY and document
recent changes in a manpage.

revision 1.34
date: 2005/09/21 14:30:14;  author: cognet;  state: Exp;  lines: +8 -8
Close the tty file descriptor once we're done with it.
Use O_NONBLOCK when opening the tty device.

Approved by:	re
2005-09-23 23:24:55 +00:00
Olivier Houchard 47d123b76e MFC rev 1.5:
revision 1.5
date: 2005/09/19 10:14:05;  author: mux;  state: Exp;  lines: +1 -1
Fix the module build for snp(4).

Approved by:	re
2005-09-23 23:23:54 +00:00
Olivier Houchard a33e352637 MFC rev 1.101 and 1.102:
revision 1.101
date: 2005/09/18 19:23:35;  author: cognet;  state: Exp;  lines: +14 -5
Slightly change the API for the SNPSTTY ioctl so that the userland now
provides a file descriptor instead of a dev_t.

revision 1.102
date: 2005/09/19 13:48:45;  author: ru;  state: Exp;  lines: +5 -5
Restore the ability to detach from a tty via SIOCSTTY and document
recent changes in a manpage.

Approved by:	re
2005-09-23 23:22:22 +00:00
Søren Schmidt 86a3db20bd MFC:
Harden the hotplug support for SATA devices.
	This also fixes a few races that was present in the timeout/detach code.
	Fix support for the VIA 6421 controller.
	Fixes the losage of some ATAPI device that reported failed probing.
	Fix problem finding the still working disk in a broken mirror on VIA.

Approved by: re@ (scottl)
2005-09-23 18:06:11 +00:00
Robert Watson 5434627fed Merge rc.initdiskless:1.45 from HEAD to RELENG_6:
Use sysctl -q when querying for kern.bootp_cookie in order to avoid
  printing boot-time errors that don't reflect true error conditions.

Approved by:	re (kensmith)
2005-09-22 16:58:56 +00:00
Robert Watson e8f8afb664 Merge sysctl.8:1.59, sysctl.c:1.68 from HEAD to RELENG_6:
Add "-q" argument to sysctl(8), which suppresses a limited set of
  warnings/ errors generated.  In particular, it suppresses "unknown oid"
  when attempting to get or set a sysctl not present in the kernel.

Approved by:	re (kensmith)
2005-09-22 15:30:21 +00:00
Giorgos Keramidas 27d90051d5 MFC 1.167: panic on attach failure...
% When bus_alloc_resource_any() fails, dc_detach() is called and it
% attempts to deallocate busdma tags and resources that haven't been
% allocated yet, causing a panic every time a dc interface fails to
% attach.  Fix by checking that we really have something to dealloc
% before calling bus_dma*() functions.
%
% Approved by:    jhb
% MFC after:      1 week

Approved by:	re (kensmith)
2005-09-22 12:46:01 +00:00
Ken Smith eeaff9eded Fix a whitespace screw-up I made when doing the MFC of COMPAT_FREEBSD5.
It's supposed to be "option", "space", "tab"; not "option", "tab", "tab".

Approved by:	re (scottl)
Pointed out by:	rwatson
Pointy hat:	kensmith
2005-09-22 12:36:39 +00:00
John Baldwin e5300670fd MFC: Various small cleanups. No functional change.
Approved by:	re (kensmith)
2005-09-21 21:11:28 +00:00
John Baldwin eac79ac32c MFC: Several improvements to the manual page including mentioning that
mtx_trylock() only works with MTX_DEF mutexes.

Approved by:	re (kensmith)
2005-09-21 21:09:36 +00:00
John Baldwin 22dc7d6602 MFC: Use if_printf() and device_printf().
Approved by:	re (kensmith)
2005-09-21 21:06:39 +00:00
John Baldwin 5b9cc6028d MFC: Destroy sx locks created with SX_SYSINIT() during module unload via a
SYSUNINIT.

Approved by:	re (kensmith)
2005-09-21 21:05:19 +00:00
John Baldwin 9b892f82ba MFC: Add witness checks to make sure exiting threads don't hold any locks.
Approved by:	re (kensmith)
2005-09-21 21:04:16 +00:00
Craig Rodrigues 5c803da891 MFC: 1.16:
In mountd_precmd(), use rc_args, not mountd_args to
  override the value of mountd_args.  This fixes the problem
  where mountd_args was not properly being set if
  weak_mountd_authentifcation="YES" was set in rc.conf.

PR:             conf/86260
Submitted by:   Thierry Herbelot <thierry at herbelot dot com>
Approved by:	re (kensmith)
2005-09-21 20:27:50 +00:00
cvs2svn 6b13c0483b This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-09-21 20:08:25 +00:00
Robert Watson 70dfc5aae7 Merge uipc_socket.c:1.248 from HEAD to RELENG_6:
Fix spelling in a comment.

Approved by:	re (scottl)
2005-09-21 15:32:21 +00:00
Robert Watson d967b070a4 Merge fifo_vnops.c:1.126 from HEAD to RELENG_6:
Assert that (vp) is locked in fifo_close(), since we rely on the
  exclusive vnode lock to synchronize the reference counts on struct
  fifoinfo.

Approved by:	re (scottl)
2005-09-21 15:31:26 +00:00
Robert Watson 790cc81ab7 Merge uipc_socket2.c:1.148 from HEAD to RELENG_6:
Re-comment sbcompress() to explain what it is it does; it took me
  quite a bit of reading to figure it out, and I want to avoid figuring
  it out again.

  Convert an if (foo) else printf("this is almost a panic") into a
  KASSERT.

Approved by:	re (scottl)
2005-09-21 15:30:54 +00:00
Pyun YongHyeon 7d6e897cbb MFC rev. 1.29 to RELENG_6:
fix LOR by dropping driver lock before calling resource_int_value(9).

Approved by:	re(scottl)
2005-09-21 03:18:30 +00:00
Tim Kientzle 50352c825d MFC archive_read_extract.c 1.42 and 1.43: Correctly restore file flags.
Approved by: re
2005-09-21 03:12:45 +00:00
Pyun YongHyeon 8912045c56 MFC rev. 1.21 to RELENG_6: fix module unloading panic
Approved by:	re(scottl)
2005-09-21 02:44:09 +00:00
Robert Watson e85b340f0d Merge fifo_vnops.c:1.125 from HEAD to RELENG_6:
The socket pointers in fifoinfo are not permitted to be NULL, so
  don't check if they are, it just confuses the fifo code more.

Approved by:	re (kensmith)
2005-09-20 13:57:17 +00:00
Gleb Smirnoff 44027ad876 MFC typo fix from 1.75:
Dej'a vu of revision 1.35

  PR:		kern/86258
  Submitted by:	Hiroshi Oota <ghelp excite.co.jp>

Approved by:	re (kensmith)
2005-09-20 13:46:15 +00:00
Gleb Smirnoff d40e00381d MFC 1.84 by yar:
Test the new M_VLANTAG packet flag before calling
  m_tag_locate().  This adds little overhead of a simple
  bitwise operation in case hardware VLAN acceleration
  is on, yet saves the more expensive function call if
  the acceleration is off.

  Reviewed by:	ru, glebius

Approved by:	re (kensmith)
2005-09-20 13:44:36 +00:00
Gleb Smirnoff 456f33935c MFC 1.69:
When message can't fit into socket receive buffer return ENOBUFS
  to userland program instead of letting it wait until end of days.

  PR:	kern/85907

Approved by:	re (kensmith)
2005-09-20 13:42:20 +00:00
Gleb Smirnoff 11b02f6e8e Merge locking of ng_pptpgre node. See 1.38, 1.39 log for longer
description.

Approved by:	re (kensmith)
2005-09-20 13:40:55 +00:00
Robert Watson 51a4db9b6e Merge savecore.c:1.76 from HEAD to RELENG_6:
Don't consider being unable to open the bounds file worthy of printing
  at LOG_WARNING by default; instead, consider it something to be printed
  to the tty when 'verbose' mode is set.  This avoids printing out extra
  lines at every boot on a system with crash dumps enabled, but that has
  not yet had to generate a crashdump.

Approved by:	re (kensmith)
2005-09-20 13:29:37 +00:00
Robert Watson 5d5e387e80 Merge dumpon:1.10 from HEAD to RELENG_6:
Use kenv -q to extract dumpdev rather than kenv, in order to avoid
  spamming the console in the event that a loader tunable 'dumpdev'
  isn't defined, which is not a relevant failure to report.

Approved by:	re (kensmith)
2005-09-20 13:28:01 +00:00
Robert Watson 6f7da852da Merge kenv.1:1.12, kenv.c:1.8 from HEAD to RELENG_6:
Add a "-q" quiet flag to kenv so that warnings can be suppressed.

Approved by:	re (kensmith)
2005-09-20 13:26:21 +00:00
Gleb Smirnoff b6286e83fa Suppress warning, to avoid fake bug reports from users of 6.0-RELEASE.
Push warning in net_add_domain() down under DIAGNOSTIC. At the moment, the
only loadable domain is netgraph and it has no problems to be loaded
at runtime, since it doesn't use if_afdata[AF_NETGRAPH], yet.

Approved by:	re (scottl)
2005-09-20 09:16:10 +00:00
Xin LI 120dad7f14 MFC 1.64 by kientzle:
The bsdtar_warnc() reporting function requires the program name to be
set up before it is called, so move the progname initialization before
the first possible call to bsdtar_warnc().

Thanks to: Stanislav Sedov
PR: bin/83366

Approved by:	re (scottl)
2005-09-20 07:48:00 +00:00
Christian Brueffer fb1f6457c3 MFC: rev. 1.886 by joel
New release notes: snd_t4dwave(4) manual page added.

Approved by:	re (hrs)
2005-09-20 04:53:12 +00:00
Christian Brueffer d28f50d4b8 MFC:
Auto generate device listings for snd_t4dwave(4).

Approved by:	re (hrs)
2005-09-20 04:51:32 +00:00
Christian Brueffer 511f3b8fe0 MFC: rev. 1.40 by joel
Xref snd_t4dwave(4).

Approved by:	re (hrs)
2005-09-20 04:49:59 +00:00
Christian Brueffer 1b5c21995f MFC:
Add manual page for snd_t4dwave(4).

Approved by:	re (hrs)
2005-09-20 04:48:30 +00:00
Christian S.J. Peron 9b46f284be MFC v1.129 src/sys/net/rtsock.c
Make sysctl_rtsock MP safe.

Approved by:	re (scottl)
2005-09-20 01:59:54 +00:00
Craig Rodrigues d0bf980be9 MFC: 1.61
Clarify wording for -m flag.

PR:     docs/84704
Approved by:	re (hrs)
2005-09-20 00:34:54 +00:00
Joe Marcus Clarke b7d67367bc MFC:
Correct a mis-merge from HEAD, and make sure the socket permissions are set
to 0666.

Reported by:	delphij via rwatson
Approved by:	re (scottl)
2005-09-19 21:50:31 +00:00
Colin Percival 23d3b80fd7 MFC revision 1.5:
When (re)allocating space for an array of pointers to char, use
  sizeof(*list), not sizeof(**list).  (i.e., sizeof(pointer) rather than
  sizeof(char)).

Approved by:	re (scottl)
2005-09-19 20:56:10 +00:00
Christian Brueffer f57f75b69b MFC:
- ed(4) MPSAFE
- acpi_ibm.4 and acpi_sony.4 manpages added

While here, correct two entities.

Approved by:	re (hrs)
2005-09-19 16:53:59 +00:00
Christian Brueffer 492871e2d8 MFC:
Manpage for the acpi_sony(4) driver.

Approved by:	re (hrs)
2005-09-19 16:51:10 +00:00
Poul-Henning Kamp e0b2ad6b7b MFC:
This bit missed out in the DEVFS MFC earlier today:
	SYSCTL debug.sizeof.cdev moved to relevant source file.

Approved by:	re@ (scottl)
2005-09-18 17:13:17 +00:00
Scott Long 93b84fdf68 MFC rev 1.94:
Fix race condition that caused activation of an event to
  be ignored immediately after it was deactivated.

Submitted by: Stephan Uphoff, Yahoo
Approved by: re
2005-09-18 15:03:31 +00:00
Poul-Henning Kamp 5dc21d2be6 MFC:
Various fixes for DEVFS, in particular "devfs ruleset already running".

Approved by:	re@ (scottl)
2005-09-18 07:10:57 +00:00
Scott Long 30ad9643f0 Switch over to 6.0-BETA5.
Approved by: re
2005-09-18 05:12:39 +00:00
Scott Long cc4a102d2b Take a step closer to the release and turn off malloc debugging.
Approved by: re (implicit)
2005-09-18 03:45:24 +00:00
Scott Long 84e108840b Now that our showstopper list has shrunk, take another step closer to the
release and turn off kernel debugging.  Also turn off SMP on i386 and amd64
and add an SMP kernel config.

Approved by: re (implicit)
2005-09-18 03:37:59 +00:00
Christian S.J. Peron 3db4865aab MFC v1.163 src/sys/kern/imgact_elf.c
MFC v1.82  src/sys/kern/vfs_lookup.c
MFC v1.394 src/sys/kern/vfs_syscalls.c

Approved by:	re (scottl)
2005-09-18 03:31:35 +00:00
Warner Losh 2e0289dfb2 MFC: Merge resource fixes for pci devices on pci0 for ioport.
Approved by: re (scottl)
2005-09-18 02:55:10 +00:00
Matt Jacob c852b22c0f MFC 1.156 (mjacob). Original log:
>Make the exploring of all luns supported by an HBA more of a
>tunable (until we get REPORT LUNS in place).
>
>If we're probing luns, and each probe succeeds, we keep going past
>lun 7 if we're a SCSI3 or better device (until we fail to probe).
>
>If we're probing luns, and a probe fails, we only keep going if
>we're quirked *for* it (CAM_QUIRK_HILUNS), and if we're not quirked
>*against* it (CAM_QUIRK_NOHILUNS), or we're a SCSI3 or better device
>and the tunable (kern.cam.cam_srch_hi) is set non-zero.

Approved by: re (scottl)
2005-09-18 02:29:27 +00:00
Gary W. Swearingen 5fd52474dd MFC 1.21
Approved by:	re
2005-09-17 17:12:18 +00:00
Xin LI b79b245e54 Oops, actually MFC 1.89 (by kan) which was missed in previous commit:
Handle a race condition where NULLFS vnode can be cleaned while threads
can still be asleep waiting for lowervp lock.

Tested by:	kkenn
Discussed with: ssouhlal, jeffr

(this is an early MFC for inclusion in the upcoming 6.0-BETA5)

Approved by:	re (scottl)
2005-09-17 15:51:41 +00:00
Tor Egge 152367c7dd MFC: Break out of loop if next buffer pointer has become invalid while
flushing current buffer.

Approved by:	re (scottl)
2005-09-17 15:51:12 +00:00
Xin LI 4977dd0d18 MFC 1.88 (by ssouhlal):
Use vput() instead of vrele() in null_reclaim() since the lower vnode
is locked.

MFC 1.89 (by kan):

Handle a race condition where NULLFS vnode can be cleaned while threads
can still be asleep waiting for lowervp lock.

Tested by:	kkenn
Discussed with: ssouhlal, jeffr

(rev. 1.89 is an early MFC for inclusion in the upcoming 6.0-BETA5)

Approved by:	re (scottl)
2005-09-17 15:48:05 +00:00
Colin Percival 6f20b87a9a MFC revision 1.3:
Log:
  Handle circular dependencies properly (via errx(3)) rather than dumping
  core.  This bug was made visible by a recent change to the audio/timidity++
  port, which now has itself as a run dependency.

Approved by:	re (scottl)
2005-09-17 15:43:40 +00:00
Gary W. Swearingen dbc55a21e6 MFC 1.25
Approved by: re
2005-09-17 15:27:27 +00:00
Max Laier 2739b1dd10 MFC: if_pfsync.c, 1.23:
Stop leaking a lock.  This used to cause a propagate_priority() page fault
  when setting syncdev and syncpeer.

  Reported by:    Dominic Marks

Approved by:	re (scottl)
2005-09-17 15:19:38 +00:00
Bjoern A. Zeeb c5150c4979 MFC: rev. 1.111
Fix panic when kernel compiled without INET6 by rejecting
IPv6 opcodes which are behind #if(n)def INET6 now.

PR:		kern/85826
Approved by:	re (scottl)
2005-09-17 13:43:36 +00:00
Joseph Koshy f922a16e32 MFC { r1.4, r1.5 "pmcstat_log.c" }
- Determine where the runtime loader got mapped to when a dynamically
   linked process was exec()'ed, and map samples in that address range
   into the appropriate buckets in the runtime loader's profile.

 - Fix a bug that caused generated gmon.out profiles to be out of
   whack.  Use saturating arithmetic when incrementing a bucket.

 - Improve a few comments.

Approved by:	re (scottl)
2005-09-17 13:04:10 +00:00
Brian Somers 68120cecc1 MFC: Add a -h option to tell cmp not to follow symbolic links.
Approved by:	re (scottl)
Sponsored by:	Sophos/ActiveState
2005-09-17 11:33:41 +00:00
Warner Losh 3c4f74e836 MFC: pccard updates
o New APIs to access CIS, attribute memory and pccard registers
o Lock ed driver
o Support more cards in ed, ep, sn, xe
o Use new APIs to get MAC address right more often.

Approved by: re (scottl)
2005-09-17 04:01:05 +00:00
cvs2svn 36c2183039 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-09-17 03:36:48 +00:00
Paul Saab d038f2869c MFC: rev 1.66
Don't allow ioctl commands to be interrupted by the user.

Approved by:	re (scottl)
2005-09-16 18:04:10 +00:00
Paul Saab 273271b835 MFC: rev 1.67
Print the actual disk device we failed to complete i/o on.

Approved by:	re (scottl)
2005-09-16 18:02:38 +00:00
Paul Saab ae94c3b11c MFC:
Ignore mutex asserts when we're dumping as well.  This allows me
to panic a system from DDB when INVARIANTS is compiled into the
kernel on a scsi system.

Approved by:	re (scottl)
2005-09-16 18:01:55 +00:00
Paul Saab d469161bde MFC:
Add support for HP branded 2610SA

Approved by:	re (scottl)
2005-09-16 18:00:59 +00:00
Paul Saab 620a03a2e2 MFC:
There's no reason to check the valence.  This allows ciss to work
on the P600.

Approved by:	re (scottl)
2005-09-16 17:59:48 +00:00
Paul Saab 676adad4d4 MFC: rev 1.283
Remove a KASSERT in the sack path that fails because of a interaction
between sack and a bug in the "bad retransmit recovery" logic. This is
a workaround, the underlying bug will be fixed later.

Approved by:	re (scottl)
2005-09-16 17:58:54 +00:00
Paul Saab 2278db1f16 MFC: rev 1.20
For FreeBSD 4 binaries, when trying to read from a device that does
not exsist, do not have ioctl return an error, but instead set -1
in the data returned to the user.  This allows the HP bios flash
utilities to work without requiring changes to their code.

Approved by:	re (scottl)
2005-09-16 17:58:06 +00:00
Robert Watson a44a9308c4 Merge fifo_vnops.c:1.124 from HEAD to RELENG_6:
Trim down now (believed to be) unused fifo_ioctl() and
  fifo_kqfilter() VOP implementations, since they in theory are used
  only on open file descriptors, in which case the ioctls are via
  fifo_ioctl_f() and kqueue requests are via fifo_kqfilter_f().
  Generate warnings if they are entered for now.  These printf()
  calls should become panic() calls.

  Annotate and re-implement fifo_ioctl_f(): don't arbitrarily
  forward ioctls to the socket layer, only forward the ones we
  explicitly support for fifos.  In the case of FIONREAD, don't
  forward the request to the write socket on a read-write fifo, or
  the read result is overwritten.  Annotate a nasty case for the
  undefined POSIX O_RDWR on fifos, in which failure of the second
  ioctl will result in the socket pair being in an inconsistent
  state.

  Assert copyright as I find myself rewriting non-trivial parts of
  fifofs.

Approved by:	re (scottl)
2005-09-16 14:03:57 +00:00
Robert Watson fbdf9a0e9c Merge fifo_vnops.c:1.122 from HEAD to RELENG_6:
Annotate two issues:

  1) fifo_kqfilter() is not actually ever used, it likely should be GC'd.

  2) fifo_kqfilter_f() doesn't implement EVFILT_VNODE, so detecting events
     on the underlying vnode for a fifo no longer works (it did in 4.x).
     Likely, fifo_kqfilter_f() should forward the request to the VFS using
     fp->f_vnode, which would work once fifo_kqfilter() was detached from
     the vnode operation vector (removing the fifo override).

  Discussed with: phk

Approved by:	re (scottl)
2005-09-16 14:03:10 +00:00
Robert Watson 68128f5309 Merge fifo_vnops.c:1.123 from HEAD to RELENG_6:
As a result of kqueue locking work, socket buffer locks will always
  be held when entering a kqueue filter for fifos via a socket buffer
  event: as such, assert the lock unconditionally rather than acquiring
  it conditionally.

Approved by:	re (scottl)
2005-09-16 13:36:44 +00:00
Robert Watson 02ac96f910 Merge fifo_vnops.c:1.121 from HEAD to RELENG_6:
Introduce no-op nosup fifo kqueue filter and detach routine, which are
  used when a read filter is requested on a write-only fifo descriptor, or
  a write filter is requested on a read-only fifo descriptor.  This
  permits the filters to be registered, but never raises the event, which
  causes kqueue behavior for fifos to more closely match similar semantics
  for poll and select, which permit testing for the condition even though
  the condition will never be raised, and is consistent with POSIX's notion
  that a fifo has identical semantics to a one-way IPC channel created
  using pipe() on most operating systems.

  The fifo regression test suite can now run to completion on HEAD without
  errors.

Approved by:	re (kensmith)
2005-09-15 20:53:56 +00:00
Robert Watson 1eafbfb990 Merge if.c:1.246 from HEAD to RELENG_6:
In netkqfilter(), return EINVAL instead of 1 (EPERM) when a filter type
  is requested on a network interface file descriptor that is
  non-applicable.

Approved by:	re (kensmith)
2005-09-15 20:53:22 +00:00
Robert Watson 835b028cc0 Merge vfs_subr.c:1.646 from HEAD to RELENG_6:
In vfs_kqfilter(), return EINVAL instead of 1 (EPERM) when an unsupported
  kqueue filter type is requested on a vnode.

Approved by:	re (kensmith)
2005-09-15 20:52:53 +00:00
Robert Watson c5242a9ef0 Merge fifo_vnops.c:1.120 from HEAD to RELENG_6:
When a request is made to register a filter on a fifo that doesn't
  apply to the fifo (i.e., not EVFILT_READ or EVFILT_WRITE), reject
  it as EINVAL, not by returning 1 (EPERM).

Approved by:	re (kensmith)
2005-09-15 20:50:31 +00:00
Robert Watson 6134bc6715 Merge fifo_vnops.c:1.119 from HEAD to RELENG_6:
Remove DFLAG_SEEKABLE from fifo file descriptors: fifos are not seekable
  according to POSIX, not to mention the fact that it doesn't make sense
  (and hence isn't really implemented).  This causes the fifo_misc
  regression test to succeed.

Approved by:	re (scottl)
2005-09-15 20:50:04 +00:00
Robert Watson d9e9ffdd83 Merge fifo_vnops.c:1.118 from HEAD to RELENG_6:
Only poll the fifo for read events if the fifo is attached to a readable
  file descriptor.  Otherwise, the read end of a fifo might return that it
  is writable (which it isn't).

  Only poll the fifo for write events if the fifo attached to a writable
  file descriptor.  Otherwise, the write end of a fifo might return that
  it is readable (which it isn't).

  In the event that a file is FREAD|FWRITE (which is allowed by POSIX, but
  has undefined behavior), we poll for both.

Approved by:	re (kensmith)
2005-09-15 20:28:56 +00:00
Robert Watson 0b4dff3760 Merge fifo_vnops.c:1.117 from HEAD to RELENG_6:
After going to some trouble to identify only the write-related events
  to poll the write socket for, the fifo polling code proceeded to poll
  for the complete set of events.  Use 'levents' instead of 'events' as
  the argument to poll, and only poll the write socket if there is
  interest in write events.

Approved by:	re (kensmith)
2005-09-15 20:28:27 +00:00
Robert Watson 723772ac9b Merge fifo_vnops.c:1.116 from HEAD to RELENG_6:
When a writer opens a fifo, wake up the read socket for read, not the
  write socket.

Approved by:	re (kensmith)
2005-09-15 20:27:56 +00:00
Robert Watson 877d85d24c Merge fifo_vnops.c:1.115 from HEAD to RELENG_6:
Add an assertion that fifo_open() doesn't race against other threads
  while sleeping to allocate fifo state: due to using the vnode lock to
  serialize access to a fifo during open, it shouldn't happen (tm).

Approved by:	re (kensmith)
2005-09-15 20:27:25 +00:00
Robert Watson ff954f586c Merge fifo_vnops.c:1.114 from HEAD to RELENG_6:
Rather than reaching into the internals of the UNIX domain socket code
  by calling uipc_connect2() to connect two socket endpoints to create a
  fifo, call soconnect2().

Approved by:    re (kensmith)
2005-09-15 20:26:19 +00:00
John Baldwin 412af1575b MFC: Fixup locking and mark MPSAFE.
Approved by:	re (kensmith)
2005-09-15 19:16:29 +00:00
Joseph Koshy a8d7daf6b7 MFC r1.12:
``Process one NMI interrupt per handler invocation as the processor
  buffers pending NMIs from multiple interrupting PMCs and delivers
  them serially.''

Approved by:	re (kensmith)
2005-09-15 15:48:16 +00:00
Pawel Jakub Dawidek 5a475b87bb MFC: sys/geom/eli/g_eli.c 1.12,1.13
- Don't forget to initialize crp_etype field.

  Reported by:	Nick Evans <[email protected]>

- Fix copy&paste typo.

Approved by:	re (scottl)
2005-09-15 14:17:31 +00:00
Pawel Jakub Dawidek 1e989c625b MFC: sbin/geom/class/eli/geom_eli.c 1.4
Even if there are no valid keys in metadata, but provider is attached
we can still use setkey subcommand.

Found by:	regression tests
Approved by:	re (scottl)
2005-09-15 14:12:54 +00:00
Pawel Jakub Dawidek 90be936c65 MFC: sys/dev/bge/if_bge.c 1.94
When bge_stop() is called from bge_detach(), mii is already NULL, so check
before trying to use it.
This fix allows to 'kldunload if_bge' without panicing.

Reviewed by:	bz
Approved by:	re (scottl)
2005-09-15 14:10:41 +00:00
Marcel Moolenaar 9d9533b68d Mega-MFC:
o  Manpage type fix:
	kgdb/kgdb.1: 1.8

o  Unwind across trapframes:
	kgdb/kgdb.h: 1.3
	kgdb/kthr.c: 1.3
	kgdb/main.c: 1.9
	kgdb/trgt.c: 1.4
	kgdb/trgt_alpha.c: 1.3, 1.4
	kgdb/trgt_amd64.c: 1.3, 1.4, 1.5
	kgdb/trgt_i386.c: 1.3, 1.4, 1.5
	kgdb/trgt_ia64.c: 1.3, 1.4
	kgdb/trgt_sparc64.c: 1.4, 1.5, 1.6
	libgdb/Makefile: 1.10
	libgdb/frame-unwind.diff: 1.1

Approved by: re (scottl)
2005-09-15 05:32:11 +00:00
Marius Strobl 81262e6696 MFC: 1.26
Add gem(4) to the list of devices supporting VLAN-sized frames natively
(since sys/dev/gem/if_gem.c rev. 1.34, MFC'ed in rev. 1.29.2.4).

Approved by:	re (scottl)
2005-09-14 21:26:09 +00:00
Marius Strobl f3aa5b8c36 MFC: 1.34
- Allow for VLAN-sized frames and set IFCAP_VLAN_MTU.
- On resume all registers have to be initialized again like after
  power-on so reset sc_inited in gem_suspend() in order get all of
  the registers set next time gem_init_regs() is called.
- On at least some ERI and GEM revisions GEM_MAC_RX_OVERFLOW happen
  often due to a silicon bug and re-initializing is all we can do
  about these errors so make handling them non-verbose.
- Remove a superfluous memset(3) call in gem_meminit(), all elements
  are initialized to 0 anyway.

Approved by:	re (scottl)
2005-09-14 21:23:50 +00:00
Marius Strobl 96f922a3aa MFC: 1.10
As with NO_CRYPT, don't try to compile geli(8) when NO_OPENSSL is defined
either.

Approved by:	re (scottl)
2005-09-14 21:21:45 +00:00
Xin LI 5611427e69 MFC 1.118:
When padding with zero, do pad after prefixes rather than padding
before prefixes.

Use cases:
	printf("%05d", -42);   -->   "00-42"   (should be "-0042")
	printf("%#05x", 12);   -->   "000xc"   (should be "0x00c")

Submitted by:	Oliver Fromme
PR:		kern/85520
Approved by:	re (kensmith)
2005-09-14 02:45:50 +00:00
Marcel Moolenaar 27c5d6ac5a Mega-MFC: Add SMP support and enable it by default. This includes:
conf/GENERIC: 1.73, 1.53
	ia64/exception.S: 1.57
	ia64/interrupt.c: 1.50, 1.51
	ia64/machdep.c: 1.201, 1.202
	ia64/mp_machdep.c: 1.56, 1.57, 1.58
	ia64/pmap.c: 1.161, 1.162, 1.164, 1.165, 1.166
	ia64/sal.c: 1.15
	ia64/trap.c: 1.114, 1.115
	ia64/vm_machdep.c: 1.91, 1.92
	include/ia64_cpu.h: 1.20
	include/param.h: 1.21
	include/pmap.h: 1.25
	include/proc.h: 1.15
	include/smp.h: 1.10

Approved by: re (kensmith, scottl -- thanks!)
2005-09-13 21:07:14 +00:00
Marcel Moolenaar 17e767d722 MFC 1.20: Remove the execute permission for stacks.
Approved by: re (blanket)
2005-09-13 20:54:00 +00:00
Andrew Thompson 8c632c4ab0 MFC: if_bridge.c, r1.21; if_ethersubr.c, r1.198; in6_ifattach.c, r1.28;
nd6.c, r1.55; nd6_nbr.c, r1.33

> Add support for multicast to the bridge and allow inet6 addresses to be
> assigned to the interface.
>
> IPv6 auto-configuration is disabled. An IPv6 link-local address has a
> link-local scope within one link, the spec is unclear for the bridge case and
> it may cause scope violation.
>
> An address can be assigned in the usual way;
>   ifconfig bridge0 inet6 xxxx:...
>
> Tested by:      bmah
> Reviewed by:    ume (netinet6)
> Approved by:    mlaier (mentor)

Approved by:	re (kensmith), mlaier (mentor)
2005-09-13 18:02:39 +00:00
Joseph Koshy f82948b38a MFC r1.9: Improve an error message.
Approved by:	re (kensmith)
2005-09-13 15:23:26 +00:00
Gleb Smirnoff 9f79477875 MFC 1.141:
- Do not hold route entry lock, when calling arprequest(). One such
    call was introduced by me in 1.139, the other one was present before.
  - Do all manipulations with rtentry and la before dropping the lock.
  - Copy interface address from route into local variable before dropping
    the lock. Supply this copy as argument to arprequest().

  (LOR Ids in original commit message.)

Approved by:	re (scottl)
2005-09-13 14:37:58 +00:00
Maxim Konovalov 8b2590702c MFC rev. 1.10: postpone a temporary file creation until we realize
if ipfw(4) ever used.

Approved by:	re (scottl)
2005-09-13 14:34:11 +00:00
Andre Oppermann 1a5be58d46 MFC rev. 1.233: Fix ICMP_UNREACH_NEEDFRAG case where no MTU was proposed
in the ICMP reply.

PR:             kern/81813
Submitted by:   Vitezslav Novy <vita at fio.cz>
Approved by:	re (kensmith)
2005-09-13 13:56:22 +00:00
Gleb Smirnoff 579f8c6e5f MFC 1.7:
Plug item leak in case when not all hooks are connected.

  Found by:	David Vos <david.vos gmail.com>

Approved by:	re (kensmith)
2005-09-13 12:44:19 +00:00
Gleb Smirnoff 8deb7fdc66 MFC 1.68 by obrien:
Fix missing '=' in structure initialization.

Approved by:	re (kensmith)
2005-09-13 12:43:15 +00:00
Gleb Smirnoff a0bef1d046 MFC 1.26 by ru:
Fixed parsing of unsigned integers.

Approved by:	re (kensmith)
2005-09-13 12:41:05 +00:00
Peter Grehan 5ba5244e24 MFC 1.3
Comment out ofw_console 'screen' entry and zs tty entries.
   The OpenFirmware console isn't used on real systems anymore and
   I never get to multi-user mode in psim. There are problems with
   zs that need to be resolved before these lines can be enabled.

   This eliminates disconcerting warnings on boot.

Approved by:	re (Ken Smith)
2005-09-13 05:59:07 +00:00
Peter Grehan ee4c283cac MFC r1.101
Fix boot-time hang/panic on G3 systems when modifying IBAT0 in
  pmap_bootstrap by using the sync;isync big hammer to make sure
  all prior operations have completed.

  Reported by:    Nathan Whitehorn <nathan at uchicago edu>

Approved by:	re (Ken Smith)
2005-09-13 05:11:37 +00:00
Maksim Yevmenkin 328d870b71 MFC to RELENG_6
Fix typo in usage

Submitted by:	Jonatan B <onatan at gmail dot com>
Approved by:	re (scottl)
2005-09-12 16:09:23 +00:00
Tor Egge 860f0d7fd4 MFC: Giant is no longer needed here.
Approved by:	re (scottl)
2005-09-12 15:56:07 +00:00
Tor Egge fb52fe2f49 MFC: Don't retry when vget() returns ENOENT in the nonblocking case due to
the vnode being doomed.  It causes a livelock.

Approved by:	re (scottl)
2005-09-12 15:53:58 +00:00
Gleb Smirnoff 173f934083 MFC 1.112:
Fix an item leak, that happens when some node calls ng_callout() two
  times consequently, without checking whether callout has been serviced
  or not. (ng_pptpgre and ng_ppp were catched in this behavior).

    - In ng_callout() save old item before calling callout_reset(). If the
      latter has returned 1, then free this item.
    - In ng_uncallout() clear c->c_arg.

  Problem reported by:    Alexandre Kardanev

Approved by:	re (kensmith)
2005-09-12 14:46:19 +00:00
Gleb Smirnoff fa7329a6e3 MFC:
Make callout_reset() return a non-zero value if a pending callout
  was rescheduled. If there was no pending callout, then return 0.

  Reviewed by:    iedowse, cperciva

Approved by:	re (kensmith)
2005-09-12 13:43:34 +00:00
Gleb Smirnoff bbcb3f4bab MFC 1.33:
Change default KTR_COMPILE from KTR_GEN to KTR_ALL, to match with
  manual page.

  Reviewed by:    jhb, pjd

Approved by:	re (kensmith)
2005-09-12 13:39:47 +00:00
Gleb Smirnoff b7d317fd8a MFC 1.31:
When a carp(4) interface is being destroyed and is in a promiscous mode,
  first interface is detached from parent and then bpfdetach() is called.
  If the interface was the last carp(4) interface attached to parent, then
  the mutex on parent is destroyed. When bpfdetach() calls if_setflags()
  we panic on destroyed mutex.

  To prevent the above scenario, clear pointer to parent, when we detach
  ourselves from parent.

Approved by:	re (kensmith)
2005-09-12 13:37:56 +00:00
Max Laier 8870017ad5 Commit imported changes to RELENG_6:
pf_ioctl.c Revision 1.153 Sun Aug 7 11:37:33 2005 UTC by dhartmei
 | verify ticket in DIOCADDADDR, from Boris Polevoy, ok deraadt@

 pf_ioctl.c Revision 1.158 Mon Sep 5 14:51:08 2005 UTC by dhartmei
 | in DIOCCHANGERULE, properly initialize table, if used in NAT rule.
 | from Boris Polevoy <vapcom at mail dot ru>, ok mcbride@

 pf.c Revision 1.502 Mon Aug 22 11:54:25 2005 UTC by dhartmei
 | when nat'ing icmp 'connections', replace icmp id with proxy values
 | (similar to proxy ports for tcp/udp). not all clients use
 | per-invokation random ids, this allows multiple concurrent
 | connections from such clients.
 | thanks for testing to Rod Whitworth, "looks ok" markus@

 pf.c Revision 1.501 Mon Aug 22 09:48:05 2005 UTC by dhartmei
 | fix rdr to bitmask replacement address pool. patch from Max Laier,
 | reported by Boris Polevoy, tested by Jean Debogue, ok henning@

Approved by:	re (scottl)
2005-09-12 11:25:17 +00:00
Scott Long d6c475c21b MFC rev 1.13 of c-decl.c. A nice side effect is that it's once again
possible to compile a HEAD kernel in a RELENG_6 world via the normal
shortcuts.

Approved by: re
2005-09-12 10:22:53 +00:00
Robert Watson 398ed1d1a6 Merge umask.2:1.13 from HEAD to RELENG_6:
Add mkfifo(2) to the man page SEE ALSO list for umask(2) -- it's
  mentioned in the description.

Approved by:	re (hrs)
2005-09-12 09:19:25 +00:00
Matt Jacob 9a1de60e77 MFC: Restore the 929X support that got nuked in merge
Approved by: re
2005-09-12 05:25:29 +00:00
Warner Losh 02b249d28d Change the default of pci_do_powerstate to 0, per request from re@.
The number of raid controllers that violate the WHQL seems to be
growing in number and not isolated to old versions as previously
thought.  Though the numbers of these seen in the wild is still
relatively small, they hang the system when parts of their devices are
powered down.  The one area that these parts appear often are in the
higher end servers.  As such, be conservative about powering down
devices that have no driver attached by default.  Until a better
approach is proven in current, this is the prudent choice.

Laptop users wishing the benefits of powering down devices with no
drivers will now need to set hw.pci.do_powerstate=1 in their
/boot/loader.conf file.  Some users will have devices that will
prevent this setting (hence the need to make it default 0).

Approved by: re@ (scottl)
2005-09-11 19:28:30 +00:00
Don Lewis 6cfe78e1fc MFC src/sys/gnu/fs/ext2fs/fs.h 1.18
src/sys/kern/kern_shutdown.c	1.175
	src/sys/sys/buf.h 		1.189

  Modified files:
    sys/gnu/fs/ext2fs    fs.h
    sys/kern             kern_shutdown.c
    sys/sys              buf.h
  Log:
  Add a new struct buf flag bit, B_PERSISTENT, and use it to tag
  struct bufs that are persistently held by ext2fs.  Ignore any buffers
  with this flag in the code in boot() that counts "busy" and dirty
  buffers and attempts to sync the dirty buffers, which is done before
  attempting to unmount all the file systems during shutdown.

  This fixes the problem caused by any ext2fs file systems that are
  mounted at system shutdown time, which caused boot() to give up on
  a non-zero number of buffers and skip the call to vfs_unmountall().
  This left all the mounted file systems in a dirty state and caused
  them to all require cleanup by fsck on reboot.

  Move the two separate copies of the "busy" buffer test in boot()
  to a separate function.

  Nuke the useless spl() stuff in the ext2fs ULCK_BUF() macro.

  Bring the PRINT_BUF_FLAGS definition in sys/buf.h up to date with
  this and previous flag changes.

  PR:             kern/56675, kern/85163
  Tested by:      "Matthias Andree" matthias.andree at gmx.de
  Reviewed by:    bde
  MFC after:      3 days

PR:		kern/56675, kern/85163
Tested by:	"Hanspeter Roth" hampi at rootshell.be
Tested by:	"Matthias Andree" matthias.andree at gmx.de
Reviewed by:	bde
Approved by:	re (scottl)
2005-09-11 19:06:50 +00:00
David E. O'Brien 0a5194d50f MFC the license files.
Approved by:	re(scottl)
2005-09-11 18:46:33 +00:00
cvs2svn 27e55f5031 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-09-11 17:50:21 +00:00
Yaroslav Tykhiy eba54cda2e MFC rev. 1.263:
Reflect a recent change in /etc/rc.subr that made ``-M''
  appear in tmpmfs and varmfs default flags explicitly.
  Explain why -M is good for these file systems (it maximizes
  performance and makes the system more stable at low memory
  conditions by reducing the chance of thrashing.)

  Bump .Dd accordingly.

Approved by:	re (hrs)
2005-09-11 17:24:49 +00:00
Dag-Erling Smørgrav be4cc68444 Upgrade to 4.2p1.
Approved by:	re (kensmith)
2005-09-11 16:50:37 +00:00
Brooks Davis 2451497381 Sync network interface startup code with HEAD.
etc/network.subr: 1.165-1.167
 - kill removable_interfaces
 - add NOAUTO keyword
 - fix quoted entries in ifconfig_<ifn> variables
 - always up the interface
 - if ifconfig_<ifn> is defined, but empty, don't set it to
   ifconfig_DEFAULT
 - always configure lo0 first if it exists
etc/pccard_ether: 1.46
 - kill removable_interfaces
 - add NOAUTO keyword
etc/rc.d/netif: 1.15-1.17
 - block Ctrl-C in dhclient
 - minor cleanup of the interface list generation code

Approved by:	re (scottl)
Requested by:	many (death to removable_interfaces!)
2005-09-10 17:05:04 +00:00
Brooks Davis ebd0446134 MFC 1.43 and 1.44:
- Add new template sources to keep /conf more organized.

Approved by:	re (scottl)
2005-09-10 17:02:45 +00:00
Brooks Davis c6fdfded4b Sync dhclient with HEAD with exception of bpf.c:1.5.
sbin/dhclient/*.c:
 - add __FBSDID
sbin/dhclient/conflex.c: 1.3-1.4
 - fix a minor buffer overflow in config parsing
 - actually support backslash escaping in config files
bin/dhclient/dhclient-script: 1.6-1.10
 - don't create or remove routes to our address through 127.0.0.1
 - improved detection of the interface of the default route
 - support quotes in the medium string
 - clear interface state more effectively on failure
 - don't update resolv.conf when unchanged
bin/dhclient/dhclient.c: 1.10-1.11
 - validate domain-name (used as resolv.conf search string)
 - handle superseded subnet-mask correctly

Approved by:	re (scottl)
2005-09-10 17:01:16 +00:00
Christian Brueffer b0d4cfb03f MFC: rev. 1.3 by tjr
Add HISTORY section.

Requested by:	pav
Approved by:	re (hrs)
2005-09-10 14:10:52 +00:00
Doug Barton 5a70a0d0b8 MFC 1.22 which removes the IP6.INT example per RFC 4159
Approved by:	re (scottl)
2005-09-10 08:27:27 +00:00
Christian S.J. Peron 47c3af75ee MFC md.c rev 1.154
MFC mdconfig.c rev 1.44

Dont allow read only backing stores to be modified

PR:		kern/84635
Approved by:	re (kensmith)
2005-09-09 21:39:47 +00:00
Andrew Thompson b6c79e3595 MFC: if_bridge.4, r1.7
> Clarify that any firewall that has pfil(9) hooks can be used.
>
> Suggested by:   sam

Approved by:	re (hrs), mlaier (mentor)
2005-09-09 08:47:26 +00:00
Gleb Smirnoff 174b442d4b MFC 1.57 (see original revision for full description):
- in ng_ksocket_incoming2() clear m_nextpkt on all mbufs
    read from socket.
  - restore rev. 1.54 change in ng_ksocket_incoming().

  PR:		kern/84952
  PR:		kern/82413
  In collaboration with:	rwatson

Approved by:	re (scottl)
2005-09-09 06:13:25 +00:00
Gleb Smirnoff d1f522da30 MFC 1.109:
Raise one more bit in READER_MASK. I believe that before this change
  it was possible to have 1 reader and 1 writer thread working on
  a node simultaneously.

  Reviewed by:	julian

Approved by:	re (scottl)
2005-09-09 06:08:07 +00:00
Gleb Smirnoff b37287d484 MFC 1.108, 1.110, 1.111:
Use non-debug macros inside debugging functions, to prevent
  important information from being rewritten.

  In INVARIANTS case also check that nodes do not pass queues of mbufs
  each other.

Approved by:	re (scottl)
2005-09-09 06:06:51 +00:00
Sam Leffler 7b061101fd MFC 1.110: clear lock on error in O_LIMIT case of install_state
Approved by:	re (scottl)
2005-09-08 22:49:23 +00:00
Sam Leffler 7569b38481 MFC 1.245: reclaim sbuf and clear lock on error in ifconf
Approved by:	re (scottl)
2005-09-08 22:43:10 +00:00
Warner Losh fb3a75b590 MFC: 1.188 and 1.189 remove bogus counter to allow ore than one card
to work in the system.

Approved by: re@ (scottl)
2005-09-08 17:51:24 +00:00
R. Imura b11c39e748 MFC 1.12: Fix panic on sparc64 caused by touching uninitialized address.
Approved by:	re (scottl)
2005-09-08 15:48:35 +00:00
R. Imura 68ba4fe4a1 MFC: check capable size of given strings correctly.
1.4 src/contrib/smbfs/lib/smb/kiconv.c
  1.2 src/lib/libkiconv/xlat16_sysctl.c
  1.11 src/sys/libkern/iconv.c

Approved by:	re (scottl)
2005-09-08 15:46:38 +00:00
Craig Rodrigues 6038f5e826 MFC:
scmouse.c, 1.39:  In set_mouse_pos(), try to avoid division by zero errors.

  scvidctl.c, 1.36:
	In sc_set_text_mode(), reset fontwidth if it is <= 0.
	Eliminates division by zero errors in syscons driver.

Approved by:	re (scottl)
2005-09-07 22:58:59 +00:00
Gary W. Swearingen 7adcfc967d MFC: Added a sentence to explain what "span" means.
PR:             docs/84850
Approved by:    re
2005-09-07 16:41:51 +00:00
Gary W. Swearingen e7fe45634c MFC: Improved descriptions of block size handling.
PR:             docs/84765
Approved by:    re
2005-09-07 16:29:11 +00:00
Gary W. Swearingen 660164f5a2 Added ENVIRONMENT section (PAGER, MANPATH, etc.).
PR:             docs/84485
Approved by:    re
2005-09-07 16:20:13 +00:00
Colin Percival 059d1f1f4c MFC: Correct insecure temporary file usage.
Security:	FreeBSD-SA-05:20.cvsbug
Approved by:	re (scottl)
2005-09-07 13:43:05 +00:00
Tor Egge bb05ec5d9d MFC: Retain generation count when writing zeroes instead of an inode to disk.
Don't free a struct inodedep if another process is allocating saved
     inode memory for the same struct inodedep in
     initiate_write_inodeblock_ufs[12]().

     Handle disappearing dependencies in softdep_disk_io_initiation().

Approved by:	re (scottl)
2005-09-07 00:03:38 +00:00
Marcel Moolenaar 523089d6dd Sync with HEAD:
Makefile: 1.7
	add.c: 1.12, 1.23
	create.c: 1.11
	destroy.c: 1.6
	gpt.8: 1.14, 1.15
	gpt.c: 1.11, 1.12, 1.13
	gpt.h: 1.8, 1.9, 1.10
	label.c: 1.1
	map.c: 1.6
	map.h: 1.6
	migrate.c: 1.14, 1.15, 1.16
	recover.c: 1.8
	remove.c: 1.5, 1.6, 1.7, 1.8
	show.c: 1.12, 1.13
o  New -l and -u options to the show command,
o  New label command to support GPT labels,
o  The remove command doesn't print the total partitions removed,
   as it prints each partition it removes by name already,
o  Added ellipsis to most usage messages.

PR: ia64/83124
Approved by: re (scottl)
2005-09-06 23:59:01 +00:00
Christian Brueffer a32239c8ab MFC: update release notes:
- VIA PadLock support
- GEOM_ELI added
- de, my, pcn, sf MPSAFE

Approved by:	re (hrs)
2005-09-06 21:15:57 +00:00
Nate Lawson d78723b7db MFC: ignore non-useful cpufreq levels and change the powerd algorithm to
one that saves more power with possibly more performance loss.  This is
kern_cpu.c:1.20,1.21 and powerd.c:1.9

Approved by:	re (scottl)
2005-09-06 18:01:44 +00:00
Warner Losh edb882636e MFC: 1.293 1.294: Treat resources that are 0xfffxxxx as being unassigned
like we treat 0.

Approved by: re@ (scottl)
2005-09-05 18:04:33 +00:00
Poul-Henning Kamp 68103aa3b0 MFC:
missing dev_relthread() call.

Approved by:	re@ (scottl)
2005-09-05 11:02:30 +00:00
Scott Long d5c1c03d40 Prepare for BETA4 builds.
Approved by: re
2005-09-04 05:07:06 +00:00
Sam Leffler 667d62894f MFC 1.28: use media type to recognize eth+802.11 network interfaces
instead of doing a regex on device names

Approved by:	re (scottl)
2005-09-03 22:49:22 +00:00
Sam Leffler 67320dafb3 sync with HEAD for net80211 changes:
o list mac support
o update manual page

Approved by:	re (scottl)
2005-09-03 22:47:47 +00:00
Sam Leffler cdb627afdd sync with HEAD after net80211 changes:
o ic_curchan
o beacon/listen interval split
o split tx+rx crypto key and h/w key index -> node mapping support

Also for ath:
o correct duration calculation when protection is enabled

Also for wi:
o handle all-zero mac address properly
o fix media status handling so devd recognizes cards on insert

Also for ipw/iwi:
o always include statistics sysctls (was only when compiled w/ debugging)
o honor manual roaming setting

Also for ral/ural:
o fix basic rate set
o fix IFS parameters
o honor operating mode when selecting ack rate
o honor manual roaming setting

Approved by:	re (scottl)
2005-09-03 22:46:43 +00:00
Sam Leffler 189d85f27b sync with HEAD:
o add ic_curchan to resolve issues with what the "current channel" is
o split beacon and listen interval
o fixup mac acl support so you can query state
o split h/w tx+rx key indices in crypto state
o add optional h/w key index -> node mapping
o change default key index allocator to DTRT for legacy parts
  that are WPA capable
o define typedef for a h/w key index
o fix race on node refcnt handling with sending probe response frames
o isolate scanning-related input handling to reduce diffs against
  future scanning code
o sanity check beacon interval in recv'd management frames and
  discard frames with out-of-range data
o fix refcnt race sending null data frames
o lock ioctl to get sta info
o fix misc races in ap mode sta state teardown

Approved by:	re (scottl)
2005-09-03 22:40:02 +00:00
Suleiman Souhlal ba11b2a1a7 MFC r1.643:
Fix a typo in vop_rename_pre() where we ended up using vholdl()
  instead of vhold(), even though the vnode interlock is unlocked.

Approved by:	re (scottl)
2005-09-03 19:01:13 +00:00
Sam Leffler a0128e885c MFC 1.8: correct alignment of addresses passed to ether_ntoa to
fix segfaults on amd64

Approved by:	re (scottl)
2005-09-03 17:45:54 +00:00
Hajimu UMEMOTO 4dbeead5f0 MFC 1.74: SADB_UPDATE did not return an error when key length is invalid.
Approved by:	re (scottl)
2005-09-03 16:13:05 +00:00
Pawel Jakub Dawidek b70af692ed MFC: sys/dev/md/md.c 1.155
- Add md_mtx lock to protect ID number and list of devices.
- Always check mdnew() return value, as even in !autounit case
  kthread_create() can fail.

Those two changes fix serval panics provoked by simple stress test.

Tested by:	Kris The BugMagnet
Approved by:	re (scottl)
2005-09-03 16:02:37 +00:00
Pawel Jakub Dawidek 6de6c83977 MFC: sys/kern/vfs_syscalls.c 1.393
In case of mac_check_vnode_rename_from() or vn_start_write() failure,
vn_finished_write() should not be called.

Reviewed by:	ssouhlal
Approved by:	re (scottl)
2005-09-03 15:57:04 +00:00
Joseph Koshy 9808e3310e MFC: { db_trace.c:1.69, exception.S:1.127, genassym.c:1.156, trap.c:1.290 }
- Special-case NMI handling on the AMD64.

  On entry or exit from the kernel the 'alltraps' and 'doreti' the code
  used by normal traps disables interrupts to protect the critical sections
  where it is setting up %gs.

  This protection is insufficient in the presence of NMIs since NMIs
  can be taken even when the processor has disabled normal interrupts.
  Thus the NMI handler needs to actually read MSR_GBASE on entry to
  the kernel to determine whether a swap of %gs using 'swapgs' is
  needed.  However, reads of MSRs are expensive and integrating this
  check into the 'alltraps'/'doreti' path would penalize normal
  interrupts.

- Teach DDB about the 'nmi_calltrap' symbol.

Reviewed by:	bde, peter (an older version) and ups
Approved by:	re (scottl)
2005-09-03 11:57:28 +00:00
Brian Somers b2bd23c95a MFC: If we fail in chown(2), try to just change the group and continue on to
change the permissions.  Failures are still recorded.

Approved by:	re (scottl)
Sponsored by:	Sophos/ActiveState
2005-09-03 11:04:25 +00:00
cvs2svn 5e1bf608fc This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-09-03 06:59:35 +00:00
Maksim Yevmenkin b6d7001810 MFC to RELENG 6
Fix dangling callout problem in the Bluetooth L2CAP code that leads to
panic. The panic happens when outgoing L2CAP connection descriptor is
deleted with the L2CAP command(s) pending in the queue. In this case when
the last L2CAP command is deleted (due to cleanup) and reference counter
for the L2CAP connection goes down to zero the auto disconnect timeout
is incorrectly set. pjd gets credit for tracking this down and committing
bandaid.

Reported by:	Jonatan B <onatan at gmail dot com>
Approved by:	re (scottl)
2005-09-03 03:34:23 +00:00
Don Lewis ba24479812 MFC vfs_subr.c 1.636 and 1.642
vfs_subr.c 1.642 fixes a small race condition in vlrureclaim() and depends
on 1.636.

  Modified files:
    sys/kern             vfs_subr.c
  Log:
   - Allow vnlru to drop giant if the filesystem does not require it.  The
     vnlru proc is extremely inefficient, potentially iteration over tens of
     thousands of vnodes without blocking.  Droping Giant allows other threads
     to preempt us although we should revisit the algorithm to fix the runtime
     problems especially since this may hold up all vnode allocations.
   - Remove the LK_NOWAIT from the VOP_LOCK in vlrureclaim.  This provides
     a natural blocking point to help alleviate the situation described above
     although it may not technically be desirable.
   - yield after we make a pass on all mount points to prevent us from
     blocking other threads which require Giant.

  MFC after:      2 weeks

  Revision  Changes    Path
  1.636     +11 -2     src/sys/kern/vfs_subr.c

  Modified files:
    sys/kern             vfs_subr.c
  Log:
  Back out the removal of LK_NOWAIT from the VOP_LOCK() call in
  vlrureclaim() in vfs_subr.c 1.636  because waiting for the vnode
  lock aggravates an existing race condition.  It is also undesirable
  according to the commit log for 1.631.

  Fix the tiny race condition that remains by rechecking the vnode
  state after grabbing the vnode lock and grabbing the vnode interlock.

  Fix the problem of other threads being starved (which 1.636 attempted
  to fix by removing LK_NOWAIT) by calling uio_yield() periodically
  in vlrureclaim().  This should be more deterministic than hoping
  that VOP_LOCK() without LK_NOWAIT will block, which may not happen
  in this loop.

  Reviewed by:    kan
  MFC after:      5 days

  Revision  Changes    Path
  1.642     +37 -7     src/sys/kern/vfs_subr.c

Approved by:	re (scottl)
2005-09-03 00:21:55 +00:00
Simon L. B. Nielsen 06e485a4d5 MFC rev 1.8:
Correct a comment to match the configuration parameter it describes.

Approved by:	re (scottl)
2005-09-02 19:10:14 +00:00
Craig Rodrigues dec095fca8 MFC:
Prevent division by zero errors in sc_mouse_move()
  by explicitly setting sc->font_width, in the same
  places where sc->font_size is set, instead of
  relying on the default initialized value of 0 for sc->font_width.

PR:             kern/84836
Reported by:    Andrey V. Elsukov <bu7cher at yandex dot ru>
Approved by:	re (scottl)
2005-09-02 15:31:03 +00:00
Gleb Smirnoff 19704ecf7e MFC 1.8, 1.9:
- Correctly parse output, when logging amount is limited in the
    rule itself, not in verbose_limit sysctl. [1]
  - Do check rules, even if verbose_limit is set 0. Rules may have
    their own log limits.

  PR:		conf/77929
  Submitted by:	Andriy Gapon [1]
  Reviewed by:	matteo

Approved by:	re (scottl)
2005-09-02 14:13:16 +00:00
Gleb Smirnoff 7e20345f51 MFC: net.graph.ngqfreemax has been deprecated.
Approved by:	re (scottl)
2005-09-02 14:08:19 +00:00
Gleb Smirnoff eb7b53adc9 Merge 1.82:
Fix fallout from revision 1.77, mark outgoing packets with M_VLANTAG flag.

  PR:		kern/80646
  Reviewed by:	yar

Approved by:	re (scottl)
2005-09-02 14:06:26 +00:00
Gregory Neil Shapiro f10ce9f2b1 MFC: Be sure to execute sendmail_precmd() to check sendmail.cf conflicts and
rebuild the aliases file if necessary.

     Revision  Changes    Path
     1.15      +1 -0      src/etc/rc.d/sendmail

Approved by:	re (scottl)
2005-09-02 03:53:10 +00:00
Craig Rodrigues 7e123d5bb7 MFC 1.29, 1.30:
Rewrite linux_ifconf() to be more like ifconf() in net/if.c
  so that we do not call uiomove() while IFNET_RLOCK() is held.
  This eliminates the witness warning:

  Calling uiomove() with the following non-sleepable locks held:
  exclusive sleep mutex ifnet r = 0 (0xc096dd60) locked @
  /usr/src/sys/modules/linux/../../compat/linux/linux_ioctl.c:2170

Approved by:	re (scottl)
2005-09-02 03:52:28 +00:00
Gregory Neil Shapiro cb1857f965 Clean up duplicate entry for sendmail.
Approved by:	re (scottl)
2005-09-02 03:52:11 +00:00
Craig Rodrigues a6db4d4a04 MFC 1.5:
Add __BEGIN_DECLS/__END_DECLS so that this header can be included in C++
programs.  Also, add include guards.

PR:             bin/44277
Submitted by:   Alex Zepeda <freebsd at blarf dot homeip dot net>
Approved by:	re (scottl)
2005-09-02 03:16:30 +00:00
Craig Rodrigues 66450a4526 MFC: 1.380
FDOPT_NORETRY is an option, and must be compared with fd->options,
 not fd->flags.

PR:             kern/85481
Submitted by:   Lev Levinson <llevinson at inbox dot ru>
Approved by:	re (ken)
2005-09-02 00:33:30 +00:00
Philip Paeps 534ff3c5fe MFC: r1.6 - Fix unhandled malloc errors.
Approved by:	re (kensmith)
2005-09-01 13:52:12 +00:00
Warner Losh 0dd92f5a6e MFC: Allow one to override {CAP,PWD}_MKDB_ENDIAN from the command line.
Approved by: re@ (scottl)
2005-09-01 01:24:42 +00:00
Gleb Smirnoff 430f3c96f2 MFC 1.28:
- Document the fact that the real length of listen queue is 1.5 more
    than the value of backlog argument.
  - Document the fact that a subsequent listen(2) calls on the listening
    socket change the backlog argument.
  - Note that current listen queue lengths can be queried using netstat(1).

  Submitted by:   Igor Sysoev <is rambler-co.ru>
  Wording by:     gnn

Approved by:	re (kensmith)
2005-08-31 14:01:48 +00:00
Gleb Smirnoff 140be5f59b MFC 1.21:
Add newline to debuging printf.

  PR:             kern/85271
  Submitted by:   Simon Morgan

Approved by:	re (kensmith)
2005-08-31 13:58:28 +00:00
Giorgos Keramidas 85b09f5253 MFC 1.23:
Make it clear that the .ko extention of a module to be loaded
is optional.

Approved by:	re (hrs)
2005-08-31 13:57:37 +00:00
Gleb Smirnoff 6f0d645dea MFC 1.76:
- Refuse hashsize of 0, since it is invalid.
  - Use defined constant instead of 512.

Approved by:	re (kensmith)
2005-08-31 13:56:15 +00:00
Craig Rodrigues 783092a047 MFC: VOP_LISTEXTATTR.9, 1.7
Update man page to reflect the fact that VOP_LISTEXTATTR
  does not return a list of ASCII NUL terminated strings.
  Instead, a list of attribute names is returned, where each
  list entry consists of one byte for the name length, followed
  by the name, without a terminating ASCII NUL.
  This in similar to change 1.17 to extattr_get_file.2

Reviewed by:	rwatson, ru
Approved by:	re (hrs)
2005-08-31 00:27:35 +00:00
Andrew Thompson 261a2a1675 MFC: if_bridge, r1.20
> Fix a panic in softclock() if the interface is destroyed with a bpf consumer
> attached.
>
> This is caused by bpf_detachd clearing IFF_PROMISC on the interface which does
> a SIOCSIFFLAGS ioctl. The problem here is that while the interface has been
> stopped, IFF_UP has not been cleared so IFF_UP != IFF_DRV_RUNNING, this causes
> the ioctl function to init() the interface which resets the callouts.
>
> The destroy then completes and frees the softc but softclock will panic on a
> dead callout pointer.
>
> Ensure ifp->if_flags matches reality by clearing IFF_UP when we destroy.

Approved by:	re (kensmith), mlaier (mentor)
2005-08-30 20:30:44 +00:00
Andrew Thompson ac1d6c037a MFC: bridgestp.c, r1.6; if_bridge.c, r1.18
> Mark the callouts as MPSAFE as if_bridge has been giant-free since day 1.
>
> Use the SMP friendly callout_init_mtx() while we are here.
>

Approved by:	re (kensmith), mlaier (mentor)
2005-08-30 20:26:53 +00:00
Murray Stokely 59f5e13c88 MFC: r1.240 - update number and size of ports distribution.
Approved by:	re (scottl)
2005-08-30 20:01:32 +00:00
Murray Stokely de2a30511d Update versions of KDE/GNOME included with FreeBSD 6.0, and minor
grammatical changes.

Approved by:	re (hrs@)
2005-08-30 19:37:33 +00:00
Max Laier eb3ca228f4 MFC: if_ethersubr.c, 1.197:
Don't loop back packets that have been routed by pf.  This fixes an
  endless loop where the same packet is sent over and over again.

  Obtained from:  OpenBSD
  Reported by:    Sergey Lapin
  Tested by:      Sergey Lapin

Approved by:	re (scottl)
2005-08-30 16:43:24 +00:00
Alexander Kabaev 265a2cff6c MFC r1.81:
Do not keep parent directory locked while calling VFS_ROOT to
traverse mount points in lookup(). The lock can be dropped safely
around VFS_ROOT because LOCKPARENT semantics with child and parent
vnodes coming from different FSes does not really have any meaningful
use and we do not really care about parent state after we relock it.
This prevents easily triggered deadlock on systems using automounter
daemon.

Approved by:	re (scottl)
2005-08-30 16:12:03 +00:00
Pawel Jakub Dawidek ef58748556 MFC: sys/geom/eli/g_eli.c 1.6-11
sys/geom/eli/g_eli.h	1.3-4
	sys/geom/eli/g_eli_ctl.c	1.2
	sbin/geom/class/eli/geli.8	1.4-6
	sbin/geom/class/eli/geom_eli.c	1.3

Sync with HEAD:
- We don't need to clear allocated memory. This will speed-up things a bit.
- Even if crypto_dispatch() return an error, request is not canceled and
  our callback will still be called, just to tell us that requested
  failed...
- Always run dedicated kernel thread (even when we have hardware support).
  There is no performance impact, but allows to allocate memory with
  M_WAITOK flag.
  As a side effect this simplify code a bit.
- Allow to change number of iterations for PKCS#5v2. It can only be used
  when there is only one key set.
- Add a __packed keyword to g_eli_metadata struct definition, so
  sizeof(struct g_eli_metadata) will return the exact number of bytes needed
  for storing it on the disk.
  Without this change GELI was unusable on amd64 (and probably other 64-bit
  archs), because sizeof(struct g_eli_metadata) was greater than 512 bytes
  and geli(8) was failing on assertion.

Approved by:	re (scottl)
2005-08-30 15:27:30 +00:00
Pawel Jakub Dawidek 9d31330c07 MFC: sys/geom/label/g_label_ext2fs.c 1.2
sys/geom/label/g_label_iso9660.c	1.2
	sys/geom/label/g_label_reiserfs.c	1.2

Verify if we can actually read the data at given offset.

Approved by:	re (scottl)
2005-08-30 15:18:54 +00:00
Pawel Jakub Dawidek 25aef68e4c MFC: sys/geom/label/g_label.c 1.17
Back-out the change from revision 1.14 and allow for '/' in labels again.

Convinced by:	green, Gavin Atkinson, dougb, gordon
Approved by:	re (scottl)
2005-08-30 15:16:14 +00:00
Pawel Jakub Dawidek 6e0a5880d2 MFC: sys/sys/systm.h 1.235
sys/i386/i386/mp_machdep.c	1.253
	sys/amd64/amd64/mp_machdep.c	1.262
	sys/geom/stripe/g_stripe.c	1.27
	sys/geom/stripe/g_stripe.h	1.8

Avoid code duplication and implement bitcount32() function in systm.h only.

Approved by:	re (scottl)
2005-08-30 15:14:40 +00:00
Pawel Jakub Dawidek d34a392d83 MFC: sbin/class/raid3/geom_raid3.c 1.13
sbin/misc/subr.c	1.4
	sbin/misc/subr.h	1.4

Move function for calculating number of bits into more central place.

Approved by:	re (scottl)
2005-08-30 15:09:06 +00:00
Pawel Jakub Dawidek 110cd34d63 MFC: sys/crypto/rijndael/rijndael-alg-fst.c 1.9,1.11
sys/opencrypto/xform.c	1.6

Check key size for rijndael, as invalid key size can lead to kernel panic.
I checked other algorithms against this bug and it seems they aren't
affected.

Reported by:	Mike Tancsa <[email protected]>
PR:		i386/84860
Approved by:	re (scottl)
2005-08-30 15:01:50 +00:00
Pawel Jakub Dawidek 90f8bc08ae MFC: Add VIA/ACE "PadLock" support as a crypto(9) driver.
HW donated by:			Mike Tancsa <[email protected]>
Most of the code obtained from:	OpenBSD
Approved by:			re (scottl)
2005-08-30 14:56:02 +00:00
Maxime Henrion 58a8df8cff MFC if_nve.c r1.8:
date: 2005/07/25 22:21:11;  author: mux;  state: Exp;  lines: +0 -1
  Remove an erroneous m_freem() call.  If m_defrag() returns a non-NULL
  pointer, it has already freed the original mbuf chain, so we shouldn't
  do it again.

Approved by:	re (scottl)
2005-08-30 09:03:13 +00:00
John Baldwin 95a02d0198 MFC: Locking and sundry fixes; mark MPSAFE:
- Use device_printf() and if_printf().
- Remove pre-new-bus and other #if 0 code.
- Overhaul failure handling in my_attach().

Approved by:	re (scottl)
2005-08-29 20:00:31 +00:00
Andre Oppermann d77468cac3 MFC addition of memmem(3).
Submitted by:	Pascal Gloor <pascal.gloor at spale.com>
Approved by:	re (scottl)
2005-08-29 18:46:39 +00:00
Andre Oppermann 989b28e965 MFC rev. 1.27 (Pretty print multipath routes).
Approved by:	 re (scottl)
2005-08-29 17:57:36 +00:00
Andre Oppermann bf5d3596f8 MFC rev. 1.31 (correct layer 2 broad- and multicast handling) and rev. 1.29
(Misc spelling and/or English fixes in comments).

PR:		kern/85052
Approved by:	re (scottl)
2005-08-29 17:52:53 +00:00
Maksim Yevmenkin 1b3533dff2 MFC to RELENG_6
Address minor locking issues. Use taskqueue_swi instead of taskqueue_swi_giant.

Approved by:	re (scottl)
2005-08-29 17:00:54 +00:00
Maksim Yevmenkin a534baf915 MFC to RELENG_6
Make sure ng_fec_init() uses the same calling convention as the rest of
the code, i.e. ng_fec_init() is called with the ifp->if_softc pointer and
NOT with the ifp pointer.

PR:		kern/85239
Reviewed by:	brooks
Approved by:	re (scottl)
2005-08-29 16:23:21 +00:00
cvs2svn 5047141c9e This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-08-29 11:34:09 +00:00
cvs2svn 0fa9bd243e This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-08-29 09:10:23 +00:00
Gleb Smirnoff 093706044d MFC:
Remove all references to T/TCP, which was removed several months ago.

Approved by:	re (scottl)
2005-08-29 09:10:22 +00:00
Gleb Smirnoff 1caaea641f MFC 1.140:
When we have a published ARP entry for some IP address, do reply on
  ARP requests only on the network where this IP address belong, to.

  Before this change we did replied on all interfaces. This could
  lead to an IP address conflict with host we are doing ARP proxy
  for.

  PR:		kern/75634
  Reviewed by:	andre

Approved by:	re (scottl)
2005-08-29 09:06:30 +00:00
Gleb Smirnoff 497b59e83e MFC:
Backout revision 1.54, because it exposes a worse problem, than
  it fixes. I believe the problem lives somewhere outside ng_ksocket,
  but until it is found, let the node be working.

  PR:		kern/84952
  PR:		kern/82413

Approved by:	re (scottl)
2005-08-29 09:01:58 +00:00
Gleb Smirnoff 37b5c5a0d4 MFC 1.87:
In order to support CARP interfaces kernel was taught to handle more
  than one interface in one subnet. However, some userland apps rely on
  the believe that this configuration is impossible.

  Add a sysctl switch net.inet.ip.same_prefix_carp_only. If the switch
  is on, then kernel will refuse to add an additional interface to
  already connected subnet unless the interface is CARP. Default
  value is off.

  PR:				bin/82306
  In collaboration with:	mlaier

Approved by:	re (scottl)
2005-08-29 08:58:45 +00:00
Suleiman Souhlal aa6b21b113 MFC rev 1.292:
Set the mountpoint path in the superblock (fs_fsmnt) at mount-time
  so that it appears in the various messages (not cleanly unmounted,
  filesystem full, etc). This has been broken since rev 1.261.

Approved by:	re (scottl)
2005-08-28 17:04:43 +00:00
Yaroslav Tykhiy 3a8c2dbfd4 MFC defaults/rc.conf#1.259, rc.subr#1.37:
Stop hard-coding an -M flag to mdmfs(8) in /etc/rc.subr.
  Now this flag can be set, or not set, for memory-backed
  file systems on individual basis, as illustrated by the
  rc.conf(5) variables tmpmfs_flags and varmfs_flags.  The
  flag is set for those FS'en by default, in /etc/defaults/rc.conf,
  in order to stay compatible with the old rc.subr behaviour.

Approved by:	re (scottl)
2005-08-28 09:08:05 +00:00
Yaroslav Tykhiy 8f9ef1adec MFC rev. 1.52:
List -W as one of the meaningful options to the -i (interfaces)
  display of netstat(1).

Approved by:	re (hrs)
2005-08-28 09:03:45 +00:00
Robert Watson 2d08011696 Merge rtsock.c:1.127 from HEAD to RELENG_6:
De-spl parts of the routing socket code now generally protected
  through locking; leave some spl references around code where there
  are open questions about global variable references.  Also, add
  an XXX regarding locking in sysctl.

Approved by:	re (scottl)
2005-08-28 04:31:40 +00:00
Markus Brueffer c9b4a600ab MFC: rev. 1.5 + 1.6
rev. 1.6:
     - Document the led(4) interface for the Thinklight
     - Bump .Dd

  rev. 1.5:
    - Clarify how events are used and how the different event sysctl correlate
    - Document how an event looks like that is received by devd(8) from
      acpi_ibm(4)
    - Document the event codes as they occur on a T41p
    - Add a note about sysctl.conf and an Xref to it
    - Add an example section providing an example script and an entry for
      devd.conf. This is an adapted version of the one in acpi_fujitsu(4).
    - s/Fn-F4/Fn+F4/ for consistency sake
    - Add a button description where refering to a T41p, remove it otherwise,
      since it might vary from model to model
    - Bump .Dd

Approved by:	re (hrs)
2005-08-27 22:51:25 +00:00
Colin Percival 7ba9a292e2 Note the addition of bsdiff(1), bspatch(1), and portsnap(8) into the
base system.

Approved by:	re (hrs)
2005-08-27 20:12:11 +00:00
Tor Egge ae124555f3 MFC: Don't set the COMPLETE flag in an inodedep structure before the
related inode has been written.

Approved by:	re (scottl)
2005-08-27 18:40:06 +00:00
Marius Strobl 8ca50a3f98 MFC: 1.98
Now that at least some screen savers work on sparc64 sync with other
archs and enable splash(4) by default.

Approved by:	re (scottl)
2005-08-27 18:04:43 +00:00
Marius Strobl f15e5c1d48 MFC: 1.30
- Wrap the handler and associated code for collecting completed RX
  descriptors that are still marked owned in #ifdef GEM_RINT_TIMEOUT
  instead of #if 0 for convenience.
- Remove stale code and comment about relying on the preset XIF config.
- In case of a watchdog timeout call the init function instead of just
  the start function so the chip is properly reset.

Merge from hme(4):
- Convert to use bus_dmamap_load_mbuf_sg() for loading RX buffers.
- Protect from a duplicate mbuf free panic in case the DMA engine hangs.

Approved by:	re (scottl)
2005-08-27 18:02:15 +00:00
Marius Strobl 5a0ba2b141 MFC: sys/boot/sparc64/loader/metadata.c 1.14,
sys/dev/uart/uart_cpu_sparc64.c 1.21

- Change the code that determines whether to use a serial console and
  which serial device to use in that case respectively to not rely on
  the OFW names of the input/output and stdin/stdout devices. While at
  it save on some variables and for sys/boot/sparc64/loader/metadata.c
  move the code in question to a new function md_bootserial() so it can
  be kept in sync with uart_cpu_getdev_console() more easily.
- Adjust the size of some buffers.
- Remove the package handle of the '/options' node from the argument
  list of uart_cpu_getdev_dbgport().

Approved by:	re (scottl)
2005-08-27 15:52:05 +00:00
Joseph Koshy 6ac41aea85 MFC: { r1.8--r1.10 }
- Add COMPATIBILITY and HISTORY sections.  Fix an -mdoc error.
   Cross-reference pmclog(3).

 - Document two new diagnostic messages in hwpmc(4).

 - Document the diagnostic message printed at startup time.  Keep the
   list of diagnostic messages sorted.

 - Document the recently introduced EOPNOTSUPP error return.  Repair
   sort ordering for the list of error descriptions.

Approved by:	re (hrs)
2005-08-27 04:25:49 +00:00
Andrew Thompson 8da896ed41 MFC: if_bridge.c, r1.19
> The mtu check in bridge_enqueue is bogus as the maximum Ethernet frame is
> actually 1514, so comparing the mbuf length which includes the Ethernet
> header
> to the interface MTU is wrong.
>
> The check was a little over the top so just remove it.

Approved by:	re (scottl), mlaier (mentor)
2005-08-26 20:00:25 +00:00
Joseph Koshy b2bdd605bb MFC:
[ hwpmc_mod.c:1.14,1.15 ]
 - Print PMC capabilities at module load time.

 - Return EOPNOTSUPP instead of EINVAL if a PMC allocation request
   specifies a PMC capability (e.g., sampling) that is not supported
   by hardware.  Return EINVAL early if the PMC class passed in is
   not recognized.

 [ hwpmc_x86.c:1.3 ]
 - On x86 processors, turn off 'INTERRUPT' capabilities on PMCs
   if the CPU does not have its local APIC enabled.

Approved by:	re (scottl)
2005-08-26 19:49:32 +00:00
John Baldwin 133f7f47c1 MFC: Conditionally lock Giant in xl's taskqueue handler function.
Approved by:	re (scottl)
2005-08-26 15:31:09 +00:00
John Baldwin dd6fde7a00 MFC: Use if_printf() and device_printf() and remove ste_unit from the
softc.

Approved by:	re (scottl)
2005-08-26 15:27:23 +00:00
John Baldwin 695bbaea54 MFC: Add aliases for atomic operations on 64-bit integers.
Approved by:	re (scottl)
2005-08-26 14:53:57 +00:00
John Baldwin 259d014e1a MFC: Fix up locking and mark MPSAFE.
Approved by:	re (scottl)
2005-08-26 14:52:36 +00:00
John Baldwin 538f73db7c MFC: Fixup locking including moving the taskqueue_drain() out of xl_stop().
Approved by:	re (scottl)
2005-08-26 14:46:22 +00:00
John Baldwin 4de5f4f1e9 MFC: Various locking fixups including removing Giant from a bus dma
callback.

Approved by:	re (scottl)
2005-08-26 14:40:03 +00:00
John Baldwin d356512cf2 MFC: Fix up locking and remove spls and support for 4.x.
Approved by:	re (scottl)
2005-08-26 14:35:45 +00:00
John Baldwin f8c55f89ab MFC: Fix up the locking in pcn(4) and mark it MPSAFE.
Approved by:	re (scottl)
2005-08-26 14:33:05 +00:00
Bjoern A. Zeeb f7b5f9b939 MFC rev. 1.109:
* Solve "No PHY found" problem for more Yukon Lite variants.
   * Catch a bus attach error.
   * Improve locking.
   (missing in original commit message but was not worth a forced commit):
   * put interrupt moderation messages under bootverbose

Approved by:	re (kensmith)
2005-08-26 10:46:20 +00:00
Giorgos Keramidas 10662d5ec3 MFC revision 1.24:
% Add a small paragraph that describes how the current environment
% settings can be displayed, near the end of the DESCRIPTION section,
% immediately after the paragraph that describes how they can be set.
%
% Add a reference to printenv(1) too (and the ``printenv'' csh builtin).
%
% Submitted by:   Gary W. Swearingen <[email protected]>
% PR:             docs/85008

Approved by:	re (hrs)
2005-08-26 10:25:44 +00:00
Colin Percival db2b47746e MFC: When looking for new lines in diff output, grep for '^[>+]'
instead of '^>', in order to catch both normal and unified diffs.

Approved by:	re (scottl)
2005-08-25 19:07:28 +00:00
Colin Percival a402b66128 MFC: Tell locate to ignore /var/db/portsnap by default because it isn't
very interesting.

Approved by:	re (scottl)
2005-08-25 19:06:11 +00:00
Søren Schmidt cf3c32f6e7 MFC:
Add support for working around controllers that cannot do DMA in 48bit.
	The workaround use PIO mode above ~137GB to allow using the disk.
	Add the Acer chips with rev < 0xc4 as first candidate.

	Add support for the Promise PDC4071[89] chips on the Fasttrak TX4300.
	Docs kindly provided by Promise.

	Apply fix for "pr82261 DMA-support on Sparc64 broken"

	Use the bio field instead of the driver field as intended.

	Dont set default mode to ATA_DMA_MAX on devices not capable of DMA.

Approved by: re@ (scottl)
2005-08-25 16:21:05 +00:00
Søren Schmidt f463bf9455 MFC:
Add definition for SATAII 3Gb/s mode.

Approved by: re@ (scottl)
2005-08-25 16:16:45 +00:00
Maksim Yevmenkin 8dbc923ce7 MFC to RELENG_6
Fix multiple typos in the mutex names. This fixes false positive (and pretty
strange looking too) LORs I have seen on my system. Pointy hat to goes to me.

Approved by:	re (scottl)
2005-08-25 16:14:33 +00:00
Robert Watson cde30cf12f White space sync: add missing line break.
Approved by:	re (kensmith - earlier whitespace fixes)
2005-08-25 05:44:06 +00:00
Robert Watson 439114992d Merge if.h:1.98 from HEAD to RELENG_6:
For each interface flag, indicate whether or not it is owned by the
  device driver, owned by the network stack, or initialized by the device
  driver before attach and read-only from then on.

  Not all device drivers and network stack components currently follow
  these rules, especially with respect to IFF_UP, and a few exceptions
  with IFF_ALLMULTI.

Approved by:	re (scottl)
2005-08-25 05:02:28 +00:00
Robert Watson a4a8a0bc4b Merge linux_ioctl.c:1.128 svr4_sockio.c:1.17 altq_cbq.c:1.3 if_oltr.c:1.38
if_pflog.c:1.14 if_pfsync.c:1.21 if_an.c:1.70 if_ar.c:1.72 if_arl.c:1.11
amrr.c:1.10 onoe.c:1.10 if_ath.c:1.101 awi.c:1.41 if_bfe.c:1.27
if_bge.c:1.93 if_cm_isa.c:1.7 smc90cx6.c:1.16 if_cnw.c:1.20 if_cp.c:1.25
if_cs.c:1.42 if_ct.c:1.26 if_cx.c:1.46 if_ed.c:1.256 if_em.c:1.68
if_en_pci.c:1.37 midway.c:1.66 if_ep.c:1.143 if_ex.c:1.58 if_fatm.c:1.20
if_fe.c:1.93 if_fwe.c:1.38 if_fwip.c:1.8 if_fxp.c:1.244 if_gem.c:1.33
if_hatm.c:1.25 if_hatm_intr.c:1.20 if_hatm_ioctl.c:1.13 if_hatm_rx.c:1.10
if_hatm_tx.c:1.14 if_hme.c:1.39 if_ie.c:1.104 if_ndis.c:1.101
if_ic.c:1.24 if_ipw.c:1.10 if_iwi.c:1.10 if_ixgb.c:1.13 if_lge.c:1.41
if_lnc.c:1.113 if_my.c:1.31 if_nge.c:1.77 if_nve.c:1.10 if_owi.c:1.12
if_patm.c:1.9 if_patm_intr.c:1.6 if_patm_ioctl.c:1.10 if_patm_tx.c:1.10
pdq_ifsubr.c:1.28 if_plip.c:1.38 if_ral.c:1.12 if_ral_pci.c:1.2
if_ray.c:1.81 if_rayvar.h:1.22 if_re.c:1.49 if_sbni.c:1.21 if_sbsh.c:1.14
if_sn.c:1.48 dp83932.c:1.21 if_snc_pccard.c:1.9 if_sr.c:1.70 if_tx.c:1.91
if_txp.c:1.33 if_aue.c:1.92 if_axe.c:1.32 if_cdce.c:1.8 if_cue.c:1.59
if_kue.c:1.66 if_rue.c:1.23 if_udav.c:1.16 if_ural.c:1.12 if_vge.c:1.16
if_vx.c:1.58 if_wi.c:1.185 if_wi_pci.c:1.26 if_wl.c:1.68 if_xe.c:1.60
if_xe_pccard.c:1.30 if_el.c:1.68 i4b_ipr.c:1.35 i4b_isppp.c:1.31
kern_poll.c:1.20 bridge.c:1.94 bridgestp.c:1.4 if_arcsubr.c:1.27
if_atm.h:1.24 if_atmsubr.c:1.40 if_bridge.c:1.16 if_ef.c:1.35
if_ethersubr.c:1.196 if_faith.c:1.37 if_fddisubr.c:1.100 if_fwsubr.c:1.14
if_gif.c:1.54 if_gre.c:1.34 if_iso88025subr.c:1.70 if_loop.c:1.107
if_ppp.c:1.106 if_spppsubr.c:1.121 if_tap.c:1.57 if_tun.c:1.154
if_vlan.c:1.80 ppp_tty.c:1.67 ieee80211_ioctl.c:1.32 atm_if.c:1.31
ng_eiface.c:1.33 ng_ether.c:1.50 ng_fec.c:1.19 ng_iface.c:1.44
ng_sppp.c:1.9 ip_carp.c:1.30 ip_fastfwd.c:1.30 in6.c:1.53 nd6_nbr.c:1.31
natm.c:1.40 if_dc.c:1.162 if_de.c:1.168 if_pcn.c:1.72 if_rl.c:1.154
if_sf.c:1.84 if_sis.c:1.135 if_sk.c:1.108 if_ste.c:1.86 if_ti.c:1.109
if_tl.c:1.101 if_vr.c:1.106 if_wb.c:1.81 if_xl.c:1.194 from HEAD to
RELENG_6:

  Propagate rename of IFF_OACTIVE and IFF_RUNNING to IFF_DRV_OACTIVE and
  IFF_DRV_RUNNING, as well as the move from ifnet.if_flags to
  ifnet.if_drv_flags.  Device drivers are now responsible for
  synchronizing access to these flags, as they are in if_drv_flags.  This
  helps prevent races between the network stack and device driver in
  maintaining the interface flags field.

  Many __FreeBSD__ and __FreeBSD_version checks maintained and continued;
  some less so.

  Reviewed by:    pjd, bz

Approved by:	re (scottl)
2005-08-25 05:01:24 +00:00
Robert Watson 1fd4ce4b9d Merge if.c:1.242, if.h:1.97, if_var.h:1.102, rtsock.c:1.125 from HEAD
to RELENG_6:

  Rename IFF_RUNNING to IFF_DRV_RUNNING, IFF_OACTIVE to IFF_DRV_OACTIVE,
  and move both flags from ifnet.if_flags to ifnet.if_drv_flags, making
  and documenting the locking of these flags the responsibility of the
  device driver, not the network stack.  The flags for these two fields
  will be mutually exclusive so that they can be exposed to user space as
  though they were stored in the same variable.

  Provide #defines to provide the old names #ifndef _KERNEL, so that user
  applications (such as ifconfig) can use the old flag names.  Using the
  old names in a device driver will result in a compile error in order to
  help device driver writers adopt the new model.

  When exposing the interface flags to user space, via interface ioctls
  or routing sockets, or the two fields together.  Since the driver flags
  cannot currently be set for user space, no new logic is currently
  required to handle this case.

  Add some assertions that general purpose network stack routines, such
  as if_setflags(), are not improperly used on driver-owned flags.

  With this change, a large number of very minor network stack races are
  closed, subject to correct device driver locking.  Most were likely
  never triggered.

  Driver sweep to follow; many thanks to pjd and bz for the line-by-line
  review they gave this patch.

  Reviewed by:    pjd, bz

Approved by:	re (scottl)
2005-08-25 04:55:48 +00:00
Craig Rodrigues 6f454978eb MFC rev 1.411:
- Remove NTP servers which do not resolve in DNS.
 - Use pool.ntp.org servers where possible, thanks to
   Chuck Swiger <cswiger at mac dot com> .
 - Update list of Swedish NTP servers, thanks to
   Fredrik Lindberg <fli+freebsd-current at shapeshifter dot se> .

PR:		bin/75479
Approved by:	re (scottl)
2005-08-25 00:42:26 +00:00
Robert Watson 89348f94f0 Merge if_atmsubr.c:1.38 from HEAD to RELENG_6:
Lock down netnatm and mark as MPSAFE:

  - Introduce a subsystem mutex, natm_mtx, manipulated with accessor macros
    NATM_LOCK_INIT(), NATM_LOCK(), NATM_UNLOCK(), NATM_LOCK_ASSERT().  It
    protects the consistency of pcb-related data structures.  Finer grained
    locking is possible, but should be done in the context of specific
    measurements (as very little work is done in netnatm -- most is in the
    ATM device driver or socket layer, so there's probably not much
    contention).

  - Remove GIANT_REQUIRED, mark as NETISR_MPSAFE, remove
    NET_NEEDS_GIANT("netnatm").

  - Conditionally acquire Giant when entering network interfaces for
    ifp->if_ioctl() using IFF_LOCKGIANT(ifp)/IFF_UNLOCKGIANT(ifp) in order
    to coexist with non-MPSAFE atm ifnet drivers..

  - De-spl.

  Reviewed by:    harti, bms (various versions)

Approved by:	re (hrs)
2005-08-24 18:10:51 +00:00
Robert Watson ad82081bf1 Merge subr_witness.c:1.196, igmp.c:1.49, in.c:1.86, in_var.h:1.55,
ip_input.c:1.303, ip_output.c:1.243 from HEAD to RELENG_6:

  Introduce in_multi_mtx, which will protect IPv4-layer multicast address
  lists, as well as accessor macros.  For now, this is a recursive mutex
  due code sequences where IPv4 multicast calls into IGMP calls into
  ip_output(), which then tests for a multicast forwarding case.

  For support macros in in_var.h to check multicast address lists, assert
  that in_multi_mtx is held.

  Acquire in_multi_mtx around iteration over the IPv4 multicast address
  lists, such as in ip_input() and ip_output().

  Acquire in_multi_mtx when manipulating the IPv4 layer multicast
  addresses, as well as over the manipulation of ifnet multicast address
  lists in order to keep the two layers in sync.

  Lock down accesses to IPv4 multicast addresses in IGMP, or assert the
  lock when performing IGMP join/leave events.

  Eliminate spl's associated with IPv4 multicast addresses, portions of
  IGMP that weren't previously expunged by IGMP locking.

  Add in_multi_mtx, igmp_mtx, and if_addr_mtx lock order to hard-coded
  lock order in WITNESS, in that order.

  Problem reported by:    Ed Maste <emaste at phaedrus dot sandvine dot ca>

Approved by:	re (scottl)
2005-08-24 17:30:44 +00:00
Robert Watson f0b4541341 Merge if_ath.c:1.99 awi.c:1.39 if_bfe.c:1.26 if_bge.c:1.92 if_ed.c:1.255
if_em.c:1.67 if_ex.c:1.57 if_fe.c:1.92 if_fxp.c:1.242 if_gem.c:1.32
if_hme.c:1.38 if_ie.c:1.103 if_ndis.c:1.100 if_ixgb.c:1.12 if_lge.c:1.40
if_lnc.c:1.112 if_my.c:1.30 if_nge.c:1.76 if_nve.c:1.9 if_owi.c:1.11
pdq_ifsubr.c:1.27 if_ray.c:1.80 if_re.c:1.47 if_sn.c:1.47 dp83932.c:1.20
if_tx.c:1.90 if_txp.c:1.32 if_aue.c:1.91 if_axe.c:1.31 if_cue.c:1.58
if_kue.c:1.65 if_rue.c:1.22 if_udav.c:1.15 if_vge.c:1.15 if_wi.c:1.182
if_wl.c:1.67 if_xe.c:1.58 if_dc.c:1.161 if_de.c:1.167 if_pcn.c:1.70
if_rl.c:1.153 if_sf.c:1.83 if_sis.c:1.134 if_sk.c:1.107 if_ste.c:1.85
if_ti.c:1.108 if_tl.c:1.100 if_vr.c:1.105 if_wb.c:1.80 if_xl.c:1.193
from HEAD to RELENG_6:

  Modify device drivers supporting multicast addresses to lock if_addr_mtx
  over iteration of their multicast address lists when synchronizing the
  hardware address filter with the network stack-maintained list.

  Problem reported by:    Ed Maste (emaste at phaedrus dot sandvine dot ca>

Approved by:	re (scottl)
2005-08-24 16:50:46 +00:00
Giorgos Keramidas f08224f928 MFC 1.34: Spell "partition" correctly.
Reminded by:	simon
Approved by:	re (scottl)
2005-08-24 15:42:12 +00:00
Robert Watson 88f723ddbd Merge in_var.h:1.54, in6_var.h:1.23, mld6.c:1.22 from HEAD to RELENG_6:
Modify network protocol consumers of the ifnet multicast address lists
  to lock if_addr_mtx.

  Problem reported by:    Ed Maste <emaste at phaedrus dot sandvine dot ca>

Approved by:	re (scottl)
2005-08-24 15:18:38 +00:00
Robert Watson 15f7d3f2ea Merge if_arcsubr.c:1.26, if_ethersubr.c:1.195, if_fddisubr.c:1.99,
if_iso88025subr.c:1.68 from HEAD to RELENG_6:

  When allocating link layer ifnet address list entries in
  ifp->if_resolvemulti(), do so with M_NOWAIT rather than M_WAITOK, so
  that a mutex can be held over the call.  In the FDDI code, add a
  missing M_ZERO.  Consumers are already aware that if_resolvemulti()
  can fail.

Approved by:	re (scottl)
2005-08-24 13:51:55 +00:00
Robert Watson 2ace4b53a4 Merge if_var.h:1.101 from HEAD to RELENG_6:
- Rename ifmaof_ifpforaddr() to if_findmulti(); assert if_addr_mtx.
    Staticize.

  Problem reported by:    Ed Maste <emaste at phaedrus dot sandvine dot ca>

Approved by:	re (scottl)
2005-08-24 13:26:14 +00:00
Simon L. B. Nielsen 1c919e7899 MFC rev 1.35:
Remove reference to raid(4), the RAIDframe manual page, which was
  deleted a while ago.

Approved by:	re (scottl)
2005-08-24 08:07:29 +00:00
SUZUKI Shinsuke 8cacfddaa9 MFC 1.55
added a missing unlock (just do the same thing as in netinet/raw_ip.c)

Approved by: re(scottl)
2005-08-24 06:46:16 +00:00
Robert Watson 2b1489c086 Merge if.c:1.240, if.c:1.241, if.c:1.242 from HEAD to RELENG_6, which
correct nits in the addition of if_addr_mtx:

if.c:1.240:
  Initialize the if_addr mutex in if_alloc() rather than waiting until
  if_attach().  This allows ethernet drivers to use it in their routines
  to program their MAC filters before ether_ifattach() is called (de(4) is
  one such driver).  Also, the if_addr mutex is destroyed in if_free()
  rather than if_detach(), so there was another potential bug in that a
  driver that failed during attach and called if_free() without having
  called ether_ifattach() would have tried to destroy an uninitialized
  mutex.

  Reported by:    Holm Tiffe holm at freibergnet dot de
  Discussed with: rwatson

if.c:1.241:
  destroy lock _before_ free'ing the structure it resides in

if.c:1.242:
  - Move IF_ADDR_LOCK_DESTROY(ifp) from if_free to if_free_type.
  - Add a note that additions should be made to if_free_type and not
    if_free to help avoid this in the future.

  This apparently fixes a use after free in if_bridge and may fix bugs
  in other direct if_free_type consumers.

  Reported by:    thompsa

Approved by:	re (hrs)
2005-08-24 04:45:02 +00:00
Robert Watson b65ff148a9 Merge if.c:1.239, if_var.h:1.101 from HEAD to RELENG_6:
Protect link layer network interface multicast address list manipulation
  using ifp->if_addr_mtx:

  - Initialize if_addr_mtx when ifnet is initialized.

  - Destroy if_addr_mtx when ifnet is torn down.

  - Rename ifmaof_ifpforaddr() to if_findmulti(); assert if_addr_mtx.
    Staticize.

  - Extract ifmultiaddr allocation and initialization into if_allocmulti();
    accept a 'mflags' argument to indicate whether or not sleeping is
    permitted.  This centralizes error handling and address duplication.

  - Extract ifmultiaddr tear-down and deallocation in if_freemulti().

  - Re-structure if_addmulti() to hold if_addr_mtx around manipulation of
    the ifnet multicast address list and reference count manipulation.
    Make use of non-sleeping allocations.  Annotate the fact that we only
    generate routing socket events for explicit address addition, not
    implicit link layer address addition.

  - Re-structure if_delmulti() to hold if_addr_mtx around manipulation of
    the ifnet multicast address list and reference count manipulation.
    Annotate the lack of a routing socket event for implicit link layer
    address removal.

  - De-spl all and sundry.

  Problem reported by:    Ed Maste <emaste at phaedrus dot sandvine dot ca>

Approved by:	re (hrs)
2005-08-24 04:42:03 +00:00
Robert Watson 79f8c3ecb3 Merge if.c:1.235 from HEAD to RELENG_6:
- Introduce a helper function if_setflag() containing the code common
    to ifpromisc() and if_allmulti() instead of duplicating the code poorly,
    with different bugs.
  - Call ifp->if_ioctl() in a consistent way: always use more compatible C
    syntax and check whether ifp->if_ioctl is not NULL prior to the call.

Discussed with:	yar
Approved by:	re (scottl)
2005-08-24 04:19:48 +00:00
Robert Watson 2004ea17af Merge vfs_subr.c:1.641 from HEAD to RELENG_6:
Silence "busy" warnings when unmounting devfs at system shutdown.  This
  is a workaround for non-symetric teardown of the file systems at
  shutdown with respect to the mount order at boot.  The proper long term
  fix is to properly detach devfs from the root mount before unmounting
  each, and should be implemented, but since the problem is non-harmful,
  this temporary band-aid will prevent false positive bug reports and
  unnecessary error output for 6.0-RELEASE.

  Tested by:      pav, pjd

Approved by:	re (scottl)
2005-08-23 01:50:19 +00:00
Ken Smith f8c24fc024 Almost ready for BETA3 builds.
Approved by:	re (implicit)
2005-08-22 03:01:35 +00:00
Robert Watson 26f04e07f6 Merge ip_output.c:1.244 from HEAD to RELENG_6:
Add helper function ip_findmoptions(), which accepts an inpcb, and attempts
  to atomically return either an existing set of IP multicast options for the
  PCB, or a newlly allocated set with default values.  The inpcb is returned
  locked.  This function may sleep.

  Call ip_moptions() to acquire a reference to a PCB's socket options, and
  perform the update of the options while holding the PCB lock.  Release the
  lock before returning.

  Remove garbage collection of multicast options when values return to the
  default, as this complicates locking substantially.  Most applications
  allocate a socket either to be multicast, or not, and don't tend to keep
  around sockets that have previously been used for multicast, then used for
  unicast.

  This closes a number of race conditions involving multiple threads or
  processes modifying the IP multicast state of a socket simultaenously.

Approved by:	re (scottl)
2005-08-20 21:32:08 +00:00
Robert Watson 4d6ce91f6e Merge libmemstat.3:1.10 from HEAD to RELENG_6:
The "Mbuf" zone was renamed "mbuf" to improve consistency, but the code
  example in libmemstat.3 was not updated to take this rename into account.
  Update the example.

  PR:             84946
  Submitted by:   Wojciech A. Koszek <dunstan at freebsd dot czest dot pl>

Approved by:	re (scottl)
2005-08-20 21:25:21 +00:00
Robert Watson 1b24988d7b Merge if_var.h:1.99 from HEAD to RELENG_6:
Allocate one of the spare ifnet integer fields to hold if_drv_flags,
  which in the future will hold IFF_OACTIVE and IFF_RUNNING, and have
  its access synchronized by the device driver rather than the
  protocol stack.  This will avoid potential races in the management
  of flags in if_flags.

  Discussed with: various (scottl, jhb, ...)

Approved by:	re (kensmith)
2005-08-20 13:38:22 +00:00
Robert Watson 7cbce16a86 Merge in_pcb.c:1.166 from HEAD to RELENG_6:
Remove no-op spl references in in_pcb.c, since in_pcb locking has been
  basically complete for several years now.  Update one spl comment to
  reference the locking strategy.

Approved by:	re (kensmith)
2005-08-20 13:34:59 +00:00
Robert Watson d112c6cae7 Merge tcp_subr.c:1.229, tcp_syncache.c:1.75, tcp_timer.c:1.75 from HEAD
to RELENG_6:

  Remove no-op spl's and most comment references to spls, as TCP locking
  is believed to be basically done (modulo any remaining bugs).

Approved by:	re (kensmith)
2005-08-20 13:34:13 +00:00
Robert Watson d3aea05630 Merge uma_dbg.c:1.21, uma_dbg.h:1.9 from HEAD to RELENG_6:
Improve canonicalization of copyrights.  Order copyrights by order of
  assertion (jeff, bmilekic, rwatson).

  Suggested ages ago by:  bde

Approved by:	re (kensmith)
2005-08-20 13:31:05 +00:00
Robert Watson b38eb1f6e6 Merge mdoc.local:1.50 from HEAD to RELENG_6:
Hook up libmemstat(3) to the library list in mdoc.local.  This will cause
  the library description (specifically, -lmemstat) to render properly in
  the libmemstat.3 man page.

  Submitted by:   ru

Approved by:	re (kensmith)
2005-08-20 13:24:28 +00:00
Hajimu UMEMOTO 67cf14591e MFC 1.34, 1.35:
- avoid exclusive sleep mutex witness warning using sx lock.
  - use TAILQ_FOREACH() for readability.

Approved by:	re (kensmith)
2005-08-20 12:20:48 +00:00
Bjoern A. Zeeb be97df34c9 MFC:
rev. 1.108, 1.109 src/sys/netinet/ip_fw2.c
rev. 1.101        src/sys/netinet/ip_fw.h
rev. 1.77         src/sbin/ipfw/ipfw2.c
rev. 1.176        src/sbin/ipfw/ipfw.8

* Add dynamic sysctl for net.inet6.ip6.fw.
* Correct handling of IPv6 Extension Headers.
* Add unreach6 code.
* Add logging for IPv6.
* Fix build without INET6 and IPFIREWALL compiled into kernel.[1]

Submitted by:   sysctl handling derived from patch from ume needed for ip6fw
Obtained from:  is_icmp6_query and send_reject6 derived from similar
                functions of netinet6,ip6fw
Reviewed by:    ume, gnn; silence on ipfw@
Spotted and tested by:  Michal Mertl <mime at traveller.cz>[1]
Approved by:    re (kensmith)
2005-08-20 08:36:57 +00:00
Yaroslav Tykhiy cec83b5f6e MFC rev. 1.29-1.31:
Make the procfs module buildable again in the MODULES_WITH_WORLD case.
This means defining a target for default opt_compat.h, but only if we
are not building the modules along with the kernel.

Approved by:	re (kensmith)
2005-08-20 08:05:01 +00:00
Alan Cox 51c40a77c6 MFC
Eliminate inconsistency in the setting of the B_DONE flag.

Approved by:	re (kensmith)
2005-08-20 06:07:55 +00:00
Brooks Davis efe01a711c MFC rev 1.9, remove an incorrect and unnecessicary bzero of the softc.
Approved by:	re (kensmith)
2005-08-20 04:35:29 +00:00
Brooks Davis 0d8cf5791f MFC rev 1.81, use if_free_type to avoid leaking struct arpcoms.
Approved by:	re (kensmith)
2005-08-20 04:34:11 +00:00
Brooks Davis f5ba655fc9 MFC rev 1.244, removal of if_findindex and correction of two if_alloc
calls before an if_attach.

Partial MFC of 1.243.  The change it was a response to has not been
MFCd, but the comment is relevent without it.

Approved by:	re (kensmith)
2005-08-20 04:32:54 +00:00
Brooks Davis c740ee65dc MFC revs 1.257 and 1.216.
- interface startup doc updates
 - s/ISC dhclient/OpenBSD dhclient/

Approved by:	re (kensmith)
2005-08-20 04:30:35 +00:00
Ian Dowse c5f5d12af8 MFC 1.22: in the ufsdirhash_build() failure case for corrupted
directories or unreadable blocks, make sure to destroy the mutex
we created.

Approved by:	re (scottl)
2005-08-20 04:27:15 +00:00
Gregory Neil Shapiro 75060007fc MFC: Make links for hoststat(8) and purgestat(8) man pages.
Revision  Changes    Path
     1.52      +2 -0      src/usr.sbin/sendmail/Makefile

Approved by:	re (hrs)
2005-08-20 01:39:08 +00:00
Doug Barton bf2503bba1 MFC 1.1.1.3, a patch to aid in out of memory conditions.
Take this opportunity to note that glebius indicated
that the initial work in this area was done by
Igor Sysoev <is rambler-co.ru>

Approved by:	re (kensmith)
2005-08-19 22:09:16 +00:00
Brian Somers 1f8a43081e MFC: Make ichsmb unloadable
Approved by:	re (kensmith)
Sponsored by:	Sophos/ActiveState
2005-08-19 18:38:55 +00:00
Hajimu UMEMOTO 1ca6cf07a4 MFC 1.36: create sysctl tree dynamically. it is required to share
net.inet6.ip6.fw with upcoming ipfw2 improvement for IPv6.

Requested by:	bz
Approved by:	re (kensmith)
2005-08-19 17:38:52 +00:00
Christian Brueffer 5d0e78b338 MFC: rev. 1.27
Clarify how the 'channel' argument should look like and add an
example on how to obtain information on devices on an ata channel.

Approved by:	re (hrs)
2005-08-19 15:54:42 +00:00
Gleb Smirnoff bc656e500e MFC:
Add a new switch -h for interface stats mode, which prints all interface
  statistics in human readable form.

  In collaboration with:	vsevolod
  Reviewed by:			cperciva

Approved by:	re (kensmith)
2005-08-19 15:08:43 +00:00
Gleb Smirnoff 01d0c2e494 MFC:
Axe ppp_for_tty(). Use tty->t_lsc pointer to store sc. This
  also eliminates recursive use of ppp_softc_list_mtx.
  PR:		kern/84686
  Reviewed by:	phk

Approved by:	re (kensmith)
2005-08-19 14:52:21 +00:00
Yoshihiro Takahashi 3de6016b8a MFC: Attempt g_ctl for metadata modification.
Approved by:	re (kensmith)
2005-08-19 12:43:55 +00:00
Yoshihiro Takahashi fb0a9a3e9b MFC: revision 1.54 (Implement g_ctl api).
Approved by:	re (kensmith)
2005-08-19 12:40:32 +00:00
Pawel Jakub Dawidek 378f5074ac MFC: sys/opencrypto/cryptodev.c 1.26
Fix bogus check. It was possible to panic the kernel by giving 0 length.
This is actually a local DoS, as every user can use /dev/crypto if there
is crypto hardware in the system and cryptodev.ko is loaded (or compiled
into the kernel).

Reported by:    Mike Tancsa <[email protected]>
Security:	Local DoS on systems with crypto HW and with /dev/crypto available
Approved by:	re (kensmith)
2005-08-19 12:04:19 +00:00
Pawel Jakub Dawidek 1714785828 MFC: usr.sbin/jls/jls.c 1.4,1.5
Not sure why, but SYSCTL_OUT() can sometimes keep returning ENOMEM
in sysctl_jail_list(). Because of this, jls(8) could enter into
an endless loop. The strange thing is, that we can call jls(8) while
the other one is in loop and it will succeed - SYSCTL_OUT() will
not return ENOMEM there.

Approved by:	re (kensmith)
2005-08-19 11:09:11 +00:00
Gleb Smirnoff 3cfaa35966 MFC:
Implement a new feature for ping(8) - sweeping pings. In a sweeping
  ping ICMP payload of packets being sent is increased with given step.
  Sweeping pings are useful for testing problematic channels, MTU
  issues or traffic policing functions in networks.

  PR:		bin/82625
  Submitted by:	Chris Hellberg <chellberg juniper.net> (with some cleanups)

Approved by:	re (kensmith)
2005-08-19 09:29:25 +00:00
Lukas Ertl c9732718ae MFC:
geom_vinum.c        rev. 1.17
  geom_vinum_drive.c  rev. 1.19
  geom_vinum_plex.c   rev. 1.16
  geom_vinum_rm.c     rev. 1.7
  geom_vinum_var.h    rev. 1.9, 1.10
  geom_vinum_volume.c rev. 1.9

Approved by:  re (kensmith)
2005-08-19 08:48:04 +00:00
Christian S.J. Peron ea207a4d7a MFC revision 1.157
date: 2005/08/18 22:30:52;  author: csjp;  state: Exp;  lines: +4 -2
Add missing braces around bpf_filter which were missed when I
merged the bpfstat code.

Approved by:	re (kensmith)
2005-08-19 04:52:02 +00:00
Christian S.J. Peron 8cc3bc3e54 Synch with HEAD:
MFC revision 1.167
date: 2005/08/08 21:06:42;  author: csjp;  state: Exp;  lines: +2 -0
Drop in a WITNESS_WARN into SYSCTL_IN to make sure that we are
not holding any non-sleep-able-locks locks when copyin is called.
This gets executed un-conditionally since we have no function
to wire the buffer in this direction.

MFC revision 1.166
date: 2005/08/08 18:54:35;  author: csjp;  state: Exp;  lines: +6 -1
Check to see if we wired the user-supplied buffers in SYSCTL_OUT, if
the buffer has not been wired and we are holding any non-sleep-able locks,
drop a witness warning. If the buffer has not been wired, it is possible
that the writing of the data can sleep, especially if the page is not in
memory. This can result in a number of different locking issues, including
dead locks.

Approved by:	re (kensmith)
2005-08-19 04:50:08 +00:00
Colin Percival 993c98cf9d MFC: Pad the strings sccs[], version[], and osrelease[], and add a
BRANCH_OVERRIDE environment variable (which, if set, overrides the
BRANCH specified here).  These make my FreeBSD Update build code
simpler by making it easier to recognize when two kernels are identical
modulo version numbers.

Approved by:	re (kensmith)
2005-08-19 04:12:41 +00:00
Marcel Moolenaar ffbd1b0688 MFC 1.3: Fix backtraces.
Approved by: re (kensmith)
2005-08-19 04:02:34 +00:00
Murray Stokely 1eef8f8fe7 MFC: correct date, fix typos, add 07/07 london bombing entry.
Approved by:	re (kensmith)
2005-08-19 03:23:07 +00:00
Colin Percival bcbde1f535 MFC: Remove dates, since they serve no purpose and result in files
spuriosuly changing each time they are built.  Also add $FreeBSD$ tags,
because cvs wants them.

Approved by:	re (kensmith)
2005-08-19 02:53:00 +00:00
Colin Percival c0beafff93 MFC: Add -frandom-seed=RepeatabilityConsideredGood to CFLAGS in order
to make this library build repeatably.

Approved by:	re (kensmith)
2005-08-19 02:49:55 +00:00
Andrew Thompson 3e2bfbde3d MFC: if_bridge.c, r1.17; bridgestp.c, r1.5
>   Ensure that we are holding the lock when initialising the bridge interface. We
>   could initialise while unlocked if the bridge is not up when setting the inet
>   address, ether_ioctl() would call bridge_init.
>
>   Change it so bridge_init is always called unlocked and then locks before
>   calling bstp_initialization().

Approved by:	re (kensmith), mlaier (mentor)
2005-08-19 02:43:07 +00:00
Robert Watson 3e9e6d7e7e Merge Makefile:1.12, vmstat.c:1.87 from HEAD to RELENG_6:
Teach vmstat -m and vmstat -z to use libmemstat(3).  Certain
  statistics from -z are now a bit different due to changes in the
  way statistics are now measured.  Reproduce with some amount of
  accuracy the slightly obscure layouts adopted by the two kernel
  sysctls.  In the future, we might want to normalize them.

  GC dosysctl(), which is now no longer used.

Merge vmstat.c:1.88 from HEAD to RELENG_6:

  Minor syntax tweaks:

  - Remove some extra blank lines.
  - Remove comments that don't contribute to understanding.
  - Remove additional blank lines in output added to maximize
    compatibility with older vmstat output, but that is actually
    somewhat gratuitous.

  Submitted by:   bde

Approved by:	re (kensmith)
2005-08-19 00:07:06 +00:00
Robert Watson fd5cc4ac2f Merge if.c:1.238 from HEAD to RELENG_6:
In multicast routines:

  Compare pointers with NULL rather than treating them as booleans.

  Compare pointers with NULL rather than 0 to make it more clear
  they are pointers.

  Assign pointers value of NULL rather than 0 to make it more clear
  they are pointers.

Approved by:	re (kensmith)
2005-08-18 18:36:53 +00:00
Robert Watson 58e16c22e8 Merge if.c:1.237 from HEAD to RELENG_6:
Rename equal() macro to sa_equal(), which matches the definitions
  of sa_equal() in other files, and makes it more clear what equal()
  is comparing.

Approved by:	re (kensmith)
2005-08-18 18:34:23 +00:00
Giorgos Keramidas 0dbc56408b MFC spelling fixes of several manpages.
Approved by:	re (kensmith)

The merged revisions/files are:

Revision  Path
1.10      src/lib/libarchive/archive_entry.3
1.21      src/lib/libarchive/archive_read.3
1.8       src/lib/libautofs/libautofs.3
1.10      src/lib/libc/net/inet6_rth_space.3
1.8       src/lib/libc/posix1e/acl_get_entry.3
1.15      src/lib/libc/posix1e/mac.3
1.7       src/lib/libc/posix1e/mac_prepare.3
1.37      src/lib/libc/stdtime/strftime.3
1.16      src/lib/libc/sys/kse.2
1.8       src/lib/libc/sys/uuidgen.2
1.4       src/share/man/man4/man4.i386/acpi_ibm.4
1.6       src/share/man/man4/man4.i386/acpi_panasonic.4
1.40      src/share/man/man4/man4.i386/ep.4
1.6       src/share/man/man4/man4.i386/pbio.4
1.5       src/share/man/man4/man4.i386/snc.4
1.2       src/share/man/man4/man4.sparc64/openprom.4
1.4       src/share/man/man4/man4.sparc64/snd_audiocs.4
1.11      src/share/man/man4/witness.4
1.3       src/share/man/man5/devfs.conf.5
1.51      src/share/man/man9/ifnet.9
1.7       src/share/man/man9/printf.9
1.12      src/usr.bin/file2c/file2c.1
1.27      src/usr.bin/indent/indent.1
1.17      src/usr.bin/lockf/lockf.1
1.90      src/usr.bin/make/make.1
1.45      src/usr.bin/systat/systat.1
1.19      src/usr.bin/truss/truss.1
1.33      src/usr.bin/xinstall/install.1
1.11      src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
1.4       src/usr.sbin/bluetooth/sdpd/sdpd.8
1.9       src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
1.36      src/usr.sbin/i4b/isdnd/isdnd.rc.5
1.53      src/usr.sbin/mtree/mtree.8
1.8       src/usr.sbin/ndiscvt/ndiscvt.8
1.13      src/usr.sbin/ntp/doc/ntpdc.8
1.26      src/usr.sbin/pppd/pppd.8
1.40      src/usr.sbin/syslogd/syslog.conf.5
1.5       src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
2005-08-18 15:01:27 +00:00
Peter Grehan 794cfc2d40 MFC: r1.141
>restore the ability to mount cd9660 filesystems as root by inverting
    >some of the options test, specifically the joliet and rockridge tests.
    > ...

Approved by:	re (Ken Smith)
2005-08-18 11:32:06 +00:00
Peter Grehan 790d05428e MFC: r1.8
> Remove unnecessary and alarming printf.

Approved by:	re (Ken Smith)
2005-08-18 11:03:53 +00:00
Gleb Smirnoff 86e36e1492 MFC 1.126:
To prevent a race between RTM_DELETE message and
  arptimer() deleting stale entry, we need to lock
  rtentry before unlocking radix head.

Approved by:	re (kensmith)
2005-08-18 10:15:25 +00:00
Gleb Smirnoff cad56251c2 MFC 1.139, that closes several races in ARP code. See original
commit log for more information.

Approved by:	re (kensmith)
2005-08-18 10:14:22 +00:00
Gleb Smirnoff a387015641 o Make rt_check() return a locked rtentry.
o Make rt_check() function more strict:
  - rt0 passed to rt_check() must not be NULL, assert this.
  - rt returned by rt_check() must be valid locked rtentry,
    if no error occured.
o Modify callers, so that they never pass NULL rt0
  to rt_check().
o Modify callers, so that they unlock rtentry.

Revisions merged:

net/if_atmsubr.c	- 1.39, 1.41
net/if_fwsubr.c		- 1.13, 1.15
net/if_iso88025subr.c	- 1.69, 1.71
net/route.c		- 1.110, 1.111
netinet6/nd6.c		- 1.51-1.53

netinet/if_ether.c intentionally not touched by this merge.

Approved by:	re (kensmith)
2005-08-18 10:12:42 +00:00
SUZUKI Shinsuke 4f66f33b42 MFC: IPv6 stealth forwarding
Revision  Changes    Path
   1.39      +3 -1      src/sys/netinet6/in6.h
   1.35      +8 -0      src/sys/netinet6/in6_proto.c
   1.30      +8 -0      src/sys/netinet6/ip6_forward.c
   1.34      +3 -0      src/sys/netinet6/ip6_var.h

PR: kern/54625
Approved by: re(kensmith)
2005-08-18 09:01:48 +00:00
Kenneth D. Merry 85351eca46 MFC, rev 1.28:
Remove a reference to compute_stats(), since it is no longer documented at
least.

Submitted by:	osa
Approved by:	re (hrs)
2005-08-18 04:46:26 +00:00
Tai-hwa Liang 8f684ddd5f MFC: (1.26) Fixing a regression introduced in rev1.25 by honouring the errno.
This should keep 'ugidfw list' to stop complaining about "Data error in
security.mac.bsdextended.rules.N: Unknown error: 0" if there is a "hole"
within the rule set.

Approved by:	re (hrs)
2005-08-17 14:35:20 +00:00
Colin Percival fe0799e89d MFC revision 1.149: Change the default partition sizes to provide more
space in /, /var, and /tmp, and if the device is large enough, provide
extra space to /var sufficient to store a crash dump.

Approved by:	re (kensmith)
2005-08-17 13:53:11 +00:00
Ken Smith e15a8c2d3b MFC v1.125:
>   Log:
>   The /stand directory now disappears out from under sysinstall while
>   it is running during installations.  The vsystem() function does get
>   used after this happens (e.g. if you manually configure the network
>   interface and ask it to enable the interface) so it needs to be a
>   little smarter about whether it uses /stand/sh or /bin/sh.

Approved by:	re (hrs)
2005-08-17 13:32:29 +00:00
Andrew Thompson 42663c7ba8 MFC: ifconfig.8, r1.101
> Document two missed if_bridge commands 'addr' and 'static'.

Approved by:	re (hrs), mlaier (mentor)
2005-08-17 02:27:08 +00:00
Poul-Henning Kamp 60bbcee642 MFC: Pull in stuff from -current.
Approved by:	re@
2005-08-16 22:49:11 +00:00
Poul-Henning Kamp 49fba49c1f MFC: fix a bug relating to multiple (>2) data sets.
Approved by:	re@
2005-08-16 22:48:12 +00:00
Poul-Henning Kamp 7ba46bf9e3 MFC: better facility for extracting and inspecting BIOS strings.
Approved by:	re@
2005-08-16 22:47:14 +00:00
Poul-Henning Kamp 0508e9d743 MFC: use g_ctl for metadata modification if possible.
Approved by:	re@
2005-08-16 22:46:05 +00:00
Poul-Henning Kamp 11885e2f0d MFC: use g_ctl for modifying metadata if possible.
Approved by:	re@
2005-08-16 22:45:33 +00:00
Poul-Henning Kamp 3c18940a8c MFC: Implement g_ctl api for metadata modification.
Approved by:	re@
2005-08-16 22:44:39 +00:00
Poul-Henning Kamp 7cba6ac65c MFC: fix a tiny race in statistics collection.
Approved by:	re@
2005-08-16 22:43:51 +00:00
Poul-Henning Kamp 35ee3c7c4e MFC: Remove map3270 file, telnet3270 is long gone.
Approved by:	re@
2005-08-16 22:42:46 +00:00
Poul-Henning Kamp bd90075c6a MFC: fix typo in debugging statement.
Approved by:	re@
2005-08-16 22:41:39 +00:00
Poul-Henning Kamp 5f881830e6 MFC: Remove vttest program, it lives in ports.
Approved by:	re@
2005-08-16 22:40:54 +00:00
Poul-Henning Kamp 1bd8cf6b99 Remove paper about the Berkeley Pascal Runtime which we have never had
in FreeBSD because it was VAX specific.

Approved by:	re@
2005-08-16 22:39:27 +00:00
Poul-Henning Kamp 7fa3be4c99 Remove pointless formatting date.
Approved by: re@
2005-08-16 22:36:54 +00:00
Christian Brueffer b0619422b3 MFC: rev. 1.11
- add missing ether_poll_deregister
- add per-device polling
- move the setting of if_capenable further down so that the
  VLAN caps are honored as well

Approved by:	re (kensmith), ru
2005-08-16 20:49:47 +00:00
cvs2svn fc207dde71 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-08-16 19:08:02 +00:00
Pawel Jakub Dawidek 0a4d97fbf5 MFC: share/man/man5/rc.conf.5 1.258,1.259,1.260
etc/defaults/rc.conf		1.255,1.256,1.257

- Remove gbde_swap_enable variable (it has no effect).
- Add geli_swap_flags variable which holds flags used by geli(8) when
  configuring GELI-encrypted swap partitions.
- Add variables used by rc.d/geli and rc.d/geli2 scripts.

Approved by:	re (kensmith)
2005-08-16 09:30:13 +00:00
Pawel Jakub Dawidek d080394f1a MFC: etc/rc.d/Makefile 1.54,1.55
- Disconnect gbde_swap from the build.
- Connect encswap, geli and geli2 to the build.

Approved by:	re (kensmith)
2005-08-16 09:23:45 +00:00
Pawel Jakub Dawidek 9660fbff2b MFC:
Add scripts for GELI device configuration on boot.

rc.d/geli - configures encryption (ask for passphrases, etc.);
rc.d/geli2 - is called after file systems are mounted and mark devices for
             detach on last close.

Approved by:	re (kensmith)
2005-08-16 09:20:32 +00:00
Robert Watson 81dbb1a34e Merge if_var.h:1.100 from HEAD to RELENG_6:
Add if_addr_mtx to struct ifnet, a mutex to protect ifnet-related address
  lists.  Add accessor macros.

  This changes the size of struct ifnet, but ideally, all ifnet consumers
  are now using if_alloc() to allocate these structures rather than
  embedding them into device driver softc's, so this won't modify the
  network device driver ABI.

Approved by:	re (hrs)
2005-08-16 09:15:14 +00:00
Pawel Jakub Dawidek b5c803d41e MFC: etc/rc.subr 1.36
Add a function which creates list of devices for GELI-encryption.

Approved by:	re (kensmith)
2005-08-16 09:06:42 +00:00
Pawel Jakub Dawidek c8ddf4d0c5 MFC: Remove gbde_swap script and introduce encswap script, which knows how to
encrypt swap partitions using both: gbde and geli.

Approved by:	re (kensmith)
2005-08-16 09:04:55 +00:00
Pawel Jakub Dawidek 1298f9d6ff MFC: sbin/geom/class/eli/geom_eli.c 1.2
When keys were configured without passphrase, number of iterations in
metadata is equal to -1. if we then wanted to attach provider (or change
keys) and forget about '-p' flag it failed on assertion (quite ok, without
assertion it could call PKCS#5v2 with 4294967295 iterations).

Instead of failing on assertion, remind about '-p' flag.

Approved by:	re (kensmith)
2005-08-16 09:02:22 +00:00
Pawel Jakub Dawidek ba72366311 MFC: sys/geom/eli/g_eli.h 1.2
Be case-insensitive when dealing with algorithm names.

Submitted by:	Benjamin Lutz <[email protected]>
PR:		kern/84659
Approved by:	re (kensmith)
2005-08-16 09:00:24 +00:00
Pawel Jakub Dawidek f031454303 MFC: sbin/geom/class/eli/geli.8 1.3
sys/geom/eli/g_eli.c		1.4,1.5

- GELI doesn't need cryptodev.
- Because code paths for I/O requests are quite complex, add comments above
  the functions which participate in I/O paths.

Approved by:	re (kensmith)
2005-08-16 08:58:33 +00:00
Pawel Jakub Dawidek 6eefffea57 MFC: sbin/geom/core/geom.c 1.23
Unfortunately dlerror(3) returns string, so there is no clean way to
ignore "no such file" errors only, which I wanted to do.
Because of this I ignored all other errors on dlopen(3) failure as well,
which isn't good.
Fix this situation by calling access(2) on library file first and ignore
only ENOENT error. This allows to report all the rest of dlopen(3) errors.

Approved by:	re (kensmith)
2005-08-16 08:45:11 +00:00
Pawel Jakub Dawidek 51ff910f9e MFC: etc/rc.d/jail 1.25
Skip jails which are already running and inform why.
We're checking for /var/run/jail_<name>.id file and if it exists, we don't
start the jail. It should be also safe in case of reboot(8), because
rc.d/cleanvar script is going to remove /var/run/jail_* files.

It helps to avoid potential mess when the same jail is started twice,
because of an administrator mistake (been there, done that).

Approved by:	re (kensmith)
2005-08-16 08:43:06 +00:00
Pawel Jakub Dawidek 539b2b9cce MFC: rc.d/cleanvar 1.10
Skip 'logpriv' socket when cleaning /var/.

Approved by:	re (kensmith)
2005-08-16 08:41:30 +00:00
Pawel Jakub Dawidek ade75492c6 MFC: rc.d/gbde 1.13
rc.subr		1.35

Move 'local_tr' function to rc.subr and change its name to 'ltr'.

Approved by:	re (kensmith)
2005-08-16 08:39:36 +00:00
Pawel Jakub Dawidek 3859a90844 MFC:
- Add code for Ext2FS and ReiserFS labels recognition.
- Avoid creating directories in devfs by changing all '/' in labels to '_'.

Submitted by:	Stanislav Sedov <[email protected]>
PR:		kern/84638
Approved by:	re (kensmith)
2005-08-16 08:20:48 +00:00
Pawel Jakub Dawidek 98168a3844 MFC: Add strcasecmp() and strncasecmp() to libkern and connect to the build.
Approved by:	re (kensmith)
2005-08-16 08:11:00 +00:00
Marcel Moolenaar 9cfad07ea9 Partial MFC rev 1.3:
o  Remove the obscure tid command, because it does what the thread
     command does, but worse.
  o  Move the PID to the extra thread info, where it makes sense and
     where it doesn't confuse users. The extra thread info holds some
     process information, to which the PID belongs.
  o  Implement the to_find_new_threads target method by having it call
     the target beneath us if we're not using KVM. This makes sure that
     new threads are found when using the remote target.

  o  Fix various core dump scenarios:
     -  Implement the to_files_info target method. Previously the
        'info target' command would cause a NULL pointer dereference.
     -  Don't assume there's a current thread. We're not initialized
        in all cases. This prevents a NULL pointer dereference.
     -  When we're not ussing KVM, have the to_xfer_memory target
        method call the target beneath us. This avoids calling into
        KVM with a NULL pointer.

Approved by: re (kensmith)
2005-08-16 03:29:22 +00:00
Joseph Koshy c59077cf70 MFC r1.7 "Sync usage message with the code and manual page".
Approved by:	re (kensmith)
2005-08-16 02:03:48 +00:00
Marcel Moolenaar d20aa9cdae MFC 1.8:
o  As mentioned in the previous commit: make the KVM error buffer
   static.
o  Register a function with atexit(3) to close the KVM object if
   we have one open.
o  Show the unread portion of the kernel's message buffer before
   presenting the prompt. It's bound to provide some useful info.
o  Don't call kgdb_target() twice. It results in having all threads
   listed twice.

Approved by: re (hrs)
2005-08-16 00:29:26 +00:00
Colin Percival eeb6ee519e MFC addition of portsnap to the base system plus subsequent enhancements
and bug fixes.

Approved by:	re (kensmith)
2005-08-15 20:24:08 +00:00
Julian Elischer bf6cd502fd MFC: reduce warnings when compiled under -W.
Obtained from:	Sandvine inc.
Approved by:  re (ken)
2005-08-15 20:04:28 +00:00
Joseph Koshy 14cdfc2259 MFC { sys/dev/hwpmc/hwpmc_mod.c:1.13, sys/kern/kern_pmc.c:1.5,
sys/sys/pmckern.h:1.5 }

Fail the module loading process if the currently executing kernel
was not compiled with 'options HWPMC_HOOKS' or if the compiled-in
version numbers of the kernel and module are not in sync.

Approved by:	re (kensmith)
2005-08-15 18:46:13 +00:00
Colin Percival 226c592181 MFC addition of bsdiff and bspatch to the base system, in order to
allow them to be used by portsnap(8) in 6.0-RELEASE.

Approved by:	re (kensmith)
2005-08-15 18:34:21 +00:00
cvs2svn b3ae05e667 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-08-15 17:07:38 +00:00
Joseph Koshy 3bd6fa1e8c MFC r1.8 "Correctly print system-wide PMC counts for short-lived command lines".
Approved by:	re (hrs)
2005-08-15 15:33:59 +00:00
Tor Egge e0fc127801 MFC: Check for marker pages when scanning active and inactive page queues.
Approved by:	re (kensmith)
2005-08-15 14:28:48 +00:00
Alexander Kabaev d109fabc39 MFC: Do not use vm_pager_init() to initialize vnode_pbuf_freecnt variable.
vm_pager_init() is run before required nswbuf variable has been set
to correct value. This caused system to run with single pbuf available
for vnode_pager. Handle both cluster_pbuf_freecnt and vnode_pbuf_freecnt
variableis in the same way.

Approved by:	re (kensmith)
2005-08-15 14:04:47 +00:00
Anton Berezin 4aa0568752 MFC: Recognize D-Link DGE-528(T) Gigabit as an re(4) device.
Approved by:	re (kensmith)
2005-08-15 14:02:37 +00:00
Alexander Kabaev 7e5fbb34e3 MFC r1.639: Do not drop the vnode interlock if vdropl is called on already
doomed vnode. vdropl callers expect it to return with interlock still being
held.

Approved by:	re (hrs)
2005-08-15 13:50:38 +00:00
Robert Watson 470403fc5c Merge if_atm.c:1.20 from HEAD to RELENG_6:
Add NATM_LOCK() and NATM_UNLOCK() in places where npcb_add() and
  npcb_free() are called, in order to eliminate witness panics.
  This was overlooked in removal of GIANT from ATM.

Approved by:	re (hrs)
2005-08-15 09:54:00 +00:00
Robert Watson 7096558609 Merge natm.c:1.39, natm.h:1.12, natm_proto.c:1.17 from HEAD to RELENG_6:
Remove FreeBSD 2.2 protocol usrreq compatibility code.

  Remove minor #ifdefs for early NetBSD and OpenBSD compatibility.

  Remove spl-related definitions.

Approved by:	re (hrs)
2005-08-15 09:52:22 +00:00
Robert Watson 8008f0db95 Merge if_atmsubr.c:1.38, natm.c:1.38, natm.h:1.11, natm_pcb.c:1.16,
natm_proto.c:1.16 from HEAD to RELENG_6:

  Lock down netnatm and mark as MPSAFE:

  - Introduce a subsystem mutex, natm_mtx, manipulated with accessor macros
    NATM_LOCK_INIT(), NATM_LOCK(), NATM_UNLOCK(), NATM_LOCK_ASSERT().  It
    protects the consistency of pcb-related data structures.  Finer grained
    locking is possible, but should be done in the context of specific
    measurements (as very little work is done in netnatm -- most is in the
    ATM device driver or socket layer, so there's probably not much
    contention).

  - Remove GIANT_REQUIRED, mark as NETISR_MPSAFE, remove
    NET_NEEDS_GIANT("netnatm").

  - Conditionally acquire Giant when entering network interfaces for
    ifp->if_ioctl() using IFF_LOCKGIANT(ifp)/IFF_UNLOCKGIANT(ifp) in order
    to coexist with non-MPSAFE atm ifnet drivers..

  - De-spl.

  Reviewed by:    harti, bms (various versions)

Approved by:	re (hrs)
2005-08-15 09:51:15 +00:00
Robert Watson 2b6c5bb1a5 Merge mac_policy.h:1.69 from HEAD to RELENG_6:
Insert a series of place-holder function pointers in mac_policy.h for
  entry points that will be inserted over the life-time of the 6.x branch,
  including for:

  - New struct file labeling (void * already added to struct file), events,
    access control checks.
  - Additional struct mount access control checks, internalization/
    externalization.
  - mac_check_cap()
  - System call enter/exit check and event.
  - Socket and vnode ioctl entry points.

Approved by:	re (hrs)
2005-08-15 09:03:50 +00:00
Robert Watson 225f959f29 Merge vm_page.h:1.137 from HEAD to RELENG_6:
Don't perform a nested include of opt_vmpage.h if LIBMEMSTAT is defined,
  as opt_vmpage.h will not be available to user space library builds.  A
  similar existing check is present for KLD_MODULE for similar reasons.

Approved by:	re (hrs)
2005-08-15 09:02:01 +00:00
Robert Watson 44d8425481 Merge uma_int.h:1.37 from HEAD to RELENG_6:
Wrap inlines in uma_int.h in #ifdef _KERNEL so that uma_int.h can be
  used from memstat_uma.c for the purposes of kvm access without lots
  of additional unsafe includes.

Approved by:	re (hrs)
2005-08-15 09:01:11 +00:00
Suleiman Souhlal 375af1003b MFC rev 1.222:
Use atomic operations on runningbufspace.

 PR:             kern/84318
 Submitted by:   ade

Approved by:	re (kensmith)
2005-08-15 06:22:09 +00:00
Suleiman Souhlal 9b716877e2 MFC rev 1.73:
The kernel is usually at /boot/kernel/kernel nowadays.

 PR:     i386/81756
 Submitted by:   trasz <[email protected]>

Approved by:	re (kensmith)
2005-08-15 06:14:07 +00:00
Suleiman Souhlal b4d6d93121 MFC rev 1.11:
it's actually 11 minutes when the machine is assumed to be down and removed
  from the output.

  Obtained from:  DragonFlyBSD

Approved by:	re (kensmith)
2005-08-15 06:07:23 +00:00
Suleiman Souhlal 8050ba73f7 MFC:
Holding a vnode doesn't prevent v_mount from disappearing (when the
  vnode is inactivated), possibly leading to a NULL dereference when
  checking if the mount wants knotes to be activated in the VOP hooks.
  So, we add a new vnode flag VV_NOKNOTE that is only set in  getnewvnode(),
  if necessary, and check it when activating knotes.
  Since the flags are not erased when a vnode is being held, we can safely
  read them.

Approved by:	re (kensmith)
2005-08-15 06:01:36 +00:00
SUZUKI Shinsuke f8c2600733 MFC Rev. 1.31
fixed a kernel crash at the start-up time of an IPv6 multicast daemon
  (e.g. pim6sd/pim6dd)

Approved by: re(kensmith)
2005-08-15 00:28:31 +00:00
Murray Stokely 801c893ab2 MFC: r1.46 - grammar improvements.
Approved by:	re (kensmith)
2005-08-14 18:52:34 +00:00
Murray Stokely bfd12c3262 MFC: r1.15 - Fix typo.
Approved by:	re (kensmith)
2005-08-14 18:48:54 +00:00
Robert Watson 13b0fe7fb5 Bump __FreeBSD_version for dev_clone eventhandler to add credential.
Approved by:	re
2005-08-13 21:27:58 +00:00
Robert Watson 7e993ff3bc Merge two sets of changes relating to devfs device node cloning from
HEAD to RELENG_6: changes to introduce a credentialed version of the
clone event handler, and then changes to merge the regular and
credentialed versions into a single interface (along with updates to
existing consumers).  With this merge, 6.x and 7.x are in sync.

First batch merges devfs_devs.c:1.37, devfs_vnops.c:1.115,
kern_conf.c:1.187, tty_pty.c:1.138, mac_vfs.c:1.109, mac_biba.c:1.36,
mac_lomac.c:1.36, mac_mls.c:1.73, mac_stub.c:1.53, mac_test.c:1.61,
conf.h:1.223, mac.h:1.68, mac_policy.h:1.67 from HEAD to RELENG_6:

  When devfs cloning takes place, provide access to the credential of the
  process that caused the clone event to take place for the device driver
  creating the device.  This allows cloned device drivers to adapt the
  device node based on security aspects of the process, such as the uid,
  gid, and MAC label.

  - Add a cred reference to struct cdev, so that when a device node is
    instantiated as a vnode, the cloning credential can be exposed to
    MAC.

  - Add make_dev_cred(), a version of make_dev() that additionally
    accepts the credential to stick in the struct cdev.  Implement it and
    make_dev() in terms of a back-end make_dev_credv().

  - Add a new event handler, dev_clone_cred, which can be registered to
    receive the credential instead of dev_clone, if desired.

  - Modify the MAC entry point mac_create_devfs_device() to accept an
    optional credential pointer (may be NULL), so that MAC policies can
    inspect and act on the label or other elements of the credential
    when initializing the skeleton device protections.

  - Modify tty_pty.c to register clone_dev_cred and invoke make_dev_cred(),
    so that the pty clone credential is exposed to the MAC Framework.

  While currently primarily focussed on MAC policies, this change is also
  a prerequisite for changes to allow ptys to be instantiated with the UID
  of the process looking up the pty.  This requires further changes to the
  pty driver -- in particular, to immediately recycle pty nodes on last
  close so that the credential-related state can be recreated on next
  lookup.

  Submitted by:   Andrew Reisse <[email protected]>
  Obtained from:  TrustedBSD Project
  Sponsored by:   SPAWAR, SPARTA

Second batch merges scsi_target.c:1.68, coda_fbsd.c:1.43,
firewirereg.h:1.38, fwdev.c:1.47, nmdm.c:1.36, snp.c:1.100, dsp.c:1.82,
mixer.c:1.45, vkbd.c:1.9, devfs_vnops.c:1.117, tty_pty.c:1.139,
tty_tty.c:1.57, bpf.c:1.156, if_tap.c:1.56, if_tun.c:1.153,
smb_dev.c:1.28, conf.h:1.224 from HEAD to RELENG_6:

  Merge the dev_clone and dev_clone_cred event handlers into a single
  event handler, dev_clone, which accepts a credential argument.
  Implementors of the event can ignore it if they're not interested,
  and most do.  This avoids having multiple event handler types and
  fall-back/precedence logic in devfs.

  This changes the kernel API for /dev cloning, and may affect third
  party packages containg cloning kernel modules.

  Requested by:   phk

These changes modifies the kernel device driver API for device cloning,
and might require minor modifications to third party device drivers that
make use of devfs cloning.  It will not be merged to RELENG_5.

Approved by:	re (scottl)
2005-08-13 21:24:18 +00:00
Christian Brueffer 2c5b802f10 MFC: rev. 1.70
Add some more info about jail startup and shutdown.

Approved by:	re (hrs)
2005-08-12 22:29:42 +00:00
Christian Brueffer 129fc91af6 MFC: rev. 1.42
Remove stray comma

Approved by:	re (hrs)
2005-08-12 22:28:25 +00:00
Christian Brueffer fc1f875076 MFC: rev. 1.5
nForce3 and nForce4 are supported as well.

Approved by:	re (hrs)
2005-08-12 22:27:37 +00:00
Christian Brueffer a648cdd7ce MFC: rev. 1.18
Sort the list of supported hardware.

Approved by:	re (hrs)
2005-08-12 22:26:03 +00:00
John Baldwin 1496051a7b MFC: Call tulip_start() rather than tulip_ifstart() from the interrupt
handler to avoid recursing on the driver lock.

Approved by:	re (kensmith)
2005-08-12 17:57:38 +00:00
Nate Lawson a8cdfc3299 MFC 1.18: Fix for 99% being reported instead of 100% when one battery
is missing.

Approved by:	re (kensmith)
2005-08-12 17:29:58 +00:00
Nate Lawson eae543bb3d MFC rev 1.15: use more reasonable boundary for user setting of lowest
Approved by:	re (kensmith)
2005-08-12 17:25:59 +00:00
Tor Egge 263daf2afa MFC: Don't allow pagedaemon to skip pages while scanning active and
inactive page queues due to the vm object being locked.

Approved by:	re (kensmith)
2005-08-12 16:43:27 +00:00
Christian Brueffer ce516d74b2 MFC:
More tcpdump 8->1 cleanup.

Approved by:	re (hrs)
2005-08-12 16:15:24 +00:00
Andrew Thompson e80b9a1305 MFC: if_bridge.c, r.1.5
> Use m_copypacket() which is an optimization of the common case
> m_copym(m, 0, M_COPYALL, how).
>
> This is required for strict alignment architectures where we align the
> IP header in the input path but m_copym() will create an unaligned copy
> in bridge_broadcast(). m_copypacket() preserves alignment of the first
> mbuf.
>
> Noticed by:     Petri Simolin
> Approved by:    mlaier (mentor)

Approved by:	re (kensmith), mlaier (mentor)
2005-08-11 20:57:59 +00:00
Markus Brueffer ab8a4e2f41 MFC Rev. 1.8:
Don't lock when holding led_mtx, instead use AcpiOsQueueForExecution to defer
  the locking.

  Idea taken from: acpi_asus(4)

  Approved by:    philip
  Reported by:    avatar
                  Gordon Bergling <[email protected]>

Approved by:	re (kensmith)
2005-08-11 15:35:58 +00:00
John Baldwin f82882525e MFC: Correct some if tests to fix a confusing printf when we route a new
IRQ for a link.

Approved by:	re (kensmith)
2005-08-11 15:35:41 +00:00
Anton Berezin 83739ae4e1 MFC 1.4: make kernel build succeed when with "options CPU_DISABLE_SSE".
Approved by:	re (kensmith)
2005-08-11 14:28:42 +00:00
Ian Dowse de31732a74 MFC 1.78: fix two bugs that caused page faults when using mice with
tilt movements.

Approved by:	re (kensmith)
2005-08-11 00:22:28 +00:00
Jesus R. Camou 0a539acfb5 MFC: config-recursive target.
Approved by:	re (hrs)
2005-08-10 20:43:27 +00:00
Bjoern A. Zeeb 32b223f5f3 MFC: rev. 1.33 src/sys/net/if_gre.c, rev. 1.20 src/sys/netinet/ip_gre.c
Add support for IPv6 over GRE [1]. PR kern/80340 includes the
  FreeBSD specific ip_newid() changes NetBSD does not have.
Correct handling of non AF_INET packets passed to bpf [2].

PR:		kern/80340[1], NetBSD PRs 29150[1], 30844[2]
Obtained from:	NetBSD ip_gre.c rev. 1.34,1.35, if_gre.c rev. 1.56
Submitted by:	Gert Doering <gert at greenie.muc.de>[2]
Approved by:	re (kensmith)
2005-08-10 19:12:32 +00:00
Jesus R. Camou e1f3dc4487 MFC: Information about starting jails
at boot time if specified in rc.conf.

Submitted by:	matteo
Approved by:	re (hrs), trhodes (mentor)
2005-08-10 19:00:43 +00:00
Sam Leffler 729c85b0e8 MFC: m_align
Approved by:	re (kensmith)
2005-08-10 17:02:29 +00:00
Yoshihiro Takahashi fb4202128a MFi386: revision 1.1202.2.1 (r300 DRM support).
Approved by:	re (kensmith)
2005-08-10 15:56:13 +00:00
Gleb Smirnoff cf8478f315 MFC 1.10:
Check that we have first fragment before pulling up TCP/UDP header.

Approved by:	re (kensmith)
2005-08-10 15:00:57 +00:00
Gleb Smirnoff facf684127 MFC:
Enhance struct ng_hook - add hk_type field and bump NG_ABI_VERSION.

Approved by:	re (kensmith)
2005-08-10 14:58:18 +00:00
Gleb Smirnoff 36dc1f701d MFC 1.103, 1.105:
avoid recursion problems in netgraph(4). See 1.103 log for
more information.

Approved by:	re (kensmith)
2005-08-10 14:54:52 +00:00
Pawel Jakub Dawidek ccb305b6e4 MFC: rc.d/jail 1.24
Allow to give more than one jail's name, eg.:

	# /etc/rc.d/jail start www mail

Approved by:	re (kensmith)
2005-08-10 14:30:05 +00:00
Stephan Uphoff 88a87d85a4 MFC ffs_softdep.c 1.182, softdep.h 1.18
Delay freeing disk space for file system blocks until all
dirty buffers are safely released. This fixes softdep
problems on truncation (deletion) of files with dirty
buffers.

Approved by:	re (kensmith)
2005-08-10 14:09:25 +00:00
Brian Somers 9913bfe2c0 MFC: Mention that console= can set multiple consoles.
Relate boot_ options to their kernel command line flags and make it clear
     how kenv(1) is used.

Approved by:	re (hrs)
2005-08-09 12:38:17 +00:00
Tai-hwa Liang f9d748d16f MFC: (1.10) Fixing compilation bustage.
Approved by:	re (kensmith)
2005-08-09 01:27:31 +00:00
Tai-hwa Liang fbe925cebb MFC: (1.7) Fixing compilation bustage.
Approved by:	re (kensmith)
2005-08-09 01:25:32 +00:00
Peter Grehan 071b54122a MFC machdep.c r1.90
trap.c    r1.55
     trap_subr.S r1.15

   Temporary band-aid to fix hang when a process exec's Altivec
 instructions.

    trap_subr.S:  declare a stub for the a-unavailable trap
                  that does an absolute jump to the vector-assist trap.
                  This is due to the fact that the vec-unavail trap
                  doesn't start at a 256-byte boundary, so the trick of
                  masking the bottom 8 bits of the link register to identify
                  the interrupt doesn't work, so let the vec-assist
                  case handle Altivec-disabled for the time being.

                  Note that this will be fixed in the future with a much
                  smaller vector code-stub (< 16 bytes) that will allow
                  use of strange vector offsets that are also present in
                  4xx processors, and also allow smaller differences in
                  vector codepaths on the G5.

    trap.c:       Treat altivec-unavailable/assist process traps as SIGILL.
                  Not quite correct, since altivec-assist should really
 		  be a panic,
                  but it is fine for the moment due to the above measure.

    machdep.c     Install the stub code for the altivec-unavailable trap, and
                  the standard trap code at the altivec-assist.

Approved by:	re (Ken Smith)
2005-08-08 07:02:12 +00:00
Ceri Davies a393ec0616 MFC r1.71.
Correct the description of the TAPE environment variable.
  Based on:

PR:             docs/84200
Submitted by:   Gary W. Swearingen <garys at opusnet dot com>
Approved by:	re (hrs)
2005-08-07 18:49:50 +00:00
Christian Brueffer ec8c914dbb MFC: rev. 1.54
Document ITE IT8211F support.

Approved by:	re (hrs)
2005-08-07 16:02:17 +00:00
Christian Brueffer 3f34f80b7b MFC: rev. 1.5
Remove Xref to non-existant usb(3) manpage.

Approved by:	re (hrs)
2005-08-07 15:49:53 +00:00
Søren Schmidt a620ace01c MFC:
Remove stale struct ata_channel declaration
        Add support for the ITE IT8211F controller
        Dont limit all transfers to DEV_BSIZE (stale dbug code)
        Hide the loaded/unloaded message behind bootverbose

Approved by: re@
2005-08-07 11:20:28 +00:00
Søren Schmidt cae160799c MFC:
Fix status to report status from the given array

Approved by: re@
2005-08-07 11:16:58 +00:00
Søren Schmidt 1a8fcecd10 MFC:
Allow the array number to be read back on atacontrol create
	Make IOCATARAIDSTATUS IOWR so status can be gotten correctly

Approved by: re@
2005-08-07 11:16:08 +00:00
Ollivier Robert 840cd808c4 MFC of revision 1.10:
The check for invalid characters introduced in 1.9 incorrectly
flags NIS entries as invalid.

Submitted by:   Bob Willcox <[email protected]>
PR:             bin/82325 (but I used the patch from Bob).
Approved by:	re (kensmith)
2005-08-07 05:56:54 +00:00
Sam Leffler 7e46ee0b14 sync with HEAD
Approved by:	re (kensmith)
2005-08-07 02:23:32 +00:00
Christian S.J. Peron edce2d71b8 MFC revision 1.61 to RELENG_6
date: 2005/07/30 20:00:13;  author: csjp;  state: Exp;  lines: +16 -4
Introduce kdevtoname, which when given the kernel address of a
cdev structure, returns the device name associated with it through
the __si_namebuf member. This un-breaks the processing of devices.

Approved by:	re (kensmith)
2005-08-06 22:26:51 +00:00
Markus Brueffer 78b066a0f4 MFC Rev. 1.13
s/Lefler/Leffler/

Approved by:	re (hrs)
2005-08-06 14:47:16 +00:00
Markus Brueffer bc65233a4b MFC Rev. 1.38
- Fix spelling of 'multiplexer'
- Grammar fixes

Approved by:	re (hrs)
2005-08-06 14:45:18 +00:00
Markus Brueffer 4c36a68441 MFC: Rev. 1.2
- Reword a sentence
- Grammar fixes
- s/CAVEAT/CAVEATS/

Approved by:	re (hrs)
2005-08-06 14:41:55 +00:00
Christian Brueffer b545d972c2 MFC: rev. 1.11
Mention that the softc is zeroed after allocation.

Approved by:	re (hrs)
2005-08-06 07:26:42 +00:00
David Xu f65720d804 MFC Revision 1.117:
In adjustrunqueue(), add code to handle thread migrating case for
    ULE scheduler. In original code, local run queue of threaded ksegrp
    is corrupted if adjustrunqueue() is called while thread is migrating.

Approved by:	re (kensmith)
Tested by:	delphij
2005-08-06 03:06:25 +00:00
David Xu 202f5faf18 MFC Revision 1.155:
If a thread was removed from system run queue, kseq_assign
    shouldn't add it again.

Approved by:	re (kensmith)
Tested by:	delphij
2005-08-06 03:03:10 +00:00
Max Laier 93bcd2e297 MFC: pf.c, 1.35 pfvar.h, 1.12
Prevent a race condition.  As pf_send_tcp() - called for expired synproxy
  states - has to drop the lock when calling back to ip_output(), the state
  purge timeout might run and gc the state. This results in a rb-tree
  inconsistency.  With this change we flag expiring states while holding the
  lock and back off if the flag is already set.

  Reported by:	glebius

Approved by:	re (kensmith)
2005-08-06 01:52:35 +00:00
Sam Leffler d731ca2ae1 MFC: 1.99:
Wireless suport fixups: add a bunch of stuff that's been in the
code but not documented (e.g. wme, mac acl) and correct some
information, etc.

Approved by:	re (kensmith)
2005-08-05 21:36:01 +00:00
Sam Leffler fd3f88199e MFC: 1.23: acm and ack are specified per-ac
Approved by:	re (kensmith)
2005-08-05 21:35:22 +00:00
Andrew Thompson 9e52c1448f MFC: if_bridge.c, r1.14
>   We check that all the member interfaces have the same MTU on attach to the
>   bridge but the interface can still be changed afterwards.
>
>   This falls under the 'dont do that' category but log an warning when INVARIANTS
>   is defined.
>
>   Approved by:    mlaier (mentor)
>
>   Revision  Changes    Path
>   1.14      +8 -0      src/sys/net/if_bridge.c

Approved by:	re (kensmith), mlaier (mentor)
2005-08-05 20:33:21 +00:00
Pawel Jakub Dawidek ad65911a6d MFC: sbin/geom/class/Makefile 1.9
Don't try to compile geli(8) when NO_CRYPT knob if defined.

Reported by:		Alexander Polakov
Committed to HEAD by:	ru
Approved by:		re (kensmith (implicit))
2005-08-05 20:24:37 +00:00
John Baldwin 39813579a8 MFC: Include a SYSUNINIT to destroy the mutex in MTX_SYSINIT.
Approved by:	re (kensmith)
MFC after:	1 week
2005-08-05 20:21:46 +00:00
Pawel Jakub Dawidek df29864fee MFC: Add regression tests (121 in total) for GEOM_ELI class.
To use them, run:

	# prove /usr/src/tools/regression/geom_eli

Sponsored by:	Wheel Sp. z o.o.
		http://www.wheel.pl
Approved by:	re (kensmith)
2005-08-05 20:04:38 +00:00
Pawel Jakub Dawidek bc921f9c4b MFC: Connect GEOM_ELI class to the build.
Sponsored by:	Wheel Sp. z o.o.
		http://www.wheel.pl
Approved by:	re (kensmith)
2005-08-05 20:02:46 +00:00
Pawel Jakub Dawidek 3a02479713 MFC: Introduce GEOM_ELI class which provides GEOM providers encryption.
For features list and usage see manual page: geli(8).

Sponsored by:	Wheel Sp. z o.o.
		http://www.wheel.pl
Approved by:	re (kensmith)
2005-08-05 19:58:14 +00:00
John Baldwin d35f842ecd MFC: Add extra constraints to inform the compiler that the memory being
modified is an input and output rather than just the register holding the
pointer being the input and output.

Approved by:	re (kensmith)
2005-08-05 19:46:13 +00:00
John Baldwin 95b1c1e157 MFC: Convert the atomic pointer operations to operate on uintptr_t rather
than void *.

Approved by:	re (kensmith)
2005-08-05 19:44:00 +00:00
Pawel Jakub Dawidek 3bad92aa35 MFC: g_raid3.c 1.41
g_raid3.h	1.12

Use root_mount KPI for RAID3 to delay root file system mount.
Actually, one cannot setup root file system on RAID3 device, but when
other file system exist in /etc/fstab which are placed on RAID3 device,
boot process will be interrupted when these devices are missing.

Approved by:	re (kensmith)
2005-08-05 19:43:29 +00:00
Pawel Jakub Dawidek 06ba06bfee MFC: pw_user.c 1.58
Change /home symbolic link, so it will point to usr/home instead of /usr/home.
Previous symlink was confusing:

	# cd /jails/virtual_system_1/home
	# realpath .
	/usr/home

...and slower.

OK'ed by:	rwatson, phk
Approved by:	re (kensmith)
2005-08-05 19:39:25 +00:00
John Baldwin bb9b7f27b3 MFC: Add support for the hw.apic.enable_extint tunable.
Approved by:	re (kensmith)
2005-08-05 19:08:25 +00:00
John Baldwin cff7fc9758 MFC: Various and sundry cleanups to remove old code and fix cruftiness.
Also, add locking and mark the driver as MPSAFE.

Approved by:	re (kensmith)
2005-08-05 19:07:19 +00:00
John Baldwin 30f52de3e8 MFC: Close a race where the last thread in a process could be harvested via
wait() before it has finished dying.

Approved by:	re (kensmith)
MFC after:	1 week
2005-08-05 19:02:56 +00:00
Brian Somers 98518f2012 MFC: Fix a comparison that broke ``set console=vidconsole'' and even the
loader.conf line ``console="vidconsole"''.

Approved by:	re (kensmith)
2005-08-05 00:36:59 +00:00
Maxim Sobolev 015b17bcdb MFC: Propagate return value of the kern_execve() to the caller properly.
Approved by:	re
2005-08-04 23:25:32 +00:00
Maksim Yevmenkin 8875da99c0 MFC if_an.c v1.69 to RELENG_6
Reorganize an_detach() a bit. Make sure ether_ifdetach() and if_free()
are called outside of AN_LOCK()/AN_UNLOCK. This fixes the following
WITNESS warning (produced when an(4) PCMCIA card is detached).
taskqueue_drain with the following non-sleepable locks held:
exclusive sleep mutex an0 (network driver) r = 0 (0xc59af168) locked @ /usr/src/
sys/dev/an/if_an.c:2836

Do not lock an to check gone flag. Only need to hold the lock to set
the gone flag.

Reviewed by:	imp
Approved by:	re (kemsmith)
2005-08-04 21:12:22 +00:00
Christian Brueffer 8ed7105420 MFC: rev. 1.28
Mention the default value of PATH and that it may be overridden.

Approved by:	re (hrs)
2005-08-04 19:58:48 +00:00
Pawel Jakub Dawidek 03818ab4e7 MFC: ggatec.8 1.6
Update manual page after ggate rewrite.

Approved by:	re (hrs)
2005-08-04 18:05:33 +00:00
John-Mark Gurney 94a0b19cc2 MFC: v1.45 intro.2, v1.40 help.common
fix a couple documentation nits

Approved by:	re (hrs)
2005-08-04 17:53:40 +00:00
Eric Anholt 28d0b02472 MFC: r300 DRM support. Supports all current non-PCIE Radeons, as far as the
developers know.

Approved by:	re (kensmith)
2005-08-04 17:31:02 +00:00
John Baldwin 28369c9e9f MFC: Fix a typo in the name of a dmamap for a bus_dmamap_sync().
Approved by:	re (kensmith)
2005-08-04 16:44:17 +00:00
John Baldwin de67d26e00 MFC: Fix a bug in pmap_protect() in the PAE case where it could look up the
wrong vm_page_t associated with a pte.

Approved by:	re (kensmith)
2005-08-04 16:41:25 +00:00
Jacques Vidrine 2721d3599f Disable hyperthreading by default for 6.x.
Approved by:	re
2005-08-04 15:17:06 +00:00
Ken Smith 58a3019d97 Almost ready for BETA2 builds...
Approved by:	re (implicit)
2005-08-01 18:14:48 +00:00
cvs2svn 4dd1b957b8 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-08-01 17:50:20 +00:00
Robert Watson 7a87b1ddf5 Merge memstat.c:1.6, memstat_internal.h:1.6, memstat_malloc.c:1.5,
memstat_uma.c:1.9 from HEAD to RELENG_6:

 Correct two libmemstat(3) bugs:

  - Move memory_type_list flushing logic from memstat_mtl_free() to
    _memstat_mtl_empty(), a libmemstat-internal function that can
    be called from other parts of the library.  Invoke
    _memstat_mtl_empty() from memstat_mtl_free(), which also frees
    the containing list structure.

    Invoke _memstat_mtl_empty() instead of memstat_mtl_free() in
    various error cases in memstat_malloc.c and memstat_uma.c, which
    previously resulted in the list being freed prematurely.

  - Reverse the order of updating the mt_kegfree and mt_free fields
    of the memory_type in memstat_uma.c, otherwise keg free items
    won't be counted properly for non-secondary zones.

Merged to RELENG_6 earlier than the proposed MFC after date so that it
can make BETA2.

Approved by:	re (kensmith)
2005-08-01 17:14:51 +00:00
Christian S.J. Peron 18c0e01372 Synch with HEAD, this brings in net.bpf.stats.
MFC revision 1.155 (bpf.c)
MFC revision 1.30 (bpfdesc.h)

Approved by:	re@ (kensmith)
2005-07-31 00:48:18 +00:00
Christian S.J. Peron e216bce7c6 MFC revision 1.24
date: 2005/07/30 15:53:40;  author: csjp;  state: Exp;  lines: +2 -1
Add missing parenthesis around error handling code upon attaching
mlx devices. This fixes an issue where mlx device drives fail to be
detected at system boot.

Approved by:	re@ (scottl)
2005-07-31 00:41:53 +00:00
Maxime Henrion bb17d21560 MFC r1.241:
date: 2005/07/29 22:40:06;  author: mux;  state: Exp;  lines: +1 -0
  Add a new PCI id for fxp(4) cards found on ICH7-based systems.

  Submitted by:   Martin Nilsson <[email protected]>

Approved by:	re@ (kensmith)
2005-07-30 21:45:32 +00:00
Hiroki Sato b77930a605 MFC: Document IODATA USB-RSAQ3 USB-Serial Adapter as a supported device.
Approved by:	re (scottl)
2005-07-30 09:35:38 +00:00
Hiroki Sato a8af060793 MFC: Fix typos and use consistent section names in manual pages:
s/SYSCTLS/SYSCTL VARIABLES/
 s/TUNABLES/LOADER TUNABLES/
 s/CAVEAT/CAVEATS/
 s/DESCIPTION/DESCRIPTION/

Approved by:	re (scottl)
2005-07-30 09:34:58 +00:00
Joseph Koshy 92563e4bb7 MFC r1.7:
Add COMPATIBILITY and HISTORY sections.

Approved by:	re (kensmith)
2005-07-30 09:12:51 +00:00
Joseph Koshy 77623cb29f MFC r1.3:
Catch with the source code.  Sort a list alphabetically.  Add a
  HISTORY section.

Approved by:	re (kensmith)
2005-07-30 09:11:25 +00:00
Dag-Erling Smørgrav 55d4253c17 MFC: build BIND without thread support.
Approved by:	re (kensmith)
2005-07-30 07:56:28 +00:00
Pawel Jakub Dawidek 86f114ed16 MFC:
GEOM_ZERO class for performance testing.

Approved by:	re (kensmith)
2005-07-30 06:22:25 +00:00
Pawel Jakub Dawidek 36961839ef MFC: kern_malloc.c 1.145
Fix the way how "InUse" column in 'vmstat -m' output works:
- increase number of allocations count only on successfull malloc(9),
  so it doesn't confuse people;
- because we need to check if 'size > 0', hide 'mtsp->mts_memalloced += size;'
  under the check as well, as for size=0 it is of course a no-op;
- avoid critical_enter()/critical_exit() in case of failure in
  malloc_type_allocated() as there will be nothing to do.

OK'ed by:	rwatson
Approved by:	re (kensmith)
2005-07-30 06:14:57 +00:00
Sam Leffler 162fdd5837 MFC of api changes (missed in previous commit)
Approved by:	re (kensmith)
2005-07-30 04:09:06 +00:00
Sam Leffler 54df9d3b30 MFC: add fragthreshold support and accept - (or any) for rtsthreshold
Approved by:	re (kensmith)
2005-07-30 03:31:15 +00:00
Sam Leffler 8df2724438 MFC fixes to deal with interfaces being removed:
o we no longer loop
o wpa_supplicant terminates when the last configured interface goes away

Approved by:	re (kensmith)
2005-07-30 01:19:10 +00:00
Brooks Davis f102929348 Sync dhclient with HEAD:
- Don't complain when debouncing dhclient startup.
 - Fix buffer handling in reveive_packet().  This fixes infinite cpu
   eating loops and probably some crashes.
 - Spell if_defaultroute route correctly in dhclient-script so we
   are allowed to change the default route.
 - Document dhclient -b.
 - Treat reassociation like association.
 - Do not force server-name to be a valid domain name.
 - Handle servers that send NUL-terminated host-name options.

Approved by:	re (scottl)
2005-07-29 23:36:28 +00:00
Sam Leffler 479d871299 Sync wireless support from HEAD:
o numerous net80211 fixes including fixes for internal bridging,
  frag threshold ioctl, rts threshold bounds checking, min wep
  length check, reject assoc requests w/ wpa/rsn ie when wpa
  is not configured
o misc api changes to reduce differences against forthcoming changes
o add stats for future use and reserve space
o probe inactive neighbors in adhoc mode before timing them out
o debug msg fixups (diff reduction against forthcoming code)
o driver mods to track api changes

Also for ath driver:
o fix diversity handling
o use any fixed antenna setting when sending beacons in adhoc mode

Approved by:	re (kensmith)
2005-07-29 23:31:04 +00:00
Kris Kennaway 8c4009e8a3 MFC:
>  devfs is not yet fully MPSAFE - for example, multiple concurrent devfs(8)
>  processes can cause a panic when operating on rulesets.

Approved by:	re (scottl)
2005-07-29 23:21:23 +00:00
Kirill Ponomarev cb6bbeb753 MFC: main.c:1.6, perform.c:1.13, pkg_version.1:1.36, version.h:1.5
date: 2005/07/27 07:55:12;  author: krion;  state: Exp;  lines: +12 -2
  Add -o/-O options to pkg_version:

   -o  Show the origin recorded on package generation instead of the
       package name.

   -O  Only list packages whose registered origin is origin.

Approved by:	re (kensmith)
2005-07-29 18:16:06 +00:00
Maksim Yevmenkin 2e3f0078e6 Insta-MFC to RELENG_6
Fix typo and check correct (rsp) pointer against the NULL value.

Submitted by:	Oliver < urnenfel at tiscali dot es >
Approved by:	re (kensmith)
2005-07-29 16:42:42 +00:00
Nate Lawson 1eb7c7ca80 MFC: Bring up to HEAD. Notify user if they don't have permission to run
powerd and don't exit if the error is EPERM.

Approved by:	re (kensmith)
2005-07-29 16:34:05 +00:00
Nate Lawson 0789f51d77 MFC: Bring up to HEAD, fixing output format bugs and adding power status
support.

Approved by:	re (kensmith)
2005-07-29 16:31:58 +00:00
Nate Lawson 477d41b5de MFC: Bring acpi_battery support up to HEAD, changing the API slightly
and fixing various bugs.

Approved by:	re (kensmith)
2005-07-29 16:27:07 +00:00
Nate Lawson 5aae1134cb MFC: Use __FBSDID
Approved by:	re (kensmith)
2005-07-29 16:22:37 +00:00
Hajimu UMEMOTO 14ce655361 MFC 1.12: don't accept invalid form of an address like 1:2:3:4:5:6:7::8.
Approved by:	re (kensmith)
2005-07-29 16:10:35 +00:00
R. Imura e4c373935d MFC rev 1.2: Fix core dump when "smbutil lc".
Approved by:	re (kensmith)
2005-07-29 16:06:33 +00:00
R. Imura a5c00857ef MFC rev 1.17: Don't compile ral and ural in the PAE kernel.
Approved by:	re (kensmith)
2005-07-29 16:02:27 +00:00
Maxime Henrion c7d923647e MFC r1.441:
date: 2005/07/24 17:55:57;  author: mux;  state: Exp;  lines: +1 -2
  Add back ed(4) in amd64 GENERIC.  It now works nicely and since those
  chips are commonly found, it makes sense to have it in GENERIC.  This
  is a candidate for a RELENG_6 MFC.

  Approved by;    peter
  Requested by:   pav
  Tested by:      pav

Approved by:	re@ (kensmith)
2005-07-29 15:40:58 +00:00
Xin LI 6da205e913 MFC 1.123:
Allow PLAY_MSF, PLAY_TRACK, PLAY_TRACK_REL, PAUSE, PLAY_12 commands to pass
through umass(4), in order to make cdcontrol(1) to issue commands to a USB
CD driver.

The command IDs were obtained from the CAM subsystem.  This was tested
on half dozen of USB CD drivers from different vendors.

Suggested by:   "intron" <intron at intron dot ac>
PR:             usb/83439
Reviewed by:    sanpei
Approved by:	re (kensmith)
2005-07-29 15:39:26 +00:00
cvs2svn 2f1d7645a3 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-07-29 10:06:58 +00:00
Joseph Koshy 2c542cd084 MFC r1.9:
Fix breakage introduced in rev 1.7.

Approved by:	re (kensmith)
2005-07-29 03:01:40 +00:00
Joseph Koshy 1e51aefe2a MFC r1.12:
Use LK_CANRECURSE since when a PMC-owning process performs an exec(),
  the new text vnode is already locked by itself.

Approved by:	re (kensmith)
2005-07-29 02:58:34 +00:00
Robert Watson d6532dd220 Merge mbuf.c:1.43,1.44 and Makefile:1.27 from HEAD to RELENG_6:
Modify "netstat -mb" to use libmemstat(3) when acting on a live system,
  with a number of positive benefits:

  - Start using UMA(9) statistics for mbufs and clusters, which avoids
    using the mbuf allocator statistics which suffer from races under
    load on SMP.  This should eliminate "negative" mbuf counts in
    netstat -mb.

  - We are now able to track cached (free) mbufs and clusters and count
    it towards memory allocated by the network stack.

  - We are now also able to track memory allocated to mbuf tags since
    libmemstat(3) can also query malloc(9).  We don't print this except
    as part of the total (for now - #if 0).

  - We are now able to track mbuf/cluster/packet allocation failures,
    although they are not currently printed (#if 0).

  - Don't print out sfbuf statistics when running on a kernel core, as
    currently that code is able only to query sysctl for statistics.

mbuf.c:1.44:

  Since libmemstat(3) now supports its own error management mechanism,
  use that instead of trying to use errno, in order to produce a
  sensible error message.

Approved by:	re (kensmith)
2005-07-28 19:54:55 +00:00
Yoshihiro Takahashi 00e490fd10 MFi386: revision 1.616.2.1
> Use an interrupt gate for the NMI handler and prevent too-early
> enabling of interrupts inside of trap().

Approved by:	re (kensmith)
2005-07-28 17:22:39 +00:00
Robert Watson 40afa88159 Merge Makefile:1.206 from HEAD to RELENG_6:
Hook libmemstat(3) up to the build.

Approved by:	re (kensmith)
2005-07-28 13:47:18 +00:00
Robert Watson 642a159618 Merge memstat_uma.c:1.8 from HEAD to RELENG_6:
If a retrieved UMA zone is a secondary zone, don't report keg free
  items, as they actually belong to the  primary zone, and maye otherwise
  be reported more than once.

Approved by:	re (kensmith)
2005-07-28 12:11:41 +00:00
Robert Watson 901efb48ee Merge uma.h:1.27, uma_core.c:1.129 from HEAD to RELENG_6:
Rename UMA_MAX_NAME to UTH_MAX_NAME, since it's a maximum in the
  monitoring API, which might or might not be the same as the internal
  maximum (currently none).

  Export flag information on UMA zones -- in particular, whether or
  not this is a secondary zone, and so the keg free count should be
  considered in that light.

Approved by:	re (kensmith)
2005-07-28 12:10:19 +00:00
Joseph Koshy bd1e485634 MFC { exception.s:r1.114, machdep.c:r1.617, trap.c:r1.278 }
Use an interrupt gate for the NMI handler and prevent too-early
enabling of interrupts inside of trap().

Revert rev 1.113 of "sys/i386/i386/exception.s" as it is no longer
needed.

Approved by:	re (kensmith)
2005-07-28 03:30:53 +00:00
Peter Grehan 1a1ff37658 MFC, r1.234:
Make sure /etc/fstab is written out for Apple-partitioned drives

    reviewed by:    scottl

Approved by:	re (Ken Smith)
2005-07-28 01:18:19 +00:00
Peter Grehan 2de20a342e MFC, r1.161:
Recognise GEM ethernet adapter (sparc64/ppc).

    reviewed by:    scottl

Approved by:	re (Ken Smith)
2005-07-28 01:17:12 +00:00
Tai-hwa Liang c45b14bfb3 MFC: (1.5) Fixing an off-by-one error.
Approved by:	re (kensmith)
2005-07-27 12:45:36 +00:00
Colin Percival f9972d2994 Correct a buffer overflow which can occur when decompressing a
carefully crafted deflated data stream. [1]

Correct problems in the AES-XCBC-MAC IPsec authentication algorithm. [2]

Submitted by:   suz [2]
Security:       FreeBSD-SA-05:18.zlib [1], FreeBSD-SA-05:19.ipsec [2]
Approved by:	re (kensmith)
2005-07-27 08:41:44 +00:00
Scott Long 4a0870f54a MFC: Don't cross-reference VFS_START.9 anymore.
Approved by: re
2005-07-27 02:11:20 +00:00
Scott Long 1dbf6b57d9 MFC: Don't reference VFS_START.9 in the Makefile anymore.
Approved by: re
2005-07-27 02:10:45 +00:00
Hiten Pandya b4917925cb Remove the VFS_START(9) manual page because it's no longer relevant. The
entry point was removed as its only consumer was MFS.

MFC of revision 1.13 of src/share/man/man9/VFS_START.9

Approved by:	re (hrs)
2005-07-26 23:59:55 +00:00
Christian Brueffer 2ccc0a3ef2 MFC: rev. 1.5
snd_ess needs snd_sbc to compile.

Noticed by:	oliver
Approved by:	re (hrs)
2005-07-26 18:33:19 +00:00
Matthew N. Dodd 511f8d9c49 MFC: 1.13
Move initialization above point of first possible reference to
avoid overwriting ty_status values set from the 'type' field.
Approved by:	 re (scottl)
2005-07-25 20:19:39 +00:00
Andrew Thompson f8c953e8bc MFC: if_bridge.c, r1.13
>   Clear the PROMISC flag from the vlan interface when we remove a member. We
>   checked for IFT_L2VLAN in bridge_ioctl_add() but not bridge_delete_member().
>
>   Approved by:    mlaier (mentor)
>
>   Revision  Changes    Path
>   1.13      +1 -0      src/sys/net/if_bridge.c

Approved by:	re (kensmith), mlaier (mentor)
2005-07-25 18:55:11 +00:00
Garance A Drosehn 18812dac86 MFC 1.3: Correct one regression test, and add a few more tests.
Approved by:	re(kensmith)
2005-07-25 18:52:07 +00:00
Garance A Drosehn fd04ed945d MFC 1.3->1.4: Fix minor bugs in -S processing:
1) An unquoted space is always a separator, even when not "in_arg".
 2) When a new destination buffer must be allocated during variable
    substitution, only copy data from the active buffer to the new
    one when we *are* "in_arg".
 3) Fix minor memory leak when expanding ${variable}s

Approved by:	re(kensmith)
2005-07-25 18:09:09 +00:00
Maksim Yevmenkin bfab6bd09d MFC to RELENG_6 ng_ubt.c v1.25
Add support for AVM BlueFRITZ! USB Bluetooth Adapter v2.0. It appears that
there are at least two versions of the adapter. Version 1 (product ID 0x2200)
of the adapter does not work with ng_ubt(4) and require special driver and
firmware. Version 2 (product ID 0x3800) seems to work just fine, except it
does not have bDeviceClass, bDeviceSubClass and bDeviceProtocol set to required
(by specification) values. This change forces ng_ubt(4) to attach to the
version 2 adapter.

Ignore AVM BlueFRITZ! USB Bluetooth Adapter v1.0 (product ID 0x2200).
It does not work with ng_ubt(4) and require special driver and firmware.

Submitted by:	Rainer Goellner < rainer at jabbe dot de >
Approved by:	re (kensmith)
Obtained from:	Marcel Holtmann < marcel at holtmann dot org >
2005-07-25 16:22:38 +00:00
Maksim Yevmenkin e76a66e639 MFC to RELENG_6
Fix kernel panic with vkbd(4). Initialize mutex properly (set name), or else
WITNESS gets upset.

Approved by:	re (kensmith)
2005-07-25 16:16:52 +00:00
Ken Smith f60852c0fb New __FreeBSD_version to mark the shared library version bump.
Approved by:	re (hrs)
2005-07-25 13:30:18 +00:00
Hiten Pandya 6f80dd38ed MFC revision 1.27, correct prototype for devstat_compute_etime(3) and
minor wordsmithing in nearby sentences.

PR:         	docs/82636
Approved by:	re (hrs)
2005-07-25 12:31:55 +00:00
Robert Watson 92c22a55fe Merge mac_stub.c:1.54 from HEAD to RELENG_6:
Remove duplicate initialization of mpo_create_stub pointer.

  PR:             83779
  Submitted by:   Wojciech A. Koszek <dunstan at freebsd dot czest dot pl>

Approved by:	re (kensmith)
2005-07-25 09:45:24 +00:00
Robert Watson 3cf6fc73c4 Merge kern_mbuf.c:1.10, uipc_mbuf.c:1.32, mbuf.h:1.171 from HEAD to
RELENG_6:

  Define four constants, MBUF_{,MEM,CLUSTER,PACKET,TAG}_MEM_NAME, which
  are string names for their respective UMA zones and malloc types, and
  are passed into uma_zcreate() and MALLOC_DEFINE().  Export them
  outside of _KERNEL in mbuf.h so that netstat can reference them.

  Change the names to improve consistency, with each zone/type
  associated with the mbuf allocator being prefixed mbuf_.

Approved by:	re (kensmith)
2005-07-25 00:08:12 +00:00
Robert Watson 30f90b2dca Merge bsd.libnames.mk:1.95 from HEAD to RELENG_6:
Add LIBMEMSTAT tp bsd.libnames.mk.

Approved by:	re (kensmith)
2005-07-24 16:17:25 +00:00
Robert Watson b9f89d829c Merge libmemstat(3) from HEAD to RELENG_6. Original commit description:
Add libmemstat(3), a library for use by debugging and monitoring
  applications in tracking kernel memory statistics.  It provides an
  abstracted interface to uma(9) and malloc(9) statistics, wrapped
  around the recently added binary stream sysctls for the allocators.

  Using this interface, it is easy to build monitoring tools, query
  specific memory types for usage information, etc.  Facilities are
  provided for binding caller-provided data to memory types,
  incremental updates of memory types, and queries that span multiple
  allocators.

  Support for additional allocators is (relatively) easy to add.

  The API for libmemstat(3) will probably change some over time as
  consumers are written, and requirements evolve.  It is written to
  avoid encoding ABIs for data structure layout into consuming
  applications for this reason.

This change merges all improvements, enhancements, bug fixes, etc, as
of this date.  Revisions merged are:

  Makefile:1.1-1.3
  libmemstat.3:1.1-1.6
  memstat.h:1.1-1.7
  memstat_all.c:1.1
  memstat_internal.h:1.5
  memstat_malloc.c:1.1-1.4
  memstat_uma.c:1.1-1.7

Approved by:	re (kensmith)
2005-07-24 14:49:49 +00:00
cvs2svn e0b04eb627 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-07-24 01:41:48 +00:00
Robert Watson 44e2176466 Merge kern_malloc.c:1.143,1.144 malloc.h:1.81 from HEAD to RELENG_6:
Introduce a new sysctl, kern.malloc_stats, which exports kernel malloc
  statistics via a binary structure stream:

  - Add structure 'malloc_type_stream_header', which defines a stream
    version, definition of MAXCPUS used in the stream, and a number of
    malloc_type records in the stream.

  - Add structure 'malloc_type_header', which defines the name of the
    malloc type being reported on.

  - When the sysctl is queried, return a stream header, followed by a
    series of type descriptions, each consisting of a type header
    followed by a series of MAXCPUS malloc_type_stats structures holding
    per-CPU allocation information.  Typical values of MAXCPUS will be 1
    (UP compiled kernel) and 16 (SMP compiled kernel).

  This query mechanism allows user space monitoring tools to extract
  memory allocation statistics in a machine-readable form, and to do so
  at a per-CPU granularity, allowing monitoring of allocation patterns
  across CPUs in order to better understand the distribution of work and
  memory flow over multiple CPUs.

  While here:

  - Bump statistics width to uint64_t, and hard code using fixed-width
    type in order to be more sure about structure layout in the stream.
    We allocate and free a lot of memory.

  - Add kmemcount, a counter of the number of registered malloc types,
    in order to avoid excessive manual counting of types.  Export via a
    new sysctl to allow user-space code to better size buffers.

  - De-XXX comment on no longer maintaining the high watermark in old
    sysctl monitoring code.

  A follow-up commit of libmemstat(3), a library to monitor kernel memory
  allocation, will occur in the next few days.  Likewise, similar changes
  to UMA.

kern_malloc.c:1.144:

  Correct build on 64-bit: cast u_int64_t to (unsigned long long) before
  printfing as (unsigned long long).  32-bit build on i386 didn't notice
  this.  Whoops.

  Reported by:    arved
  Tested by:      sledge

Approved by:	re (kensmith)
2005-07-23 17:11:33 +00:00
Max Laier a3c051ff3a MFC: -sp pfsync
Print newly exported pfsync statistics with netstat(8).

  Requested by:   glebius

Approved by:	re (kensmith)
2005-07-23 17:03:59 +00:00
Max Laier cb08093a44 MFC: if_pfsync.c, 1.20 in_proto.c, 1.78
Export pfsyncstats via sysctl "net.inet.pfsync" in order to print them
  with netstat (seperate commit).

  Requested by:   glebius

Approved by:	re (kensmith)
2005-07-23 17:02:10 +00:00
R. Imura 5e71040dc5 MFC 1.45: Fix looking up files having invalid short name.
PR:		77074
Approved by:	re (kensmith)
2005-07-23 17:02:04 +00:00
Max Laier 8790c1d23d MFC: if.c, 1.236
Move eventhandler for 'ifnet_departure_event' at the end of the progress.
  Some of the (IPv6) cleanup functions send packets to inform peers of the
  departure.  These packets confused users of ifnet_departure_event (pf at
  the moment).

  PR:             kern/80627
  Tested by:      Divacky Roman

Approved by:	re (kensmith)
2005-07-23 17:00:07 +00:00
Robert Watson 9a684f5523 Merge uma_core.c:1.128 from HEAD to RELENG_6:
Further UMA statistics related changes:

    - Add a new uma_zfree_internal() flag, ZFREE_STATFREE, which causes it to
      to update the zone's uz_frees statistic.  Previously, the statistic was
      updated unconditionally.

    - Use the flag in situations where a "real" free occurs: i.e., one where
      the caller is freeing an allocated item, to be differentiated from
      situations where uma_zfree_internal() is used to tear down the item
      during slab teardown in order to invoke its fini() method.  Also use
      the flag when UMA is freeing its internal objects.

    - When exchanging a bucket with the zone from the per-CPU cache when
      freeing an item, flush cache statistics back to the zone (since the
      zone lock and critical section are both held) to match the allocation
      case.

Approved by:	re (kensmith)
2005-07-23 15:11:13 +00:00
Robert Watson 2a6e440a26 Merge uma_core.c:1.127 from HEAD to RELENG_6:
Use mp_maxid in preference to MAXCPU when creating exports of UMA
  per-CPU cache statistics.  UMA sizes the cache array based on the
  number of CPUs at boot (mp_maxid + 1), and iterating based on MAXCPU
  could read off the end of the array (into the next zone).

  Reported by:    yongari

Approved by:	re (kensmith)
2005-07-23 15:10:29 +00:00
Robert Watson 42a3182cd4 Merge uma.h:1.26, uma_int.h:1.36, uma_core.c:1.126 from HEAD to
RELENG_6:

  Improve canonicalization of copyrights.  Order copyrights by order of
  assertion (jeff, bmilekic, rwatson).

  Suggested ages ago by:  bde

Approved by:	re (kensmith)
2005-07-23 15:10:00 +00:00
Robert Watson 7dccfdfd47 Merge uma_core.c:1.125 from HEAD to RELENG_5:
Move the unlocking of the zone mutex in sysctl_vm_zone_stats() so that
  it covers the following of the uc_alloc/freebucket cache pointers.
  Originally, I felt that the race wasn't helped by holding the mutex,
  hence a comment in the code and not holding it across the cache access.
  However, it does improve consistency, as while it doesn't prevent
  bucket exchange, it does prevent bucket pointer invalidation.  So a
  race in gathering cache free space statistics still can occur, but not
  one that follows an invalid bucket pointer, if the mutex is held.

  Submitted by:   yongari

Approved by:	re (kensmith)
2005-07-23 15:08:53 +00:00
Robert Watson e645659366 Merge uma.h:1.25, uma_int.h:1.35, uma_core.c:1.124 from HEAD to
RELENG_6:

  Increase the flags field for kegs from a 16 to a 32 bit value;
  we have exhausted all 16 flags.

Approved by:	re (kensmith)
2005-07-23 15:08:12 +00:00
Robert Watson 3f05780ca4 Merge uma.h:1.24, uma_int.h:1.34, uma_core.c:1.123 from HEAD to
RELENG_6:

  Track UMA(9) allocation failures by zone, and export via sysctl.

  Requested by:   victor cruceru <victor dot cruceru at gmail dot com>

Approved by:	re (kensmith)
2005-07-23 15:06:54 +00:00
Robert Watson 6ab1c7df2e Merge uma.h:1.23, uma_int.h:1.33, uma_core.c:1.122 from HEAD to
RELENG_6:

  Introduce a new sysctl, vm.zone_stats, which exports UMA(9) allocator
  statistics via a binary structure stream:

  - Add structure 'uma_stream_header', which defines a stream version,
    definition of MAXCPUs used in the stream, and the number of zone
    records in the stream.

  - Add structure 'uma_type_header', which defines the name, alignment,
    size, resource allocation limits, current pages allocated, preferred
    bucket size, and central zone + keg statistics.

  - Add structure 'uma_percpu_stat', which, for each per-CPU cache,
    includes the number of allocations and frees, as well as the number
    of free items in the cache.

  - When the sysctl is queried, return a stream header, followed by a
    series of type descriptions, each consisting of a type header
    followed by a series of MAXCPUs uma_percpu_stat structures holding
    per-CPU allocation information.  Typical values of MAXCPU will be
    1 (UP compiled kernel) and 16 (SMP compiled kernel).

  This query mechanism allows user space monitoring tools to extract
  memory allocation statistics in a machine-readable form, and to do so
  at a per-CPU granularity, allowing monitoring of allocation patterns
  across CPUs in order to better understand the distribution of work and
  memory flow over multiple CPUs.

  While here, also export the number of UMA zones as a sysctl
  vm.uma_count, in order to assist in sizing user swpace buffers to
  receive the stream.

  A follow-up commit of libmemstat(3), a library to monitor kernel memory
  allocation, will occur in the next few days.  This change directly
  supports converting netstat(1)'s "-mb" mode to using UMA-sourced stats
  rather than separately maintained mbuf allocator statistics.

Approved by:	re (kensmith)
2005-07-23 15:05:24 +00:00
Robert Watson dc7a1fc3f8 Merge uma_int.h:1.32, uma_core.c:1.121 from HEAD to RELENG_6:
In addition to tracking allocs in the zone, also track frees.  Add
  a zone free counter, as well as a cache free counter.

Approved by:	re (kensmith)
2005-07-23 15:03:49 +00:00
Robert Watson 9c910b2e18 Merge uma_core.c:1.20 from HEAD to RELENG_6:
In an earlier world order, UMA would flush per-CPU statistics to the
  zone whenever it was moving buckets between the zone and the cache,
  or when coalescing statistics across the CPU.  Remove flushing of
  statistics to the zone when coalescing statistics as part of sysctl,
  as we won't be running on the right CPU to write to the cache
  statistics.

  Add a missed gathering of statistics: when uma_zalloc_internal()
  does a special case allocation of a single item, make sure to update
  the zone statistics to represent this.  Previously this case wasn't
  accounted for in user-visible statistics.

Approved by:	re (kensmith)
2005-07-23 15:01:48 +00:00
Hajimu UMEMOTO 3efa946cbc MFC 1.418: mention getaddrinfo(3) ABI breakage on 64 bit arch.
Approved by:	re (kensmith)
2005-07-22 20:21:50 +00:00
Hajimu UMEMOTO 180e5a2537 MFC: Remove padding for ABI compatibility of ai_addrlen member
from struct addrinfo.  This change break ABI compatibility on
64 bit arch.

	include/netdb.h:		1.39
	lib/libc/net/getaddrinfo.c:	1.70

Approved by:	re (kensmith)
2005-07-22 20:17:30 +00:00
Ken Smith 3f0da39ca5 Insta-MFC of the shared library version bump. All shared libraries
whose version has not already been bumped since RELENG_5 are being
bumped.

Revisions of files being MFC-ed:

> Path						Revision
> src/gnu/lib/libdialog/Makefile		1.43
> src/gnu/lib/libg2c/Makefile			1.16
> src/gnu/lib/libobjc/Makefile			1.27
> src/gnu/lib/libreadline/Makefile.inc		1.12
> src/gnu/lib/libregex/Makefile			1.32
> src/gnu/lib/libstdc++/Makefile		1.56
> src/kerberos5/lib/Makefile.inc		1.7
> src/lib/Makefile.inc				1.3
> src/lib/libalias/Makefile			1.31
> src/lib/libarchive/Makefile			1.37
> src/lib/libbegemot/Makefile			1.3
> src/lib/libbluetooth/Makefile			1.2
> src/lib/libbsnmp/Makefile.inc			1.6
> src/lib/libbz2/Makefile			1.6
> src/lib/libc_r/Makefile			1.42
> src/lib/libcrypt/Makefile			1.36
> src/lib/libdevstat/Makefile			1.15
> src/lib/libdevstat/devstat.h			1.11
> src/lib/libedit/Makefile			1.29
> src/lib/libexpat/Makefile			1.5
> src/lib/libfetch/Makefile			1.45
> src/lib/libftpio/Makefile			1.14
> src/lib/libgpib/Makefile			1.2
> src/lib/libipsec/Makefile			1.17
> src/lib/libkiconv/Makefile			1.3
> src/lib/libmagic/Makefile			1.7
> src/lib/libmp/Makefile			1.10
> src/lib/libncp/Makefile			1.6
> src/lib/libncurses/Makefile			1.79
> src/lib/libnetgraph/Makefile			1.11
> src/lib/libngatm/Makefile			1.6
> src/lib/libopie/Makefile			1.21
> src/lib/libpam/Makefile.inc			1.17
> src/lib/libpthread/Makefile			1.54
> src/lib/libradius/Makefile			1.12
> src/lib/libsdp/Makefile			1.4
> src/lib/libsmb/Makefile			1.8
> src/lib/libtacplus/Makefile			1.7
> src/lib/libthr/Makefile			1.14
> src/lib/libthread_db/Makefile			1.6
> src/lib/libugidfw/Makefile			1.7
> src/lib/libusbhid/Makefile			1.10
> src/lib/libutil/Makefile			1.57
> src/lib/libvgl/Makefile			1.11
> src/lib/libwrap/Makefile			1.17
> src/lib/libypclnt/Makefile			1.13
> src/lib/msun/Makefile				1.72
> src/secure/lib/libcrypto/Makefile		1.74
> src/secure/lib/libssh/Makefile		1.35
> src/secure/lib/libssl/Makefile		1.22
> src/usr.sbin/bsnmpd/modules/Makefile.inc	1.10

Reviewed by:	ru
Approved by:	re (scottl)
2005-07-22 17:29:10 +00:00
Scott Long 19997e47e0 MFC rev 1.55: Check the correct IDs for the Dell PERC3/S/Di filter driver.
Approved by: re
2005-07-22 16:29:51 +00:00
Maksim Yevmenkin 0b5d902920 MFC to RELENG_6
kbdmux(4) keyboard multiplexer integration

o Hook up kbdmux(4) to the build.

Approved by:	re (kensmith)
2005-07-21 17:47:27 +00:00
Ken Smith f9271dae74 Forced commit to note the RELENG_6 branch tag was added to this file so
it can be part of the 6.0 release.

Requested by:	emax
Approved by:	re (implicit)
2005-07-21 17:09:24 +00:00
Maksim Yevmenkin dc6648522c MFC to RELENG_6
kbdmux(4) keyboard multiplexer integration

o Teach kbdcontrol(1) how to attach/detach keyboards to/from the keyboard
  multiplexor;

o Update kbdcontrol(1) man page and document new functionality.

To attach/detach keyboard to/from keyboard multiplexor one needs to use
keyboard device name (i.e. ukbd0).

Approved by:	re (kensmith)
2005-07-21 17:04:02 +00:00
Ken Smith 218619d2eb Forced commit to note the RELENG_6 branch tag was added so this file
can be part of the 6.0 release.

Requested by:	emax
Approved by:	re (implicit)
2005-07-21 16:41:18 +00:00
Ken Smith 6ab5a30d48 Forced commit to note the RELENG_6 branch tag was added to this file
so it can be part of the 6.0 release.

Requested by:	emax
Approved by:	re (implicit)
2005-07-21 16:40:07 +00:00
Paul Saab 675663d93a MFC: rev 1.127
Fix for a NFS soft mounts bug where if the number of retries exceeds
the max rexmits, the request was not being bounced back with a
ETIMEDOUT error.

Approved by:	re
2005-07-21 16:19:02 +00:00
Robert Watson d9b4d8208c Merge ifconfig.8:1.98, ifconfig.c:1.115, ifconfig.h:1.17,
ifieee80211.c:1.19 from HEAD to RELENG_6:

  Add a new flag '-k' to ifconfig(8), indicating that it is alright to
  print potentially sensitive keying material to stdout.  With the new
  802.11 support, ifconfig(8) is now capable of printing 802.11 keys,
  and did by default for the root user, which is undesirable in some
  environments.  Now it will not print keying material unless requested
  (and available to the user).

Approved by:	re (kensmith)
2005-07-21 12:25:40 +00:00
cvs2svn fcc7eb90c9 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-07-20 21:10:58 +00:00
Hartmut Brandt 3dd8ef558e MFC to RELENG_6.
Fix the "..." special command. If this command is found all further
commands for this target are appended to the .END target instead
of beeing executed now. They are executed when the graph is finished.
There was a bug with executing the .END target which came in when
doing conversion to LST_FOREACH() which caused make to dump core.

PR:		bin/83698
Submitted by:	Max Okumoto <[email protected]>
Approved by:	re
2005-07-20 19:05:23 +00:00
Maksim Yevmenkin 484fe85e27 MFC to RELENG_6
kbdmux(4) keyboard multiplexer integration

o Add two new ioctl's KBADDKBD and KBRELKBD. These are used to add and remove
  keyboard to (and from) kbdmux(4) keyboard multiplexer;

o Introduce new kbd_find_keyboard2() function. It does exactly the same job
  as kbd_find_keyboard() function except it allows to specify starting index.
  This function can be used to iterate over keyboards array;

o Re-implement kbd_find_keyboard() as call to kbd_find_keyboard2() with starting
  index of zero;

o Make sure syscons(4) passed KBADDKBD and KBRELKBD ioctl's onto currently
  active keyboard.

These changes should not have any visible effect.

Approved by:	re (kensmith)
2005-07-20 18:56:21 +00:00
John Baldwin 73321f9f7f Regenerate.
Approved by:	re (kensmith) (implicit)
2005-07-20 17:43:53 +00:00
John Baldwin d9c455d827 MFC: Sync up the MP safe flags of the compat ABIs with the master list and
mark known-safe ABI syscall wrappers as MP safe.

Approved by:	re (kensmith)
2005-07-20 17:42:15 +00:00
Simon L. B. Nielsen c7033163cf MFC rev 1.116 of src/sys/fs/devfs/devfs_vnops.c:
Correct devfs ruleset bypass.

Submitted by:	csjp
Reviewed by:	phk
Security:	FreeBSD-SA-05:17.devfs
Approved by:	re (scottl)
2005-07-20 13:35:07 +00:00
Pawel Jakub Dawidek f2a20a86ef MFC: g_concat.c 1.25
g_stripe.c	1.26

Before calling g_orphan_provider(), add G_PF_WITHER flag, so GEOM will know
to destroy it.

PR:		kern/81758
Submitted by:	trasz <[email protected]>
Approved by:	re (kensmith)
2005-07-20 13:12:20 +00:00
Robert Watson 331f12d6fe Merge ip_input.c:1.302 from HEAD to RELENG_6:
Remove spl() calls from ip_slowtimo(), as IP fragment queue locking was
  merged several years ago.

Approved by:	re (kensmith)
2005-07-20 12:03:38 +00:00
Robert Watson ca00b7f8a8 Merge if_sbsh.c:1.13 from HEAD to RELENG_6:
Mark if_sbsh as IFF_NEEDSGIANT, because it does.

Approved by:	re (kensmith)
2005-07-20 09:41:52 +00:00
Robert Watson 7245178f54 Merge if_cnw.c:1.19 from HEAD to RELENG_6:
Mark if_cnw as IFF_NEEDSGIANT, because it does.

Approved by:	re (kensmith)
2005-07-20 09:41:08 +00:00
Andrew Thompson 553561ff8f MFC: Allow interfaces with MTU != 1500 to be bridged
> 1.6       +3 -0      src/share/man/man4/if_bridge.4
> 1.12      +6 -1      src/sys/net/if_bridge.c

Approved by:	re (kensmith), mlaier (mentor)
2005-07-19 23:25:39 +00:00
John Baldwin 83b3a3b0e5 MFC: Add 'sysent' target.
Approved by:	re (kensmith)
2005-07-18 19:54:49 +00:00
John Baldwin 693129ffa7 MFC: Fix instant panics when booting with debug.mpsafevm=0 by fixing up
an old test.

Approved by:	re (kensmith)
2005-07-18 19:53:21 +00:00
John Baldwin a66c012789 MFC: Set timer0_max_count to a correct value in the lapic timer case and
fix i8254_restore() so that it actually works in the non-lapic timer case
thus unbreaking suspend/resume for several people.

Approved by:	re (kensmith)
2005-07-18 19:52:05 +00:00
John Baldwin 0cf8ca56fe MFC: Wrap freebsd32_mmap_partial() with Giant.
Approved by:	re (kensmith)
2005-07-18 19:49:48 +00:00
John Baldwin 98a54bfa70 Regenerate after IPC syscall addition.
Approved by:	re (kensmith) (implicit)
2005-07-18 19:48:44 +00:00
John Baldwin b3c5f9841c MFC: Stop hardcoding #define's and hook up the IPC syscalls.
Approved by:	re (kensmith)
2005-07-18 19:48:13 +00:00
John Baldwin 4eea996813 MFC: Don't provide an acpi attachment for the non-pnp mss(4) driver.
Approved by:	re (kensmith)
MFC after:	1 week
2005-07-18 19:46:38 +00:00
John Baldwin 57b2704343 MFC: Ignore BIOS IRQs > 15.
Approved by:	re (kensmith)
MFC after:	1 week
2005-07-18 19:45:21 +00:00
John Baldwin 44de88001d MFC: Don't probe PnP ISA devices.
Approved by:	re (kensmith)
MFC after:	1 week
2005-07-18 19:43:45 +00:00
Pawel Jakub Dawidek 4633afd963 MFC: geom_raid3.c 1.12
Don't forget to initialize 'id' field.

Approved by:	re (kensmith)
2005-07-18 16:14:21 +00:00
Yaroslav Tykhiy a97fa107c5 MFC 1.114: Add missing symbolic names of new interface flags.
Approved by:	re (kensmith)
2005-07-18 14:02:19 +00:00
Ken Smith 2c50af1e2f MFC addition of the COMPAT_FREEBSD5 option. Specific versions
being MFCed:

> Path                          Revision
> src/sys/alpha/conf/GENERIC    1.187
> src/sys/amd64/conf/GENERIC    1.440
> src/sys/i386/conf/GENERIC     1.430
> src/sys/ia64/conf/GENERIC     1.73
> src/sys/pc98/conf/GENERIC     1.270
> src/sys/powerpc/conf/GENERIC  1.49
> src/sys/sparc64/conf/GENERIC  1.97

Approved by:    re (scottl)
2005-07-18 12:23:42 +00:00
Peter Grehan 536a114421 MFC: r1.22
Remove obsolete ttya/ttyb entries and replace with ttyy0/1.
Mark origin of ofw_console(4) and zs(4) devices.

Approved by:	re (Ken Smith)
2005-07-18 12:06:38 +00:00
Sheldon Hearn 49789c8663 MFC rev 1.34: regen
Approved by:	re (kensmith)
2005-07-18 07:45:17 +00:00
Joe Marcus Clarke 7cbc8b473d MFC: revs 1.23 and 1.24
* Replace fch{mod,own} with straight ch{mod,own} as the former cannot be used
  on socket file descriptors
* Open permissions on /var/run/devd.pipe so that any user can read devd events
  from this socket
* Enable non-blocking I/O on devd.pipe to keep clients from wedging devd.
  If a write(2) on devd.pipe would block, the client in question will be
  removed

Approved by:	re (kensmith)
2005-07-18 02:10:22 +00:00
Robert Watson 1ff39e3d4b Merge pmcstat.8:1.6 from HEAD to RELENG_6:
Fix spelling error in sample command.

Approved by:	re (hrs)
2005-07-17 19:32:27 +00:00
Robert Watson 5b6aa6b30e Merge sem_init.3:1.18, sem_post.3:1.15, sem_wait.3:1.13 from HEAD to
RELENG_6:

  Cross-reference sem_getvalue(3) from several other semaphore-related
  functions.

Approved by:	re (hrs)
2005-07-17 19:28:55 +00:00
Xin LI 2fe0b3eca2 MFC revision 1.13
date: 2005/07/13 10:40:07;  author: delphij;  state: Exp;  lines: +7 -4
Better memory handling:

 - It is acceptable to call free(3) when the given pointer itself
   is NULL, so we do not need to determine NULL before passing
   a pointer to free(3)
 - Handle failure of malloc(3)

Submitted by:	Dan Lukes <dan at obluda cz>
PR:		bin/83352
Approved by:	re (scottl)
2005-07-17 17:29:22 +00:00
Christian Brueffer 8041946bb9 MFC:
- Remove MLINKS to nonexistant manpages
- Change some section numbers to match reality
- For MLINKS to manpages from ports, mention which port installs them

Approved by:	re (hrs)
2005-07-17 15:03:36 +00:00
Christian Brueffer b9f7c53437 MFC: rev. 1.321
MLINK firewire.4 to ieee1394.4

Approved by:	re (hrs)
2005-07-17 14:48:55 +00:00
Christian Brueffer 27294cdf64 MFC: rev. 1.96 + 1.97
Information about the capability flags in 'ifconfig foo0 scan' output.

Approved by:	re (hrs), (earlier version)
2005-07-16 19:09:56 +00:00
Christian Brueffer 368bf4117b MFC:
Spelling and grammar fixes.

Approved by:	re (kensmith)
2005-07-16 19:02:21 +00:00
Hideyuki KURASHINA 7d059b855d In Contributed Software section,
- lukemftp is derived from NetBSD, actually.
  - Unify OpenPAM entries.

Fix a typo.

Approved by:	re (hrs)
2005-07-15 18:39:44 +00:00
cvs2svn 25cea8d441 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-15 15:19:22 +00:00
Hiroki Sato b782659d00 Update $RDIR to 6-STABLE.
Approved by:	re (implicitly)
2005-07-15 15:19:21 +00:00
Hiroki Sato b2b76485d5 Update version numbers to 6-STABLE.
Approved by:	re (implicitly)
2005-07-15 15:18:42 +00:00
Renato Botelho 140f02b650 Add myself to FreeBSD calendar
Approved by:	re (Ken Smith), flz (mentor)
2005-07-15 14:46:00 +00:00
Ken Smith 1b232a83d4 Sync name with current BETA builds.
Approved by:	re (implicit)
2005-07-15 11:40:36 +00:00
Ken Smith 7e967f429a Drop the -A argument to the cvs command which is no longer necessary.
Noticed by:	delphij, ru
Pointy hat:	kensmith
Approved by:	re (implicit)
2005-07-14 15:47:48 +00:00
Ken Smith 882f477d3c Retro-fit packages-5.4-release entry.
Approved by:	re (implicit)
2005-07-11 16:14:21 +00:00
Ken Smith 0069ee36ba Update branch tag.
Approved by:	re (implicit)
2005-07-11 16:07:25 +00:00
Ken Smith cdc8bfa000 Suggest this is a -STABLE branch now.
Approved by:	re (implicit)
2005-07-11 16:06:30 +00:00
Ken Smith 22bab6ba12 Add 7.0 as a version not in doc-common.
Approved by:	re (implicit)
2005-07-11 16:04:22 +00:00
Ken Smith 25df33fe8e Note date of RELENG_6 branch.
Approved by:	re (implicit)
2005-07-11 16:02:28 +00:00
Ken Smith 3f429c0918 Add branch tag for cvs update operation.
Approved by:	re (implicit)
2005-07-11 16:01:33 +00:00
Scott Long 8714d54f58 Welcome to 6.0-BETA. I, for one, welcome our new RELENG_6 overlords.
Approved by: re
2005-07-11 08:45:10 +00:00
cvs2svn a4f5516f10 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:57 +00:00
cvs2svn 8a9a437087 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:56 +00:00
cvs2svn 86f4d4698a This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:55 +00:00
cvs2svn 1ddddd2edd This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:54 +00:00
cvs2svn 111fd7df02 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:53 +00:00
cvs2svn 13c0dfd4a2 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:52 +00:00
cvs2svn 5efe4ee6a3 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:51 +00:00
cvs2svn 645e89f064 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:50 +00:00
cvs2svn 42f74320a3 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:49 +00:00
cvs2svn 0c8b24e30c This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:48 +00:00
cvs2svn 6c394c22fc This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:47 +00:00
cvs2svn cab8591922 This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:46 +00:00
cvs2svn 581cf4279c This commit was manufactured by cvs2svn to create branch 'RELENG_6_1'. 2005-07-11 04:14:45 +00:00
cvs2svn 6ac68e81ff This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-07-11 04:14:43 +00:00
4948 changed files with 588534 additions and 463997 deletions

No files matched your search

+1 -1
View File
@@ -4,7 +4,7 @@
The compilation of software known as FreeBSD is distributed under the
following terms:
Copyright (C) 1992-2005 The FreeBSD Project. All rights reserved.
Copyright (C) 1992-2006 The FreeBSD Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
+1
View File
@@ -9,3 +9,4 @@ subsystem login expires notes
Special cases:
src/* RELENG_4_* Requires Security Officer approval.
src/* RELENG_5_* Requires Security Officer approval.
src/* RELENG_6_* Requires Security Officer approval.
+31 -26
View File
@@ -16,6 +16,9 @@
# reinstallkernel.debug
# kernel - buildkernel + installkernel.
# update - Convenient way to update your source tree (cvs).
# check-old - Print a list of old files/directories in the system.
# delete-old - Delete obsolete files and directories interactively.
# delete-old-libs - Delete obsolete libraries interactively.
#
# This makefile is simple by design. The FreeBSD make automatically reads
# the /usr/share/mk/sys.mk unless the -m argument is specified on the
@@ -38,15 +41,17 @@
# For individuals wanting to upgrade their sources (even if only a
# delta of a few days):
#
# 1. `cd /usr/src' (or to the directory containing your source tree).
# 2. `make buildworld'
# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
# 5. `reboot' (in single user mode: boot -s from the loader prompt).
# 6. `mergemaster -p'
# 7. `make installworld'
# 8. `mergemaster'
# 9. `reboot'
# 1. `cd /usr/src' (or to the directory containing your source tree).
# 2. `make buildworld'
# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
# 5. `reboot' (in single user mode: boot -s from the loader prompt).
# 6. `mergemaster -p'
# 7. `make installworld'
# 8. `make delete-old'
# 9. `mergemaster'
# 10. `reboot'
# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore)
#
# See src/UPDATING `COMMON ITEMS' for more complete information.
#
@@ -62,9 +67,9 @@
# developer convenience only. They are intentionally not documented and
# completely subject to change without notice.
#
TGTS= all all-man buildenv buildkernel buildworld checkdpadd clean \
cleandepend cleandir depend distribute distributeworld \
distribution everything \
TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \
clean cleandepend cleandir delete-old delete-old-libs depend \
distribute distributeworld distrib-dirs distribution everything \
hierarchy install installcheck installkernel installkernel.debug\
reinstallkernel reinstallkernel.debug installworld \
kernel-toolchain libraries lint maninstall \
@@ -88,11 +93,11 @@ TGTS+= ${BITGTS}
PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj
_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
-f /dev/null -V MAKEOBJDIRPREFIX dummy
.if !empty(_MAKEOBJDIRPREFIX)
.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
(in /etc/make.conf) or command-line variable.
(in make.conf(5)) or command-line variable.
.endif
MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
BINMAKE= \
@@ -254,6 +259,7 @@ make: .PHONY
# with a reasonable chance of success, regardless of how old your
# existing system is.
#
.if make(universe)
universe: universe_prologue
universe_prologue:
@echo "--------------------------------------------------------------"
@@ -262,6 +268,10 @@ universe_prologue:
.for target in i386 i386:pc98 sparc64 alpha ia64 amd64
.for arch in ${target:C/:.*$//}
.for mach in ${target:C/^.*://}
KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \
find [A-Z]*[A-Z] -type f -maxdepth 0 \
! -name DEFAULTS ! -name LINT
KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/}
universe: universe_${mach}
.ORDER: universe_prologue universe_${mach} universe_epilogue
universe_${mach}:
@@ -275,7 +285,13 @@ universe_${mach}:
-cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \
> ${.CURDIR}/_.${mach}.makeLINT 2>&1
.endif
cd ${.CURDIR} && ${MAKE} buildkernels TARGET_ARCH=${arch} TARGET=${mach}
.for kernel in ${KERNCONFS}
-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
TARGET_ARCH=${arch} TARGET=${mach} \
KERNCONF=${kernel} \
__MAKE_CONF=/dev/null \
> _.${mach}.${kernel} 2>&1
.endfor
@echo ">> ${mach} completed on `LC_ALL=C date`"
.endfor
.endfor
@@ -286,15 +302,4 @@ universe_epilogue:
@echo ">>> make universe completed on `LC_ALL=C date`"
@echo " (started ${STARTTIME})"
@echo "--------------------------------------------------------------"
.if make(buildkernels)
KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \
find [A-Z]*[A-Z] -type f -maxdepth 0 ! -name NOTES
buildkernels:
.for kernel in ${KERNCONFS}
-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
KERNCONF=${kernel} \
__MAKE_CONF=/dev/null \
> _.${TARGET}.${kernel} 2>&1
.endfor
.endif
+138 -33
View File
@@ -87,7 +87,7 @@ CLEANDIR= cleandir
.endif
CVS?= cvs
CVSFLAGS?= -A -P -d -I!
CVSFLAGS?= -r RELENG_6_1 -P -d -I!
SUP?= /usr/local/bin/cvsup
SUPFLAGS?= -g -L 2 -P -
.if defined(SUPHOST)
@@ -236,14 +236,8 @@ LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
SHLIBDIR=/usr/lib32
LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML \
CC="${CC} ${LIB32CC}" \
CXX="${CXX} ${LIB32CXX}" \
OBJC="${OBJC} ${LIB32OBJC}" \
LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
AS="${AS} --32" \
LIBDIR=/usr/lib32 \
SHLIBDIR=/usr/lib32
-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML
LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS
.endif
# install stage
@@ -280,6 +274,9 @@ _worldtmp:
@echo "--------------------------------------------------------------"
.if !defined(NO_CLEAN)
rm -rf ${WORLDTMP}
.if ${TARGET_ARCH} == "amd64"
rm -rf ${LIB32TMP}
.endif
.else
rm -rf ${WORLDTMP}/legacy/usr/include
# XXX - These two can depend on any header file.
@@ -338,6 +335,9 @@ _cleanobj:
@echo ">>> stage 2.1: cleaning up the object tree"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
.if ${TARGET_ARCH} == "amd64"
rm -rf ${OBJTREE}/lib32
.endif
.endif
_obj:
@echo
@@ -397,6 +397,7 @@ build32:
.endfor
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${LIB32TMP}/usr/include >/dev/null
mkdir -p ${WORLDTMP}
ln -sf ${.CURDIR}/sys ${WORLDTMP}
.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
.for _t in obj depend all
@@ -441,12 +442,12 @@ distribute32 install32:
.else
mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
.endif
cd ${.CURDIR}/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.if !defined(NO_CRYPT)
cd ${.CURDIR}/secure/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.endif
cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} ${.TARGET:S/32$//}
cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
.endif
@@ -479,13 +480,27 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
#
SPECIAL_INSTALLCHECKS=
#
# Require DESTDIR to be set if installing for a different architecture.
#
.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
.if !make(distributeworld)
SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR
installcheck_DESTDIR:
.if !defined(DESTDIR) || empty(DESTDIR)
@echo "ERROR: Please set DESTDIR!"; \
false
.endif
.endif
.endif
#
# installcheck
#
# Checks to be sure system is ready for installworld
#
CHECK_UIDS=
CHECK_GIDS=
CHECK_GIDS= audit
.if !defined(NO_SENDMAIL)
CHECK_UIDS+= smmsp
CHECK_GIDS+= smmsp
@@ -521,7 +536,7 @@ distributeworld installworld: installcheck
mkdir -p ${INSTALLTMP}
for prog in [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep install-info \
ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
test true uname wc zic; do \
cp `which $$prog` ${INSTALLTMP}; \
done
@@ -558,8 +573,8 @@ redistribute:
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32
.endif
distribution:
cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} distribution
distrib-dirs distribution:
cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} ${.TARGET}
#
# buildkernel and installkernel
@@ -691,12 +706,6 @@ reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS}
@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
false
.endif
@echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; \
${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel"
@echo "--------------------------------------------------------------"
@@ -776,7 +785,7 @@ _strfile= games/fortune/strfile
.if !defined(NO_CXX)
_gperf= gnu/usr.bin/gperf
.if ${BOOTSTRAPPING} < 500113
.if ${BOOTSTRAPPING} < 600101
_groff= gnu/usr.bin/groff
.else
_groff= gnu/usr.bin/groff/tmac
@@ -803,6 +812,10 @@ _gencat= usr.bin/gencat
_mklocale= usr.bin/mklocale
.endif
.if ${BOOTSTRAPPING} < 600106
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
.if !defined(NO_RESCUE) && \
${BOOTSTRAPPING} < 600008
_crunchgen= usr.sbin/crunch/crunchgen
@@ -826,6 +839,7 @@ bootstrap-tools:
${_mklocale} \
usr.bin/rpcgen \
usr.bin/xinstall \
${_gensnmptree} \
usr.sbin/config \
${_crunchgen} \
${_pwd_mkdb}
@@ -973,14 +987,6 @@ _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
lib/libopie__L lib/libtacplus__L: lib/libmd__L
.if !defined(NO_BIND)
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
_prebuild_libs+= lib/libc_r
.else
_prebuild_libs+= lib/libpthread
.endif
.endif
_generic_libs+= lib
.if !defined(NO_CRYPT)
@@ -1011,7 +1017,7 @@ _prebuild_libs+= lib/libypclnt
_generic_libs+= usr.bin/lex/lib
.if ${MACHINE_ARCH} == "i386"
.if ${MACHINE} == "i386"
_generic_libs+= usr.sbin/pcvt/keycap
.endif
@@ -1058,3 +1064,102 @@ par-${__target}: ${SUBDIR:S/$/.${__target}__D/}
.endfor
.include <bsd.subdir.mk>
.if make(delete-old) || make(delete-old-libs) || make(check-old)
#
# check for / delete old files section
#
.include "ObsoleteFiles.inc"
OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \
else you can not start such an application. Consult UPDATING for more \
information regarding how to cope with the removal/revision bump of a \
specific library."
.if !defined(BATCH_DELETE_OLD_FILES)
RM_I=-i
.else
RM_I=-v
.endif
delete-old-files:
@echo ">>> Removing old files (only deletes safe to delete libs)"
.for file in ${OLD_FILES}
# Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry.
@[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \
|| ([ -f "${DESTDIR}/${file}" ] \
&& echo "Removing schg flag on ${DESTDIR}/${file}" \
&& chflags noschg "${DESTDIR}/${file}" \
&& rm ${RM_I} "${DESTDIR}/${file}"))
.endfor
# Remove catpages without corresponding manpages.
@3<&0; \
find ${DESTDIR}/usr/share/man/cat* ! -type d | \
sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
while read catpage; do \
read manpage; \
if [ ! -e "$${manpage}" ]; then \
rm ${RM_I} $${catpage} <&3 ; \
fi; \
done
@echo ">>> Old files removed"
check-old-files:
@echo ">>> Checking for old files"
.for file in ${OLD_FILES}
@[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}"
.endfor
# Check for catpages without corresponding manpages.
@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
while read catpage; do \
read manpage; \
if [ ! -e "$${manpage}" ]; then \
echo $${catpage} ; \
fi; \
done
delete-old-libs:
@echo ">>> Removing old libraries"
@echo "${OLD_LIBS_MESSAGE}" | fmt
.for file in ${OLD_LIBS}
@[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \
|| ([ -f "${DESTDIR}/${file}" ] \
&& echo "Removing schg flag on ${DESTDIR}/${file}" \
&& chflags noschg "${DESTDIR}/${file}" \
&& rm ${RM_I} "${DESTDIR}/${file}"))
.endfor
@echo ">>> Old libraries removed"
check-old-libs:
@echo ">>> Checking for old libraries"
.for file in ${OLD_LIBS}
@[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}"
.endfor
delete-old-dirs:
@echo ">>> Removing old directories"
.for dir in ${OLD_DIRS}
# Don't fail if an old directory isn't empty.
@[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true)
.endfor
@echo ">>> Old directories removed"
check-old-dirs:
@echo ">>> Checking for old directories"
.for dir in ${OLD_DIRS}
@[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}"
.endfor
delete-old: delete-old-files delete-old-dirs
@echo "To remove old libraries run '${MAKE} delete-old-libs'."
check-old: check-old-files check-old-libs check-old-dirs
@echo "To remove old files and directories run '${MAKE} delete-old'."
@echo "To remove old libraries run '${MAKE} delete-old-libs'."
.endif
+2861
View File
File diff suppressed because it is too large. Load diff
+2
View File
@@ -59,6 +59,8 @@ libexec System daemons.
release Release building Makefile & associated tools.
rescue Build system for statically linked /rescue utilities.
sbin System commands.
secure Cryptographic libraries and commands.
+218 -25
View File
@@ -1,4 +1,4 @@
Updating Information for FreeBSD current users
Updating Information for FreeBSD STABLE users
This file is maintained and copyrighted by M. Warner Losh
<[email protected]>. See end of file for further details. For commonly
@@ -8,18 +8,200 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade.
NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW:
FreeBSD 6.x has many debugging features turned on, in
both the kernel and userland. These features attempt to detect
incorrect use of system primitives, and encourage loud failure
through extra sanity checking and fail stop semantics. They
also substantially impact system performance. If you want to
do performance measurement, benchmarking, and optimization,
you'll want to turn them off. This includes various WITNESS-
related kernel options, INVARIANTS, malloc debugging flags
in userland, and various verbose features in the kernel. Many
developers choose to disable these features on build machines
to maximize performance.
20080416: p24 FreeBSD-SA-08:05.openssh
Fix logic error in sshd(8) concerning the handling of failed
attempts to bind ports for X11 forwarding.
20080214: p23 FreeBSD-SA-08:02.sendfile
Fix sendfile(2) write-only file permission bypass.
20080114: p22 FreeBSD-SA-08:01.pty
Fix issues which allow snooping on ptys.
20071129: p21 FreeBSD-SA-07:09.random
Correct a random value disclosure in random(4).
20071003: p20 FreeBSD-SA-07:08.openssl
Correct a buffer overflow in OpenSSL SSL_get_shared_ciphers().
20070801: p19 FreeBSD-SA-07:06.tcpdump, FreeBSD-SA-07:07.bind
Correct a buffer overflow in tcpdump(1). [07:06]
Correct predictable query ids in named(8). [07:07]
20070712: p18 FreeBSD-SA-07:05.libarchive
Correct multiple security issues in how libarchive handles
corrupt tar archives, including a potentially exploitable
buffer overflow.
20070523: p17 FreeBSD-SA-07:04.file
Fix buffer overflow in libmagic(3).
20070426: p16 FreeBSD-SA-07:03.ipv6
Disable processing of IPv6 type 0 Routing Headers. This behaviour
can be changed via the (newly added) net.inet6.ip6.rthdr0_allowed
sysctl.
20070228: p15 FreeBSD-EN-07:04.zoneinfo
Update zoneinfo files for change in Daylight Savings Time that
begins in 2007.
20070214: p14 FreeBSD-EN-07:01.nfs
Correct problems with locking, namei leakage, and symlink
creation in the NFS subsystem.
20070209: p13 FreeBSD-SA-07:02.bind
Correct two remote denials of service in BIND involving DNSSEC and
recursive DNS queries respectively.
20070111: p12 FreeBSD-SA-07:01.jail
Correct jail rc.d script privilege escalation.
20061206 p11 FreeBSD-SA-06:25.kmem
Correct a signedness bug which allowed members of the operator
group to read kernel memory.
20060930: p10 FreeBSD-SA-06:22.openssh
Correct multiple vulnerabilities in sshd(8).
20060929: p9 FreeBSD-SA-06:23.openssl
Correct problem in the 2006-09-28 patch concerning the handling of
excessively large DH moduli.
20060928: p8 FreeBSD-SA-06:23.openssl
Correct multiple vulnerabilities in crypto(3).
Limit the size of public keys used in order to protect applications
from a denial of service via insane key sizes.
20060919: p7 FreeBSD-SA-06:21.gzip
Correct multiple vulnerabilities in gzip(1).
20060906: p6 FreeBSD-SA-06:19.openssl, FreeBSD-SA-06:20.bind
Correct incorrect PKCS#1 v1.5 padding validation in
crypto(3). [06:19]
Correct multiple denial-of-service vulnerabilities in BIND related to
SIG Query Processing and Excessive Recursive Queries. [06:20]
20060828: p5 FreeBSD-EN-06:02.net
Correct several problems in the network stack, including a
locally-triggered kernel panic, inaccuracy in reported memory
allocation statistics, and problems on IPv6 point-to-point links.
20060823: p4 FreeBSD-SA-06:18.ppp
Correct buffer overflow in the handling of LCP options in ppp(4).
20060707: p3 FreeBSD-EN-06:01.jail
Correct bug in the startup scripts for jails.
20060614: p2 FreeBSD-SA-06:17.sendmail
Correct a bug in the handling of multipart messages by sendmail(8)
which can allow a malformed message to crash a sendmail queue
processing process.
20060531: p1 FreeBSD-SA-06:15.ypserv, FreeBSD-SA-06:16.smbfs
Enable inadvertantly disabled "securenet" access controls in
ypserv. [06:15]
Correct a bug in the handling of backslash characters in smbfs
which can allow an attacker to escape from a chroot(2). [06:16]
20060506:
FreeBSD 6.1-RELEASE
20060419: FreeBSD-SA-06:14.fpu
Correct a local information leakage bug affecting AMD FPUs.
20060309:
The support for Linux applications the 3dfx kernel module used
to provide is in a separate module named 3dfx_linux now. The
latter will pull in 3dfx.ko and linux.ko through its dependencies
when loaded.
20060211:
An IPv6 support of ipfw was enabled by default. If you don't
want to filter an IPv6 by ipfw, please add following line into
your ipfw rule:
pass ip6 from any to any
20060210:
Now most modules get their build-time options from the kernel
configuration file. A few modules still have fixed options
due to their non-conformant implementation, but they will be
corrected eventually. You may need to review the options of
the modules in use, explicitly specify the non-default options
in the kernel configuration file, and rebuild the kernel and
modules afterwards.
20060204:
The 'audit' group was added to support the new auditing functionality
in the base system. Be sure to follow the directions for updating,
including the requirement to run mergemaster -p.
20060127:
The i386 loader(8) now defaults to the serial speed set by the
previous boot stage, if the comconsole is already in use. If
you've changed BOOT_COMCONSOLE_SPEED in make.conf(5) and
installed a new loader, but have not rebuilt and reinstalled the
boot blocks, then your loader will leave the console at 9600
baud. Either install the new boot blocks, or set
comconsole_speed in loader.conf(5). Note that the new boot
blocks also support a -S<speed> flag described in boot(8).
20060122:
/etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp.
Its /etc/rc.conf.d configuration file has been `ppp' from
the beginning, and hence there is no need to touch it.
20060113:
si(4)'s device files now contain the unit number.
Uses of {cua,tty}A[0-9a-f] should be replaced by {cua,tty}A0[0-9a-f].
20051230:
A lot of fixes and new features in the soundsystem. To get all
benefits, you may want to recompile mplayer (if installed) after
booting the new world.
20051222:
Bug fixes to the trimdomain(3) function in libutil may result in
slight changes to the host names appearing in log files under
relatively rare circumstances.
20051220:
Scripts in the local_startup directories (as defined in
/etc/defaults/rc.conf) that have the new rc.d semantics will
now be run as part of the base system rcorder. If there are
errors or problems with one of these local scripts, it could
cause boot problems. If you encounter such problems, boot in
single user mode, remove that script from the */rc.d directory.
Please report the problem to the port's maintainer, and the
[email protected] mailing list.
20051215:
The setkey(8) utility was moved from /usr/sbin/setkey to /sbin/setkey.
You may want to update scripts which depend on its location.
20051108:
rp(4)'s device files now contain the unit number.
Uses of {cua,tty}R[0-9a-f] should be replaced by {cua,tty}R0[0-9a-f].
20051101:
FreeBSD 6.0-RELEASE
20051001:
kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8)
to turn polling(4) on your interfaces.
20050722:
The ai_addrlen of a struct addrinfo was changed to a socklen_t
to conform to POSIX-2001. This change broke an ABI
compatibility on 64 bit architecture. You have to recompile
userland programs that use getaddrinfo(3) on 64 bit
architecture.
20050711:
RELENG_6 branched here.
20050629:
The pccard_ifconfig rc.conf variable has been removed and a new
@@ -90,7 +272,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW:
20050227:
The on-disk format of LC_CTYPE files was changed to be machine
independent. Please make sure NOT to use NO_CLEAN buildworld
when crossing this point.
when crossing this point. Crossing this point also requires
recompile or reinstall of all locale depended packages.
20050225:
The ifi_epoch member of struct if_data has been changed to
@@ -224,6 +407,16 @@ COMMON ITEMS:
prefix all make commands with 'env -i '. See the env(1) manual
page for more details.
Due to several updates to the build infrastructure, source
upgrades from versions prior to 5.3 no longer supported.
When upgrading from one major version to another it is generally
best to upgrade to the latest code in the currently installed branch
first, then do an upgrade to the new branch. This is the best-tested
upgrade path, and has the highest probability of being successful.
Please try this approach before reporting problems with a major
version upgrade.
To build a kernel
-----------------
If you are updating from a prior version of FreeBSD (even one just
@@ -242,7 +435,7 @@ COMMON ITEMS:
To just build a kernel when you know that it won't mess you up
--------------------------------------------------------------
This assumes you are already running a 5.X system. Replace
This assumes you are already running a 6.X system. Replace
${arch} with the architecture of your machine (e.g. "i386",
"alpha", "amd64", "ia64", "pc98", "sparc64", etc).
@@ -267,6 +460,7 @@ COMMON ITEMS:
<reboot in single user> [3]
mergemaster -p [5]
make installworld
make delete-old
mergemaster [4]
<reboot>
@@ -295,8 +489,8 @@ COMMON ITEMS:
<reboot>
To upgrade in-place from 5.x-stable to current
----------------------------------------------
To upgrade in-place from 5.x-stable or higher to 6.x-stable
-----------------------------------------------------------
<make sure you have good level 0 dumps>
make buildworld [9]
make kernel KERNCONF=YOUR_KERNEL_HERE [8]
@@ -304,6 +498,7 @@ COMMON ITEMS:
<reboot in single user> [3]
mergemaster -p [5]
make installworld
make delete-old
mergemaster -i [4]
<reboot>
@@ -341,15 +536,13 @@ COMMON ITEMS:
[5] Usually this step is a noop. However, from time to time
you may need to do this if you get unknown user in the following
step. It never hurts to do it all the time. You may need to
install a new mergemaster (cd src/usr.sbin/mergemaster && make
install) after the buildworld before this step if you last updated
from current before 20020224 or from -stable before 20020408.
step. It never hurts to do it all the time.
[8] In order to have a kernel that can run the 4.x binaries
needed to do an installworld, you must include the COMPAT_FREEBSD4
[8] In order to have a kernel that can run the 5.x binaries
needed to do an installworld, you must include the COMPAT_FREEBSD5
option in your kernel. Failure to do so may leave you with a system
that is hard to boot to recover.
that is hard to boot to recover. A similar kernel option COMPAT_FREEBSD5
is required to run the 5.x binaries on more recent kernels.
Make sure that you merge any new devices from GENERIC since the
last time you updated your kernel config file.
@@ -367,7 +560,7 @@ COMMON ITEMS:
FORMAT:
This file contains a list, in reverse chronological order, of major
breakages in tracking -current. Not all things will be listed here,
breakages in tracking -STABLE. Not all things will be listed here,
and it only starts on October 16, 2004. Updating files can found in
previous releases if your system is older than this.
+4 -1
View File
@@ -363,7 +363,10 @@ copy(char *argv[], enum op type, int fts_options)
*/
if (pflag) {
if (setfile(curr->fts_statp, -1))
rval = 1;
rval = 1;
if (preserve_dir_acls(curr->fts_statp,
curr->fts_accpath, to.p_path) != 0)
rval = 1;
} else {
mode = curr->fts_statp->st_mode;
if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) ||
+2
View File
@@ -46,5 +46,7 @@ int copy_file(const FTSENT *, int);
int copy_link(const FTSENT *, int);
int copy_special(struct stat *, int);
int setfile(struct stat *, int);
int preserve_dir_acls(struct stat *, char *, char *);
int preserve_fd_acls(int, int);
void usage(void);
__END_DECLS
+80
View File
@@ -35,6 +35,8 @@ static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/acl.h>
#include <sys/param.h>
#include <sys/stat.h>
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
@@ -204,6 +206,8 @@ copy_file(const FTSENT *entp, int dne)
if (pflag && setfile(fs, to_fd))
rval = 1;
if (pflag && preserve_fd_acls(from_fd, to_fd) != 0)
rval = 1;
(void)close(from_fd);
if (close(to_fd)) {
warn("%s", to.p_path);
@@ -326,6 +330,82 @@ setfile(struct stat *fs, int fd)
return (rval);
}
int
preserve_fd_acls(int source_fd, int dest_fd)
{
struct acl *aclp;
acl_t acl;
if (fpathconf(source_fd, _PC_ACL_EXTENDED) != 1 ||
fpathconf(dest_fd, _PC_ACL_EXTENDED) != 1)
return (0);
acl = acl_get_fd(source_fd);
if (acl == NULL) {
warn("failed to get acl entries while setting %s", to.p_path);
return (1);
}
aclp = &acl->ats_acl;
if (aclp->acl_cnt == 3)
return (0);
if (acl_set_fd(dest_fd, acl) < 0) {
warn("failed to set acl entries for %s", to.p_path);
return (1);
}
return (0);
}
int
preserve_dir_acls(struct stat *fs, char *source_dir, char *dest_dir)
{
acl_t (*aclgetf)(const char *, acl_type_t);
int (*aclsetf)(const char *, acl_type_t, acl_t);
struct acl *aclp;
acl_t acl;
if (pathconf(source_dir, _PC_ACL_EXTENDED) != 1 ||
pathconf(dest_dir, _PC_ACL_EXTENDED) != 1)
return (0);
/*
* If the file is a link we will not follow it
*/
if (S_ISLNK(fs->st_mode)) {
aclgetf = acl_get_link_np;
aclsetf = acl_set_link_np;
} else {
aclgetf = acl_get_file;
aclsetf = acl_set_file;
}
/*
* Even if there is no ACL_TYPE_DEFAULT entry here, a zero
* size ACL will be returned. So it is not safe to simply
* check the pointer to see if the default ACL is present.
*/
acl = aclgetf(source_dir, ACL_TYPE_DEFAULT);
if (acl == NULL) {
warn("failed to get default acl entries on %s",
source_dir);
return (1);
}
aclp = &acl->ats_acl;
if (aclp->acl_cnt != 0 && aclsetf(dest_dir,
ACL_TYPE_DEFAULT, acl) < 0) {
warn("failed to set default acl entries on %s",
dest_dir);
return (1);
}
acl = aclgetf(source_dir, ACL_TYPE_ACCESS);
if (acl == NULL) {
warn("failed to get acl entries on %s", source_dir);
return (1);
}
aclp = &acl->ats_acl;
if (aclsetf(dest_dir, ACL_TYPE_ACCESS, acl) < 0) {
warn("failed to set acl entries on %s", dest_dir);
return (1);
}
return (0);
}
void
usage(void)
{
+19 -1
View File
@@ -68,12 +68,30 @@ NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
.if defined(NO_NLS_CATALOGS) || defined(RESCUE)
CFLAGS+= -DNO_NLS_CATALOGS
.else
CFLAGS+= -DHAVE_ICONV
SRCS+= iconv_stub.c
# Folloing links can be installed from ports/shells/tcsh_nls:
# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8
# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8
# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8
# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8
# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8
# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8
# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8
# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8
# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8
.endif
NLSNAME= tcsh
.for catalog in ${CATALOGS}
NLS+= ${catalog:C/.*://}
NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//}
NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]*
NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]*
.endfor
csh.1: tcsh.man
+5 -5
View File
@@ -673,7 +673,7 @@ which can be used later to refer to the job in the commands described below.
Job numbers remain
the same until the job terminates and then are re-used.
.PP
When a job is started in the backgound using `&', its number, as well
When a job is started in the background using `&', its number, as well
as the process numbers of all its (top level) commands, is typed by the shell
before prompting you for another command.
For example,
@@ -699,7 +699,7 @@ foreground job. A background job can become suspended by using the
.I stop
command described below. When jobs are suspended they merely stop
any further progress until started again, either in the foreground
or the backgound. The shell notices when a job becomes stopped and
or the background. The shell notices when a job becomes stopped and
reports this fact, much like it reports the termination of background jobs.
For foreground jobs this looks like
.DS
@@ -742,7 +742,7 @@ starts `du' in the foreground, stops it before it finishes, then continues
it in the background allowing more foreground commands to be executed.
This is especially helpful
when a foreground job ends up taking longer than you expected and you
wish you had started it in the backgound in the beginning.
wish you had started it in the background in the beginning.
.PP
All
.I "job control"
@@ -775,7 +775,7 @@ in only one of the jobs.
The
.I jobs
command types the table of jobs, giving the job number,
commands and status (`Stopped' or `Running') of each backgound or
commands and status (`Stopped' or `Running') of each background or
suspended job. With the `\-l' option the process numbers are also
typed.
.DS
@@ -874,7 +874,7 @@ and then put in the background using
Some time later when the `s' command was finished,
.I ed
tried to read another command and was stopped because jobs
in the backgound cannot read from the terminal. The
in the background cannot read from the terminal. The
.I fg
command returned the `ed' job to the foreground where it could once again
accept commands from the terminal.
+4
View File
@@ -205,3 +205,7 @@
#include "config_p.h"
#include "config_f.h"
#ifndef NO_NLS_CATALOGS
#define NLS_CATALOGS
#endif
+1
View File
@@ -98,6 +98,7 @@
#define SYSMALLOC
/* Use LC_MESSAGES locale category to open the message catalog */
#define MCLoadBySet NL_CAT_LOCALE
#define BUFSIZE 8192
#endif
#if defined(__bsdi__)
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2001 Alfred Perlstein
* Author: Alfred Perlstein <alfred@FreeBSD.org>
/*-
* Copyright (c) 2006 Hajimu UMEMOTO <ume@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,24 +23,22 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
* $FreeBSD$
*/
#include <pthread.h>
#include <pthread_np.h>
#include "thr_private.h"
#ifndef _ICONV_H_
#define _ICONV_H_
__weak_reference(_pthread_main_np, pthread_main_np);
typedef void *iconv_t;
typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *);
typedef int dl_iconv_close_t(iconv_t);
/*
* Provide the equivelant to Solaris thr_main() function
*/
int
_pthread_main_np()
{
extern iconv_t dl_iconv_open(const char *, const char *);
extern dl_iconv_t *dl_iconv;
extern dl_iconv_close_t *dl_iconv_close;
if (!_thr_initial)
return (-1);
else
return (pthread_equal(pthread_self(), _thr_initial) ? 1 : 0);
}
#define iconv_open dl_iconv_open
#define iconv dl_iconv
#define iconv_close dl_iconv_close
#endif /* !_ICONV_H_ */
+69
View File
@@ -0,0 +1,69 @@
/*-
* Copyright (c) 2006 Hajimu UMEMOTO <[email protected]>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#include <dlfcn.h>
#include <stddef.h>
#include "iconv.h"
#undef iconv_open
#undef iconv
#undef iconv_close
#define ICONVLIB "libiconv.so"
#define ICONV_ENGINE "iconv"
#define ICONV_OPEN "iconv_open"
#define ICONV_CLOSE "iconv_close"
typedef iconv_t iconv_open_t(const char *, const char *);
dl_iconv_t *dl_iconv;
dl_iconv_close_t *dl_iconv_close;
static int initialized;
static void *iconvlib;
static iconv_open_t *iconv_open;
iconv_t
dl_iconv_open(const char *tocode, const char *fromcode)
{
if (initialized) {
if (iconvlib == NULL)
return (iconv_t)-1;
} else {
initialized = 1;
iconvlib = dlopen(ICONVLIB, RTLD_LAZY | RTLD_GLOBAL);
if (iconvlib == NULL)
return (iconv_t)-1;
iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN);
dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE);
dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib,
ICONV_CLOSE);
}
return iconv_open(tocode, fromcode);
}
+1 -1
View File
@@ -420,7 +420,7 @@ standard.
Protection mechanisms in the
.Xr geom 4
subsystem might prevent the super-user from writing blocks to a disk.
Instructions for temporarily disabling these protectsion mechanisms can be
Instructions for temporarily disabling these protection mechanisms can be
found in the
.Xr geom 4
manpage.
+4 -1
View File
@@ -38,7 +38,7 @@
.Nd get ACL information
.Sh SYNOPSIS
.Nm
.Op Fl dh
.Op Fl dhq
.Op Ar
.Sh DESCRIPTION
The
@@ -64,6 +64,9 @@ An error is generated if a default ACL cannot be associated with
.It Fl h
If the target of the operation is a symbolic link, return the ACL from
the symbolic link itself rather than following the link.
.It Fl q
Don't write commented information about file name and ownership. This is
useful when dealing with filenames with unprintable characters.
.El
.Pp
The following operand is available:
+16 -10
View File
@@ -52,7 +52,7 @@ static void
usage(void)
{
fprintf(stderr, "getfacl [-dh] [file ...]\n");
fprintf(stderr, "getfacl [-dhq] [file ...]\n");
}
/*
@@ -147,7 +147,7 @@ acl_from_stat(struct stat sb)
}
static int
print_acl(char *path, acl_type_t type, int hflag)
print_acl(char *path, acl_type_t type, int hflag, int qflag)
{
struct stat sb;
acl_t acl;
@@ -168,7 +168,9 @@ print_acl(char *path, acl_type_t type, int hflag)
else
more_than_one++;
printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid);
if (!qflag)
printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid,
sb.st_gid);
if (hflag)
acl = acl_get_link_np(path, type);
@@ -204,7 +206,7 @@ print_acl(char *path, acl_type_t type, int hflag)
}
static int
print_acl_from_stdin(acl_type_t type, int hflag)
print_acl_from_stdin(acl_type_t type, int hflag, int qflag)
{
char *p, pathname[PATH_MAX];
int carried_error = 0;
@@ -212,7 +214,7 @@ print_acl_from_stdin(acl_type_t type, int hflag)
while (fgets(pathname, (int)sizeof(pathname), stdin)) {
if ((p = strchr(pathname, '\n')) != NULL)
*p = '\0';
if (print_acl(pathname, type, hflag) == -1) {
if (print_acl(pathname, type, hflag, qflag) == -1) {
carried_error = -1;
}
}
@@ -226,10 +228,11 @@ main(int argc, char *argv[])
acl_type_t type = ACL_TYPE_ACCESS;
int carried_error = 0;
int ch, error, i;
int hflag;
int hflag, qflag;
hflag = 0;
while ((ch = getopt(argc, argv, "dh")) != -1)
qflag = 0;
while ((ch = getopt(argc, argv, "dhq")) != -1)
switch(ch) {
case 'd':
type = ACL_TYPE_DEFAULT;
@@ -237,6 +240,9 @@ main(int argc, char *argv[])
case 'h':
hflag = 1;
break;
case 'q':
qflag = 1;
break;
default:
usage();
return(-1);
@@ -245,17 +251,17 @@ main(int argc, char *argv[])
argv += optind;
if (argc == 0) {
error = print_acl_from_stdin(type, hflag);
error = print_acl_from_stdin(type, hflag, qflag);
return(error ? 1 : 0);
}
for (i = 0; i < argc; i++) {
if (!strcmp(argv[i], "-")) {
error = print_acl_from_stdin(type, hflag);
error = print_acl_from_stdin(type, hflag, qflag);
if (error == -1)
carried_error = -1;
} else {
error = print_acl(argv[i], type, hflag);
error = print_acl(argv[i], type, hflag, qflag);
if (error == -1)
carried_error = -1;
}
+8 -1
View File
@@ -32,10 +32,12 @@
.Nd dump or modify the kernel environment
.Sh SYNOPSIS
.Nm
.Op Fl h
.Op Fl hq
.Nm
.Op Fl q
.Ar variable Ns Op = Ns Ar value
.Nm
.Op Fl q
.Fl u
.Ar variable
.Sh DESCRIPTION
@@ -60,6 +62,11 @@ If the environment variable is followed by an optional
.Ar value ,
.Nm
will set the environment variable to this value.
.Pp
If the
.Fl q
option is set, warnings normally printed as a result of being unable to
perform the requested operation will be suppressed.
.Sh SEE ALSO
.Xr kenv 2 ,
.Xr loader 8
+12 -8
View File
@@ -42,15 +42,16 @@ static int ksetenv(char *, char *);
static int kunsetenv(char *);
static int hflag = 0;
static int qflag = 0;
static int uflag = 0;
static void
usage(void)
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
"usage: kenv [-h]",
" kenv variable[=value]",
" kenv -u variable");
"usage: kenv [-hq]",
" kenv [-q] variable[=value]",
" kenv [-q] -u variable");
exit(1);
}
@@ -63,11 +64,14 @@ main(int argc, char **argv)
error = 0;
val = NULL;
env = NULL;
while ((ch = getopt(argc, argv, "hu")) != -1) {
while ((ch = getopt(argc, argv, "hqu")) != -1) {
switch (ch) {
case 'h':
hflag++;
break;
case 'q':
qflag++;
break;
case 'u':
uflag++;
break;
@@ -93,21 +97,21 @@ main(int argc, char **argv)
usage();
if (env == NULL) {
error = kdumpenv();
if (error)
if (error && !qflag)
warn("kdumpenv");
} else if (val == NULL) {
if (uflag) {
error = kunsetenv(env);
if (error)
if (error && !qflag)
warnx("unable to unset %s", env);
} else {
error = kgetenv(env);
if (error)
if (error && !qflag)
warnx("unable to get %s", env);
}
} else {
error = ksetenv(env, val);
if (error)
if (error && !qflag)
warnx("unable to set %s to %s", env, val);
}
return (error);
+27 -3
View File
@@ -32,7 +32,7 @@
.\" @(#)ln.1 8.2 (Berkeley) 12/30/93
.\" $FreeBSD$
.\"
.Dd December 30, 1993
.Dd February 14, 2006
.Dt LN 1
.Os
.Sh NAME
@@ -41,11 +41,11 @@
.Nd make links
.Sh SYNOPSIS
.Nm
.Op Fl fhinsv
.Op Fl Ffhinsv
.Ar source_file
.Op Ar target_file
.Nm
.Op Fl fhinsv
.Op Fl Ffhinsv
.Ar source_file ...
.Ar target_dir
.Nm link
@@ -76,6 +76,24 @@ then unlink it so that the link may occur.
option overrides any previous
.Fl i
options.)
.It Fl F
If the target file already exists and is a directory, then remove it
so that the link may occur.
The
.Fl F
option should be used with either
.Fl f
or
.Fl i
options.
If none is specified,
.Fl f
is implied.
The
.Fl F
option is a no-op unless
.Fl s
option is specified.
.It Fl h
If the
.Ar target_file
@@ -179,6 +197,12 @@ options are non-standard and their use in scripts is not recommended.
They are provided solely for compatibility with other
.Nm
implementations.
.Pp
The
.Fl F
option is
.Fx
extention and should not be used in portable scripts.
.Sh SEE ALSO
.Xr link 2 ,
.Xr lstat 2 ,
+23 -5
View File
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
int fflag; /* Unlink existing files. */
int Fflag; /* Remove empty directories also. */
int hflag; /* Check new name for symlink first. */
int iflag; /* Interactive mode. */
int sflag; /* Symbolic, not hard, link. */
@@ -91,8 +92,11 @@ main(int argc, char *argv[])
exit(linkit(argv[0], argv[1], 0));
}
while ((ch = getopt(argc, argv, "fhinsv")) != -1)
while ((ch = getopt(argc, argv, "Ffhinsv")) != -1)
switch (ch) {
case 'F':
Fflag = 1;
break;
case 'f':
fflag = 1;
iflag = 0;
@@ -121,6 +125,10 @@ main(int argc, char *argv[])
linkf = sflag ? symlink : link;
linkch = sflag ? '-' : '=';
if (sflag == 0)
Fflag = 0;
if (Fflag == 1 && iflag == 0)
fflag = 1;
switch(argc) {
case 0:
@@ -200,7 +208,12 @@ linkit(const char *target, const char *source, int isdir)
* and interactively if -i was specified.
*/
if (fflag && exists) {
if (unlink(source)) {
if (Fflag && S_ISDIR(sb.st_mode)) {
if (rmdir(source)) {
warn("%s", source);
return (1);
}
} else if (unlink(source)) {
warn("%s", source);
return (1);
}
@@ -216,7 +229,12 @@ linkit(const char *target, const char *source, int isdir)
return (1);
}
if (unlink(source)) {
if (Fflag && S_ISDIR(sb.st_mode)) {
if (rmdir(source)) {
warn("%s", source);
return (1);
}
} else if (unlink(source)) {
warn("%s", source);
return (1);
}
@@ -236,8 +254,8 @@ void
usage(void)
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
"usage: ln [-fhinsv] source_file [target_file]",
" ln [-fhinsv] source_file ... target_dir",
"usage: ln [-Ffhinsv] source_file [target_file]",
" ln [-Ffhinsv] source_file ... target_dir",
" link source_file target_file");
exit(1);
}
+58 -40
View File
@@ -32,7 +32,7 @@
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
.\" $FreeBSD$
.\"
.Dd June 2, 2005
.Dd November 16, 2005
.Dt LS 1
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Nd list directory contents
.Sh SYNOPSIS
.Nm
.Op Fl ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1
.Op Fl ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1
.Op Ar
.Sh DESCRIPTION
For each operand that names a
@@ -72,7 +72,9 @@ List all entries except for
.Pa \&.
and
.Pa .. .
Always set for the super-user.
Automatically set for the super-user unless
.Fl I
is specified.
.It Fl B
Force printing of non-printable characters (as defined by
.Xr ctype 3
@@ -117,6 +119,10 @@ none of the
or
.Fl l
options are specified.
.It Fl I
Prevent
.Fl A
from being automatically set for the super-user.
.It Fl L
If argument is a symbolic link, list the file or directory the link references
rather than the link itself.
@@ -180,29 +186,17 @@ using base 2 for sizes.
.It Fl i
For each file, print the file's file serial number (inode number).
.It Fl k
If the
.Fl s
option is specified, print the file size allocation in kilobytes,
not blocks.
This option overrides the environment variable
.Ev BLOCKSIZE .
Note that
.Fl k
is mutually exclusive to
.Fl h ,
and later
.Fl k
will nullify earlier
.Fl h .
This has the same effect as setting environment variable
.Ev BLOCKSIZE
to 1024, except that it also nullifies any
.Fl h
options to its left.
.It Fl l
(The lowercase letter
.Dq ell . )
List in long format.
(See below.)
A total sum (in blocks, see the
.Fl s
option for the block size unit) for all the file
sizes is output on a line before the long listing.
List files in the long format, as described in the
.Sx The Long Format
subsection below.
.It Fl m
Stream output format; list files across the page, separated by commas.
.It Fl n
@@ -226,13 +220,12 @@ this is the default when output is to a terminal.
.It Fl r
Reverse the order of the sort.
.It Fl s
Display the number of file system blocks actually used by each file, in units
of 512 bytes, where partial units are rounded up to the next integer value.
A total sum for all the file
sizes is output on a line before the listing.
The environment variable
.Ev BLOCKSIZE
overrides the unit size of 512 bytes.
Display the number of blocks used in the file system by each file.
Block sizes and directory totals are handled as described in
.Sx The Long Format
subsection below, except (if the long format is not also requested)
the directory totals are not output when the output is in a
single column, even if multi-column output is requested.
.It Fl t
Sort by time modified (most recently modified
first) before sorting the operands in lexicographical
@@ -318,10 +311,6 @@ number of bytes in the file, abbreviated
month, day-of-month file was last modified,
hour file last modified, minute file last
modified, and the pathname.
In addition, for each directory whose contents are displayed, the total
number of 512-byte blocks used by the files in the directory is displayed
on a line by itself immediately before the information for the files in the
directory.
.Pp
If the modification time of the file is more than 6 months
in the past or future, then the year of the last modification
@@ -340,6 +329,24 @@ If the file is a symbolic link the pathname of the
linked-to file is preceded by
.Dq Li -> .
.Pp
The listing of a directory's contents is preceded
by a labeled total number of blocks used in the file system by the files
which are listed as the directory's contents
(which may or may not include
.Pa \&.
and
.Pa ..
and other files which start with a dot, depending on other options).
.Pp
The default block size is 512 bytes.
The block size may be set with option
.Fl k
or environment variable
.Ev BLOCKSIZE .
Numbers of blocks in the output will have been rounded up so the
numbers of bytes is at least as many as used by the corresponding
file system blocks (which might have a different size).
.Pp
The file mode printed under the
.Fl l
option consists of the
@@ -446,12 +453,15 @@ The following environment variables affect the execution of
.Nm :
.Bl -tag -width ".Ev CLICOLOR_FORCE"
.It Ev BLOCKSIZE
If the environment variable
.Ev BLOCKSIZE
is set, the block counts
(see
.Fl s )
will be displayed in units of that size block.
If this is set, its value, rounded up to 512 or down to a
multiple of 512, will be used as the block size in bytes by the
.Fl l
and
.Fl s
options.
See
.Sx The Long Format
subsection for more information.
.It Ev CLICOLOR
Use
.Tn ANSI
@@ -640,6 +650,7 @@ specification.
.Xr sticky 8
.Sh STANDARDS
With the exception of options
.Fl I ,
.Fl g ,
.Fl n
and
@@ -663,3 +674,10 @@ command appeared in
.Sh BUGS
To maintain backward compatibility, the relationships between the many
options are quite complex.
.Pp
The exception mentioned in the
.Fl s
option description might be a feature that was
based on the fact that single-column output
usually goes to something other than a terminal.
It is debatable whether this is a design bug.
+9 -5
View File
@@ -110,6 +110,7 @@ int termwidth = 80; /* default terminal width */
static int f_kblocks; /* print size in kilobytes */
static int f_listdir; /* list actual directory, not contents */
static int f_listdot; /* list files beginning with . */
static int f_noautodot; /* do not automatically enable -A for root */
int f_longform; /* long listing format */
int f_nonprint; /* show unprintables as ? */
static int f_nosort; /* don't sort output */
@@ -175,13 +176,9 @@ main(int argc, char *argv[])
termwidth = atoi(p);
}
/* Root is -A automatically. */
if (!getuid())
f_listdot = 1;
fts_options = FTS_PHYSICAL;
while ((ch = getopt(argc, argv,
"1ABCFGHLPRSTWZabcdfghiklmnopqrstuwx")) != -1) {
"1ABCFGHILPRSTWZabcdfghiklmnopqrstuwx")) != -1) {
switch (ch) {
/*
* The -1, -C, -x and -l options all override each other so
@@ -247,6 +244,9 @@ main(int argc, char *argv[])
case 'A':
f_listdot = 1;
break;
case 'I':
f_noautodot = 1;
break;
/* The -d option turns off the -R option. */
case 'd':
f_listdir = 1;
@@ -326,6 +326,10 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
/* Root is -A automatically unless -I. */
if (!f_listdot && getuid() == (uid_t)0 && !f_noautodot)
f_listdot = 1;
/* Enabling of colours is conditional on the environment. */
if (getenv("CLICOLOR") &&
(isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")))
+2 -2
View File
@@ -222,9 +222,9 @@ usage(void)
{
(void)fprintf(stderr,
#ifdef COLORLS
"usage: ls [-ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1]"
"usage: ls [-ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1]"
#else
"usage: ls [-ABCFHLPRSTWZabcdfghiklmnopqrstuwx1]"
"usage: ls [-ABCFHILPRSTWZabcdfghiklmnopqrstuwx1]"
#endif
" [file ...]\n");
exit(1);
+18 -1
View File
@@ -44,6 +44,8 @@ static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/acl.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/wait.h>
@@ -252,6 +254,7 @@ fastcopy(char *from, char *to, struct stat *sbp)
static char *bp;
mode_t oldmode;
int nread, from_fd, to_fd;
acl_t acl;
if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
warn("%s", from);
@@ -288,7 +291,6 @@ err: if (unlink(to))
(void)close(to_fd);
return (1);
}
(void)close(from_fd);
oldmode = sbp->st_mode & ALLPERMS;
if (fchown(to_fd, sbp->st_uid, sbp->st_gid)) {
@@ -301,6 +303,21 @@ err: if (unlink(to))
sbp->st_mode &= ~(S_ISUID | S_ISGID);
}
}
/*
* POSIX 1003.2c states that if _POSIX_ACL_EXTENDED is in effect
* for dest_file, then it's ACLs shall reflect the ACLs of the
* source_file.
*/
if (fpathconf(to_fd, _PC_ACL_EXTENDED) == 1 &&
fpathconf(from_fd, _PC_ACL_EXTENDED) == 1) {
acl = acl_get_fd(from_fd);
if (acl == NULL)
warn("failed to get acl entries while setting %s",
from);
else if (acl_set_fd(to_fd, acl) < 0)
warn("failed to set acl entries for %s", to);
}
(void)close(from_fd);
if (fchmod(to_fd, sbp->st_mode))
warn("%s: set mode (was: 0%03o)", to, oldmode);
/*
+21 -5
View File
@@ -295,8 +295,9 @@ parsefmt(const char *p, int user)
static VAR *
findvar(char *p, int user, char **header)
{
size_t rflen;
VAR *v, key;
char *hp;
char *hp, *realfmt;
hp = strchr(p, '=');
if (hp)
@@ -306,11 +307,26 @@ findvar(char *p, int user, char **header)
v = bsearch(&key, var, sizeof(var)/sizeof(VAR) - 1, sizeof(VAR), vcmp);
if (v && v->alias) {
if (hp) {
warnx("%s: illegal keyword specification", p);
eval = 1;
/*
* If the user specified an alternate-header for this
* (aliased) format-name, then we need to copy that
* alternate-header when making the recursive call to
* process the alias.
*/
if (hp == NULL)
parsefmt(v->alias, user);
else {
/*
* XXX - This processing will not be correct for
* any alias which expands into a list of format
* keywords. Presently there are no aliases
* which do that.
*/
rflen = strlen(v->alias) + strlen(hp) + 2;
realfmt = malloc(rflen);
snprintf(realfmt, rflen, "%s=%s", v->alias, hp);
parsefmt(realfmt, user);
}
parsefmt(v->alias, user);
return ((VAR *)NULL);
}
if (!v) {
+5 -1
View File
@@ -32,7 +32,7 @@
.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
.\" $FreeBSD$
.\"
.Dd October 28, 2004
.Dd September 29, 2005
.Dt RM 1
.Os
.Sh NAME
@@ -88,6 +88,10 @@ yet provides almost the same level of protection against mistakes.
Overwrite regular files before deleting them.
Files are overwritten three times, first with the byte pattern 0xff,
then 0x00, and then 0xff again, before they are deleted.
Specifying this flag for a read only file will cause
.Nm
to generate an error message and exit.
The file will not be removed or overwritten.
.It Fl R
Attempt to remove the file hierarchy rooted in each file argument.
The
+6 -4
View File
@@ -307,6 +307,7 @@ err:
}
if (errno)
err(1, "fts_read");
fts_close(fts);
}
void
@@ -452,11 +453,8 @@ check(char *path, char *name, struct stat *sp)
* talking to a terminal, ask. Symbolic links are excluded
* because their permissions are meaningless. Check stdin_ok
* first because we may not have stat'ed the file.
* Also skip this check if the -P option was specified because
* we will not be able to overwrite file contents and will
* barf later.
*/
if (!stdin_ok || S_ISLNK(sp->st_mode) || Pflag ||
if (!stdin_ok || S_ISLNK(sp->st_mode) ||
(!access(name, W_OK) &&
!(sp->st_flags & (SF_APPEND|SF_IMMUTABLE)) &&
(!(sp->st_flags & (UF_APPEND|UF_IMMUTABLE)) || !uid)))
@@ -464,6 +462,10 @@ check(char *path, char *name, struct stat *sp)
strmode(sp->st_mode, modep);
if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
err(1, "fflagstostr");
if (Pflag)
errx(1,
"%s: -P was specified, but file is not writable",
path);
(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
modep + 1, modep[9] == ' ' ? "" : " ",
user_from_uid(sp->st_uid, 0),
+1 -1
View File
@@ -22,7 +22,7 @@ LFLAGS= -8 # 8-bit lex scanner for arithmetic
CFLAGS+=-DSHELL -I. -I${.CURDIR}
# for debug:
# CFLAGS+= -g -DDEBUG=2
WARNS?= 0
WARNS?= 3
WFORMAT=0
.PATH: ${.CURDIR}/bltin \
+2 -2
View File
@@ -144,7 +144,7 @@ unalias(char *name)
}
#ifdef mkinit
MKINIT void rmaliases();
MKINIT void rmaliases(void);
SHELLPROC {
rmaliases();
@@ -242,7 +242,7 @@ unaliascmd(int argc __unused, char **argv __unused)
}
}
for (i = 0; *argptr; argptr++)
i = unalias(*argptr);
i |= unalias(*argptr);
return (i);
}
+3 -1
View File
@@ -30,6 +30,8 @@
* $FreeBSD$
*/
extern char *arith_buf, *arith_startbuf;
int arith(char *);
int arith_assign(char *, arith_t);
void arith_lex_reset(void);
int expcmd(int, char **);
+3 -3
View File
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include <limits.h>
#include <stdio.h>
#include "arith.h"
#include "shell.h"
#include "var.h"
%}
@@ -261,12 +262,11 @@ expr:
#define lstrlen(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3)
char *arith_buf, *arith_startbuf;
extern void arith_lex_reset();
int yylex(void);
int yyparse(void);
int
static int
arith_assign(char *name, arith_t value)
{
char *str;
@@ -294,7 +294,7 @@ arith(char *s)
return result;
}
void
static void
yyerror(char *s)
{
+3 -1
View File
@@ -42,13 +42,15 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include "arith.h"
#include "shell.h"
#include "y.tab.h"
#include "error.h"
#include "memalloc.h"
#include "var.h"
extern char *arith_buf, *arith_startbuf;
int yylex(void);
#undef YY_INPUT
#define YY_INPUT(buf,result,max) \
result = (*buf = *arith_buf++) ? 1 : YY_NULL;
+2
View File
@@ -82,5 +82,7 @@
pointer stalloc(int);
void error(const char *, ...) __printf0like(1, 2);
int echocmd(int, char **);
int testcmd(int, char **);
extern char *commandname;
+7 -11
View File
@@ -47,12 +47,12 @@
# NOTE: bltincmd must come first!
bltincmd builtin
commandcmd command
#alloccmd alloc
aliascmd alias
bgcmd -j bg
bindcmd bind
breakcmd break continue
#catfcmd catf
cdcmd cd chdir
commandcmd command
dotcmd .
echocmd echo
evalcmd eval
@@ -62,15 +62,13 @@ expcmd exp let
exportcmd export readonly
#exprcmd expr
falsecmd false
histcmd -h fc
fgcmd -j fg
getoptscmd getopts
hashcmd hash
histcmd -h fc
jobidcmd jobid
jobscmd jobs
#linecmd line
localcmd local
#nlechocmd nlecho
#printfcmd printf
pwdcmd pwd
readcmd read
@@ -78,16 +76,14 @@ returncmd return
setcmd set
setvarcmd setvar
shiftcmd shift
testcmd test [
timescmd times
trapcmd trap
truecmd : true
typecmd type
ulimitcmd ulimit
umaskcmd umask
unaliascmd unalias
unsetcmd unset
waitcmd wait
#foocmd foo
aliascmd alias
ulimitcmd ulimit
testcmd test [
bindcmd bind
wordexpcmd wordexp
+58 -16
View File
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/resource.h>
#include <sys/wait.h> /* For WIFSIGNALED(status) */
#include <errno.h>
@@ -90,8 +91,8 @@ int exitstatus; /* exit status of last command */
int oexitstatus; /* saved exit status */
STATIC void evalloop(union node *);
STATIC void evalfor(union node *);
STATIC void evalloop(union node *, int);
STATIC void evalfor(union node *, int);
STATIC void evalcase(union node *, int);
STATIC void evalsubshell(union node *, int);
STATIC void expredir(union node *);
@@ -182,6 +183,9 @@ evalstring(char *s)
void
evaltree(union node *n, int flags)
{
int do_etest;
do_etest = 0;
if (n == NULL) {
TRACE(("evaltree(NULL) called\n"));
exitstatus = 0;
@@ -190,10 +194,10 @@ evaltree(union node *n, int flags)
#ifndef NO_HISTORY
displayhist = 1; /* show history substitutions done with fc */
#endif
TRACE(("evaltree(0x%lx: %d) called\n", (long)n, n->type));
TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type));
switch (n->type) {
case NSEMI:
evaltree(n->nbinary.ch1, 0);
evaltree(n->nbinary.ch1, flags & ~EV_EXIT);
if (evalskip)
goto out;
evaltree(n->nbinary.ch2, flags);
@@ -219,6 +223,7 @@ evaltree(union node *n, int flags)
break;
case NSUBSHELL:
evalsubshell(n, flags);
do_etest = !(flags & EV_TESTED);
break;
case NBACKGND:
evalsubshell(n, flags);
@@ -237,10 +242,10 @@ evaltree(union node *n, int flags)
}
case NWHILE:
case NUNTIL:
evalloop(n);
evalloop(n, flags & ~EV_EXIT);
break;
case NFOR:
evalfor(n);
evalfor(n, flags & ~EV_EXIT);
break;
case NCASE:
evalcase(n, flags);
@@ -256,9 +261,11 @@ evaltree(union node *n, int flags)
case NPIPE:
evalpipe(n);
do_etest = !(flags & EV_TESTED);
break;
case NCMD:
evalcommand(n, flags, (struct backcmd *)NULL);
do_etest = !(flags & EV_TESTED);
break;
default:
out1fmt("Node type = %d\n", n->type);
@@ -268,15 +275,13 @@ evaltree(union node *n, int flags)
out:
if (pendingsigs)
dotrap();
if ((flags & EV_EXIT) || (eflag && exitstatus
&& !(flags & EV_TESTED) && (n->type == NCMD ||
n->type == NSUBSHELL)))
if ((flags & EV_EXIT) || (eflag && exitstatus != 0 && do_etest))
exitshell(exitstatus);
}
STATIC void
evalloop(union node *n)
evalloop(union node *n, int flags)
{
int status;
@@ -300,7 +305,7 @@ skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
if (exitstatus == 0)
break;
}
evaltree(n->nbinary.ch2, 0);
evaltree(n->nbinary.ch2, flags);
status = exitstatus;
if (evalskip)
goto skipping;
@@ -312,7 +317,7 @@ skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
STATIC void
evalfor(union node *n)
evalfor(union node *n, int flags)
{
struct arglist arglist;
union node *argp;
@@ -333,7 +338,7 @@ evalfor(union node *n)
loopnest++;
for (sp = arglist.list ; sp ; sp = sp->next) {
setvar(n->nfor.var, sp->text, 0);
evaltree(n->nfor.body, 0);
evaltree(n->nfor.body, flags);
if (evalskip) {
if (evalskip == SKIPCONT && --skipcount <= 0) {
evalskip = 0;
@@ -457,7 +462,7 @@ evalpipe(union node *n)
int prevfd;
int pip[2];
TRACE(("evalpipe(0x%lx) called\n", (long)n));
TRACE(("evalpipe(%p) called\n", (void *)n));
pipelen = 0;
for (lp = n->npipe.cmdlist ; lp ; lp = lp->next)
pipelen++;
@@ -596,7 +601,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
#endif
/* First expand the arguments. */
TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags));
setstackmark(&smark);
arglist.lastp = &arglist.list;
varlist.lastp = &varlist.list;
@@ -972,6 +977,7 @@ commandcmd(int argc, char **argv)
struct strlist *sp;
char *path;
int ch;
int cmd = -1;
for (sp = cmdenviron; sp ; sp = sp->next)
setvareq(sp->text, VEXPORT|VSTACK);
@@ -979,11 +985,17 @@ commandcmd(int argc, char **argv)
optind = optreset = 1;
opterr = 0;
while ((ch = getopt(argc, argv, "p")) != -1) {
while ((ch = getopt(argc, argv, "pvV")) != -1) {
switch (ch) {
case 'p':
path = stdpath;
break;
case 'v':
cmd = TYPECMD_SMALLV;
break;
case 'V':
cmd = TYPECMD_BIGV;
break;
case '?':
default:
error("unknown option: -%c", optopt);
@@ -992,6 +1004,11 @@ commandcmd(int argc, char **argv)
argc -= optind;
argv += optind;
if (cmd != -1) {
if (argc != 1)
error("wrong number of arguments");
return typecmd_impl(2, argv - 1, cmd);
}
if (argc != 0) {
old = handler;
handler = &loc;
@@ -1062,3 +1079,28 @@ execcmd(int argc, char **argv)
}
return 0;
}
int
timescmd(int argc __unused, char **argv __unused)
{
struct rusage ru;
long shumins, shsmins, chumins, chsmins;
double shusecs, shssecs, chusecs, chssecs;
if (getrusage(RUSAGE_SELF, &ru) < 0)
return 1;
shumins = ru.ru_utime.tv_sec / 60;
shusecs = ru.ru_utime.tv_sec % 60 + ru.ru_utime.tv_usec / 1000000.;
shsmins = ru.ru_stime.tv_sec / 60;
shssecs = ru.ru_stime.tv_sec % 60 + ru.ru_stime.tv_usec / 1000000.;
if (getrusage(RUSAGE_CHILDREN, &ru) < 0)
return 1;
chumins = ru.ru_utime.tv_sec / 60;
chusecs = ru.ru_utime.tv_sec % 60 + ru.ru_utime.tv_usec / 1000000.;
chsmins = ru.ru_stime.tv_sec / 60;
chssecs = ru.ru_stime.tv_sec % 60 + ru.ru_stime.tv_usec / 1000000.;
out1fmt("%ldm%.3fs %ldm%.3fs\n%ldm%.3fs %ldm%.3fs\n", shumins,
shusecs, shsmins, shssecs, chumins, chusecs, chsmins, chssecs);
return 0;
}
+1
View File
@@ -56,6 +56,7 @@ int returncmd(int, char **);
int falsecmd(int, char **);
int truecmd(int, char **);
int execcmd(int, char **);
int timescmd(int, char **);
int commandcmd(int, char **);
/* in_function returns nonzero if we are currently evaluating a function */
+48 -13
View File
@@ -555,7 +555,7 @@ clearcmdentry(int firstchange)
*/
#ifdef mkinit
MKINIT void deletefuncs();
MKINIT void deletefuncs(void);
SHELLPROC {
deletefuncs();
@@ -705,11 +705,12 @@ unsetfunc(char *name)
}
/*
* Locate and print what a word is...
* Shared code for the following builtin commands:
* type, command -v, command -V
*/
int
typecmd(int argc, char **argv)
typecmd_impl(int argc, char **argv, int cmd)
{
struct cmdentry entry;
struct tblentry *cmdp;
@@ -720,20 +721,28 @@ typecmd(int argc, char **argv)
extern char *const parsekwd[];
for (i = 1; i < argc; i++) {
out1str(argv[i]);
if (cmd != TYPECMD_SMALLV)
out1str(argv[i]);
/* First look at the keywords */
for (pp = (char **)parsekwd; *pp; pp++)
if (**pp == *argv[i] && equal(*pp, argv[i]))
break;
if (*pp) {
out1str(" is a shell keyword\n");
if (cmd == TYPECMD_SMALLV)
out1fmt("%s\n", argv[i]);
else
out1str(" is a shell keyword\n");
continue;
}
/* Then look at the aliases */
if ((ap = lookupalias(argv[i], 1)) != NULL) {
out1fmt(" is an alias for %s\n", ap->val);
if (cmd == TYPECMD_SMALLV)
out1fmt("alias %s='%s'\n", argv[i], ap->val);
else
out1fmt(" is an alias for %s\n", ap->val);
continue;
}
@@ -756,29 +765,55 @@ typecmd(int argc, char **argv)
name = padvance(&path, argv[i]);
stunalloc(name);
} while (--j >= 0);
out1fmt(" is%s %s\n",
cmdp ? " a tracked alias for" : "", name);
if (cmd == TYPECMD_SMALLV)
out1fmt("%s\n", name);
else
out1fmt(" is%s %s\n",
(cmdp && cmd == TYPECMD_TYPE) ?
" a tracked alias for" : "",
name);
} else {
if (access(argv[i], X_OK) == 0)
out1fmt(" is %s\n", argv[i]);
if (access(argv[i], X_OK) == 0) {
if (cmd == TYPECMD_SMALLV)
out1fmt("%s\n", argv[i]);
else
out1fmt(" is %s\n", argv[i]);
}
else
out1fmt(": %s\n", strerror(errno));
}
break;
}
case CMDFUNCTION:
out1str(" is a shell function\n");
if (cmd == TYPECMD_SMALLV)
out1fmt("%s\n", argv[i]);
else
out1str(" is a shell function\n");
break;
case CMDBUILTIN:
out1str(" is a shell builtin\n");
if (cmd == TYPECMD_SMALLV)
out1fmt("%s\n", argv[i]);
else
out1str(" is a shell builtin\n");
break;
default:
out1str(": not found\n");
if (cmd != TYPECMD_SMALLV)
out1str(": not found\n");
error |= 127;
break;
}
}
return error;
}
/*
* Locate and print what a word is...
*/
int
typecmd(int argc, char **argv)
{
return typecmd_impl(argc, argv, TYPECMD_TYPE);
}
+7
View File
@@ -39,6 +39,12 @@
#define CMDBUILTIN 1 /* command is a shell builtin */
#define CMDFUNCTION 2 /* command is a shell function */
/* values for typecmd_impl's third parameter */
enum {
TYPECMD_SMALLV, /* command -v */
TYPECMD_BIGV, /* command -V */
TYPECMD_TYPE /* type */
};
struct cmdentry {
int cmdtype;
@@ -63,5 +69,6 @@ void deletefuncs(void);
void addcmdentry(char *, struct cmdentry *);
void defun(char *, union node *);
int unsetfunc(char *);
int typecmd_impl(int, char **, int);
int typecmd(int, char **);
void clearcmdentry(int);
+2 -4
View File
@@ -893,7 +893,7 @@ numvar:
}
/* FALLTHROUGH */
case '*':
if (ifsset() != 0)
if (ifsset())
sep = ifsval()[0];
else
sep = ' ';
@@ -1022,8 +1022,7 @@ ifsbreakup(char *string, struct arglist *arglist)
p++;
}
} while ((ifsp = ifsp->next) != NULL);
if (*start || (!ifsspc && start > string &&
(nulonly || 1))) {
if (*start || (!ifsspc && start > string)) {
sp = (struct strlist *)stalloc(sizeof *sp);
sp->text = start;
*arglist->lastp = sp;
@@ -1211,7 +1210,6 @@ expmeta(char *enddir, char *name)
scopy(dp->d_name, enddir);
addfname(expdir);
} else {
char *q;
for (p = enddir, q = dp->d_name;
(*p++ = *q++) != '\0';)
continue;
+2 -2
View File
@@ -156,7 +156,7 @@ sethistsize(hs)
if (hs == NULL || *hs == '\0' ||
(histsize = atoi(hs)) < 0)
histsize = 100;
history(hist, &he, H_EVENT, histsize);
history(hist, &he, H_SETSIZE, histsize);
}
}
@@ -481,7 +481,7 @@ bindcmd(int argc, char **argv)
if (el == NULL)
error("line editing is disabled");
return (el_parse(el, argc, argv));
return (el_parse(el, argc, (const char **)argv));
}
#else
+4 -2
View File
@@ -647,7 +647,7 @@ makejob(union node *node __unused, int nprocs)
jp->ps = &jp->ps0;
}
INTON;
TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
TRACE(("makejob(%p, %d) returns %%%d\n", (void *)node, nprocs,
jp - jobtab + 1));
return jp;
}
@@ -733,7 +733,7 @@ forkshell(struct job *jp, union node *n, int mode)
pid_t pid;
pid_t pgrp;
TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n,
TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n,
mode));
INTOFF;
flushall();
@@ -924,6 +924,8 @@ dowait(int block, struct job *job)
} while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) ||
(pid > 0 && WIFSTOPPED(status) && !iflag));
in_dowait--;
if (pid == -1 && errno == ECHILD && job != NULL)
job->state = JOBDONE;
if (breakwaitcmd != 0) {
breakwaitcmd = 0;
if (pid <= 0)
+1
View File
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include "shell.h"
#include "exec.h" /* defines padvance() */
#include "mail.h"
#include "var.h"
#include "output.h"
#include "memalloc.h"
+16 -2
View File
@@ -57,7 +57,10 @@ ckmalloc(int nbytes)
{
pointer p;
if ((p = malloc(nbytes)) == NULL)
INTOFF;
p = malloc(nbytes);
INTON;
if (p == NULL)
error("Out of space");
return p;
}
@@ -70,11 +73,22 @@ ckmalloc(int nbytes)
pointer
ckrealloc(pointer p, int nbytes)
{
if ((p = realloc(p, nbytes)) == NULL)
INTOFF;
p = realloc(p, nbytes);
INTON;
if (p == NULL)
error("Out of space");
return p;
}
void
ckfree(pointer p)
{
INTOFF;
free(p);
INTON;
}
/*
* Make a copy of a string in safe storage.
+1 -2
View File
@@ -48,6 +48,7 @@ extern int herefd;
pointer ckmalloc(int);
pointer ckrealloc(pointer, int);
void ckfree(pointer);
char *savestr(char *);
pointer stalloc(int);
void stunalloc(pointer);
@@ -72,5 +73,3 @@ void ungrabstackstr(char *, char *);
#define STTOPC(p) p[-1]
#define STADJUST(amount, p) (p += (amount), sstrnleft -= (amount))
#define grabstackstr(p) stalloc(stackblocksize() - sstrnleft)
#define ckfree(p) free((pointer)(p))
+8 -8
View File
@@ -64,6 +64,10 @@ __FBSDID("$FreeBSD$");
#undef eflag
int readcmd(int, char **);
int umaskcmd(int, char **);
int ulimitcmd(int, char **);
/*
* The read builtin. The -r option causes backslashes to be treated like
* ordinary characters.
@@ -188,13 +192,7 @@ readcmd(int argc __unused, char **argv __unused)
continue;
}
startword = 0;
if (backslash && c == '\\') {
if (read(STDIN_FILENO, &c, 1) != 1) {
status = 1;
break;
}
STPUTC(c, p);
} else if (ap[1] != NULL && strchr(ifs, c) != NULL) {
if (ap[1] != NULL && strchr(ifs, c) != NULL) {
STACKSTRNUL(p);
setvar(*ap, stackblock(), 0);
ap++;
@@ -270,18 +268,20 @@ umaskcmd(int argc __unused, char **argv)
mask = 0;
do {
if (*ap >= '8' || *ap < '0')
error("Illegal number: %s", argv[1]);
error("Illegal number: %s", *argptr);
mask = (mask << 3) + (*ap - '0');
} while (*++ap != '\0');
umask(mask);
} else {
void *set;
INTOFF;
if ((set = setmode (ap)) == 0)
error("Illegal number: %s", ap);
mask = getmode (set, ~mask & 0777);
umask(~mask & 0777);
free(set);
INTON;
}
}
return 0;
+3 -3
View File
@@ -58,9 +58,9 @@ cat <<\!
!
awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \
print $0}' builtins.def | sed 's/-[hj]//' > $temp
awk '{ printf "int %s();\n", $1}' $temp
awk '{ printf "int %s(int, char **);\n", $1}' $temp
echo '
int (*const builtinfunc[])() = {'
int (*const builtinfunc[])(int, char **) = {'
awk '/^[^#]/ { printf "\t%s,\n", $1}' $temp
echo '};
@@ -87,6 +87,6 @@ struct builtincmd {
int code;
};
extern int (*const builtinfunc[])();
extern int (*const builtinfunc[])(int, char **);
extern const struct builtincmd builtincmd[];'
rm -f $temp
+6 -5
View File
@@ -133,10 +133,10 @@ char shellproc[] = "\
struct event event[] = {
{"INIT", "init", init},
{"RESET", "reset", reset},
{"SHELLPROC", "initshellproc", shellproc},
{NULL, NULL}
{ "INIT", "init", init, { NULL, 0, NULL, NULL } },
{ "RESET", "reset", reset, { NULL, 0, NULL, NULL } },
{ "SHELLPROC", "initshellproc", shellproc, { NULL, 0, NULL, NULL } },
{ NULL, NULL, NULL, { NULL, 0, NULL, NULL } }
};
@@ -172,6 +172,7 @@ main(int argc __unused, char *argv[])
header_files[0] = "\"shell.h\"";
header_files[1] = "\"mystring.h\"";
header_files[2] = "\"init.h\"";
for (ap = argv + 1 ; *ap ; ap++)
readfile(*ap);
output();
@@ -391,7 +392,7 @@ output(void)
for (ep = event ; ep->name ; ep++) {
fputs("\n\n\n", fp);
fputs(ep->comment, fp);
fprintf(fp, "\nvoid\n%s() {\n", ep->routine);
fprintf(fp, "\nvoid\n%s(void)\n{\n", ep->routine);
writetext(&ep->code, fp);
fprintf(fp, "}\n");
}
+4 -3
View File
@@ -343,9 +343,10 @@ print(char *name)
static char *macro[] = {
"#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)",
"#define is_alpha(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))",
"#define is_name(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalpha((unsigned char) (c))))",
"#define is_in_name(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalnum((unsigned char) (c))))",
"#define is_eof(c)\t((c) == PEOF)",
"#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))",
"#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalpha((unsigned char) (c))))",
"#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalnum((unsigned char) (c))))",
"#define is_special(c)\t((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT))",
NULL
};
+8 -11
View File
@@ -247,7 +247,7 @@ end_options2:
STATIC void
minus_o(char *name, int val)
{
int doneset, i;
int i;
if (name == NULL) {
if (val) {
@@ -258,16 +258,13 @@ minus_o(char *name, int val)
optlist[i].val ? "on" : "off");
} else {
/* Output suitable for re-input to shell. */
for (doneset = i = 0; i < NOPTS; i++)
if (optlist[i].val) {
if (!doneset) {
out1str("set");
doneset = 1;
}
out1fmt(" -o %s", optlist[i].name);
}
if (doneset)
out1c('\n');
for (i = 0; i < NOPTS; i++) {
if (i % 6 == 0)
out1str(i == 0 ? "set" : "\nset");
out1fmt(" %co %s", optlist[i].val ? '-' : '+',
optlist[i].name);
}
out1c('\n');
}
} else {
for (i = 0; i < NOPTS; i++)
+4
View File
@@ -134,6 +134,10 @@ outqstr(const char *p, struct output *file)
{
char ch;
if (p[0] == '\0') {
outstr("''", file);
return;
}
if (p[strcspn(p, "|&;<>()$`\\\"'")] == '\0' && (!ifsset() ||
p[strcspn(p, ifsval())] == '\0')) {
outstr(p, file);
+11 -18
View File
@@ -39,6 +39,7 @@ static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
__FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <unistd.h>
#include "shell.h"
#include "parser.h"
@@ -97,12 +98,6 @@ STATIC int startlinno; /* line # where last token started */
/* XXX When 'noaliases' is set to one, no alias expansion takes place. */
static int noaliases = 0;
#define GDB_HACK 1 /* avoid local declarations which gdb can't handle */
#ifdef GDB_HACK
static const char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0'};
static const char types[] = "}-+?=";
#endif
STATIC union node *list(int);
STATIC union node *andor(void);
@@ -383,13 +378,12 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
if (lasttoken != TNL && lasttoken != TSEMI)
synexpect(-1);
} else {
#ifndef GDB_HACK
static const char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE,
'@', '=', '\0'};
#endif
static char argvars[5] = {
CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0'
};
n2 = (union node *)stalloc(sizeof (struct narg));
n2->type = NARG;
n2->narg.text = (char *)argvars;
n2->narg.text = argvars;
n2->narg.backquote = NULL;
n2->narg.next = NULL;
n1->nfor.args = n2;
@@ -1185,13 +1179,12 @@ parsesub: {
int typeloc;
int flags;
char *p;
#ifndef GDB_HACK
static const char types[] = "}-+?=";
#endif
int bracketed_name = 0; /* used to handle ${[0-9]*} variables */
c = pgetc();
if (c != '(' && c != '{' && !is_name(c) && !is_special(c)) {
if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) &&
!is_special(c)) {
USTPUTC('$', out);
pungetc();
} else if (c == '(') { /* $(command) or $((arith)) */
@@ -1218,11 +1211,11 @@ parsesub: {
else
subtype = 0;
}
if (is_name(c)) {
if (!is_eof(c) && is_name(c)) {
do {
STPUTC(c, out);
c = pgetc();
} while (is_in_name(c));
} while (!is_eof(c) && is_in_name(c));
} else if (is_digit(c)) {
if (bracketed_name) {
do {
@@ -1599,7 +1592,7 @@ getprompt(void *unused __unused)
*/
case 'h':
case 'H':
ps[i] == '\0';
ps[i] = '\0';
gethostname(&ps[i], PROMPTLEN - i);
/* Skip to end of hostname. */
trim = (*fmt == 'h') ? '.' : '\0';
@@ -1615,7 +1608,7 @@ getprompt(void *unused __unused)
*/
case 'W':
case 'w':
ps[i] == '\0';
ps[i] = '\0';
getcwd(&ps[i], PROMPTLEN - i);
if (*fmt == 'W') {
/* Final path component only. */
+109 -23
View File
@@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$
.\"
.Dd July 3, 2004
.Dd December 8, 2005
.Dt SH 1
.Os
.Sh NAME
@@ -208,13 +208,22 @@ option if it has been set).
.It Fl e Li errexit
Exit immediately if any untested command fails in non-interactive mode.
The exit status of a command is considered to be
explicitly tested if the command is used to control
an if, elif, while, or until; or if the command is the left
explicitly tested if the command is part of the list used to control
an
.Ic if , elif , while ,
or
.Ic until ;
if the command is the left
hand operand of an
.Dq Li &&
or
.Dq Li ||
operator; or if the command is a pipeline preceded by the
.Ic !\&
operator.
If a shell function is executed and its exit status is explicitly
tested, all commands of the function are considered to be tested as
well.
.It Fl f Li noglob
Disable pathname expansion.
.It Fl I Li ignoreeof
@@ -355,8 +364,9 @@ The following is a list of valid operators:
.El
.Ss Quoting
Quoting is used to remove the special meaning of certain characters
or words to the shell, such as operators, whitespace, or
keywords.
or words to the shell, such as operators, whitespace, keywords,
or alias names.
.Pp
There are three types of quoting: matched single quotes,
matched double quotes, and backslash.
.Bl -tag -width indent
@@ -422,6 +432,16 @@ to create functions with arguments.
They can also be
used to create lexically obscure code.
This use is discouraged.
.Pp
An alias name may be escaped in a command line, so that it is not
replaced by its alias value, by using quoting characters within or
adjacent to the alias name.
This is most often done by prefixing
an alias name with a backslash to execute a function, built-in, or
normal program with the same name.
See the
.Sx Quoting
subsection.
.Ss Commands
The shell interprets the words it reads according to a
language, the specification of which is outside the scope
@@ -776,10 +796,15 @@ repeat until the exit status of the first list is zero.
The syntax of the
.Ic for
command is:
.Dl Ic for Ar variable Ic in Ar word ...
.Dl Ic for Ar variable Op Ic in Ar word ...
.Dl Ic do Ar list
.Dl Ic done
.Pp
If
.Ic in
and the following words are omitted,
.Ic in Li $@
is used instead.
The words are expanded, and then the list is executed
repeatedly with the variable set to each word in turn.
The
@@ -872,7 +897,7 @@ and the syntax is:
.Bd -ragged -offset indent
.Ic local
.Op Ar variable ...
.Op Ar -
.Op Fl
.Ed
.Pp
The
@@ -1352,8 +1377,7 @@ for the file.
If it is not found in the
.Ev PATH ,
it is sought in the current working directory.
.It Ic alias Op Ar name ...
.It Ic alias Op Ar name Ns = Ns Ar string ...
.It Ic alias Oo Ar name Ns Oo = Ns Ar string Oc ... Oc
If
.Ar name Ns = Ns Ar string
is specified, the shell defines the alias
@@ -1372,6 +1396,9 @@ built-in command prints the names and values of all defined aliases
.Ic unalias ) .
Alias values are written with appropriate quoting so that they are
suitable for re-input to the shell.
Also see the
.Sx Aliases
subsection.
.It Ic bg Op Ar job ...
Continue the specified jobs
(or the current job if no jobs are given)
@@ -1439,7 +1466,8 @@ A synonym for the
.Ic cd
built-in command.
.It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ...
Execute the specified
.It Ic command Oo Fl v | V Oc Op Ar utility
The first form of invocation executes the specified
.Ar utility
as a simple command (see the
.Sx Simple Commands
@@ -1451,10 +1479,39 @@ option is specified, the command search is performed using a
default value of
.Ev PATH
that is guaranteed to find all of the standard utilities.
.It Ic echo Oo Fl e | n Oc Op Ar string
Print
.Ar string
to the standard output with a newline appended.
.Pp
If the
.Fl v
option is specified,
.Ar utility
is not executed but a description of its interpretation by the shell is
printed.
For ordinary commands the output is the path name; for shell built-in
commands, shell functions and keywords only the name is written.
Aliases are printed as
.Dq Ic alias Ar name Ns = Ns Ar value .
.Pp
The
.Fl V
option is identical to
.Fl v
except for the output.
It prints
.Dq Ar utility Ic is Ar description
where
.Ar description
is either
the path name to
.Ar utility ,
a shell builtin,
a shell function,
a shell keyword
or
an alias for
. Ar value .
.It Ic echo Oo Fl e | n Oc Op Ar string ...
Print a space-separated list of the arguments to the standard output
and append a newline character.
.Bl -tag -width indent
.It Fl n
Suppress the output of the trailing newline.
@@ -1534,7 +1591,8 @@ If
is given
it is used as the exit status of the shell;
otherwise the exit status of the preceding command is used.
.It Ic export Oo Fl p Oc Op Ar name ...
.It Ic export Ar name ...
.It Ic export Op Fl p
The specified names are exported so that they will
appear in the environment of subsequent commands.
The only way to un-export a variable is to
@@ -1719,6 +1777,10 @@ option is specified, the PID of each job is also printed.
If the
.Fl s
option is specified, only the PIDs of the jobs are printed, one per line.
.It Ic local Oo Ar variable ... Oc Op Fl
See the
.Sx Functions
subsection.
.It Ic pwd Op Fl L | P
Print the path of the current directory.
The built-in command may
@@ -1784,7 +1846,7 @@ option is specified and the
elapses before any input is supplied,
the
.Ic read
command will return without assigning any values.
command will return an exit status of 1 without assigning any values.
The
.Ar timeout
value may optionally be followed by one of
@@ -1820,6 +1882,10 @@ If the
option is specified, the read-only variables are printed as
.Dq Ic readonly Ar name Ns = Ns Ar value
lines, suitable for re-input to the shell.
.It Ic return Op Ar exitstatus
See the
.Sx Functions
subsection.
.It Ic set Oo Fl /+abCEefIimnpTuVvx Oc Oo Fl /+o Ar longname Oc Oo
.Fl c Ar string Oc Op Fl - Ar arg ...
The
@@ -1885,7 +1951,13 @@ A shift sets the value of $1 to the value of $2,
the value of $2 to the value of $3, and so on,
decreasing the value of $# by one.
If there are zero positional parameters, shifting does not do anything.
.It Ic times
Print the amount of time spent executing the shell and its children.
The first output line shows the user and system times for the shell
itself, the second one contains the user and system times for the
children.
.It Ic trap Oo Ar action Oc Ar signal ...
.It Ic trap Fl l
Cause the shell to parse and execute
.Ar action
when any specified
@@ -1897,14 +1969,25 @@ In addition, the pseudo-signal
may be used to specify an action that is performed when the shell terminates.
The
.Ar action
may be null or omitted;
may be an empty string or a dash
.Pq Ar - ;
the former causes the specified signal to be ignored
and the latter causes the default action to be taken.
Omitting the
.Ar action
is another way to request the default action, for compatibility reasons this
usage is not recommended though.
When the shell forks off a subshell,
it resets trapped (but not ignored) signals to the default action.
The
.Ic trap
command has no effect on signals that were ignored on entry to the shell.
.Pp
Option
.Fl l
causes the
.Ic trap
command to display a list of valid signal names.
.It Ic type Op Ar name ...
Interpret each
.Ar name
@@ -1978,16 +2061,19 @@ The maximal number of simultaneous processes for this user ID.
.It Fl v Ar virtualmem
The maximal virtual size of a process, in kilobytes.
.El
.It Ic umask Op Ar mask
.It Ic umask Oo Fl S Oc Op Ar mask
Set the file creation mask (see
.Xr umask 2 )
to the octal value specified by
to the octal or symbolic (see
.Xr chmod 1 )
value specified by
.Ar mask .
If the argument is omitted, the current mask value is printed.
.It Ic unalias Oo Fl a Oc Op Ar name
If
.Ar name
is specified, the shell removes that alias.
If the
.Fl S
option is specified, the output is symbolic, otherwise the output is octal.
.It Ic unalias Oo Fl a Oc Op Ar name ...
The specified alias names are removed.
If
.Fl a
is specified, all aliases are removed.
-1
View File
@@ -371,7 +371,6 @@ void
opentrace(void)
{
char s[100];
char *getenv();
int flags;
if (!debug)
+6 -7
View File
@@ -153,15 +153,14 @@ trapcmd(int argc, char **argv)
if (argc <= 1) {
for (signo = 0 ; signo < sys_nsig ; signo++) {
if (signo < NSIG && trap[signo] != NULL) {
out1str("trap -- ");
out1qstr(trap[signo]);
if (signo == 0) {
out1fmt("trap -- '%s' %s\n",
trap[signo], "exit");
out1str(" exit\n");
} else if (sys_signame[signo]) {
out1fmt("trap -- '%s' %s\n",
trap[signo], sys_signame[signo]);
out1fmt(" %s\n", sys_signame[signo]);
} else {
out1fmt("trap -- '%s' %d\n",
trap[signo], signo);
out1fmt(" %d\n", signo);
}
}
}
@@ -382,7 +381,7 @@ onsig(int signo)
*/
if (Tflag &&
trap[signo] != NULL &&
! trap[signo][0] == '\0' &&
! (trap[signo][0] == '\0') &&
! (trap[signo][0] == ':' && trap[signo][1] == '\0'))
breakwaitcmd = 1;
+4 -2
View File
@@ -445,7 +445,7 @@ environment(void)
*/
#ifdef mkinit
MKINIT void shprocvar();
MKINIT void shprocvar(void);
SHELLPROC {
shprocvar();
@@ -541,9 +541,11 @@ exportcmd(int argc, char **argv)
argc -= optind;
argv += optind;
if (values && argc != 0)
error("-p requires no arguments");
listsetvar(cmdenviron);
if (argc != 0) {
while ((name = *argptr++) != NULL) {
while ((name = *argv++) != NULL) {
if ((p = strchr(name, '=')) != NULL) {
p++;
} else {
+1 -1
View File
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
if (l > INT_MAX) {
/*
* Avoid overflow when `seconds' is huge. This assumes
* that the maximum value for a time_t is >= INT_MAX.
* that the maximum value for a time_t is <= INT_MAX.
*/
l = INT_MAX;
}
-79
View File
@@ -1,79 +0,0 @@
.\" Copyright (c) 2002 Marcel Moolenaar
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\"
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD$
.\"
.Dd May 23, 2002
.Dt UUIDGEN 1
.Os
.Sh NAME
.Nm uuidgen
.Nd generate universally unique identifiers
.Sh SYNOPSIS
.Nm
.Op Fl 1
.Op Fl n Ar count
.Op Fl o Ar filename
.Sh DESCRIPTION
The
.Nm
utility by default generates a single universally unique identifier (UUID),
also known as a globally unique identifier (GUID).
The UUID is written to stdout by default.
The following options can be used to change the behaviour of
.Nm :
.Bl -tag -width indent
.It Fl 1
This option only has effect if multiple identifiers are to be generated and
instructs
.Nm
to not generate them in batch, but one at a time.
.It Fl n
This option controls the number of identifiers generated.
By default, multiple
identifiers are generated in batch.
.It Fl o
Redirect output to
.Ar filename
instead of stdout.
.El
.Pp
Batched generation yields a dense set of identifiers in such a way that there
is no identifier that is larger than the smallest identifier in the set and
smaller than the largest identifier in the set and that is not already in the
set.
.Pp
When generating the identifiers one at a time, the identifiers will be close
to each other, but operating system latency and processing time will be
reflected in the distance between two successive identifiers.
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr uuidgen 2 ,
.Xr uuid 3
.Sh HISTORY
The
.Nm
command first appeared in
.Fx 5.0 .
-113
View File
@@ -1,113 +0,0 @@
/*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <uuid.h>
static void
usage(void)
{
(void)fprintf(stderr, "usage: uuidgen [-1] [-n count] [-o filename]\n");
exit(1);
}
int
main(int argc, char *argv[])
{
FILE *fp;
uuid_t *store, *uuid;
char *p;
int ch, count, i, iterate;
count = -1; /* no count yet */
fp = stdout; /* default output file */
iterate = 0; /* not one at a time */
while ((ch = getopt(argc, argv, "1n:o:")) != -1)
switch (ch) {
case '1':
iterate = 1;
break;
case 'n':
if (count > 0)
usage();
count = strtol(optarg, &p, 10);
if (*p != 0 || count < 1)
usage();
break;
case 'o':
if (fp != stdout)
errx(1, "multiple output files not allowed");
fp = fopen(optarg, "w");
if (fp == NULL)
err(1, "fopen");
break;
default:
usage();
}
argv += optind;
argc -= optind;
if (argc)
usage();
if (count == -1)
count = 1;
store = (uuid_t*)malloc(sizeof(uuid_t) * count);
if (store == NULL)
err(1, "malloc()");
if (!iterate) {
/* Get them all in a single batch */
if (uuidgen(store, count) != 0)
err(1, "uuidgen()");
} else {
uuid = store;
for (i = 0; i < count; i++) {
if (uuidgen(uuid++, 1) != 0)
err(1, "uuidgen()");
}
}
uuid = store;
while (count--) {
uuid_to_string(uuid++, &p, NULL);
fprintf(fp, "%s\n", p);
free(p);
}
free(store);
if (fp != stdout)
fclose(fp);
return (0);
}
+2 -2
View File
@@ -355,7 +355,7 @@ the features.
.%T Amd \- The 4.4 BSD Automounter
.Re
.Pp
.Pa http://www.cs.columbia.edu/~ezk/am-utils/
.Pa http://www.am-utils.org/
.Sh HISTORY
The
.Nm amd
@@ -365,7 +365,7 @@ utility first appeared in
.An Jan-Simon Pendry Aq [email protected] ,
Department of Computing, Imperial College, London, UK.
.Pp
.An Erez Zadok Aq ezk@cs.columbia.edu ,
.An Erez Zadok Aq ezk@am-utils.org ,
Department of Computer Science, Columbia University,
New York, USA.
.Pp
+1 -1
View File
@@ -571,7 +571,7 @@ option to
.Nm amd .
If
.Dq yes ,
then the name refered to by
then the name referred to by
.Va ${rhost}
is normalized relative to the host database before being used.
The effect is
+257
View File
@@ -1,4 +1,261 @@
--- 9.3.2 released ---
--- 9.3.2rc1 released ---
1936. [bug] The validator could leak memory. [RT #15544]
1932. [bug] hpux: LDFLAGS was getting corrupted. [RT #15530]
--- 9.3.2b2 released ---
1930. [port] HPUX: ia64 support. [RT #15473]
1929. [port] FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.
1926. [bug] The Windows installer did not check for empty
passwords. BINDinstall was being installed in
the wrong place. [RT #15483]
1925. [port] All outer level AC_TRY_RUNs need cross compiling
defaults. [RT #15469]
1924. [port] libbind: hpux ia64 support. [RT #15473]
1923. [bug] ns_client_detach() called too early. [RT #15499]
--- 9.3.2b1 released ---
1917. [doc] funcsynopsisinfo wasn't being treated as verbatim
when generating man pages. [RT #15385]
1915. [bug] dig +ndots was broken. [RT #15215]
1914. [protocol] DS is required to accept mnemonic algorithms
(RFC 4034). Still emit numeric algorithms for
compatability with RFC 3658. [RT #15354]
1911. [bug] Update windows socket code. [RT #14965]
1910. [bug] dig's +sigchase code overhauled. [RT #14933]
1909. [bug] The DLV code has been re-worked to make no longer
query order sensitive. [RT #14933]
1905. [bug] Strings returned from cfg_obj_asstring() should be
treated as read-only. [RT #15256]
1901. [cleanup] Don't add DNSKEY records to the additional section.
1900. [bug] ixfr-from-differences failed to ensure that the
serial number increased. [RT #15036]
1896. [bug] Extend ISC_SOCKADDR_FORMATSIZE and
ISC_NETADDR_FORMATSIZE to allow for scope details.
1894. [bug] Recursive clients soft quota support wasn't working
as expected. [RT #15103]
1893. [bug] A escaped character is, potentially, converted to
the output character set too early. [RT #14666]
1892. [port] Use uintptr_t if available. [RT #14606]
1889. [port] sunos: non blocking i/o support. [RT #14951]
1887. [bug] The cache could delete expired records too fast for
clients with a virtual time in the past. [RT #14991]
1886. [bug] fctx_create() could return success even though it
failed. [RT #14993]
1884. [cleanup] dighost.c: move external declarations into <dig/dig.h>.
1883. [bug] dnssec-signzone, dnssec-keygen: handle negative debug
levels. [RT #14962]
1881. [func] Add a system test for named-checkconf. [RT #14931]
1877. [bug] Fix unreasonably low quantum on call to
dns_rbt_destroy2(). Remove unnecessay unhash_node()
call. [RT #14919]
1875. [bug] process_dhtkey() was using the wrong memory context
to free some memory. [RT #14890]
1874. [port] sunos: portability fixes. [RT #14814]
1873. [port] win32: isc__errno2result() now reports its caller.
[RT #13753]
1872. [port] win32: Handle ERROR_NETNAME_DELETED. [RT #13753]
1867. [bug] It was possible to trigger a INSIST in
dlv_validatezonekey(). [RT #14846]
1866. [bug] resolv.conf parse errors were being ignored by
dig/host/nslookup. [RT #14841]
1865. [bug] Silently ignore nameservers in /etc/resolv.conf with
bad addresses. [RT #14841]
1864. [bug] Don't try the alternative transfer source if you
got a answer / transfer with the main source
address. [RT #14802]
1863. [bug] rrset-order "fixed" error messages not complete.
1861. [bug] dig could trigger a INSIST on certain malformed
responses. [RT #14801]
1860. [port] solaris 2.8: hack_shutup_pthreadmutexinit was
incorrectly set. [RT #14775]
1858. [bug] The flush-zones-on-shutdown option wasn't being
parsed. [RT #14686]
1857. [bug] named could trigger a INSIST() if reconfigured /
reloaded too fast. [RT #14673]
1856. [doc] Switch Docbook toolchain from DSSSL to XSL.
[RT #11398]
1855. [bug] ixfr-from-differences was failing to detect changes
of ttl due to dns_diff_subtract() was ignoring the ttl
of records. [RT #14616]
1854. [bug] lwres also needs to know the print format for
(long long). [RT #13754]
1853. [bug] Rework how DLV interacts with proveunsecure().
[RT #13605]
1852. [cleanup] Remove last vestiges of dnssec-signkey and
dnssec-makekeyset (removed from Makefile years ago).
1850. [bug] Memory leak in lwres_getipnodebyaddr(). [RT #14591]
1849. [doc] All forms of the man pages (docbook, man, html) should
have consistant copyright dates.
1848. [bug] Improve SMF integration. [RT #13238]
1847. [bug] isc_ondestroy_init() is called too late in
dns_rbtdb_create()/dns_rbtdb64_create().
[RT #13661]
1846. [contrib] query-loc-0.3.0 from Stephane Bortzmeyer
<[email protected]>.
1845. [bug] Improve error reporting to distingish between
accept()/fcntl() and socket()/fcntl() errors.
[RT #13745]
1844. [bug] inet_pton() accepted more that 4 hexadecimal digits
for each 16 bit piece of the IPv6 address. The text
representation of a IPv6 address has been tighted
to disallow this (draft-ietf-ipv6-addr-arch-v4-02.txt).
[RT #5662]
1843. [cleanup] CINCLUDES takes precedence over CFLAGS. This helps
when CFLAGS contains "-I /usr/local/include"
resulting in old header files being used.
1842. [port] cmsg_len() could produce incorrect results on
some platform. [RT #13744]
1841. [bug] "dig +nssearch" now makes a recursive query to
find the list of nameservers to query. [RT #13694]
1839. [bug] <isc/hash.h> was not being installed.
1838. [cleanup] Don't allow Linux capabilities to be inherited.
[RT #13707]
1837. [bug] Compile time option ISC_FACILITY was not effective
for 'named -u <user>'. [RT #13714]
1836. [cleanup] Silence compiler warnings in hash_test.c.
1835. [bug] Update dnssec-signzone's usage message. [RT #13657]
1834. [bug] Bad memset in rdata_test.c. [RT #13658]
1833. [bug] Race condition in isc_mutex_lock_profile(). [RT #13660]
1832. [bug] named fails to return BADKEY on unknown TSIG algorithm.
[RT #13620]
1831. [doc] Update named-checkzone documentation. [RT#13604]
1830. [bug] adb lame cache has sence of test reversed. [RT #13600]
1829. [bug] win32: "pid-file none;" broken. [RT #13563]
1828. [bug] isc_rwlock_init() failed to properly cleanup if it
encountered a error. [RT #13549]
1827. [bug] host: update usage message for '-a'. [RT #37116]
1826. [bug] Missing DESTROYLOCK() in isc_mem_createx() on out
of memory error. [RT #13537]
1825. [bug] Missing UNLOCK() on out of memory error from in
rbtdb.c:subtractrdataset(). [RT #13519]
1824. [bug] Memory leak on dns_zone_setdbtype() failure.
[RT #13510]
1823. [bug] Wrong macro used to check for point to point interface.
[RT#13418]
1822. [bug] check-names test for RT was reversed. [RT #13382]
1821. [doc] acls definitions are no longer required to be
in named.conf prior to reference. They can be
defined after being referenced.
1820. [bug] Gracefully handle acl loops. [RT #13659]
1819. [bug] The validator needed to check both the algorithm and
digest types of the DS to determine if it could be
used to introduce a secure zone. [RT #13593]
1816. [port] UnixWare: failed to compile lib/isc/unix/net.c.
[RT #13597]
1815. [bug] nsupdate triggered a REQUIRE if the server was set
without also setting the zone and it encountered
a CNAME and was using TSIG. [RT #13086]
1810. [bug] configure, lib/bind/configure make different default
decisions about whether to do a threaded build.
[RT #13212]
1809. [bug] "make distclean" failed for libbind if the platform
is not supported.
1807. [bug] When forwarding (forward only) set the active domain
from the forward zone name. [RT #13526]
1804. [bug] Ensure that if we are queried for glue that it fits
in the additional section or TC is set to tell the
client to retry using TCP. [RT #10114]
1803. [bug] dnssec-signzone sometimes failed to remove old
RRSIGs. [RT #13483]
1802. [bug] Handle connection resets better. [RT #11280]
1799. [bug] 'rndc flushname' failed to flush negative cache
entries. [RT #13438]
1795. [bug] "rndc dumpdb" was not fully documented. Minor
formating issues with "rndc dumpdb -all". [RT #13396]
1791. [bug] 'host -t a' still printed out AAAA and MX records.
[RT #13230]
--- 9.3.1 released ---
1818. [bug] 'named-checkconf -z' triggered an INSIST. [RT #13599]
+393 -338
View File
@@ -1,470 +1,525 @@
Frequently Asked Questions about BIND 9
-------------------------------------------------------------------------------
Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads?
A: Linux threads do not fully implement the Posix threads (pthreads) standard.
In particular, setuid() operates only on the current thread, not the full
process. Because of this limitation, BIND 9 cannot use setuid() on Linux as it
can on all other supported platforms. setuid() cannot be called before
creating threads, since the server does not start listening on reserved ports
until after threads have started.
In particular, setuid() operates only on the current thread, not the full
process. Because of this limitation, BIND 9 cannot use setuid() on Linux as
it can on all other supported platforms. setuid() cannot be called before
creating threads, since the server does not start listening on reserved
ports until after threads have started.
In the 2.2.18 or 2.3.99-pre3 and newer kernels, the ability to preserve
capabilities across a setuid() call is present. This allows BIND 9 to call
setuid() early, while retaining the ability to bind reserved ports. This is
a Linux-specific hack.
In the 2.2.18 or 2.3.99-pre3 and newer kernels, the ability to preserve
capabilities across a setuid() call is present. This allows BIND 9 to call
setuid() early, while retaining the ability to bind reserved ports. This is
a Linux-specific hack.
On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less
of a security risk than a root process that has not dropped privileges.
On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less
of a security risk than a root process that has not dropped privileges.
If Linux threads ever work correctly, this restriction will go away.
If Linux threads ever work correctly, this restriction will go away.
Configuring BIND9 with the --disable-threads option (the default) causes a
non-threaded version to be built, which will allow -u to be used.
Configuring BIND9 with the --disable-threads option (the default) causes a
non-threaded version to be built, which will allow -u to be used.
Q: Why does named log the warning message "no TTL specified - using SOA MINTTL
instead"?
Q: Why does named log the warning message "no TTL specified - using SOA
MINTTL instead"?
A: Your zone file is illegal according to RFC1035. It must either
have a line like
A: Your zone file is illegal according to RFC1035. It must either have a line
like:
$TTL 86400
at the beginning, or the first record in it must have a TTL field,
like the "84600" in this example:
at the beginning, or the first record in it must have a TTL field, like the
"84600" in this example:
example.com. 86400 IN SOA ns hostmaster ( 1 3600 1800 1814400 3600 )
Q: Why do I see 5 (or more) copies of named on Linux?
A: Linux threads each show up as a process under ps. The approximate
number of threads running is n+4, where n is the number of CPUs. Note that
the amount of memory used is not cumulative; if each process is using 10M of
memory, only a total of 10M is used.
A: Linux threads each show up as a process under ps. The approximate number of
threads running is n+4, where n is the number of CPUs. Note that the amount
of memory used is not cumulative; if each process is using 10M of memory,
only a total of 10M is used.
Q: Why does BIND 9 log "permission denied" errors accessing its configuration
files or zones on my Linux system even though it is running as root?
Q: Why does BIND 9 log "permission denied" errors accessing its
configuration files or zones on my Linux system even though it is running
as root?
A: On Linux, BIND 9 drops most of its root privileges on startup.
This including the privilege to open files owned by other users.
Therefore, if the server is running as root, the configuration files
and zone files should also be owned by root.
A: On Linux, BIND 9 drops most of its root privileges on startup. This
including the privilege to open files owned by other users. Therefore, if
the server is running as root, the configuration files and zone files should
also be owned by root.
Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file
bar: ran out of space"
A: This is often caused by TXT records with missing close quotes. Check that
all TXT records containing quoted strings have both open and close quotes.
bar: ran out of space"?
A: This is often caused by TXT records with missing close quotes. Check that
all TXT records containing quoted strings have both open and close quotes.
Q: How do I produce a usable core file from a multithreaded named on Linux?
A: If the Linux kernel is 2.4.7 or newer, multithreaded core dumps
are usable (that is, the correct thread is dumped). Otherwise, if using
a 2.2 kernel, apply the kernel patch found in contrib/linux/coredump-patch
and rebuild the kernel. This patch will cause multithreaded programs to dump
the correct thread.
A: If the Linux kernel is 2.4.7 or newer, multithreaded core dumps are usable
(that is, the correct thread is dumped). Otherwise, if using a 2.2 kernel,
apply the kernel patch found in contrib/linux/coredump-patch and rebuild the
kernel. This patch will cause multithreaded programs to dump the correct
thread.
Q: How do I restrict people from looking up the server version?
A: Put a "version" option containing something other than the real
version in the "options" section of named.conf. Note doing this will
not prevent attacks and may impede people trying to diagnose problems
with your server. Also it is possible to "fingerprint" nameservers to
determine their version.
A: Put a "version" option containing something other than the real version in
the "options" section of named.conf. Note doing this will not prevent
attacks and may impede people trying to diagnose problems with your server.
Also it is possible to "fingerprint" nameservers to determine their version.
Q: How do I restrict only remote users from looking up the server version?
Q: How do I restrict only remote users from looking up the server
version?
A: The following view statement will intercept lookups as the internal
view that holds the version information will be matched last. The
caveats of the previous answer still apply, of course.
view "chaos" chaos {
match-clients { <those to be refused>; };
allow-query { none; };
zone "." {
type hint;
file "/dev/null"; // or any empty file
};
};
A: The following view statement will intercept lookups as the internal view
that holds the version information will be matched last. The caveats of the
previous answer still apply, of course.
view "chaos" chaos {
match-clients { <those to be refused>; };
allow-query { none; };
zone "." {
type hint;
file "/dev/null"; // or any empty file
};
};
Q: What do "no source of entropy found" or "could not open entropy source foo"
mean?
mean?
A: The server requires a source of entropy to perform certain operations,
mostly DNSSEC related. These messages indicate that you have no source
of entropy. On systems with /dev/random or an equivalent, it is used by
default. A source of entropy can also be defined using the random-device
option in named.conf.
mostly DNSSEC related. These messages indicate that you have no source of
entropy. On systems with /dev/random or an equivalent, it is used by
default. A source of entropy can also be defined using the random-device
option in named.conf.
Q: I installed BIND 9 and restarted named, but it's still BIND 8. Why?
Q: I installed BIND 9 and restarted named, but it's still BIND 8. Why?
A: BIND 9 is installed under /usr/local by default. BIND 8 is often installed
under /usr. Check that the correct named is running.
A: BIND 9 is installed under /usr/local by default. BIND 8 is often
installed under /usr. Check that the correct named is running.
Q: I'm trying to use TSIG to authenticate dynamic updates or zone transfers.
I'm sure I have the keys set up correctly, but the server is rejecting the
TSIG. Why?
A: This may be a clock skew problem. Check that the the clocks on the client
and server are properly synchronised (e.g., using ntp).
Q: I'm trying to use TSIG to authenticate dynamic updates or zone
transfers. I'm sure I have the keys set up correctly, but the server
is rejecting the TSIG. Why?
Q: I'm trying to compile BIND 9, and "make" is failing due to files not being
found. Why?
A: This may be a clock skew problem. Check that the the clocks on
the client and server are properly synchronized (e.g., using ntp).
A: Using a parallel or distributed "make" to build BIND 9 is not supported, and
doesn't work. If you are using one of these, use normal make or gmake
instead.
Q: I have a BIND 9 master and a BIND 8.2.3 slave, and the master is logging
error messages like "notify to 10.0.0.1#53 failed: unexpected end of input".
What's wrong?
Q: I'm trying to compile BIND 9, and "make" is failing due to files not
being found. Why?
A: This error message is caused by a known bug in BIND 8.2.3 and is fixed in
BIND 8.2.4. It can be safely ignored - the notify has been acted on by the
slave despite the error message.
A: Using a parallel or distributed "make" to build BIND 9 is not
supported, and doesn't work. If you are using one of these, use
normal make or gmake instead.
Q: I keep getting log messages like the following. Why?
Dec 4 23:47:59 client 10.0.0.1#1355: updating zone 'example.com/IN': update
failed: 'RRset exists (value dependent)' prerequisite not satisfied
(NXRRSET)
Q: I have a BIND 9 master and a BIND 8.2.3 slave, and the master is
logging error messages like "notify to 10.0.0.1#53 failed: unexpected
end of input". What's wrong?
A: DNS updates allow the update request to test to see if certain conditions
are met prior to proceeding with the update. The message above is saying
that conditions were not met and the update is not proceeding. See doc/rfc/
rfc2136.txt for more details on prerequisites.
A: This error message is caused by a known bug in BIND 8.2.3 and is fixed
in BIND 8.2.4. It can be safely ignored - the notify has been acted on by
the slave despite the error message.
Q: I keep getting log messages like the following. Why?
Dec 4 23:47:59 client 10.0.0.1#1355: updating zone 'example.com/IN':
update failed: 'RRset exists (value dependent)' prerequisite not
satisfied (NXRRSET)
A: DNS updates allow the update request to test to see if certain
conditions are met prior to proceeding with the update. The message
above is saying that conditions were not met and the update is not
proceeding. See doc/rfc/rfc2136.txt for more details on prerequisites.
Q: I keep getting log messages like the following. Why?
Q: I keep getting log messages like the following. Why?
Jun 21 12:00:00.000 client 10.0.0.1#1234: update denied
A: Someone is trying to update your DNS data using the RFC2136 Dynamic
Update protocol. Windows 2000 machines have a habit of sending dynamic
update requests to DNS servers without being specifically configured to
do so. If the update requests are coming from a Windows 2000 machine,
see <http://support.microsoft.com/support/kb/articles/q246/8/04.asp>
for information about how to turn them off.
A: Someone is trying to update your DNS data using the RFC2136 Dynamic Update
protocol. Windows 2000 machines have a habit of sending dynamic update
requests to DNS servers without being specifically configured to do so. If
the update requests are coming from a Windows 2000 machine, see http://
support.microsoft.com/support/kb/articles/q246/8/04.asp for information
about how to turn them off.
Q: I see a log message like the following. Why?
Q: I see a log message like the following. Why?
couldn't open pid file '/var/run/named.pid': Permission denied
A: You are most likely running named as a non-root user, and that user
does not have permission to write in /var/run. The common ways of
fixing this are to create a /var/run/named directory owned by the named
user and set pid-file to "/var/run/named/named.pid", or set
pid-file to "named.pid", which will put the file in the directory
specified by the directory option (which, in this case, must be writable
by the named user).
A: You are most likely running named as a non-root user, and that user does not
have permission to write in /var/run. The common ways of fixing this are to
create a /var/run/named directory owned by the named user and set pid-file
to "/var/run/named/named.pid", or set pid-file to "named.pid", which will
put the file in the directory specified by the directory option (which, in
this case, must be writable by the named user).
Q: When I do a "dig . ns", many of the A records for the root servers are
missing. Why?
Q: When I do a "dig . ns", many of the A records for the root
servers are missing. Why?
A: This is normal and harmless. It is a somewhat confusing side effect of the
way BIND 9 does RFC2181 trust ranking and of the efforts BIND 9 makes to
avoid promoting glue into answers.
A: This is normal and harmless. It is a somewhat confusing side effect
of the way BIND 9 does RFC2181 trust ranking and of the efforts BIND 9
makes to avoid promoting glue into answers.
When BIND 9 first starts up and primes its cache, it receives the root
server addresses as additional data in an authoritative response from a root
server, and these records are eligible for inclusion as additional data in
responses. Subsequently it receives a subset of the root server addresses as
additional data in a non-authoritative (referral) response from a root
server. This causes the addresses to now be considered non-authoritative
(glue) data, which is not eligible for inclusion in responses.
When BIND 9 first starts up and primes its cache, it receives the root
server addresses as additional data in an authoritative response from
a root server, and these records are eligible for inclusion as
additional data in responses. Subsequently it receives a subset of
the root server addresses as additional data in a non-authoritative
(referral) response from a root server. This causes the addresses to
now be considered non-authoritative (glue) data, which is not eligible
for inclusion in responses.
The server does have a complete set of root server addresses cached at all
times, it just may not include all of them as additional data, depending on
whether they were last received as answers or as glue. You can always look
up the addresses with explicit queries like "dig a.root-servers.net A".
The server does have a complete set of root server addresses cached
at all times, it just may not include all of them as additional data,
depending on whether they were last received as answers or as glue.
You can always look up the addresses with explicit queries like
"dig a.root-servers.net A".
Q: Zone transfers from my BIND 9 master to my Windows 2000 slave
fail. Why?
A: This may be caused by a bug in the Windows 2000 DNS server where
DNS messages larger than 16K are not handled properly. This can be
worked around by setting the option "transfer-format one-answer;".
Also check whether your zone contains domain names with embedded
spaces or other special characters, like "John\032Doe\213s\032Computer",
since such names have been known to cause Windows 2000 slaves to
incorrectly reject the zone.
Q: Zone transfers from my BIND 9 master to my Windows 2000 slave fail. Why?
A: This may be caused by a bug in the Windows 2000 DNS server where DNS
messages larger than 16K are not handled properly. This can be worked around
by setting the option "transfer-format one-answer;". Also check whether your
zone contains domain names with embedded spaces or other special characters,
like "John\032Doe\213s\032Computer", since such names have been known to
cause Windows 2000 slaves to incorrectly reject the zone.
Q: Why don't my zones reload when I do an "rndc reload" or SIGHUP?
A: A zone can be updated either by editing zone files and reloading
the server or by dynamic update, but not both. If you have enabled
dynamic update for a zone using the "allow-update" option, you are not
supposed to edit the zone file by hand, and the server will not
attempt to reload it.
A: A zone can be updated either by editing zone files and reloading the server
or by dynamic update, but not both. If you have enabled dynamic update for a
zone using the "allow-update" option, you are not supposed to edit the zone
file by hand, and the server will not attempt to reload it.
Q: I can query the nameserver from the nameserver but not from other machines.
Why?
Q: I can query the nameserver from the nameserver but not from other
machines. Why?
A: This is usually the result of the firewall configuration stopping the
queries and / or the replies.
A: This is usually the result of the firewall configuration stopping
the queries and / or the replies.
Q: How can I make a server a slave for both an internal and an external view at
the same time? When I tried, both views on the slave were transferred from
the same view on the master.
A: You will need to give the master and slave multiple IP addresses and use
those to make sure you reach the correct view on the other machine.
Q: How can I make a server a slave for both an internal and
an external view at the same time? When I tried, both views
on the slave were transferred from the same view on the master.
Master: 10.0.1.1 (internal), 10.0.1.2 (external, IP alias)
internal:
match-clients { !10.0.1.2; !10.0.1.4; 10.0.1/24; };
notify-source 10.0.1.1;
transfer-source 10.0.1.1;
query-source address 10.0.1.1;
external:
match-clients { any; };
recursion no; // don't offer recursion to the world
notify-source 10.0.1.2;
transfer-source 10.0.1.2;
query-source address 10.0.1.2;
A: You will need to give the master and slave multiple IP addresses and
use those to make sure you reach the correct view on the other machine.
Slave: 10.0.1.3 (internal), 10.0.1.4 (external, IP alias)
internal:
match-clients { !10.0.1.2; !10.0.1.4; 10.0.1/24; };
notify-source 10.0.1.3;
transfer-source 10.0.1.3;
query-source address 10.0.1.3;
external:
match-clients { any; };
recursion no; // don't offer recursion to the world
notify-source 10.0.1.4;
transfer-source 10.0.1.4;
query-source address 10.0.1.4;
e.g.
Master: 10.0.1.1 (internal), 10.0.1.2 (external, IP alias)
internal:
match-clients { !10.0.1.2; !10.0.1.4; 10.0.1/24; };
notify-source 10.0.1.1;
transfer-source 10.0.1.1;
query-source address 10.0.1.1;
external:
match-clients { any; };
recursion no; // don't offer recursion to the world
notify-source 10.0.1.2;
transfer-source 10.0.1.2;
query-source address 10.0.1.2;
You put the external address on the alias so that all the other dns clients
on these boxes see the internal view by default.
Slave: 10.0.1.3 (internal), 10.0.1.4 (external, IP alias)
internal:
match-clients { !10.0.1.2; !10.0.1.4; 10.0.1/24; };
notify-source 10.0.1.3;
transfer-source 10.0.1.3;
query-source address 10.0.1.3;
external:
match-clients { any; };
recursion no; // don't offer recursion to the world
notify-source 10.0.1.4;
transfer-source 10.0.1.4;
query-source address 10.0.1.4;
A: BIND 9.3 and later: Use TSIG to select the appropriate view.
You put the external address on the alias so that all the other
dns clients on these boxes see the internal view by default.
Master 10.0.1.1:
key "external" {
algorithm hmac-md5;
secret "xxxxxxxx";
};
view "internal" {
match-clients { !key external; 10.0.1/24; };
...
};
view "external" {
match-clients { key external; any; };
server 10.0.0.2 { keys external; };
recursion no;
...
};
A: (BIND 9.3 and later) Use TSIG to select the appropriate view.
Slave 10.0.1.2:
key "external" {
algorithm hmac-md5;
secret "xxxxxxxx";
};
view "internal" {
match-clients { !key external; 10.0.1/24; };
...
};
view "external" {
match-clients { key external; any; };
server 10.0.0.1 { keys external; };
recursion no;
...
};
Master 10.0.1.1:
key "external" {
algorithm hmac-md5;
secret "xxxxxxxx";
};
view "internal" {
match-clients { !key external; 10.0.1/24; };
...
};
view "external" {
match-clients { key external; any; };
server 10.0.0.2 { keys external; };
recursion no;
...
};
Q: I have FreeBSD 4.x and "rndc-confgen -a" just sits there.
Slave 10.0.1.2:
key "external" {
algorithm hmac-md5;
secret "xxxxxxxx";
};
view "internal" {
match-clients { !key external; 10.0.1/24; };
};
view "external" {
match-clients { key external; any; };
server 10.0.0.1 { keys external; };
recursion no;
...
};
A: /dev/random is not configured. Use rndcontrol(8) to tell the kernel to use
certain interrupts as a source of random events. You can make this permanent
by setting rand_irqs in /etc/rc.conf.
/etc/rc.conf
rand_irqs="3 14 15"
Q: I have Freebsd 4.x and "rndc-confgen -a" just sits there.
A: /dev/random is not configured. Use rndcontrol(8) to tell the kernel
to use certain interrupts as a source of random events. You can make this
permanent by setting rand_irqs in /etc/rc.conf.
e.g.
/etc/rc.conf
rand_irqs="3 14 15"
See also http://people.freebsd.org/~dougb/randomness.html
See also http://people.freebsd.org/~dougb/randomness.html
Q: Why is named listening on UDP port other than 53?
A: Named uses a system selected port to make queries of other nameservers.
This behaviour can be overridden by using query-source to lock down the
port and/or address. See also notify-source and transfer-source.
A: Named uses a system selected port to make queries of other nameservers. This
behaviour can be overridden by using query-source to lock down the port and/
or address. See also notify-source and transfer-source.
Q: I get error messages like "multiple RRs of singleton type" and "CNAME and
other data" when transferring a zone. What does this mean?
Q: I get error messages like "multiple RRs of singleton type" and
"CNAME and other data" when transferring a zone. What does this mean?
A: These indicate a malformed master zone. You can identify the exact records
involved by transferring the zone using dig then running named-checkzone on
it.
A: These indicate a malformed master zone. You can identify the
exact records involved by transferring the zone using dig then
running named-checkzone on it.
dig axfr example.com @master-server > tmp
named-checkzone example.com tmp
e.g.
dig axfr example.com @master-server > tmp
named-checkzone example.com tmp
A CNAME record cannot exist with the same name as another record except for
the DNSSEC records which prove its existance (NSEC).
RFC 1034, Section 3.6.2: "If a CNAME RR is present at a node, no other data
should be present; this ensures that the data for a canonical name and its
aliases cannot be different. This rule also insures that a cached CNAME can
be used without checking with an authoritative server for other RR types."
Q: I get error messages like "named.conf:99: unexpected end of input" where
99 is the last line of named.conf.
Q: I get error messages like "named.conf:99: unexpected end of input" where 99
is the last line of named.conf.
A: Some text editors (notepad and wordpad) fail to put a line termination
indication (e.g. CR/LF) on the last line of a text file. This can be fixed
by "adding" a blank line to the end of the file. Named expects to see EOF
immediately after EOL and treats text files where this is not met as truncated.
A: Some text editors (notepad and wordpad) fail to put a line title indication
(e.g. CR/LF) on the last line of a text file. This can be fixed by "adding"
a blank line to the end of the file. Named expects to see EOF immediately
after EOL and treats text files where this is not met as truncated.
Q: I get warning messages like "zone example.com/IN: refresh: failure trying master
1.2.3.4#53: timed out".
Q: I get warning messages like "zone example.com/IN: refresh: failure trying
master 1.2.3.4#53: timed out".
A: Check that you can make UDP queries from the slave to the master
dig +norec example.com soa @1.2.3.4
dig +norec example.com soa @1.2.3.4
A: You could be generating queries faster than the slave can cope with. Lower
the serial query rate.
You could be generating queries faster than the slave can cope with. Lower
the serial query rate.
serial-query-rate 5; // default 20
serial-query-rate 5; // default 20
Q: How do I share a dynamic zone between multiple views?
A: You choose one view to be master and the second a slave and transfer
the zone between views.
A: You choose one view to be master and the second a slave and transfer the
zone between views.
Master 10.0.1.1:
key "external" {
algorithm hmac-md5;
secret "xxxxxxxx";
};
Master 10.0.1.1:
key "external" {
algorithm hmac-md5;
secret "xxxxxxxx";
};
key "mykey" {
algorithm hmac-md5;
secret "yyyyyyyy";
};
key "mykey" {
algorithm hmac-md5;
secret "yyyyyyyy";
};
view "internal" {
match-clients { !external; 10.0.1/24; };
server 10.0.1.1 {
/* Deliver notify messages to external view. */
keys { external; };
};
zone "example.com" {
type master;
file "internal/example.db";
allow-update { key mykey; };
notify-also { 10.0.1.1; };
};
};
view "internal" {
match-clients { !external; 10.0.1/24; };
server 10.0.1.1 {
/* Deliver notify messages to external view. */
keys { external; };
};
zone "example.com" {
type master;
file "internal/example.db";
allow-update { key mykey; };
notify-also { 10.0.1.1; };
};
};
view "external" {
match-clients { external; any; };
zone "example.com" {
type slave;
file "external/example.db";
masters { 10.0.1.1; };
transfer-source { 10.0.1.1; };
// allow-update-forwarding { any; };
// allow-notify { ... };
};
};
view "external" {
match-clients { external; any; };
zone "example.com" {
type slave;
file "external/example.db";
masters { 10.0.1.1; };
transfer-source { 10.0.1.1; };
// allow-update-forwarding { any; };
// allow-notify { ... };
};
};
Q: I get a error message like "zone wireless.ietf56.ietf.org/IN: loading master
file primaries/wireless.ietf56.ietf.org: no owner".
A: This error is produced when a line in the master file contains leading
white space (tab/space) but the is no current record owner name to inherit
the name from. Usually this is the result of putting white space before
a comment. Forgeting the "@" for the SOA record or indenting the master
file.
file primaries/wireless.ietf56.ietf.org: no owner".
A: This error is produced when a line in the master file contains leading white
space (tab/space) but the is no current record owner name to inherit the
name from. Usually this is the result of putting white space before a
comment. Forgeting the "@" for the SOA record or indenting the master file.
Q: Why are my logs in GMT (UTC).
A: You are running chrooted (-t) and have not supplied local timzone
information in the chroot area.
information in the chroot area.
FreeBSD: /etc/localtime
Solaris: /etc/TIMEZONE and /usr/share/lib/zoneinfo
OSF: /etc/zoneinfo/localtime
FreeBSD: /etc/localtime
Solaris: /etc/TIMEZONE and /usr/share/lib/zoneinfo
OSF: /etc/zoneinfo/localtime
See also tzset(3) and zic(8).
See also tzset(3) and zic(8).
Q: I get the error message "named: capset failed: Operation not permitted" when
starting named.
Q: I get the error message "named: capset failed: Operation not permitted"
when starting named.
A: The capability module, part of "Linux Security Modules/LSM", has not been
loaded into the kernel. See insmod(8).
A: The capset module has not been loaded into the kernel. See insmod(8).
Q: I get "rndc: connect failed: connection refused" when I try to run
rndc.
Q: I get "rndc: connect failed: connection refused" when I try to run rndc.
A: This is usually a configuration error.
First ensure that named is running and no errors are being
reported at startup (/var/log/messages or equivalent). Running
"named -g <usual arguements>" from a terminal can help at this
point.
First ensure that named is running and no errors are being reported at
startup (/var/log/messages or equivalent). Running "named -g <usual
arguments>" from a title can help at this point.
Secondly ensure that named is configured to use rndc either by
"rndc-confgen -a", rndc-confgen or manually. The Administators
Reference manual has details on how to do this.
Secondly ensure that named is configured to use rndc either by "rndc-confgen
-a", rndc-confgen or manually. The Administrators Reference manual has
details on how to do this.
Old versions of rndc-confgen used localhost rather than 127.0.0.1
in /etc/rndc.conf for the default server. Update /etc/rndc.conf
if necessary so that the default server listed in /etc/rndc.conf
matches the addresses used in named.conf. "localhost" has two
address (127.0.0.1 and ::1).
If you use "rndc-confgen -a" and named is running with -t or -u
ensure that /etc/rndc.conf has the correct ownership and that
a copy is in the chroot area. You can do this by re-running
"rndc-confgen -a" with appropriate -t and -u arguements.
Old versions of rndc-confgen used localhost rather than 127.0.0.1 in /etc/
rndc.conf for the default server. Update /etc/rndc.conf if necessary so that
the default server listed in /etc/rndc.conf matches the addresses used in
named.conf. "localhost" has two address (127.0.0.1 and ::1).
If you use "rndc-confgen -a" and named is running with -t or -u ensure that
/etc/rndc.conf has the correct ownership and that a copy is in the chroot
area. You can do this by re-running "rndc-confgen -a" with appropriate -t
and -u arguments.
Q: I don't get RRSIG's returned when I use "dig +dnssec".
A: You need to ensure DNSSEC is enabled (dnssec-enable yes;).
Q: I get "Error 1067" when starting named under Windows.
A: This is the service manager saying that named exited. You need to
examine the Application log in the EventViewer to find out why.
A: This is the service manager saying that named exited. You need to examine
the Application log in the EventViewer to find out why.
Common causes are that you failed to create "named.conf" (usually
"C:\windows\dns\etc\named.conf") or failed to specify the directory
in named.conf.
Common causes are that you failed to create "named.conf" (usually "C:\
windows\dns\etc\named.conf") or failed to specify the directory in
named.conf.
options {
Directory "C:\windows\dns\etc";
};
options {
Directory "C:\windows\dns\etc";
};
Q: I get "transfer of 'example.net/IN' from 192.168.4.12#53: failed while
receiving responses: permission denied" error messages.
A: These indicate a filesystem permission error preventing named creating /
renaming the temporary file. These will usually also have other associated
error messages like
"dumping master file: sl/tmp-XXXX5il3sQ: open: permission denied"
Named needs write permission on the directory containing the file. Named
writes the new cache file to a temporary file then renames it to the name
specified in named.conf to ensure that the contents are always complete.
This is to prevent named loading a partial zone in the event of power
failure or similar interrupting the write of the master file.
Note file names are relative to the directory specified in options and any
chroot directory ([<chroot dir>/][<options dir>]).
If named is invoked as "named -t /chroot/DNS" with the following named.conf
then "/chroot/DNS/var/named/sl" needs to be writable by the user named is
running as.
options {
directory "/var/named";
};
zone "example.net" {
type slave;
file "sl/example.net";
masters { 192.168.4.12; };
};
Q: How do I intergrate BIND 9 and Solaris SMF
A: Sun has a blog entry describing how to do this.
http://blogs.sun.com/roller/page/anay/Weblog?catname=%2FSolaris
Q: Can a NS record refer to a CNAME.
A: No. The rules for glue (copies of the *address* records in the parent zones)
and additional section processing do not allow it to work.
You would have to add both the CNAME and address records (A/AAAA) as glue to
the parent zone and have CNAMEs be followed when doing additional section
processing to make it work. No namesever implementation supports either of
these requirements.
Q: What does "RFC 1918 response from Internet for 0.0.0.10.IN-ADDR.ARPA" mean?
A: If the IN-ADDR.ARPA name covered refers to a internal address space you are
using then you have failed to follow RFC 1918 usage rules and are leaking
queries to the Internet. You should establish your own zones for these
addresses to prevent you quering the Internet's name servers for these
addresses. Please see http://as112.net/ for details of the problems you are
causing and the counter measures that have had to be deployed.
If you are not using these private addresses then a client has queried for
them. You can just ignore the messages, get the offending client to stop
sending you these messages as they are most probably leaking them or setup
your own zones empty zones to serve answers to these queries.
zone "10.IN-ADDR.ARPA" {
type master;
file "empty";
};
zone "16.172.IN-ADDR.ARPA" {
type master;
file "empty";
};
...
zone "31.172.IN-ADDR.ARPA" {
type master;
file "empty";
};
zone "168.192.IN-ADDR.ARPA" {
type master;
file "empty";
};
empty:
@ 10800 IN SOA <name-of-server>. <contact-email>. (
1 3600 1200 604800 10800 )
@ 10800 IN NS <name-of-server>.
Note
Future versions of named are likely to do this automatically.
File diff suppressed because it is too large. Load diff
-105
View File
@@ -1,105 +0,0 @@
FreeBSD maintainer's guide to updating BIND 9
=============================================
1) Obtain the latest source distribution from the ISC's FTP server
(ftp://ftp.isc.org/isc/bind9/)
2) Unpack the tarball in a suitable directory, and cd into the new
source directory.
3) Remove unwanted files and directories:
$ while read pattern ; do rm -rf $pattern ; done \
</usr/src/contrib/bind9/FREEBSD-Xlist
Make sure that took care of everything, and if it didn't, make sure
to update FREEBSD-Xlist so you won't miss it the next time. A good
way to do this is to run a test import and see if any new files
show up:
$ cvs -q -n import src/contrib/bind9 ISC x | grep \^N
4) Import the sources:
$ cvs import -m "Vendor import of BIND 9.X.Y" \
src/contrib/bind9 ISC BIND_9_X_Y
5) Resolve conflicts.
As of 17 March 2005, we have no local patches against BIND 9; thus
there are no conflicts to merge. This may change at a later date.
6) Remove any references to the {bin,lib}/tests and docutil
directories from the configure and Makefile templates:
$ sed -i.orig -e '/\/tests/d; /docutil/d;' \
configure.in Makefile.in */Makefile.in
Please do not commit this change, as it would unnecessarily take
files off the vendor branch. You only need this to generate
config.h.
7) Generate and run configure:
$ autoconf253
$ autoheader253
$ ./configure --prefix=/usr \
--infodir=/usr/share/info --mandir=/usr/share/man \
--enable-threads --enable-libbind --disable-ipv6 \
--enable-getifaddrs --disable-linux-caps \
--with-openssl=/usr --with-randomdev=/dev/random
Note that we intentionally disable IPv6 support on the configure
command line; src/lib/bind/config.mk will re-enable it at compile
time if NO_INET6 is not defined.
8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and
commit it. Do not commit any other file that was modified or
created in steps 6) or 7).
9) cd src/lib/bind/dns && make -DMAINTAINER_MODE generate && rm gen
Commit the new versions of the files generated.
The following directories contain Makefiles for bits and pieces of
BIND 9:
FreeBSD directory ISC directory
========================================================
src/lib/bind bind9/lib
src/lib/bind/bind bind9/lib/bind
src/lib/bind/bind9 bind9/lib/bind9
src/lib/bind/dns bind9/lib/dns
src/lib/bind/isc bind9/lib/isc
src/lib/bind/isccc bind9/lib/isccc
src/lib/bind/isccfg bind9/lib/isccfg
src/lib/bind/lwres bind9/lib/lwres
src/share/doc/bind9 bind9/doc/{arm,misc}
src/usr.bin/dig bind9/bin/dig
src/usr.bin/host bind9/bin/dig
src/usr.bin/nslookup bind9/bin/dig
src/usr.bin/nsupdate bind9/bin/nsupdate
src/usr.sbin/dnssec-keygen bind9/bin/dnssec
src/usr.sbin/dnssec-signzone bind9/bin/dnssec
src/usr.sbin/named bind9/bin/named
src/usr.sbin/named-checkconf bind9/bin/check
src/usr.sbin/named-checkzone bind9/bin/check
src/usr.sbin/rndc bind9/bin/rndc
src/usr.sbin/rndc-confgen bind9/bin/rndc
Make sure that the lists of sources, headers and man pages in each
FreeBSD Makefile accurately reflects those in the corresponding ISC
Makefile. Please strive to keep those lists in the same order and
with line breaks in the same places to ease future comparisons.
A) Build and test.
B) Lather, rinse, repeat.
C) Commit when everything builds cleanly and works properly.
-- [email protected]
-- [email protected]
$FreeBSD$
-63
View File
@@ -1,63 +0,0 @@
# $FreeBSD$
# Misc. stuff
.cvsignore
aclocal.m4
config.h.in
configure
contrib
docutil
# Tests
bin/tests
lib/tests
# Windows directories
bin/check/win32
bin/dig/win32
bin/dnssec/win32
bin/named/win32
bin/nsupdate/win32
bin/rndc/win32
bin/win32
config.h.win32
lib/bind9/win32
lib/dns/gen-win32.h
lib/dns/win32
lib/isc/win32
lib/isccc/win32
lib/isccfg/win32
lib/lwres/win32
lib/win32
win32utils
# Various ports to other OSs
lib/bind/port/aix*
lib/bind/port/aux3
lib/bind/port/bsdos
lib/bind/port/bsdos2
lib/bind/port/cygwin
lib/bind/port/darwin
lib/bind/port/decunix
lib/bind/port/hpux
lib/bind/port/hpux10
lib/bind/port/hpux9
lib/bind/port/irix
lib/bind/port/linux
lib/bind/port/lynxos
lib/bind/port/mpe
lib/bind/port/netbsd
lib/bind/port/next
lib/bind/port/openbsd
lib/bind/port/prand_conf
lib/bind/port/qnx
lib/bind/port/rhapsody
lib/bind/port/sco42
lib/bind/port/sco50
lib/bind/port/solaris
lib/bind/port/sunos
lib/bind/port/ultrix
lib/bind/port/unixware20
lib/bind/port/unixware212
lib/bind/port/unixware7
lib/bind/port/unknown
+23 -1
View File
@@ -43,6 +43,26 @@ BIND 9
Nominum, Inc.
BIND 9.3.2
BIND 9.3.2 is a maintenance release, containing fixes for
a number of bugs in 9.3.1.
libbind: corresponds to that from BIND 8.4.7-REL.
Known Issues:
The following INSIST can be triggered with DNSSEC enabled.
resolver.c:762: INSIST(result != 0 || dns_rdataset_isassociated(event->rdataset) || fctx->type == ((dns_rdatatype_t)dns_rdatatype_any) || fctx->type == ((dns_rdatatype_t)dns_rdatatype_rrsig)) failed
We are still trying to isolate the cause. If you have core
dump please send a bug report to [email protected] with
the location of the core, named executable and OS details.
Note: contrib/nanny contains a perl script to restart named
in the event of a INSIST/REQUIRE/ENSURE failure.
BIND 9.3.1
BIND 9.3.1 is a maintenance release, containing fixes for
@@ -210,7 +230,7 @@ Building
UnixWare 7.1.1
HP-UX 10.20
BSD/OS 4.2
Mac OS X 10.1
Mac OS X 10.1, 10.3.8
To build, just
@@ -300,9 +320,11 @@ Building
Building with gcc is not supported, unless gcc is the vendor's usual
compiler (e.g. the various BSD systems, Linux).
Known compiler issues:
* gcc-3.2.1 and gcc-3.1.1 is known to cause problems with solaris-x86.
* gcc prior to gcc-3.2.3 ultrasparc generates incorrect code at -02.
* gcc-3.3.5 powerpc generates incorrect code at -02.
* Irix, MipsPRO 7.4.1m is known to cause problems.
A limited test suite can be run with "make test". Many of
the tests require you to configure a set of virtual IP addresses
+39 -28
View File
@@ -1,59 +1,70 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2002 Internet Software Consortium.
.\"
.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2002 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: named-checkconf.8,v 1.11.12.4 2004/06/03 05:35:41 marka Exp $
.\" $Id: named-checkconf.8,v 1.11.12.7 2005/10/13 02:33:41 marka Exp $
.\"
.TH "NAMED-CHECKCONF" "8" "June 14, 2000" "BIND9" ""
.SH NAME
named-checkconf \- named configuration file syntax checking tool
.SH SYNOPSIS
.sp
\fBnamed-checkconf\fR [ \fB-v\fR ] [ \fB-j\fR ] [ \fB-t \fIdirectory\fB\fR ] \fBfilename\fR [ \fB-z\fR ]
.hy 0
.ad l
.\" ** You probably do not want to edit this file directly **
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "NAMED\-CHECKCONF" "8" "June 14, 2000" "BIND9" "BIND9"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
named\-checkconf \- named configuration file syntax checking tool
.SH "SYNOPSIS"
.HP 16
\fBnamed\-checkconf\fR [\fB\-v\fR] [\fB\-j\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] {filename} [\fB\-z\fR]
.SH "DESCRIPTION"
.PP
\fBnamed-checkconf\fR checks the syntax, but not
the semantics, of a named configuration file.
\fBnamed\-checkconf\fR
checks the syntax, but not the semantics, of a named configuration file.
.SH "OPTIONS"
.TP
\fB-t \fIdirectory\fB\fR
chroot to \fIdirectory\fR so that include
directives in the configuration file are processed as if
run by a similarly chrooted named.
\-t \fIdirectory\fR
chroot to
\fIdirectory\fR
so that include directives in the configuration file are processed as if run by a similarly chrooted named.
.TP
\fB-v\fR
Print the version of the \fBnamed-checkconf\fR
\-v
Print the version of the
\fBnamed\-checkconf\fR
program and exit.
.TP
\fB-z\fR
\-z
Perform a check load the master zonefiles found in
\fInamed.conf\fR.
.TP
\fB-j\fR
\-j
When loading a zonefile read the journal if it exists.
.TP
\fBfilename\fR
The name of the configuration file to be checked. If not
specified, it defaults to \fI/etc/named.conf\fR.
filename
The name of the configuration file to be checked. If not specified, it defaults to
\fI/etc/named.conf\fR.
.SH "RETURN VALUES"
.PP
\fBnamed-checkconf\fR returns an exit status of 1 if
errors were detected and 0 otherwise.
\fBnamed\-checkconf\fR
returns an exit status of 1 if errors were detected and 0 otherwise.
.SH "SEE ALSO"
.PP
\fBnamed\fR(8),
\fIBIND 9 Administrator Reference Manual\fR.
BIND 9 Administrator Reference Manual.
.SH "AUTHOR"
.PP
Internet Systems Consortium
@@ -1,7 +1,9 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001, 2002 Internet Software Consortium.
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2002 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named-checkconf.docbook,v 1.3.2.1.8.5 2004/06/03 02:24:59 marka Exp $ -->
<!-- $Id: named-checkconf.docbook,v 1.3.2.1.8.7 2005/05/12 21:35:56 sra Exp $ -->
<refentry>
<refentryinfo>
@@ -29,6 +31,20 @@
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<docinfo>
<copyright>
<year>2004</year>
<year>2005</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo>
<refnamediv>
<refname><application>named-checkconf</application></refname>
<refpurpose>named configuration file syntax checking tool</refpurpose>
@@ -116,6 +132,7 @@
<para>
<command>named-checkconf</command> returns an exit status of 1 if
errors were detected and 0 otherwise.
</para>
</refsect1>
<refsect1>
+76 -200
View File
@@ -1,216 +1,92 @@
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001, 2002 Internet Software Consortium.
-
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2002 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named-checkconf.html,v 1.5.2.1.4.5 2004/08/22 23:38:57 marka Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML
><HEAD
><TITLE
>named-checkconf</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.7"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#840084"
ALINK="#0000FF"
><H1
><A
NAME="AEN1"
></A
><SPAN
CLASS="APPLICATION"
>named-checkconf</SPAN
></H1
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN9"
></A
><H2
>Name</H2
><SPAN
CLASS="APPLICATION"
>named-checkconf</SPAN
>&nbsp;--&nbsp;named configuration file syntax checking tool</DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN13"
></A
><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>named-checkconf</B
> [<VAR
CLASS="OPTION"
>-v</VAR
>] [<VAR
CLASS="OPTION"
>-j</VAR
>] [<VAR
CLASS="OPTION"
>-t <VAR
CLASS="REPLACEABLE"
>directory</VAR
></VAR
>] {filename} [<VAR
CLASS="OPTION"
>-z</VAR
>]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN26"
></A
><H2
>DESCRIPTION</H2
><P
> <B
CLASS="COMMAND"
>named-checkconf</B
> checks the syntax, but not
<!-- $Id: named-checkconf.html,v 1.5.2.1.4.12 2005/10/13 02:33:42 marka Exp $ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>named-checkconf</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
<a name="id2463721"></a><div class="titlepage"></div>
<div class="refnamediv">
<h2>Name</h2>
<p><span class="application">named-checkconf</span> &#8212; named configuration file syntax checking tool</p>
</div>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p><code class="command">named-checkconf</code> [<code class="option">-v</code>] [<code class="option">-j</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename} [<code class="option">-z</code>]</p></div>
</div>
<div class="refsect1" lang="en">
<a name="id2525865"></a><h2>DESCRIPTION</h2>
<p>
<span><strong class="command">named-checkconf</strong></span> checks the syntax, but not
the semantics, of a named configuration file.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN30"
></A
><H2
>OPTIONS</H2
><P
></P
><DIV
CLASS="VARIABLELIST"
><DL
><DT
>-t <VAR
CLASS="REPLACEABLE"
>directory</VAR
></DT
><DD
><P
> chroot to <TT
CLASS="FILENAME"
>directory</TT
> so that include
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2525878"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-t <em class="replaceable"><code>directory</code></em></span></dt>
<dd><p>
chroot to <code class="filename">directory</code> so that include
directives in the configuration file are processed as if
run by a similarly chrooted named.
</P
></DD
><DT
>-v</DT
><DD
><P
> Print the version of the <B
CLASS="COMMAND"
>named-checkconf</B
>
</p></dd>
<dt><span class="term">-v</span></dt>
<dd><p>
Print the version of the <span><strong class="command">named-checkconf</strong></span>
program and exit.
</P
></DD
><DT
>-z</DT
><DD
><P
> Perform a check load the master zonefiles found in
<TT
CLASS="FILENAME"
>named.conf</TT
>.
</P
></DD
><DT
>-j</DT
><DD
><P
> When loading a zonefile read the journal if it exists.
</P
></DD
><DT
>filename</DT
><DD
><P
> The name of the configuration file to be checked. If not
specified, it defaults to <TT
CLASS="FILENAME"
>/etc/named.conf</TT
>.
</P
></DD
></DL
></DIV
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN58"
></A
><H2
>RETURN VALUES</H2
><P
> <B
CLASS="COMMAND"
>named-checkconf</B
> returns an exit status of 1 if
</p></dd>
<dt><span class="term">-z</span></dt>
<dd><p>
Perform a check load the master zonefiles found in
<code class="filename">named.conf</code>.
</p></dd>
<dt><span class="term">-j</span></dt>
<dd><p>
When loading a zonefile read the journal if it exists.
</p></dd>
<dt><span class="term">filename</span></dt>
<dd><p>
The name of the configuration file to be checked. If not
specified, it defaults to <code class="filename">/etc/named.conf</code>.
</p></dd>
</dl></div>
</div>
<div class="refsect1" lang="en">
<a name="id2525970"></a><h2>RETURN VALUES</h2>
<p>
<span><strong class="command">named-checkconf</strong></span> returns an exit status of 1 if
errors were detected and 0 otherwise.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN62"
></A
><H2
>SEE ALSO</H2
><P
> <SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>named</SPAN
>(8)</SPAN
>,
<I
CLASS="CITETITLE"
>BIND 9 Administrator Reference Manual</I
>.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN69"
></A
><H2
>AUTHOR</H2
><P
> Internet Systems Consortium
</P
></DIV
></BODY
></HTML
>
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2525982"></a><h2>SEE ALSO</h2>
<p>
<span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>.
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526006"></a><h2>AUTHOR</h2>
<p>
<span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
</div></body>
</html>
+65 -48
View File
@@ -1,94 +1,111 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2002 Internet Software Consortium.
.\"
.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2002 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: named-checkzone.8,v 1.11.2.1.8.4 2004/06/03 05:35:42 marka Exp $
.\" $Id: named-checkzone.8,v 1.11.2.1.8.8 2005/10/13 02:33:41 marka Exp $
.\"
.TH "NAMED-CHECKZONE" "8" "June 13, 2000" "BIND9" ""
.SH NAME
named-checkzone \- zone file validity checking tool
.SH SYNOPSIS
.sp
\fBnamed-checkzone\fR [ \fB-d\fR ] [ \fB-j\fR ] [ \fB-q\fR ] [ \fB-v\fR ] [ \fB-c \fIclass\fB\fR ] [ \fB-k \fImode\fB\fR ] [ \fB-n \fImode\fB\fR ] [ \fB-o \fIfilename\fB\fR ] [ \fB-t \fIdirectory\fB\fR ] [ \fB-w \fIdirectory\fB\fR ] [ \fB-D\fR ] \fBzonename\fR \fBfilename\fR
.hy 0
.ad l
.\" ** You probably do not want to edit this file directly **
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "NAMED\-CHECKZONE" "8" "June 13, 2000" "BIND9" "BIND9"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
named\-checkzone \- zone file validity checking tool
.SH "SYNOPSIS"
.HP 16
\fBnamed\-checkzone\fR [\fB\-d\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-o\ \fR\fB\fIfilename\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] {zonename} {filename}
.SH "DESCRIPTION"
.PP
\fBnamed-checkzone\fR checks the syntax and integrity of
a zone file. It performs the same checks as \fBnamed\fR
\fBnamed\-checkzone\fR
checks the syntax and integrity of a zone file. It performs the same checks as
\fBnamed\fR
does when loading a zone. This makes
\fBnamed-checkzone\fR useful for checking zone
files before configuring them into a name server.
\fBnamed\-checkzone\fR
useful for checking zone files before configuring them into a name server.
.SH "OPTIONS"
.TP
\fB-d\fR
\-d
Enable debugging.
.TP
\fB-q\fR
Quiet mode - exit code only.
\-q
Quiet mode \- exit code only.
.TP
\fB-v\fR
Print the version of the \fBnamed-checkzone\fR
\-v
Print the version of the
\fBnamed\-checkzone\fR
program and exit.
.TP
\fB-j\fR
\-j
When loading the zone file read the journal if it exists.
.TP
\fB-c \fIclass\fB\fR
\-c \fIclass\fR
Specify the class of the zone. If not specified "IN" is assumed.
.TP
\fB-k \fImode\fB\fR
Perform \fB"check-name"\fR checks with the specified failure mode.
Possible modes are \fB"fail"\fR,
\fB"warn"\fR (default) and
\-k \fImode\fR
Perform
\fB"check\-name"\fR
checks with the specified failure mode. Possible modes are
\fB"fail"\fR,
\fB"warn"\fR
(default) and
\fB"ignore"\fR.
.TP
\fB-n \fImode\fB\fR
Specify whether NS records should be checked to see if they
are addresses. Possible modes are \fB"fail"\fR,
\fB"warn"\fR (default) and
\-n \fImode\fR
Specify whether NS records should be checked to see if they are addresses. Possible modes are
\fB"fail"\fR,
\fB"warn"\fR
(default) and
\fB"ignore"\fR.
.TP
\fB-o \fIfilename\fB\fR
Write zone output to \fIdirectory\fR.
\-o \fIfilename\fR
Write zone output to
\fIfilename\fR.
.TP
\fB-t \fIdirectory\fB\fR
chroot to \fIdirectory\fR so that include
directives in the configuration file are processed as if
run by a similarly chrooted named.
\-t \fIdirectory\fR
chroot to
\fIdirectory\fR
so that include directives in the configuration file are processed as if run by a similarly chrooted named.
.TP
\fB-w \fIdirectory\fB\fR
chdir to \fIdirectory\fR so that relative
filenames in master file $INCLUDE directives work. This
is similar to the directory clause in
\-w \fIdirectory\fR
chdir to
\fIdirectory\fR
so that relative filenames in master file $INCLUDE directives work. This is similar to the directory clause in
\fInamed.conf\fR.
.TP
\fB-D\fR
\-D
Dump zone file in canonical format.
.TP
\fBzonename\fR
zonename
The domain name of the zone being checked.
.TP
\fBfilename\fR
filename
The name of the zone file.
.SH "RETURN VALUES"
.PP
\fBnamed-checkzone\fR returns an exit status of 1 if
errors were detected and 0 otherwise.
\fBnamed\-checkzone\fR
returns an exit status of 1 if errors were detected and 0 otherwise.
.SH "SEE ALSO"
.PP
\fBnamed\fR(8),
\fIRFC 1035\fR,
\fIBIND 9 Administrator Reference Manual\fR.
RFC 1035,
BIND 9 Administrator Reference Manual.
.SH "AUTHOR"
.PP
Internet Systems Consortium
@@ -1,7 +1,9 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001, 2002 Internet Software Consortium.
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2002 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named-checkzone.docbook,v 1.3.2.2.8.7 2004/06/03 02:25:00 marka Exp $ -->
<!-- $Id: named-checkzone.docbook,v 1.3.2.2.8.11 2005/05/12 21:35:57 sra Exp $ -->
<refentry>
<refentryinfo>
@@ -29,6 +31,20 @@
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<docinfo>
<copyright>
<year>2004</year>
<year>2005</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo>
<refnamediv>
<refname><application>named-checkzone</application></refname>
<refpurpose>zone file validity checking tool</refpurpose>
@@ -103,6 +119,7 @@
When loading the zone file read the journal if it exists.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-c <replaceable class="parameter">class</replaceable></term>
@@ -141,7 +158,7 @@
<term>-o <replaceable class="parameter">filename</replaceable></term>
<listitem>
<para>
Write zone output to <filename>directory</filename>.
Write zone output to <filename>filename</filename>.
</para>
</listitem>
</varlistentry>
@@ -205,6 +222,7 @@
<para>
<command>named-checkzone</command> returns an exit status of 1 if
errors were detected and 0 otherwise.
</para>
</refsect1>
<refsect1>
+116 -348
View File
@@ -1,367 +1,135 @@
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001, 2002 Internet Software Consortium.
-
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2002 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named-checkzone.html,v 1.5.2.2.4.5 2004/08/22 23:38:57 marka Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML
><HEAD
><TITLE
>named-checkzone</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.7"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#840084"
ALINK="#0000FF"
><H1
><A
NAME="AEN1"
></A
><SPAN
CLASS="APPLICATION"
>named-checkzone</SPAN
></H1
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN9"
></A
><H2
>Name</H2
><SPAN
CLASS="APPLICATION"
>named-checkzone</SPAN
>&nbsp;--&nbsp;zone file validity checking tool</DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN13"
></A
><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>named-checkzone</B
> [<VAR
CLASS="OPTION"
>-d</VAR
>] [<VAR
CLASS="OPTION"
>-j</VAR
>] [<VAR
CLASS="OPTION"
>-q</VAR
>] [<VAR
CLASS="OPTION"
>-v</VAR
>] [<VAR
CLASS="OPTION"
>-c <VAR
CLASS="REPLACEABLE"
>class</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-k <VAR
CLASS="REPLACEABLE"
>mode</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-n <VAR
CLASS="REPLACEABLE"
>mode</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-o <VAR
CLASS="REPLACEABLE"
>filename</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-t <VAR
CLASS="REPLACEABLE"
>directory</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-w <VAR
CLASS="REPLACEABLE"
>directory</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-D</VAR
>] {zonename} {filename}</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN46"
></A
><H2
>DESCRIPTION</H2
><P
> <B
CLASS="COMMAND"
>named-checkzone</B
> checks the syntax and integrity of
a zone file. It performs the same checks as <B
CLASS="COMMAND"
>named</B
>
<!-- $Id: named-checkzone.html,v 1.5.2.2.4.13 2005/10/13 02:33:42 marka Exp $ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>named-checkzone</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
<a name="id2463721"></a><div class="titlepage"></div>
<div class="refnamediv">
<h2>Name</h2>
<p><span class="application">named-checkzone</span> &#8212; zone file validity checking tool</p>
</div>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p><code class="command">named-checkzone</code> [<code class="option">-d</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-o <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] {zonename} {filename}</p></div>
</div>
<div class="refsect1" lang="en">
<a name="id2525922"></a><h2>DESCRIPTION</h2>
<p>
<span><strong class="command">named-checkzone</strong></span> checks the syntax and integrity of
a zone file. It performs the same checks as <span><strong class="command">named</strong></span>
does when loading a zone. This makes
<B
CLASS="COMMAND"
>named-checkzone</B
> useful for checking zone
<span><strong class="command">named-checkzone</strong></span> useful for checking zone
files before configuring them into a name server.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN52"
></A
><H2
>OPTIONS</H2
><P
></P
><DIV
CLASS="VARIABLELIST"
><DL
><DT
>-d</DT
><DD
><P
> Enable debugging.
</P
></DD
><DT
>-q</DT
><DD
><P
> Quiet mode - exit code only.
</P
></DD
><DT
>-v</DT
><DD
><P
> Print the version of the <B
CLASS="COMMAND"
>named-checkzone</B
>
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2525942"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-d</span></dt>
<dd><p>
Enable debugging.
</p></dd>
<dt><span class="term">-q</span></dt>
<dd><p>
Quiet mode - exit code only.
</p></dd>
<dt><span class="term">-v</span></dt>
<dd><p>
Print the version of the <span><strong class="command">named-checkzone</strong></span>
program and exit.
</P
></DD
><DT
>-j</DT
><DD
><P
> When loading the zone file read the journal if it exists.
</P
></DD
><DT
>-c <VAR
CLASS="REPLACEABLE"
>class</VAR
></DT
><DD
><P
> Specify the class of the zone. If not specified "IN" is assumed.
</P
></DD
><DT
>-k <VAR
CLASS="REPLACEABLE"
>mode</VAR
></DT
><DD
><P
> Perform <B
CLASS="COMMAND"
>"check-name"</B
> checks with the specified failure mode.
Possible modes are <B
CLASS="COMMAND"
>"fail"</B
>,
<B
CLASS="COMMAND"
>"warn"</B
> (default) and
<B
CLASS="COMMAND"
>"ignore"</B
>.
</P
></DD
><DT
>-n <VAR
CLASS="REPLACEABLE"
>mode</VAR
></DT
><DD
><P
> Specify whether NS records should be checked to see if they
are addresses. Possible modes are <B
CLASS="COMMAND"
>"fail"</B
>,
<B
CLASS="COMMAND"
>"warn"</B
> (default) and
<B
CLASS="COMMAND"
>"ignore"</B
>.
</P
></DD
><DT
>-o <VAR
CLASS="REPLACEABLE"
>filename</VAR
></DT
><DD
><P
> Write zone output to <TT
CLASS="FILENAME"
>directory</TT
>.
</P
></DD
><DT
>-t <VAR
CLASS="REPLACEABLE"
>directory</VAR
></DT
><DD
><P
> chroot to <TT
CLASS="FILENAME"
>directory</TT
> so that include
</p></dd>
<dt><span class="term">-j</span></dt>
<dd><p>
When loading the zone file read the journal if it exists.
</p></dd>
<dt><span class="term">-c <em class="replaceable"><code>class</code></em></span></dt>
<dd><p>
Specify the class of the zone. If not specified "IN" is assumed.
</p></dd>
<dt><span class="term">-k <em class="replaceable"><code>mode</code></em></span></dt>
<dd><p>
Perform <span><strong class="command">"check-name"</strong></span> checks with the specified failure mode.
Possible modes are <span><strong class="command">"fail"</strong></span>,
<span><strong class="command">"warn"</strong></span> (default) and
<span><strong class="command">"ignore"</strong></span>.
</p></dd>
<dt><span class="term">-n <em class="replaceable"><code>mode</code></em></span></dt>
<dd><p>
Specify whether NS records should be checked to see if they
are addresses. Possible modes are <span><strong class="command">"fail"</strong></span>,
<span><strong class="command">"warn"</strong></span> (default) and
<span><strong class="command">"ignore"</strong></span>.
</p></dd>
<dt><span class="term">-o <em class="replaceable"><code>filename</code></em></span></dt>
<dd><p>
Write zone output to <code class="filename">filename</code>.
</p></dd>
<dt><span class="term">-t <em class="replaceable"><code>directory</code></em></span></dt>
<dd><p>
chroot to <code class="filename">directory</code> so that include
directives in the configuration file are processed as if
run by a similarly chrooted named.
</P
></DD
><DT
>-w <VAR
CLASS="REPLACEABLE"
>directory</VAR
></DT
><DD
><P
> chdir to <TT
CLASS="FILENAME"
>directory</TT
> so that relative
</p></dd>
<dt><span class="term">-w <em class="replaceable"><code>directory</code></em></span></dt>
<dd><p>
chdir to <code class="filename">directory</code> so that relative
filenames in master file $INCLUDE directives work. This
is similar to the directory clause in
<TT
CLASS="FILENAME"
>named.conf</TT
>.
</P
></DD
><DT
>-D</DT
><DD
><P
> Dump zone file in canonical format.
</P
></DD
><DT
>zonename</DT
><DD
><P
> The domain name of the zone being checked.
</P
></DD
><DT
>filename</DT
><DD
><P
> The name of the zone file.
</P
></DD
></DL
></DIV
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN125"
></A
><H2
>RETURN VALUES</H2
><P
> <B
CLASS="COMMAND"
>named-checkzone</B
> returns an exit status of 1 if
<code class="filename">named.conf</code>.
</p></dd>
<dt><span class="term">-D</span></dt>
<dd><p>
Dump zone file in canonical format.
</p></dd>
<dt><span class="term">zonename</span></dt>
<dd><p>
The domain name of the zone being checked.
</p></dd>
<dt><span class="term">filename</span></dt>
<dd><p>
The name of the zone file.
</p></dd>
</dl></div>
</div>
<div class="refsect1" lang="en">
<a name="id2526187"></a><h2>RETURN VALUES</h2>
<p>
<span><strong class="command">named-checkzone</strong></span> returns an exit status of 1 if
errors were detected and 0 otherwise.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN129"
></A
><H2
>SEE ALSO</H2
><P
> <SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>named</SPAN
>(8)</SPAN
>,
<I
CLASS="CITETITLE"
>RFC 1035</I
>,
<I
CLASS="CITETITLE"
>BIND 9 Administrator Reference Manual</I
>.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN137"
></A
><H2
>AUTHOR</H2
><P
> Internet Systems Consortium
</P
></DIV
></BODY
></HTML
>
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526200"></a><h2>SEE ALSO</h2>
<p>
<span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
<em class="citetitle">RFC 1035</em>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>.
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526227"></a><h2>AUTHOR</h2>
<p>
<span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
</div></body>
</html>
+267 -245
View File
@@ -1,216 +1,244 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2003 Internet Software Consortium.
.\"
.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2003 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: dig.1,v 1.14.2.4.2.6 2004/06/23 09:11:01 marka Exp $
.\" $Id: dig.1,v 1.14.2.4.2.10 2005/10/13 02:33:42 marka Exp $
.\"
.TH "DIG" "1" "Jun 30, 2000" "BIND9" ""
.SH NAME
.hy 0
.ad l
.\" ** You probably do not want to edit this file directly **
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "DIG" "1" "Jun 30, 2000" "BIND9" "BIND9"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
dig \- DNS lookup utility
.SH SYNOPSIS
.sp
\fBdig\fR [ \fB@server\fR ] [ \fB-b \fIaddress\fB\fR ] [ \fB-c \fIclass\fB\fR ] [ \fB-f \fIfilename\fB\fR ] [ \fB-k \fIfilename\fB\fR ] [ \fB-p \fIport#\fB\fR ] [ \fB-t \fItype\fB\fR ] [ \fB-x \fIaddr\fB\fR ] [ \fB-y \fIname:key\fB\fR ] [ \fB-4\fR ] [ \fB-6\fR ] [ \fBname\fR ] [ \fBtype\fR ] [ \fBclass\fR ] [ \fBqueryopt\fR\fI...\fR ]
.sp
\fBdig\fR [ \fB-h\fR ]
.sp
\fBdig\fR [ \fBglobal-queryopt\fR\fI...\fR ] [ \fBquery\fR\fI...\fR ]
.SH "SYNOPSIS"
.HP 4
\fBdig\fR [@server] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-k\ \fR\fB\fIfilename\fR\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [\fB\-y\ \fR\fB\fIname:key\fR\fR] [\fB\-4\fR] [\fB\-6\fR] [name] [type] [class] [queryopt...]
.HP 4
\fBdig\fR [\fB\-h\fR]
.HP 4
\fBdig\fR [global\-queryopt...] [query...]
.SH "DESCRIPTION"
.PP
\fBdig\fR (domain information groper) is a flexible tool
for interrogating DNS name servers. It performs DNS lookups and
displays the answers that are returned from the name server(s) that
were queried. Most DNS administrators use \fBdig\fR to
troubleshoot DNS problems because of its flexibility, ease of use and
clarity of output. Other lookup tools tend to have less functionality
than \fBdig\fR.
\fBdig\fR
(domain information groper) is a flexible tool for interrogating DNS name servers. It performs DNS lookups and displays the answers that are returned from the name server(s) that were queried. Most DNS administrators use
\fBdig\fR
to troubleshoot DNS problems because of its flexibility, ease of use and clarity of output. Other lookup tools tend to have less functionality than
\fBdig\fR.
.PP
Although \fBdig\fR is normally used with command-line
arguments, it also has a batch mode of operation for reading lookup
requests from a file. A brief summary of its command-line arguments
and options is printed when the \fB-h\fR option is given.
Unlike earlier versions, the BIND9 implementation of
\fBdig\fR allows multiple lookups to be issued from the
command line.
Although
\fBdig\fR
is normally used with command\-line arguments, it also has a batch mode of operation for reading lookup requests from a file. A brief summary of its command\-line arguments and options is printed when the
\fB\-h\fR
option is given. Unlike earlier versions, the BIND9 implementation of
\fBdig\fR
allows multiple lookups to be issued from the command line.
.PP
Unless it is told to query a specific name server,
\fBdig\fR will try each of the servers listed in
\fBdig\fR
will try each of the servers listed in
\fI/etc/resolv.conf\fR.
.PP
When no command line arguments or options are given, will perform an
NS query for "." (the root).
When no command line arguments or options are given, will perform an NS query for "." (the root).
.PP
It is possible to set per-user defaults for \fBdig\fR via
\fI${HOME}/.digrc\fR. This file is read and any options in it
are applied before the command line arguments.
It is possible to set per\-user defaults for
\fBdig\fR
via
\fI${HOME}/.digrc\fR. This file is read and any options in it are applied before the command line arguments.
.SH "SIMPLE USAGE"
.PP
A typical invocation of \fBdig\fR looks like:
A typical invocation of
\fBdig\fR
looks like:
.sp
.nf
dig @server name type
.sp
.fi
.sp
where:
.TP
\fBserver\fR
is the name or IP address of the name server to query. This can be an IPv4
address in dotted-decimal notation or an IPv6
address in colon-delimited notation. When the supplied
\fIserver\fR argument is a hostname,
\fBdig\fR resolves that name before querying that name
server. If no \fIserver\fR argument is provided,
\fBdig\fR consults \fI/etc/resolv.conf\fR
and queries the name servers listed there. The reply from the name
server that responds is displayed.
is the name or IP address of the name server to query. This can be an IPv4 address in dotted\-decimal notation or an IPv6 address in colon\-delimited notation. When the supplied
\fIserver\fR
argument is a hostname,
\fBdig\fR
resolves that name before querying that name server. If no
\fIserver\fR
argument is provided,
\fBdig\fR
consults
\fI/etc/resolv.conf\fR
and queries the name servers listed there. The reply from the name server that responds is displayed.
.TP
\fBname\fR
is the name of the resource record that is to be looked up.
.TP
\fBtype\fR
indicates what type of query is required \(em
ANY, A, MX, SIG, etc.
\fItype\fR can be any valid query type. If no
\fItype\fR argument is supplied,
\fBdig\fR will perform a lookup for an A record.
indicates what type of query is required \(em ANY, A, MX, SIG, etc.
\fItype\fR
can be any valid query type. If no
\fItype\fR
argument is supplied,
\fBdig\fR
will perform a lookup for an A record.
.SH "OPTIONS"
.PP
The \fB-b\fR option sets the source IP address of the query
to \fIaddress\fR. This must be a valid address on
one of the host's network interfaces or "0.0.0.0" or "::". An optional port
may be specified by appending "#<port>"
The
\fB\-b\fR
option sets the source IP address of the query to
\fIaddress\fR. This must be a valid address on one of the host's network interfaces or "0.0.0.0" or "::". An optional port may be specified by appending "#<port>"
.PP
The default query class (IN for internet) is overridden by the
\fB-c\fR option. \fIclass\fR is any valid
class, such as HS for Hesiod records or CH for CHAOSNET records.
\fB\-c\fR
option.
\fIclass\fR
is any valid class, such as HS for Hesiod records or CH for CHAOSNET records.
.PP
The \fB-f\fR option makes \fBdig \fR operate
in batch mode by reading a list of lookup requests to process from the
file \fIfilename\fR. The file contains a number of
queries, one per line. Each entry in the file should be organised in
the same way they would be presented as queries to
\fBdig\fR using the command-line interface.
The
\fB\-f\fR
option makes
\fBdig \fR
operate in batch mode by reading a list of lookup requests to process from the file
\fIfilename\fR. The file contains a number of queries, one per line. Each entry in the file should be organised in the same way they would be presented as queries to
\fBdig\fR
using the command\-line interface.
.PP
If a non-standard port number is to be queried, the
\fB-p\fR option is used. \fIport#\fR is
the port number that \fBdig\fR will send its queries
instead of the standard DNS port number 53. This option would be used
to test a name server that has been configured to listen for queries
on a non-standard port number.
If a non\-standard port number is to be queried, the
\fB\-p\fR
option is used.
\fIport#\fR
is the port number that
\fBdig\fR
will send its queries instead of the standard DNS port number 53. This option would be used to test a name server that has been configured to listen for queries on a non\-standard port number.
.PP
The \fB-4\fR option forces \fBdig\fR to only
use IPv4 query transport. The \fB-6\fR option forces
\fBdig\fR to only use IPv6 query transport.
The
\fB\-4\fR
option forces
\fBdig\fR
to only use IPv4 query transport. The
\fB\-6\fR
option forces
\fBdig\fR
to only use IPv6 query transport.
.PP
The \fB-t\fR option sets the query type to
\fItype\fR. It can be any valid query type which is
supported in BIND9. The default query type "A", unless the
\fB-x\fR option is supplied to indicate a reverse lookup.
A zone transfer can be requested by specifying a type of AXFR. When
an incremental zone transfer (IXFR) is required,
\fItype\fR is set to ixfr=N.
The incremental zone transfer will contain the changes made to the zone
since the serial number in the zone's SOA record was
The
\fB\-t\fR
option sets the query type to
\fItype\fR. It can be any valid query type which is supported in BIND9. The default query type "A", unless the
\fB\-x\fR
option is supplied to indicate a reverse lookup. A zone transfer can be requested by specifying a type of AXFR. When an incremental zone transfer (IXFR) is required,
\fItype\fR
is set to
ixfr=N. The incremental zone transfer will contain the changes made to the zone since the serial number in the zone's SOA record was
\fIN\fR.
.PP
Reverse lookups - mapping addresses to names - are simplified by the
\fB-x\fR option. \fIaddr\fR is an IPv4
address in dotted-decimal notation, or a colon-delimited IPv6 address.
When this option is used, there is no need to provide the
\fIname\fR, \fIclass\fR and
\fItype\fR arguments. \fBdig\fR
Reverse lookups \- mapping addresses to names \- are simplified by the
\fB\-x\fR
option.
\fIaddr\fR
is an IPv4 address in dotted\-decimal notation, or a colon\-delimited IPv6 address. When this option is used, there is no need to provide the
\fIname\fR,
\fIclass\fR
and
\fItype\fR
arguments.
\fBdig\fR
automatically performs a lookup for a name like
11.12.13.10.in-addr.arpa and sets the query type and
class to PTR and IN respectively. By default, IPv6 addresses are
looked up using nibble format under the IP6.ARPA domain.
To use the older RFC1886 method using the IP6.INT domain
specify the \fB-i\fR option. Bit string labels (RFC2874)
are now experimental and are not attempted.
11.12.13.10.in\-addr.arpa
and sets the query type and class to PTR and IN respectively. By default, IPv6 addresses are looked up using nibble format under the IP6.ARPA domain. To use the older RFC1886 method using the IP6.INT domain specify the
\fB\-i\fR
option. Bit string labels (RFC2874) are now experimental and are not attempted.
.PP
To sign the DNS queries sent by \fBdig\fR and their
responses using transaction signatures (TSIG), specify a TSIG key file
using the \fB-k\fR option. You can also specify the TSIG
key itself on the command line using the \fB-y\fR option;
\fIname\fR is the name of the TSIG key and
\fIkey\fR is the actual key. The key is a base-64
encoded string, typically generated by \fBdnssec-keygen\fR(8).
Caution should be taken when using the \fB-y\fR option on
multi-user systems as the key can be visible in the output from
\fBps\fR(1) or in the shell's history file. When
using TSIG authentication with \fBdig\fR, the name
server that is queried needs to know the key and algorithm that is
being used. In BIND, this is done by providing appropriate
\fBkey\fR and \fBserver\fR statements in
To sign the DNS queries sent by
\fBdig\fR
and their responses using transaction signatures (TSIG), specify a TSIG key file using the
\fB\-k\fR
option. You can also specify the TSIG key itself on the command line using the
\fB\-y\fR
option;
\fIname\fR
is the name of the TSIG key and
\fIkey\fR
is the actual key. The key is a base\-64 encoded string, typically generated by
\fBdnssec\-keygen\fR(8). Caution should be taken when using the
\fB\-y\fR
option on multi\-user systems as the key can be visible in the output from
\fBps\fR(1 )
or in the shell's history file. When using TSIG authentication with
\fBdig\fR, the name server that is queried needs to know the key and algorithm that is being used. In BIND, this is done by providing appropriate
\fBkey\fR
and
\fBserver\fR
statements in
\fInamed.conf\fR.
.SH "QUERY OPTIONS"
.PP
\fBdig\fR provides a number of query options which affect
the way in which lookups are made and the results displayed. Some of
these set or reset flag bits in the query header, some determine which
sections of the answer get printed, and others determine the timeout
and retry strategies.
\fBdig\fR
provides a number of query options which affect the way in which lookups are made and the results displayed. Some of these set or reset flag bits in the query header, some determine which sections of the answer get printed, and others determine the timeout and retry strategies.
.PP
Each query option is identified by a keyword preceded by a plus sign
(+). Some keywords set or reset an option. These may be preceded
by the string no to negate the meaning of that keyword. Other
keywords assign values to options like the timeout interval. They
have the form \fB+keyword=value\fR.
The query options are:
Each query option is identified by a keyword preceded by a plus sign (+). Some keywords set or reset an option. These may be preceded by the string
no
to negate the meaning of that keyword. Other keywords assign values to options like the timeout interval. They have the form
\fB+keyword=value\fR. The query options are:
.TP
\fB+[no]tcp\fR
Use [do not use] TCP when querying name servers. The default
behaviour is to use UDP unless an AXFR or IXFR query is requested, in
which case a TCP connection is used.
Use [do not use] TCP when querying name servers. The default behaviour is to use UDP unless an AXFR or IXFR query is requested, in which case a TCP connection is used.
.TP
\fB+[no]vc\fR
Use [do not use] TCP when querying name servers. This alternate
syntax to \fI+[no]tcp\fR is provided for backwards
compatibility. The "vc" stands for "virtual circuit".
Use [do not use] TCP when querying name servers. This alternate syntax to
\fI+[no]tcp\fR
is provided for backwards compatibility. The "vc" stands for "virtual circuit".
.TP
\fB+[no]ignore\fR
Ignore truncation in UDP responses instead of retrying with TCP. By
default, TCP retries are performed.
Ignore truncation in UDP responses instead of retrying with TCP. By default, TCP retries are performed.
.TP
\fB+domain=somename\fR
Set the search list to contain the single domain
\fIsomename\fR, as if specified in a
\fBdomain\fR directive in
\fI/etc/resolv.conf\fR, and enable search list
processing as if the \fI+search\fR option were given.
\fBdomain\fR
directive in
\fI/etc/resolv.conf\fR, and enable search list processing as if the
\fI+search\fR
option were given.
.TP
\fB+[no]search\fR
Use [do not use] the search list defined by the searchlist or domain
directive in \fIresolv.conf\fR (if any).
The search list is not used by default.
Use [do not use] the search list defined by the searchlist or domain directive in
\fIresolv.conf\fR
(if any). The search list is not used by default.
.TP
\fB+[no]defname\fR
Deprecated, treated as a synonym for \fI+[no]search\fR
Deprecated, treated as a synonym for
\fI+[no]search\fR
.TP
\fB+[no]aaonly\fR
Sets the "aa" flag in the query.
.TP
\fB+[no]aaflag\fR
A synonym for \fI+[no]aaonly\fR.
A synonym for
\fI+[no]aaonly\fR.
.TP
\fB+[no]adflag\fR
Set [do not set] the AD (authentic data) bit in the query. The AD bit
currently has a standard meaning only in responses, not in queries,
but the ability to set the bit in the query is provided for
completeness.
Set [do not set] the AD (authentic data) bit in the query. The AD bit currently has a standard meaning only in responses, not in queries, but the ability to set the bit in the query is provided for completeness.
.TP
\fB+[no]cdflag\fR
Set [do not set] the CD (checking disabled) bit in the query. This
requests the server to not perform DNSSEC validation of responses.
Set [do not set] the CD (checking disabled) bit in the query. This requests the server to not perform DNSSEC validation of responses.
.TP
\fB+[no]cl\fR
Display [do not display] the CLASS when printing the record.
@@ -219,170 +247,164 @@ Display [do not display] the CLASS when printing the record.
Display [do not display] the TTL when printing the record.
.TP
\fB+[no]recurse\fR
Toggle the setting of the RD (recursion desired) bit in the query.
This bit is set by default, which means \fBdig\fR
normally sends recursive queries. Recursion is automatically disabled
when the \fI+nssearch\fR or
\fI+trace\fR query options are used.
Toggle the setting of the RD (recursion desired) bit in the query. This bit is set by default, which means
\fBdig\fR
normally sends recursive queries. Recursion is automatically disabled when the
\fI+nssearch\fR
or
\fI+trace\fR
query options are used.
.TP
\fB+[no]nssearch\fR
When this option is set, \fBdig\fR attempts to find the
authoritative name servers for the zone containing the name being
looked up and display the SOA record that each name server has for the
zone.
When this option is set,
\fBdig\fR
attempts to find the authoritative name servers for the zone containing the name being looked up and display the SOA record that each name server has for the zone.
.TP
\fB+[no]trace\fR
Toggle tracing of the delegation path from the root name servers for
the name being looked up. Tracing is disabled by default. When
tracing is enabled, \fBdig\fR makes iterative queries to
resolve the name being looked up. It will follow referrals from the
root servers, showing the answer from each server that was used to
resolve the lookup.
Toggle tracing of the delegation path from the root name servers for the name being looked up. Tracing is disabled by default. When tracing is enabled,
\fBdig\fR
makes iterative queries to resolve the name being looked up. It will follow referrals from the root servers, showing the answer from each server that was used to resolve the lookup.
.TP
\fB+[no]cmd\fR
toggles the printing of the initial comment in the output identifying
the version of \fBdig\fR and the query options that have
been applied. This comment is printed by default.
toggles the printing of the initial comment in the output identifying the version of
\fBdig\fR
and the query options that have been applied. This comment is printed by default.
.TP
\fB+[no]short\fR
Provide a terse answer. The default is to print the answer in a
verbose form.
Provide a terse answer. The default is to print the answer in a verbose form.
.TP
\fB+[no]identify\fR
Show [or do not show] the IP address and port number that supplied the
answer when the \fI+short\fR option is enabled. If
short form answers are requested, the default is not to show the
source address and port number of the server that provided the answer.
Show [or do not show] the IP address and port number that supplied the answer when the
\fI+short\fR
option is enabled. If short form answers are requested, the default is not to show the source address and port number of the server that provided the answer.
.TP
\fB+[no]comments\fR
Toggle the display of comment lines in the output. The default is to
print comments.
Toggle the display of comment lines in the output. The default is to print comments.
.TP
\fB+[no]stats\fR
This query option toggles the printing of statistics: when the query
was made, the size of the reply and so on. The default behaviour is
to print the query statistics.
This query option toggles the printing of statistics: when the query was made, the size of the reply and so on. The default behaviour is to print the query statistics.
.TP
\fB+[no]qr\fR
Print [do not print] the query as it is sent.
By default, the query is not printed.
Print [do not print] the query as it is sent. By default, the query is not printed.
.TP
\fB+[no]question\fR
Print [do not print] the question section of a query when an answer is
returned. The default is to print the question section as a comment.
Print [do not print] the question section of a query when an answer is returned. The default is to print the question section as a comment.
.TP
\fB+[no]answer\fR
Display [do not display] the answer section of a reply. The default
is to display it.
Display [do not display] the answer section of a reply. The default is to display it.
.TP
\fB+[no]authority\fR
Display [do not display] the authority section of a reply. The
default is to display it.
Display [do not display] the authority section of a reply. The default is to display it.
.TP
\fB+[no]additional\fR
Display [do not display] the additional section of a reply.
The default is to display it.
Display [do not display] the additional section of a reply. The default is to display it.
.TP
\fB+[no]all\fR
Set or clear all display flags.
.TP
\fB+time=T\fR
Sets the timeout for a query to
\fIT\fR seconds. The default time out is 5 seconds.
An attempt to set \fIT\fR to less than 1 will result
in a query timeout of 1 second being applied.
\fIT\fR
seconds. The default time out is 5 seconds. An attempt to set
\fIT\fR
to less than 1 will result in a query timeout of 1 second being applied.
.TP
\fB+tries=T\fR
Sets the number of times to try UDP queries to server to
\fIT\fR instead of the default, 3. If
\fIT\fR is less than or equal to zero, the number of
tries is silently rounded up to 1.
\fIT\fR
instead of the default, 3. If
\fIT\fR
is less than or equal to zero, the number of tries is silently rounded up to 1.
.TP
\fB+retry=T\fR
Sets the number of times to retry UDP queries to server to
\fIT\fR instead of the default, 2. Unlike
\fI+tries\fR, this does not include the initial
query.
\fIT\fR
instead of the default, 2. Unlike
\fI+tries\fR, this does not include the initial query.
.TP
\fB+ndots=D\fR
Set the number of dots that have to appear in
\fIname\fR to \fID\fR for it to be
considered absolute. The default value is that defined using the
ndots statement in \fI/etc/resolv.conf\fR, or 1 if no
ndots statement is present. Names with fewer dots are interpreted as
relative names and will be searched for in the domains listed in the
\fBsearch\fR or \fBdomain\fR directive in
\fIname\fR
to
\fID\fR
for it to be considered absolute. The default value is that defined using the ndots statement in
\fI/etc/resolv.conf\fR, or 1 if no ndots statement is present. Names with fewer dots are interpreted as relative names and will be searched for in the domains listed in the
\fBsearch\fR
or
\fBdomain\fR
directive in
\fI/etc/resolv.conf\fR.
.TP
\fB+bufsize=B\fR
Set the UDP message buffer size advertised using EDNS0 to
\fIB\fR bytes. The maximum and minimum sizes of this
buffer are 65535 and 0 respectively. Values outside this range are
rounded up or down appropriately.
\fIB\fR
bytes. The maximum and minimum sizes of this buffer are 65535 and 0 respectively. Values outside this range are rounded up or down appropriately.
.TP
\fB+[no]multiline\fR
Print records like the SOA records in a verbose multi-line
format with human-readable comments. The default is to print
each record on a single line, to facilitate machine parsing
of the \fBdig\fR output.
Print records like the SOA records in a verbose multi\-line format with human\-readable comments. The default is to print each record on a single line, to facilitate machine parsing of the
\fBdig\fR
output.
.TP
\fB+[no]fail\fR
Do not try the next server if you receive a SERVFAIL. The default is
to not try the next server which is the reverse of normal stub resolver
behaviour.
Do not try the next server if you receive a SERVFAIL. The default is to not try the next server which is the reverse of normal stub resolver behaviour.
.TP
\fB+[no]besteffort\fR
Attempt to display the contents of messages which are malformed.
The default is to not display malformed answers.
Attempt to display the contents of messages which are malformed. The default is to not display malformed answers.
.TP
\fB+[no]dnssec\fR
Requests DNSSEC records be sent by setting the DNSSEC OK bit (DO)
in the OPT record in the additional section of the query.
Requests DNSSEC records be sent by setting the DNSSEC OK bit (DO) in the OPT record in the additional section of the query.
.TP
\fB+[no]sigchase\fR
Chase DNSSEC signature chains. Requires dig be compiled with
-DDIG_SIGCHASE.
Chase DNSSEC signature chains. Requires dig be compiled with \-DDIG_SIGCHASE.
.TP
\fB+trusted-key=####\fR
Specify a trusted key to be used with \fB+sigchase\fR.
Requires dig be compiled with -DDIG_SIGCHASE.
\fB+trusted\-key=####\fR
Specifies a file containing trusted keys to be used with
\fB+sigchase\fR. Each DNSKEY record must be on its own line.
.sp
If not specified
\fBdig\fR
will look for
\fI/etc/trusted\-key.key\fR
then
\fItrusted\-key.key\fR
in the current directory.
.sp
Requires dig be compiled with \-DDIG_SIGCHASE.
.TP
\fB+[no]topdown\fR
When chasing DNSSEC signature chains perform a top down validation.
Requires dig be compiled with -DDIG_SIGCHASE.
When chasing DNSSEC signature chains perform a top down validation. Requires dig be compiled with \-DDIG_SIGCHASE.
.SH "MULTIPLE QUERIES"
.PP
The BIND 9 implementation of \fBdig \fR supports
specifying multiple queries on the command line (in addition to
supporting the \fB-f\fR batch file option). Each of those
queries can be supplied with its own set of flags, options and query
options.
The BIND 9 implementation of
\fBdig \fR
supports specifying multiple queries on the command line (in addition to supporting the
\fB\-f\fR
batch file option). Each of those queries can be supplied with its own set of flags, options and query options.
.PP
In this case, each \fIquery\fR argument represent an
individual query in the command-line syntax described above. Each
consists of any of the standard options and flags, the name to be
looked up, an optional query type and class and any query options that
should be applied to that query.
In this case, each
\fIquery\fR
argument represent an individual query in the command\-line syntax described above. Each consists of any of the standard options and flags, the name to be looked up, an optional query type and class and any query options that should be applied to that query.
.PP
A global set of query options, which should be applied to all queries,
can also be supplied. These global query options must precede the
first tuple of name, class, type, options, flags, and query options
supplied on the command line. Any global query options (except
the \fB+[no]cmd\fR option) can be
overridden by a query-specific set of query options. For example:
A global set of query options, which should be applied to all queries, can also be supplied. These global query options must precede the first tuple of name, class, type, options, flags, and query options supplied on the command line. Any global query options (except the
\fB+[no]cmd\fR
option) can be overridden by a query\-specific set of query options. For example:
.sp
.nf
dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
.sp
dig +qr www.isc.org any \-x 127.0.0.1 isc.org ns +noqr
.fi
shows how \fBdig\fR could be used from the command line
to make three lookups: an ANY query for www.isc.org, a
reverse lookup of 127.0.0.1 and a query for the NS records of
isc.org.
A global query option of \fI+qr\fR is applied, so
that \fBdig\fR shows the initial query it made for each
lookup. The final query has a local query option of
\fI+noqr\fR which means that \fBdig\fR
.sp
shows how
\fBdig\fR
could be used from the command line to make three lookups: an ANY query for
www.isc.org, a reverse lookup of 127.0.0.1 and a query for the NS records of
isc.org. A global query option of
\fI+qr\fR
is applied, so that
\fBdig\fR
shows the initial query it made for each lookup. The final query has a local query option of
\fI+noqr\fR
which means that
\fBdig\fR
will not print the initial query when it looks up the NS records for
isc.org.
.SH "FILES"
@@ -394,8 +416,8 @@ isc.org.
.PP
\fBhost\fR(1),
\fBnamed\fR(8),
\fBdnssec-keygen\fR(8),
\fIRFC1035\fR.
.SH "BUGS"
\fBdnssec\-keygen\fR(8),
RFC1035.
.SH "BUGS "
.PP
There are probably too many query options.
There are probably too many query options.
+6 -34
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.c,v 1.157.2.13.2.25 2004/09/16 02:14:14 marka Exp $ */
/* $Id: dig.c,v 1.157.2.13.2.29 2005/10/14 01:38:40 marka Exp $ */
#include <config.h>
#include <stdlib.h>
@@ -45,10 +45,6 @@
#include <dig/dig.h>
extern ISC_LIST(dig_lookup_t) lookup_list;
extern dig_serverlist_t server_list;
extern ISC_LIST(dig_searchlist_t) search_list;
#define ADD_STRING(b, s) { \
if (strlen(s) >= isc_buffer_availablelength(b)) \
return (ISC_R_NOSPACE); \
@@ -58,31 +54,8 @@ extern ISC_LIST(dig_searchlist_t) search_list;
#define DIG_MAX_ADDRESSES 20
extern isc_boolean_t have_ipv4, have_ipv6, specified_source,
usesearch, qr;
extern in_port_t port;
extern unsigned int timeout;
extern isc_mem_t *mctx;
extern dns_messageid_t id;
extern int sendcount;
extern int ndots;
extern int lookup_counter;
extern int exitcode;
extern isc_sockaddr_t bind_address;
extern char keynametext[MXNAME];
extern char keyfile[MXNAME];
extern char keysecret[MXNAME];
#ifdef DIG_SIGCHASE
extern char trustedkey[MXNAME];
#endif
extern dns_tsigkey_t *key;
extern isc_boolean_t validated;
extern isc_taskmgr_t *taskmgr;
extern isc_task_t *global_task;
extern isc_boolean_t free_now;
dig_lookup_t *default_lookup = NULL;
extern isc_boolean_t debugging, memdebugging;
static char *batchname = NULL;
static FILE *batchfp = NULL;
static char *argv0;
@@ -133,8 +106,6 @@ static const char *rcodetext[] = {
"BADVERS"
};
extern char *progname;
static void
print_usage(FILE *fp) {
fputs(
@@ -593,6 +564,7 @@ buftoosmall:
}
}
}
if (headers && query->lookup->comments && !short_form)
printf("\n");
@@ -818,7 +790,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
break;
case 'l': /* cl */
FULLCHECK("cl");
noclass = !state;
noclass = ISC_TF(!state);
break;
case 'm': /* cmd */
FULLCHECK("cmd");
@@ -892,7 +864,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
lookup->ns_search_only = state;
if (state) {
lookup->trace_root = ISC_TRUE;
lookup->recurse = ISC_FALSE;
lookup->recurse = ISC_TRUE;
lookup->identify = ISC_TRUE;
lookup->stats = ISC_FALSE;
lookup->comments = ISC_FALSE;
@@ -1054,7 +1026,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
break;
case 't': /* ttlid */
FULLCHECK("ttlid");
nottl = !state;
nottl = ISC_TF(!state);
break;
default:
goto invalid_option;
+45 -15
View File
@@ -1,6 +1,8 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2003 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: dig.docbook,v 1.4.2.7.4.9 2004/06/23 04:19:41 marka Exp $ -->
<!-- $Id: dig.docbook,v 1.4.2.7.4.12 2005/08/30 00:50:29 marka Exp $ -->
<refentry>
@@ -30,6 +32,21 @@
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<docinfo>
<copyright>
<year>2004</year>
<year>2005</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo>
<refnamediv>
<refname>dig</refname>
<refpurpose>DNS lookup utility</refpurpose>
@@ -38,7 +55,7 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>dig</command>
<arg choice=opt>@server</arg>
<arg choice="opt">@server</arg>
<arg><option>-b <replaceable class="parameter">address</replaceable></option></arg>
<arg><option>-c <replaceable class="parameter">class</replaceable></option></arg>
<arg><option>-f <replaceable class="parameter">filename</replaceable></option></arg>
@@ -49,10 +66,10 @@
<arg><option>-y <replaceable class="parameter">name:key</replaceable></option></arg>
<arg><option>-4</option></arg>
<arg><option>-6</option></arg>
<arg choice=opt>name</arg>
<arg choice=opt>type</arg>
<arg choice=opt>class</arg>
<arg choice=opt rep=repeat>queryopt</arg>
<arg choice="opt">name</arg>
<arg choice="opt">type</arg>
<arg choice="opt">class</arg>
<arg choice="opt" rep="repeat">queryopt</arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -62,8 +79,8 @@
<cmdsynopsis>
<command>dig</command>
<arg choice=opt rep=repeat>global-queryopt</arg>
<arg choice=opt rep=repeat>query</arg>
<arg choice="opt" rep="repeat">global-queryopt</arg>
<arg choice="opt" rep="repeat">query</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -513,11 +530,24 @@ Chase DNSSEC signature chains. Requires dig be compiled with
-DDIG_SIGCHASE.
</para></listitem></varlistentry>
<varlistentry><term><option>+trusted-key=####</option></term>
<listitem><para>
Specify a trusted key to be used with <option>+sigchase</option>.
Requires dig be compiled with -DDIG_SIGCHASE.
</para></listitem></varlistentry>
<varlistentry>
<term><option>+trusted-key=####</option></term>
<listitem>
<para>
Specifies a file containing trusted keys to be used with
<option>+sigchase</option>. Each DNSKEY record must be
on its own line.
</para>
<para>
If not specified <command>dig</command> will look for
<filename>/etc/trusted-key.key</filename> then
<filename>trusted-key.key</filename> in the current directory.
</para>
<para>
Requires dig be compiled with -DDIG_SIGCHASE.
</para>
</listitem>
</varlistentry>
<varlistentry><term><option>+[no]topdown</option></term>
<listitem><para>
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
+140 -91
View File
@@ -1,132 +1,181 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2002 Internet Software Consortium.
.\"
.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2002 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: host.1,v 1.11.2.1.4.4 2004/04/13 04:11:03 marka Exp $
.\" $Id: host.1,v 1.11.2.1.4.7 2005/10/13 02:33:43 marka Exp $
.\"
.TH "HOST" "1" "Jun 30, 2000" "BIND9" ""
.SH NAME
.hy 0
.ad l
.\" ** You probably do not want to edit this file directly **
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "HOST" "1" "Jun 30, 2000" "BIND9" "BIND9"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
host \- DNS lookup utility
.SH SYNOPSIS
.sp
\fBhost\fR [ \fB-aCdlnrTwv\fR ] [ \fB-c \fIclass\fB\fR ] [ \fB-N \fIndots\fB\fR ] [ \fB-R \fInumber\fB\fR ] [ \fB-t \fItype\fB\fR ] [ \fB-W \fIwait\fB\fR ] [ \fB-4\fR ] [ \fB-6\fR ] \fBname\fR [ \fBserver\fR ]
.SH "SYNOPSIS"
.HP 5
\fBhost\fR [\fB\-aCdlnrTwv\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-N\ \fR\fB\fIndots\fR\fR] [\fB\-R\ \fR\fB\fInumber\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-W\ \fR\fB\fIwait\fR\fR] [\fB\-4\fR] [\fB\-6\fR] {name} [server]
.SH "DESCRIPTION"
.PP
\fBhost\fR
is a simple utility for performing DNS lookups.
It is normally used to convert names to IP addresses and vice versa.
When no arguments or options are given,
is a simple utility for performing DNS lookups. It is normally used to convert names to IP addresses and vice versa. When no arguments or options are given,
\fBhost\fR
prints a short summary of its command line arguments and options.
.PP
\fIname\fR is the domain name that is to be looked
up. It can also be a dotted-decimal IPv4 address or a colon-delimited
IPv6 address, in which case \fBhost\fR will by default
perform a reverse lookup for that address.
\fIserver\fR is an optional argument which is either
the name or IP address of the name server that \fBhost\fR
\fIname\fR
is the domain name that is to be looked up. It can also be a dotted\-decimal IPv4 address or a colon\-delimited IPv6 address, in which case
\fBhost\fR
will by default perform a reverse lookup for that address.
\fIserver\fR
is an optional argument which is either the name or IP address of the name server that
\fBhost\fR
should query instead of the server or servers listed in
\fI/etc/resolv.conf\fR.
.PP
The \fB-a\fR (all) option is equivalent to setting the
\fB-v\fR option and asking \fBhost\fR to make
a query of type ANY.
The
\fB\-a\fR
(all) option is equivalent to setting the
\fB\-v\fR
option and asking
\fBhost\fR
to make a query of type ANY.
.PP
When the \fB-C\fR option is used, \fBhost\fR
When the
\fB\-C\fR
option is used,
\fBhost\fR
will attempt to display the SOA records for zone
\fIname\fR from all the listed authoritative name
servers for that zone. The list of name servers is defined by the NS
records that are found for the zone.
\fIname\fR
from all the listed authoritative name servers for that zone. The list of name servers is defined by the NS records that are found for the zone.
.PP
The \fB-c\fR option instructs to make a DNS query of class
\fIclass\fR. This can be used to lookup Hesiod or
Chaosnet class resource records. The default class is IN (Internet).
The
\fB\-c\fR
option instructs to make a DNS query of class
\fIclass\fR. This can be used to lookup Hesiod or Chaosnet class resource records. The default class is IN (Internet).
.PP
Verbose output is generated by \fBhost\fR when the
\fB-d\fR or \fB-v\fR option is used. The two
options are equivalent. They have been provided for backwards
compatibility. In previous versions, the \fB-d\fR option
switched on debugging traces and \fB-v\fR enabled verbose
output.
Verbose output is generated by
\fBhost\fR
when the
\fB\-d\fR
or
\fB\-v\fR
option is used. The two options are equivalent. They have been provided for backwards compatibility. In previous versions, the
\fB\-d\fR
option switched on debugging traces and
\fB\-v\fR
enabled verbose output.
.PP
List mode is selected by the \fB-l\fR option. This makes
\fBhost\fR perform a zone transfer for zone
\fIname\fR. Transfer the zone printing out the NS, PTR
and address records (A/AAAA). If combined with \fB-a\fR
all records will be printed.
List mode is selected by the
\fB\-l\fR
option. This makes
\fBhost\fR
perform a zone transfer for zone
\fIname\fR. Transfer the zone printing out the NS, PTR and address records (A/AAAA). If combined with
\fB\-a\fR
all records will be printed.
.PP
The \fB-i\fR
option specifies that reverse lookups of IPv6 addresses should
use the IP6.INT domain as defined in RFC1886.
The default is to use IP6.ARPA.
The
\fB\-i\fR
option specifies that reverse lookups of IPv6 addresses should use the IP6.INT domain as defined in RFC1886. The default is to use IP6.ARPA.
.PP
The \fB-N\fR option sets the number of dots that have to be
in \fIname\fR for it to be considered absolute. The
default value is that defined using the ndots statement in
\fI/etc/resolv.conf\fR, or 1 if no ndots statement is
present. Names with fewer dots are interpreted as relative names and
will be searched for in the domains listed in the \fBsearch\fR
or \fBdomain\fR directive in
The
\fB\-N\fR
option sets the number of dots that have to be in
\fIname\fR
for it to be considered absolute. The default value is that defined using the ndots statement in
\fI/etc/resolv.conf\fR, or 1 if no ndots statement is present. Names with fewer dots are interpreted as relative names and will be searched for in the domains listed in the
\fBsearch\fR
or
\fBdomain\fR
directive in
\fI/etc/resolv.conf\fR.
.PP
The number of UDP retries for a lookup can be changed with the
\fB-R\fR option. \fInumber\fR indicates
how many times \fBhost\fR will repeat a query that does
not get answered. The default number of retries is 1. If
\fInumber\fR is negative or zero, the number of
retries will default to 1.
\fB\-R\fR
option.
\fInumber\fR
indicates how many times
\fBhost\fR
will repeat a query that does not get answered. The default number of retries is 1. If
\fInumber\fR
is negative or zero, the number of retries will default to 1.
.PP
Non-recursive queries can be made via the \fB-r\fR option.
Setting this option clears the \fBRD\fR \(em recursion
desired \(em bit in the query which \fBhost\fR makes.
This should mean that the name server receiving the query will not
attempt to resolve \fIname\fR. The
\fB-r\fR option enables \fBhost\fR to mimic
the behaviour of a name server by making non-recursive queries and
expecting to receive answers to those queries that are usually
referrals to other name servers.
Non\-recursive queries can be made via the
\fB\-r\fR
option. Setting this option clears the
\fBRD\fR
\(em recursion desired \(em bit in the query which
\fBhost\fR
makes. This should mean that the name server receiving the query will not attempt to resolve
\fIname\fR. The
\fB\-r\fR
option enables
\fBhost\fR
to mimic the behaviour of a name server by making non\-recursive queries and expecting to receive answers to those queries that are usually referrals to other name servers.
.PP
By default \fBhost\fR uses UDP when making queries. The
\fB-T\fR option makes it use a TCP connection when querying
the name server. TCP will be automatically selected for queries that
require it, such as zone transfer (AXFR) requests.
By default
\fBhost\fR
uses UDP when making queries. The
\fB\-T\fR
option makes it use a TCP connection when querying the name server. TCP will be automatically selected for queries that require it, such as zone transfer (AXFR) requests.
.PP
The \fB-4\fR option forces \fBhost\fR to only
use IPv4 query transport. The \fB-6\fR option forces
\fBhost\fR to only use IPv6 query transport.
The
\fB\-4\fR
option forces
\fBhost\fR
to only use IPv4 query transport. The
\fB\-6\fR
option forces
\fBhost\fR
to only use IPv6 query transport.
.PP
The \fB-t\fR option is used to select the query type.
\fItype\fR can be any recognised query type: CNAME,
NS, SOA, SIG, KEY, AXFR, etc. When no query type is specified,
\fBhost\fR automatically selects an appropriate query
type. By default it looks for A records, but if the
\fB-C\fR option was given, queries will be made for SOA
records, and if \fIname\fR is a dotted-decimal IPv4
address or colon-delimited IPv6 address, \fBhost\fR will
query for PTR records. If a query type of IXFR is chosen the starting
serial number can be specified by appending an equal followed by the
starting serial number (e.g. -t IXFR=12345678).
The
\fB\-t\fR
option is used to select the query type.
\fItype\fR
can be any recognised query type: CNAME, NS, SOA, SIG, KEY, AXFR, etc. When no query type is specified,
\fBhost\fR
automatically selects an appropriate query type. By default it looks for A records, but if the
\fB\-C\fR
option was given, queries will be made for SOA records, and if
\fIname\fR
is a dotted\-decimal IPv4 address or colon\-delimited IPv6 address,
\fBhost\fR
will query for PTR records. If a query type of IXFR is chosen the starting serial number can be specified by appending an equal followed by the starting serial number (e.g. \-t IXFR=12345678).
.PP
The time to wait for a reply can be controlled through the
\fB-W\fR and \fB-w\fR options. The
\fB-W\fR option makes \fBhost\fR wait for
\fIwait\fR seconds. If \fIwait\fR
\fB\-W\fR
and
\fB\-w\fR
options. The
\fB\-W\fR
option makes
\fBhost\fR
wait for
\fIwait\fR
seconds. If
\fIwait\fR
is less than one, the wait interval is set to one second. When the
\fB-w\fR option is used, \fBhost\fR will
effectively wait forever for a reply. The time to wait for a response
will be set to the number of seconds given by the hardware's maximum
value for an integer quantity.
\fB\-w\fR
option is used,
\fBhost\fR
will effectively wait forever for a reply. The time to wait for a response will be set to the number of seconds given by the hardware's maximum value for an integer quantity.
.SH "FILES"
.PP
\fI/etc/resolv.conf\fR
+3 -17
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: host.c,v 1.76.2.5.2.10 2004/09/06 01:33:05 marka Exp $ */
/* $Id: host.c,v 1.76.2.5.2.13 2005/07/04 03:29:45 marka Exp $ */
#include <config.h>
#include <limits.h>
@@ -40,21 +40,6 @@
#include <dig/dig.h>
extern ISC_LIST(dig_lookup_t) lookup_list;
extern dig_serverlist_t server_list;
extern ISC_LIST(dig_searchlist_t) search_list;
extern isc_boolean_t have_ipv4, have_ipv6;
extern isc_boolean_t usesearch;
extern isc_boolean_t debugging;
extern unsigned int timeout;
extern isc_mem_t *mctx;
extern int ndots;
extern int tries;
extern char *progname;
extern isc_task_t *global_task;
extern int fatalexit;
static isc_boolean_t short_form = ISC_TRUE, listed_server = ISC_FALSE;
static isc_boolean_t default_lookups = ISC_TRUE;
static int seen_error = -1;
@@ -604,6 +589,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
} else
list_type = rdtype;
list_addresses = ISC_FALSE;
default_lookups = ISC_FALSE;
break;
case 'c':
tr.base = isc_commandline_argument;
+21 -5
View File
@@ -1,6 +1,8 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2002 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: host.docbook,v 1.2.2.2.4.5 2004/04/13 01:26:26 marka Exp $ -->
<!-- $Id: host.docbook,v 1.2.2.2.4.7 2005/05/13 01:22:32 marka Exp $ -->
<refentry>
@@ -30,6 +32,20 @@
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<docinfo>
<copyright>
<year>2004</year>
<year>2005</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo>
<refnamediv>
<refname>host</refname>
<refpurpose>DNS lookup utility</refpurpose>
@@ -46,8 +62,8 @@
<arg><option>-W <replaceable class="parameter">wait</replaceable></option></arg>
<arg><option>-4</option></arg>
<arg><option>-6</option></arg>
<arg choice=req>name</arg>
<arg choice=opt>server</arg>
<arg choice="req">name</arg>
<arg choice="opt">server</arg>
</cmdsynopsis>
</refsynopsisdiv>
+135 -398
View File
@@ -1,434 +1,171 @@
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2002 Internet Software Consortium.
-
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2002 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: host.html,v 1.4.2.1.4.6 2004/08/22 23:38:58 marka Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML
><HEAD
><TITLE
>host</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.7"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#840084"
ALINK="#0000FF"
><H1
><A
NAME="AEN1"
></A
>host</H1
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN8"
></A
><H2
>Name</H2
>host&nbsp;--&nbsp;DNS lookup utility</DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN11"
></A
><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>host</B
> [<VAR
CLASS="OPTION"
>-aCdlnrTwv</VAR
>] [<VAR
CLASS="OPTION"
>-c <VAR
CLASS="REPLACEABLE"
>class</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-N <VAR
CLASS="REPLACEABLE"
>ndots</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-R <VAR
CLASS="REPLACEABLE"
>number</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-t <VAR
CLASS="REPLACEABLE"
>type</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-W <VAR
CLASS="REPLACEABLE"
>wait</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-4</VAR
>] [<VAR
CLASS="OPTION"
>-6</VAR
>] {name} [server]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN37"
></A
><H2
>DESCRIPTION</H2
><P
><B
CLASS="COMMAND"
>host</B
>
<!-- $Id: host.html,v 1.4.2.1.4.12 2005/10/13 02:33:44 marka Exp $ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>host</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
<a name="id2463721"></a><div class="titlepage"></div>
<div class="refnamediv">
<h2>Name</h2>
<p>host &#8212; DNS lookup utility</p>
</div>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p><code class="command">host</code> [<code class="option">-aCdlnrTwv</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-N <em class="replaceable"><code>ndots</code></em></code>] [<code class="option">-R <em class="replaceable"><code>number</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-W <em class="replaceable"><code>wait</code></em></code>] [<code class="option">-4</code>] [<code class="option">-6</code>] {name} [server]</p></div>
</div>
<div class="refsect1" lang="en">
<a name="id2525901"></a><h2>DESCRIPTION</h2>
<p>
<span><strong class="command">host</strong></span>
is a simple utility for performing DNS lookups.
It is normally used to convert names to IP addresses and vice versa.
When no arguments or options are given,
<B
CLASS="COMMAND"
>host</B
>
prints a short summary of its command line arguments and options.</P
><P
><VAR
CLASS="PARAMETER"
>name</VAR
> is the domain name that is to be looked
<span><strong class="command">host</strong></span>
prints a short summary of its command line arguments and options.
</p>
<p>
<em class="parameter"><code>name</code></em> is the domain name that is to be looked
up. It can also be a dotted-decimal IPv4 address or a colon-delimited
IPv6 address, in which case <B
CLASS="COMMAND"
>host</B
> will by default
IPv6 address, in which case <span><strong class="command">host</strong></span> will by default
perform a reverse lookup for that address.
<VAR
CLASS="PARAMETER"
>server</VAR
> is an optional argument which is either
the name or IP address of the name server that <B
CLASS="COMMAND"
>host</B
>
<em class="parameter"><code>server</code></em> is an optional argument which is either
the name or IP address of the name server that <span><strong class="command">host</strong></span>
should query instead of the server or servers listed in
<TT
CLASS="FILENAME"
>/etc/resolv.conf</TT
>.</P
><P
>The <VAR
CLASS="OPTION"
>-a</VAR
> (all) option is equivalent to setting the
<VAR
CLASS="OPTION"
>-v</VAR
> option and asking <B
CLASS="COMMAND"
>host</B
> to make
a query of type ANY.</P
><P
>When the <VAR
CLASS="OPTION"
>-C</VAR
> option is used, <B
CLASS="COMMAND"
>host</B
>
<code class="filename">/etc/resolv.conf</code>.
</p>
<p>
The <code class="option">-a</code> (all) option is equivalent to setting the
<code class="option">-v</code> option and asking <span><strong class="command">host</strong></span> to make
a query of type ANY.
</p>
<p>
When the <code class="option">-C</code> option is used, <span><strong class="command">host</strong></span>
will attempt to display the SOA records for zone
<VAR
CLASS="PARAMETER"
>name</VAR
> from all the listed authoritative name
<em class="parameter"><code>name</code></em> from all the listed authoritative name
servers for that zone. The list of name servers is defined by the NS
records that are found for the zone.</P
><P
>The <VAR
CLASS="OPTION"
>-c</VAR
> option instructs to make a DNS query of class
<VAR
CLASS="PARAMETER"
>class</VAR
>. This can be used to lookup Hesiod or
Chaosnet class resource records. The default class is IN (Internet).</P
><P
>Verbose output is generated by <B
CLASS="COMMAND"
>host</B
> when the
<VAR
CLASS="OPTION"
>-d</VAR
> or <VAR
CLASS="OPTION"
>-v</VAR
> option is used. The two
records that are found for the zone.
</p>
<p>
The <code class="option">-c</code> option instructs to make a DNS query of class
<em class="parameter"><code>class</code></em>. This can be used to lookup Hesiod or
Chaosnet class resource records. The default class is IN (Internet).
</p>
<p>
Verbose output is generated by <span><strong class="command">host</strong></span> when the
<code class="option">-d</code> or <code class="option">-v</code> option is used. The two
options are equivalent. They have been provided for backwards
compatibility. In previous versions, the <VAR
CLASS="OPTION"
>-d</VAR
> option
switched on debugging traces and <VAR
CLASS="OPTION"
>-v</VAR
> enabled verbose
output.</P
><P
>List mode is selected by the <VAR
CLASS="OPTION"
>-l</VAR
> option. This makes
<B
CLASS="COMMAND"
>host</B
> perform a zone transfer for zone
<VAR
CLASS="PARAMETER"
>name</VAR
>. Transfer the zone printing out the NS, PTR
and address records (A/AAAA). If combined with <VAR
CLASS="OPTION"
>-a</VAR
>
all records will be printed. </P
><P
>The <VAR
CLASS="OPTION"
>-i</VAR
>
compatibility. In previous versions, the <code class="option">-d</code> option
switched on debugging traces and <code class="option">-v</code> enabled verbose
output.
</p>
<p>
List mode is selected by the <code class="option">-l</code> option. This makes
<span><strong class="command">host</strong></span> perform a zone transfer for zone
<em class="parameter"><code>name</code></em>. Transfer the zone printing out the NS, PTR
and address records (A/AAAA). If combined with <code class="option">-a</code>
all records will be printed.
</p>
<p>
The <code class="option">-i</code>
option specifies that reverse lookups of IPv6 addresses should
use the IP6.INT domain as defined in RFC1886.
The default is to use IP6.ARPA.</P
><P
>The <VAR
CLASS="OPTION"
>-N</VAR
> option sets the number of dots that have to be
in <VAR
CLASS="PARAMETER"
>name</VAR
> for it to be considered absolute. The
The default is to use IP6.ARPA.
</p>
<p>
The <code class="option">-N</code> option sets the number of dots that have to be
in <em class="parameter"><code>name</code></em> for it to be considered absolute. The
default value is that defined using the ndots statement in
<TT
CLASS="FILENAME"
>/etc/resolv.conf</TT
>, or 1 if no ndots statement is
<code class="filename">/etc/resolv.conf</code>, or 1 if no ndots statement is
present. Names with fewer dots are interpreted as relative names and
will be searched for in the domains listed in the <SPAN
CLASS="TYPE"
>search</SPAN
>
or <SPAN
CLASS="TYPE"
>domain</SPAN
> directive in
<TT
CLASS="FILENAME"
>/etc/resolv.conf</TT
>.</P
><P
>The number of UDP retries for a lookup can be changed with the
<VAR
CLASS="OPTION"
>-R</VAR
> option. <VAR
CLASS="PARAMETER"
>number</VAR
> indicates
how many times <B
CLASS="COMMAND"
>host</B
> will repeat a query that does
will be searched for in the domains listed in the <span class="type">search</span>
or <span class="type">domain</span> directive in
<code class="filename">/etc/resolv.conf</code>.
</p>
<p>
The number of UDP retries for a lookup can be changed with the
<code class="option">-R</code> option. <em class="parameter"><code>number</code></em> indicates
how many times <span><strong class="command">host</strong></span> will repeat a query that does
not get answered. The default number of retries is 1. If
<VAR
CLASS="PARAMETER"
>number</VAR
> is negative or zero, the number of
retries will default to 1.</P
><P
>Non-recursive queries can be made via the <VAR
CLASS="OPTION"
>-r</VAR
> option.
Setting this option clears the <SPAN
CLASS="TYPE"
>RD</SPAN
> &mdash; recursion
desired &mdash; bit in the query which <B
CLASS="COMMAND"
>host</B
> makes.
<em class="parameter"><code>number</code></em> is negative or zero, the number of
retries will default to 1.
</p>
<p>
Non-recursive queries can be made via the <code class="option">-r</code> option.
Setting this option clears the <span class="type">RD</span> &#8212; recursion
desired &#8212; bit in the query which <span><strong class="command">host</strong></span> makes.
This should mean that the name server receiving the query will not
attempt to resolve <VAR
CLASS="PARAMETER"
>name</VAR
>. The
<VAR
CLASS="OPTION"
>-r</VAR
> option enables <B
CLASS="COMMAND"
>host</B
> to mimic
attempt to resolve <em class="parameter"><code>name</code></em>. The
<code class="option">-r</code> option enables <span><strong class="command">host</strong></span> to mimic
the behaviour of a name server by making non-recursive queries and
expecting to receive answers to those queries that are usually
referrals to other name servers.</P
><P
>By default <B
CLASS="COMMAND"
>host</B
> uses UDP when making queries. The
<VAR
CLASS="OPTION"
>-T</VAR
> option makes it use a TCP connection when querying
referrals to other name servers.
</p>
<p>
By default <span><strong class="command">host</strong></span> uses UDP when making queries. The
<code class="option">-T</code> option makes it use a TCP connection when querying
the name server. TCP will be automatically selected for queries that
require it, such as zone transfer (AXFR) requests.</P
><P
>The <VAR
CLASS="OPTION"
>-4</VAR
> option forces <B
CLASS="COMMAND"
>host</B
> to only
use IPv4 query transport. The <VAR
CLASS="OPTION"
>-6</VAR
> option forces
<B
CLASS="COMMAND"
>host</B
> to only use IPv6 query transport.</P
><P
>The <VAR
CLASS="OPTION"
>-t</VAR
> option is used to select the query type.
<VAR
CLASS="PARAMETER"
>type</VAR
> can be any recognised query type: CNAME,
require it, such as zone transfer (AXFR) requests.
</p>
<p>
The <code class="option">-4</code> option forces <span><strong class="command">host</strong></span> to only
use IPv4 query transport. The <code class="option">-6</code> option forces
<span><strong class="command">host</strong></span> to only use IPv6 query transport.
</p>
<p>
The <code class="option">-t</code> option is used to select the query type.
<em class="parameter"><code>type</code></em> can be any recognised query type: CNAME,
NS, SOA, SIG, KEY, AXFR, etc. When no query type is specified,
<B
CLASS="COMMAND"
>host</B
> automatically selects an appropriate query
<span><strong class="command">host</strong></span> automatically selects an appropriate query
type. By default it looks for A records, but if the
<VAR
CLASS="OPTION"
>-C</VAR
> option was given, queries will be made for SOA
records, and if <VAR
CLASS="PARAMETER"
>name</VAR
> is a dotted-decimal IPv4
address or colon-delimited IPv6 address, <B
CLASS="COMMAND"
>host</B
> will
<code class="option">-C</code> option was given, queries will be made for SOA
records, and if <em class="parameter"><code>name</code></em> is a dotted-decimal IPv4
address or colon-delimited IPv6 address, <span><strong class="command">host</strong></span> will
query for PTR records. If a query type of IXFR is chosen the starting
serial number can be specified by appending an equal followed by the
starting serial number (e.g. -t IXFR=12345678).</P
><P
>The time to wait for a reply can be controlled through the
<VAR
CLASS="OPTION"
>-W</VAR
> and <VAR
CLASS="OPTION"
>-w</VAR
> options. The
<VAR
CLASS="OPTION"
>-W</VAR
> option makes <B
CLASS="COMMAND"
>host</B
> wait for
<VAR
CLASS="PARAMETER"
>wait</VAR
> seconds. If <VAR
CLASS="PARAMETER"
>wait</VAR
>
starting serial number (e.g. -t IXFR=12345678).
</p>
<p>
The time to wait for a reply can be controlled through the
<code class="option">-W</code> and <code class="option">-w</code> options. The
<code class="option">-W</code> option makes <span><strong class="command">host</strong></span> wait for
<em class="parameter"><code>wait</code></em> seconds. If <em class="parameter"><code>wait</code></em>
is less than one, the wait interval is set to one second. When the
<VAR
CLASS="OPTION"
>-w</VAR
> option is used, <B
CLASS="COMMAND"
>host</B
> will
<code class="option">-w</code> option is used, <span><strong class="command">host</strong></span> will
effectively wait forever for a reply. The time to wait for a response
will be set to the number of seconds given by the hardware's maximum
value for an integer quantity.</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN115"
></A
><H2
>FILES</H2
><P
><TT
CLASS="FILENAME"
>/etc/resolv.conf</TT
></P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN119"
></A
><H2
>SEE ALSO</H2
><P
><SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>dig</SPAN
>(1)</SPAN
>,
<SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>named</SPAN
>(8)</SPAN
>.</P
></DIV
></BODY
></HTML
>
value for an integer quantity.
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526241"></a><h2>FILES</h2>
<p>
<code class="filename">/etc/resolv.conf</code>
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526253"></a><h2>SEE ALSO</h2>
<p>
<span class="citerefentry"><span class="refentrytitle">dig</span>(1)</span>,
<span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>.
</p>
</div>
</div></body>
</html>
+43 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.h,v 1.71.2.6.2.7 2004/09/06 01:33:06 marka Exp $ */
/* $Id: dig.h,v 1.71.2.6.2.11 2005/07/04 03:29:45 marka Exp $ */
#ifndef DIG_H
#define DIG_H
@@ -35,7 +35,7 @@
#include <isc/sockaddr.h>
#include <isc/socket.h>
#define MXSERV 6
#define MXSERV 20
#define MXNAME (DNS_NAME_MAXTEXT+1)
#define MXRD 32
#define BUFSIZE 512
@@ -66,14 +66,6 @@
* in a tight loop of constant lookups. It's value is arbitrary.
*/
#define ROOTNS 1
/*
* Set the number of root servers to ask for information when running in
* trace mode.
* XXXMWS -- trace mode is currently semi-broken, and this number *MUST*
* be 1.
*/
/*
* Defaults for the sigchase suboptions. Consolidated here because
* these control the layout of dig_lookup_t (among other things).
@@ -224,6 +216,46 @@ struct dig_message {
ISC_LINK(dig_message_t) link;
};
#endif
typedef ISC_LIST(dig_searchlist_t) dig_searchlistlist_t;
typedef ISC_LIST(dig_lookup_t) dig_lookuplist_t;
/*
* Externals from dighost.c
*/
extern dig_lookuplist_t lookup_list;
extern dig_serverlist_t server_list;
extern dig_searchlistlist_t search_list;
extern isc_boolean_t have_ipv4, have_ipv6, specified_source,
usesearch, qr;
extern in_port_t port;
extern unsigned int timeout;
extern isc_mem_t *mctx;
extern dns_messageid_t id;
extern int sendcount;
extern int ndots;
extern int lookup_counter;
extern int exitcode;
extern isc_sockaddr_t bind_address;
extern char keynametext[MXNAME];
extern char keyfile[MXNAME];
extern char keysecret[MXNAME];
#ifdef DIG_SIGCHASE
extern char trustedkey[MXNAME];
#endif
extern dns_tsigkey_t *key;
extern isc_boolean_t validated;
extern isc_taskmgr_t *taskmgr;
extern isc_task_t *global_task;
extern isc_boolean_t free_now;
extern isc_boolean_t debugging, memdebugging;
extern char *progname;
extern int tries;
extern int fatalexit;
/*
* Routines in dighost.c.
*/
+81 -92
View File
@@ -1,76 +1,72 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: nslookup.1,v 1.1.6.2 2004/08/20 02:29:39 marka Exp $
.\" $Id: nslookup.1,v 1.1.6.5 2005/10/13 02:33:43 marka Exp $
.\"
.TH "NSLOOKUP" "1" "Jun 30, 2000" "BIND9" ""
.SH NAME
.hy 0
.ad l
.\" ** You probably do not want to edit this file directly **
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "NSLOOKUP" "1" "Jun 30, 2000" "BIND9" "BIND9"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
nslookup \- query Internet name servers interactively
.SH SYNOPSIS
.sp
\fBnslookup\fR [ \fB-option\fR ] [ \fBname | -\fR ] [ \fBserver\fR ]
.SH "SYNOPSIS"
.HP 9
\fBnslookup\fR [\fB\-option\fR] [name\ |\ \-] [server]
.SH "DESCRIPTION"
.PP
\fBNslookup\fR
is a program to query Internet domain name servers. \fBNslookup\fR
has two modes: interactive and non-interactive. Interactive mode allows
the user to query name servers for information about various hosts and
domains or to print a list of hosts in a domain. Non-interactive mode is
used to print just the name and requested information for a host or
domain.
is a program to query Internet domain name servers.
\fBNslookup\fR
has two modes: interactive and non\-interactive. Interactive mode allows the user to query name servers for information about various hosts and domains or to print a list of hosts in a domain. Non\-interactive mode is used to print just the name and requested information for a host or domain.
.SH "ARGUMENTS"
.PP
Interactive mode is entered in the following cases:
.IP 1.
.TP 3
1.
when no arguments are given (the default name server will be used)
.IP 2.
when the first argument is a hyphen (-) and the second argument is
the host name or Internet address of a name server.
.TP
2.
when the first argument is a hyphen (\-) and the second argument is the host name or Internet address of a name server.
.PP
Non-interactive mode is used when the name or Internet address of the
host to be looked up is given as the first argument. The optional second
argument specifies the host name or address of a name server.
Non\-interactive mode is used when the name or Internet address of the host to be looked up is given as the first argument. The optional second argument specifies the host name or address of a name server.
.PP
Options can also be specified on the command line if they precede the
arguments and are prefixed with a hyphen. For example, to
change the default query type to host information, and the initial timeout to 10 seconds, type:
.PP
.sp
.nf
nslookup -query=hinfo -timeout=10
.sp
.fi
Options can also be specified on the command line if they precede the arguments and are prefixed with a hyphen. For example, to change the default query type to host information, and the initial timeout to 10 seconds, type:
.IP .sp .nf nslookup \-query=hinfo \-timeout=10 .fi
.SH "INTERACTIVE COMMANDS"
.TP
\fBhost [server]\fR
Look up information for host using the current default server or
using server, if specified. If host is an Internet address and
the query type is A or PTR, the name of the host is returned.
If host is a name and does not have a trailing period, the
search list is used to qualify the name.
To look up a host not in the current domain, append a period to
the name.
host [server]
Look up information for host using the current default server or using server, if specified. If host is an Internet address and the query type is A or PTR, the name of the host is returned. If host is a name and does not have a trailing period, the search list is used to qualify the name.
.sp
To look up a host not in the current domain, append a period to the name.
.TP
\fBserver \fIdomain\fB\fR
\fBserver\fR \fIdomain\fR
.TP
\fBlserver \fIdomain\fB\fR
Change the default server to \fIdomain\fR; lserver uses the initial
server to look up information about \fIdomain\fR, while server uses
the current default server. If an authoritative answer can't be
found, the names of servers that might have the answer are
returned.
\fBlserver\fR \fIdomain\fR
Change the default server to
\fIdomain\fR;
\fBlserver\fR
uses the initial server to look up information about
\fIdomain\fR, while
\fBserver\fR
uses the current default server. If an authoritative answer can't be found, the names of servers that might have the answer are returned.
.TP
\fBroot\fR
not implemented
@@ -93,17 +89,15 @@ not implemented
\fBexit\fR
Exits the program.
.TP
\fBset \fIkeyword[=value]\fB\fR
This command is used to change state information that affects
the lookups. Valid keywords are:
\fBset\fR \fIkeyword\fR\fI[=value]\fR
This command is used to change state information that affects the lookups. Valid keywords are:
.RS
.TP
\fBall\fR
Prints the current values of the frequently used
options to \fBset\fR. Information about the current default
server and host is also printed.
Prints the current values of the frequently used options to
\fBset\fR. Information about the current default server and host is also printed.
.TP
\fBclass=\fIvalue\fB\fR
\fBclass=\fR\fIvalue\fR
Change the query class to one of:
.RS
.TP
@@ -119,66 +113,61 @@ the Hesiod class
\fBANY\fR
wildcard
.RE
.PP
.IP
The class specifies the protocol group of the information.
.sp
(Default = IN; abbreviation = cl)
.TP
\fB\fI[no]\fBdebug\fR
Turn debugging mode on. A lot more information is
printed about the packet sent to the server and the
resulting answer.
(Default = nodebug; abbreviation = [no]deb)
\fB\fI[no]\fR\fR\fBdebug\fR
Turn debugging mode on. A lot more information is printed about the packet sent to the server and the resulting answer.
.sp
(Default = nodebug; abbreviation =
[no]deb)
.TP
\fB\fI[no]\fBd2\fR
Turn debugging mode on. A lot more information is
printed about the packet sent to the server and the
resulting answer.
\fB\fI[no]\fR\fR\fBd2\fR
Turn debugging mode on. A lot more information is printed about the packet sent to the server and the resulting answer.
.sp
(Default = nod2)
.TP
\fBdomain=\fIname\fB\fR
Sets the search list to \fIname\fR.
\fBdomain=\fR\fIname\fR
Sets the search list to
\fIname\fR.
.TP
\fB\fI[no]\fBsearch\fR
If the lookup request contains at least one period but
doesn't end with a trailing period, append the domain
names in the domain search list to the request until an
answer is received.
\fB\fI[no]\fR\fR\fBsearch\fR
If the lookup request contains at least one period but doesn't end with a trailing period, append the domain names in the domain search list to the request until an answer is received.
.sp
(Default = search)
.TP
\fBport=\fIvalue\fB\fR
Change the default TCP/UDP name server port to \fIvalue\fR.
\fBport=\fR\fIvalue\fR
Change the default TCP/UDP name server port to
\fIvalue\fR.
.sp
(Default = 53; abbreviation = po)
.TP
\fBquerytype=\fIvalue\fB\fR
\fBquerytype=\fR\fIvalue\fR
.TP
\fBtype=\fIvalue\fB\fR
\fBtype=\fR\fIvalue\fR
Change the top of the information query.
.sp
(Default = A; abbreviations = q, ty)
.TP
\fB\fI[no]\fBrecurse\fR
Tell the name server to query other servers if it does not have the
information.
\fB\fI[no]\fR\fR\fBrecurse\fR
Tell the name server to query other servers if it does not have the information.
.sp
(Default = recurse; abbreviation = [no]rec)
.TP
\fBretry=\fInumber\fB\fR
\fBretry=\fR\fInumber\fR
Set the number of retries to number.
.TP
\fBtimeout=\fInumber\fB\fR
Change the initial timeout interval for waiting for a
reply to number seconds.
\fBtimeout=\fR\fInumber\fR
Change the initial timeout interval for waiting for a reply to number seconds.
.TP
\fB\fI[no]\fBvc\fR
\fB\fI[no]\fR\fR\fBvc\fR
Always use a virtual circuit when sending requests to the server.
.sp
(Default = novc)
.RE
.IP
.SH "FILES"
.PP
\fI/etc/resolv.conf\fR
+2 -15
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nslookup.c,v 1.90.2.4.2.8 2004/09/06 01:33:05 marka Exp $ */
/* $Id: nslookup.c,v 1.90.2.4.2.10 2005/07/12 05:47:42 marka Exp $ */
#include <config.h>
@@ -44,19 +44,6 @@
#include <dig/dig.h>
extern ISC_LIST(dig_lookup_t) lookup_list;
extern dig_serverlist_t server_list;
extern ISC_LIST(dig_searchlist_t) search_list;
extern isc_boolean_t usesearch, debugging;
extern in_port_t port;
extern unsigned int timeout;
extern isc_mem_t *mctx;
extern int tries;
extern int lookup_counter;
extern isc_task_t *global_task;
extern char *progname;
static isc_boolean_t short_form = ISC_TRUE,
tcpmode = ISC_FALSE,
identify = ISC_FALSE, stats = ISC_TRUE,
+25 -15
View File
@@ -1,6 +1,8 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +17,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: nslookup.docbook,v 1.3.6.3 2004/08/30 00:50:11 marka Exp $ -->
<!-- $Id: nslookup.docbook,v 1.3.6.5 2005/05/13 01:22:33 marka Exp $ -->
<!--
- Copyright (c) 1985, 1989
@@ -62,6 +64,14 @@
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<docinfo>
<copyright>
<year>2004</year>
<year>2005</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
<refnamediv>
<refname>nslookup</refname>
<refpurpose>query Internet name servers interactively</refpurpose>
@@ -71,8 +81,8 @@
<cmdsynopsis>
<command>nslookup</command>
<arg><option>-option</option></arg>
<arg choice=opt>name | -</arg>
<arg choice=opt>server</arg>
<arg choice="opt">name | -</arg>
<arg choice="opt">server</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -93,19 +103,19 @@ domain.
<title>ARGUMENTS</title>
<para>
Interactive mode is entered in the following cases:
<OrderedList Numeration=Loweralpha>
<Listitem>
<orderedlist numeration="loweralpha">
<listitem>
<para>
when no arguments are given (the default name server will be used)
</para>
</Listitem>
<Listitem>
</listitem>
<listitem>
<para>
when the first argument is a hyphen (-) and the second argument is
the host name or Internet address of a name server.
</para>
</Listitem>
</OrderedList>
</listitem>
</orderedlist>
</para>
<para>
@@ -118,11 +128,11 @@ argument specifies the host name or address of a name server.
Options can also be specified on the command line if they precede the
arguments and are prefixed with a hyphen. For example, to
change the default query type to host information, and the initial timeout to 10 seconds, type:
<InformalExample>
<PROGRAMLISTING>
<informalexample>
<programlisting>
nslookup -query=hinfo -timeout=10
</PROGRAMLISTING>
</InformalExample>
</programlisting>
</informalexample>
</para>
</refsect1>
+229 -582
View File
@@ -1,617 +1,264 @@
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
-
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: nslookup.html,v 1.1.6.3 2004/08/22 23:38:58 marka Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML
><HEAD
><TITLE
>nslookup</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.7"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#840084"
ALINK="#0000FF"
><H1
><A
NAME="AEN1"
></A
>nslookup</H1
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN8"
></A
><H2
>Name</H2
>nslookup&nbsp;--&nbsp;query Internet name servers interactively</DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN11"
></A
><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>nslookup</B
> [<VAR
CLASS="OPTION"
>-option</VAR
>] [name | -] [server]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN18"
></A
><H2
>DESCRIPTION</H2
><P
><B
CLASS="COMMAND"
>Nslookup</B
>
is a program to query Internet domain name servers. <B
CLASS="COMMAND"
>Nslookup</B
>
<!-- $Id: nslookup.html,v 1.1.6.9 2005/10/13 02:33:44 marka Exp $ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>nslookup</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
<a name="id2463728"></a><div class="titlepage"></div>
<div class="refnamediv">
<h2>Name</h2>
<p>nslookup &#8212; query Internet name servers interactively</p>
</div>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p><code class="command">nslookup</code> [<code class="option">-option</code>] [name | -] [server]</p></div>
</div>
<div class="refsect1" lang="en">
<a name="id2525973"></a><h2>DESCRIPTION</h2>
<p>
<span><strong class="command">Nslookup</strong></span>
is a program to query Internet domain name servers. <span><strong class="command">Nslookup</strong></span>
has two modes: interactive and non-interactive. Interactive mode allows
the user to query name servers for information about various hosts and
domains or to print a list of hosts in a domain. Non-interactive mode is
used to print just the name and requested information for a host or
domain.</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN23"
></A
><H2
>ARGUMENTS</H2
><P
>Interactive mode is entered in the following cases:
<P
></P
><OL
TYPE="a"
><LI
><P
>when no arguments are given (the default name server will be used)</P
></LI
><LI
><P
>when the first argument is a hyphen (-) and the second argument is
the host name or Internet address of a name server.</P
></LI
></OL
></P
><P
>Non-interactive mode is used when the name or Internet address of the
domain.
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2525990"></a><h2>ARGUMENTS</h2>
<p>
Interactive mode is entered in the following cases:
</p>
<div class="orderedlist"><ol type="a">
<li><p>
when no arguments are given (the default name server will be used)
</p></li>
<li><p>
when the first argument is a hyphen (-) and the second argument is
the host name or Internet address of a name server.
</p></li>
</ol></div>
<p>
</p>
<p>
Non-interactive mode is used when the name or Internet address of the
host to be looked up is given as the first argument. The optional second
argument specifies the host name or address of a name server.</P
><P
>Options can also be specified on the command line if they precede the
argument specifies the host name or address of a name server.
</p>
<p>
Options can also be specified on the command line if they precede the
arguments and are prefixed with a hyphen. For example, to
change the default query type to host information, and the initial timeout to 10 seconds, type:
<DIV
CLASS="INFORMALEXAMPLE"
><P
></P
><A
NAME="AEN33"
></A
><PRE
CLASS="PROGRAMLISTING"
>nslookup -query=hinfo -timeout=10</PRE
><P
></P
></DIV
></P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN35"
></A
><H2
>INTERACTIVE COMMANDS</H2
><P
></P
><DIV
CLASS="VARIABLELIST"
><DL
><DT
>host [<SPAN
CLASS="OPTIONAL"
>server</SPAN
>]</DT
><DD
><P
>Look up information for host using the current default server or
</p>
<div class="informalexample"><pre class="programlisting">
nslookup -query=hinfo -timeout=10
</pre></div>
<p>
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526033"></a><h2>INTERACTIVE COMMANDS</h2>
<div class="variablelist"><dl>
<dt><span class="term">host [<span class="optional">server</span>]</span></dt>
<dd>
<p>
Look up information for host using the current default server or
using server, if specified. If host is an Internet address and
the query type is A or PTR, the name of the host is returned.
If host is a name and does not have a trailing period, the
search list is used to qualify the name.</P
><P
>To look up a host not in the current domain, append a period to
the name.</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>server</CODE
> <VAR
CLASS="REPLACEABLE"
>domain</VAR
></DT
><DD
><P
></P
></DD
><DT
><CODE
CLASS="CONSTANT"
>lserver</CODE
> <VAR
CLASS="REPLACEABLE"
>domain</VAR
></DT
><DD
><P
>Change the default server to <VAR
CLASS="REPLACEABLE"
>domain</VAR
>; <CODE
CLASS="CONSTANT"
>lserver</CODE
> uses the initial
server to look up information about <VAR
CLASS="REPLACEABLE"
>domain</VAR
>, while <CODE
CLASS="CONSTANT"
>server</CODE
> uses
search list is used to qualify the name.
</p>
<p>
To look up a host not in the current domain, append a period to
the name.
</p>
</dd>
<dt><span class="term"><code class="constant">server</code> <em class="replaceable"><code>domain</code></em></span></dt>
<dd><p></p></dd>
<dt><span class="term"><code class="constant">lserver</code> <em class="replaceable"><code>domain</code></em></span></dt>
<dd><p>
Change the default server to <em class="replaceable"><code>domain</code></em>; <code class="constant">lserver</code> uses the initial
server to look up information about <em class="replaceable"><code>domain</code></em>, while <code class="constant">server</code> uses
the current default server. If an authoritative answer can't be
found, the names of servers that might have the answer are
returned.</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>root</CODE
></DT
><DD
><P
>not implemented</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>finger</CODE
></DT
><DD
><P
>not implemented</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>ls</CODE
></DT
><DD
><P
>not implemented</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>view</CODE
></DT
><DD
><P
>not implemented</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>help</CODE
></DT
><DD
><P
>not implemented</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>?</CODE
></DT
><DD
><P
>not implemented</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>exit</CODE
></DT
><DD
><P
>Exits the program.</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>set</CODE
> <VAR
CLASS="REPLACEABLE"
>keyword[<SPAN
CLASS="OPTIONAL"
>=value</SPAN
>]</VAR
></DT
><DD
><P
>This command is used to change state information that affects
returned.
</p></dd>
<dt><span class="term"><code class="constant">root</code></span></dt>
<dd><p>not implemented</p></dd>
<dt><span class="term"><code class="constant">finger</code></span></dt>
<dd><p>not implemented</p></dd>
<dt><span class="term"><code class="constant">ls</code></span></dt>
<dd><p>not implemented</p></dd>
<dt><span class="term"><code class="constant">view</code></span></dt>
<dd><p>not implemented</p></dd>
<dt><span class="term"><code class="constant">help</code></span></dt>
<dd><p>not implemented</p></dd>
<dt><span class="term"><code class="constant">?</code></span></dt>
<dd><p>not implemented</p></dd>
<dt><span class="term"><code class="constant">exit</code></span></dt>
<dd><p>Exits the program.</p></dd>
<dt><span class="term"><code class="constant">set</code> <em class="replaceable"><code>keyword[<span class="optional">=value</span>]</code></em></span></dt>
<dd>
<p>This command is used to change state information that affects
the lookups. Valid keywords are:
<P
></P
><DIV
CLASS="VARIABLELIST"
><DL
><DT
><CODE
CLASS="CONSTANT"
>all</CODE
></DT
><DD
><P
>Prints the current values of the frequently used
options to <B
CLASS="COMMAND"
>set</B
>. Information about the current default
</p>
<div class="variablelist"><dl>
<dt><span class="term"><code class="constant">all</code></span></dt>
<dd><p>Prints the current values of the frequently used
options to <span><strong class="command">set</strong></span>. Information about the current default
server and host is also printed.
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>class=</CODE
><VAR
CLASS="REPLACEABLE"
>value</VAR
></DT
><DD
><P
> Change the query class to one of:
<P
></P
><DIV
CLASS="VARIABLELIST"
><DL
><DT
><CODE
CLASS="CONSTANT"
>IN</CODE
></DT
><DD
><P
>the Internet class</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>CH</CODE
></DT
><DD
><P
>the Chaos class</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>HS</CODE
></DT
><DD
><P
>the Hesiod class</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>ANY</CODE
></DT
><DD
><P
>wildcard</P
></DD
></DL
></DIV
>
</p></dd>
<dt><span class="term"><code class="constant">class=</code><em class="replaceable"><code>value</code></em></span></dt>
<dd>
<p>
Change the query class to one of:
</p>
<div class="variablelist"><dl>
<dt><span class="term"><code class="constant">IN</code></span></dt>
<dd><p>the Internet class</p></dd>
<dt><span class="term"><code class="constant">CH</code></span></dt>
<dd><p>the Chaos class</p></dd>
<dt><span class="term"><code class="constant">HS</code></span></dt>
<dd><p>the Hesiod class</p></dd>
<dt><span class="term"><code class="constant">ANY</code></span></dt>
<dd><p>wildcard</p></dd>
</dl></div>
<p>
The class specifies the protocol group of the information.
</P
><P
> (Default = IN; abbreviation = cl)
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
><VAR
CLASS="REPLACEABLE"
>[<SPAN
CLASS="OPTIONAL"
>no</SPAN
>]</VAR
>debug</CODE
></DT
><DD
><P
> Turn debugging mode on. A lot more information is
</p>
<p>
(Default = IN; abbreviation = cl)
</p>
</dd>
<dt><span class="term"><code class="constant"><em class="replaceable"><code>[<span class="optional">no</span>]</code></em>debug</code></span></dt>
<dd>
<p>
Turn debugging mode on. A lot more information is
printed about the packet sent to the server and the
resulting answer.
</P
><P
> (Default = nodebug; abbreviation = [<SPAN
CLASS="OPTIONAL"
>no</SPAN
>]deb)
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
><VAR
CLASS="REPLACEABLE"
>[<SPAN
CLASS="OPTIONAL"
>no</SPAN
>]</VAR
>d2</CODE
></DT
><DD
><P
> Turn debugging mode on. A lot more information is
</p>
<p>
(Default = nodebug; abbreviation = [<span class="optional">no</span>]deb)
</p>
</dd>
<dt><span class="term"><code class="constant"><em class="replaceable"><code>[<span class="optional">no</span>]</code></em>d2</code></span></dt>
<dd>
<p>
Turn debugging mode on. A lot more information is
printed about the packet sent to the server and the
resulting answer.
</P
><P
> (Default = nod2)
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>domain=</CODE
><VAR
CLASS="REPLACEABLE"
>name</VAR
></DT
><DD
><P
> Sets the search list to <VAR
CLASS="REPLACEABLE"
>name</VAR
>.
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
><VAR
CLASS="REPLACEABLE"
>[<SPAN
CLASS="OPTIONAL"
>no</SPAN
>]</VAR
>search</CODE
></DT
><DD
><P
> If the lookup request contains at least one period but
</p>
<p>
(Default = nod2)
</p>
</dd>
<dt><span class="term"><code class="constant">domain=</code><em class="replaceable"><code>name</code></em></span></dt>
<dd><p>
Sets the search list to <em class="replaceable"><code>name</code></em>.
</p></dd>
<dt><span class="term"><code class="constant"><em class="replaceable"><code>[<span class="optional">no</span>]</code></em>search</code></span></dt>
<dd>
<p>
If the lookup request contains at least one period but
doesn't end with a trailing period, append the domain
names in the domain search list to the request until an
answer is received.
</P
><P
> (Default = search)
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>port=</CODE
><VAR
CLASS="REPLACEABLE"
>value</VAR
></DT
><DD
><P
> Change the default TCP/UDP name server port to <VAR
CLASS="REPLACEABLE"
>value</VAR
>.
</P
><P
> (Default = 53; abbreviation = po)
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>querytype=</CODE
><VAR
CLASS="REPLACEABLE"
>value</VAR
></DT
><DD
><P
></P
></DD
><DT
><CODE
CLASS="CONSTANT"
>type=</CODE
><VAR
CLASS="REPLACEABLE"
>value</VAR
></DT
><DD
><P
> Change the top of the information query.
</P
><P
> (Default = A; abbreviations = q, ty)
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
><VAR
CLASS="REPLACEABLE"
>[<SPAN
CLASS="OPTIONAL"
>no</SPAN
>]</VAR
>recurse</CODE
></DT
><DD
><P
> Tell the name server to query other servers if it does not have the
</p>
<p>
(Default = search)
</p>
</dd>
<dt><span class="term"><code class="constant">port=</code><em class="replaceable"><code>value</code></em></span></dt>
<dd>
<p>
Change the default TCP/UDP name server port to <em class="replaceable"><code>value</code></em>.
</p>
<p>
(Default = 53; abbreviation = po)
</p>
</dd>
<dt><span class="term"><code class="constant">querytype=</code><em class="replaceable"><code>value</code></em></span></dt>
<dd><p></p></dd>
<dt><span class="term"><code class="constant">type=</code><em class="replaceable"><code>value</code></em></span></dt>
<dd>
<p>
Change the top of the information query.
</p>
<p>
(Default = A; abbreviations = q, ty)
</p>
</dd>
<dt><span class="term"><code class="constant"><em class="replaceable"><code>[<span class="optional">no</span>]</code></em>recurse</code></span></dt>
<dd>
<p>
Tell the name server to query other servers if it does not have the
information.
</P
><P
> (Default = recurse; abbreviation = [no]rec)
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>retry=</CODE
><VAR
CLASS="REPLACEABLE"
>number</VAR
></DT
><DD
><P
> Set the number of retries to number.
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
>timeout=</CODE
><VAR
CLASS="REPLACEABLE"
>number</VAR
></DT
><DD
><P
> Change the initial timeout interval for waiting for a
</p>
<p>
(Default = recurse; abbreviation = [no]rec)
</p>
</dd>
<dt><span class="term"><code class="constant">retry=</code><em class="replaceable"><code>number</code></em></span></dt>
<dd><p>
Set the number of retries to number.
</p></dd>
<dt><span class="term"><code class="constant">timeout=</code><em class="replaceable"><code>number</code></em></span></dt>
<dd><p>
Change the initial timeout interval for waiting for a
reply to number seconds.
</P
></DD
><DT
><CODE
CLASS="CONSTANT"
><VAR
CLASS="REPLACEABLE"
>[<SPAN
CLASS="OPTIONAL"
>no</SPAN
>]</VAR
>vc</CODE
></DT
><DD
><P
> Always use a virtual circuit when sending requests to the server.
</P
><P
> (Default = novc)
</P
></DD
></DL
></DIV
></P
></DD
></DL
></DIV
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN218"
></A
><H2
>FILES</H2
><P
><TT
CLASS="FILENAME"
>/etc/resolv.conf</TT
></P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN222"
></A
><H2
>SEE ALSO</H2
><P
><SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>dig</SPAN
>(1)</SPAN
>,
<SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>host</SPAN
>(1)</SPAN
>,
<SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>named</SPAN
>(8)</SPAN
>.</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN234"
></A
><H2
>Author</H2
><P
>Andrew Cherenson</P
></DIV
></BODY
></HTML
>
</p></dd>
<dt><span class="term"><code class="constant"><em class="replaceable"><code>[<span class="optional">no</span>]</code></em>vc</code></span></dt>
<dd>
<p>
Always use a virtual circuit when sending requests to the server.
</p>
<p>
(Default = novc)
</p>
</dd>
</dl></div>
<p>
</p>
</dd>
</dl></div>
</div>
<div class="refsect1" lang="en">
<a name="id2526490"></a><h2>FILES</h2>
<p>
<code class="filename">/etc/resolv.conf</code>
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526503"></a><h2>SEE ALSO</h2>
<p>
<span class="citerefentry"><span class="refentrytitle">dig</span>(1)</span>,
<span class="citerefentry"><span class="refentrytitle">host</span>(1)</span>,
<span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>.
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526538"></a><h2>Author</h2>
<p>
Andrew Cherenson
</p>
</div>
</div></body>
</html>
+4 -3
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.19.12.9 2004/07/20 07:01:48 marka Exp $
# $Id: Makefile.in,v 1.19.12.12 2005/05/02 00:25:54 marka Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@@ -58,7 +58,8 @@ dnssec-keygen@EXEEXT@: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
dnssec-keygen.@O@ ${OBJS} ${LIBS}
dnssec-signzone.@O@: dnssec-signzone.c
${LIBTOOL_MODE_COMPILE} ${PURIFY} ${CC} ${ALL_CFLAGS} -c $<
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-c ${srcdir}/dnssec-signzone.c
dnssec-signzone@EXEEXT@: dnssec-signzone.@O@ ${OBJS} ${DEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+106 -116
View File
@@ -1,174 +1,164 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2003 Internet Software Consortium.
.\"
.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2003 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: dnssec-keygen.8,v 1.19.12.5 2004/06/11 02:32:45 marka Exp $
.\" $Id: dnssec-keygen.8,v 1.19.12.9 2005/10/13 02:33:45 marka Exp $
.\"
.TH "DNSSEC-KEYGEN" "8" "June 30, 2000" "BIND9" ""
.SH NAME
dnssec-keygen \- DNSSEC key generation tool
.SH SYNOPSIS
.sp
\fBdnssec-keygen\fR \fB-a \fIalgorithm\fB\fR \fB-b \fIkeysize\fB\fR \fB-n \fInametype\fB\fR [ \fB-c \fIclass\fB\fR ] [ \fB-e\fR ] [ \fB-f \fIflag\fB\fR ] [ \fB-g \fIgenerator\fB\fR ] [ \fB-h\fR ] [ \fB-k\fR ] [ \fB-p \fIprotocol\fB\fR ] [ \fB-r \fIrandomdev\fB\fR ] [ \fB-s \fIstrength\fB\fR ] [ \fB-t \fItype\fB\fR ] [ \fB-v \fIlevel\fB\fR ] \fBname\fR
.hy 0
.ad l
.\" ** You probably do not want to edit this file directly **
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "DNSSEC\-KEYGEN" "8" "June 30, 2000" "BIND9" "BIND9"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
dnssec\-keygen \- DNSSEC key generation tool
.SH "SYNOPSIS"
.HP 14
\fBdnssec\-keygen\fR {\-a\ \fIalgorithm\fR} {\-b\ \fIkeysize\fR} {\-n\ \fInametype\fR} [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-e\fR] [\fB\-f\ \fR\fB\fIflag\fR\fR] [\fB\-g\ \fR\fB\fIgenerator\fR\fR] [\fB\-h\fR] [\fB\-k\fR] [\fB\-p\ \fR\fB\fIprotocol\fR\fR] [\fB\-r\ \fR\fB\fIrandomdev\fR\fR] [\fB\-s\ \fR\fB\fIstrength\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] {name}
.SH "DESCRIPTION"
.PP
\fBdnssec-keygen\fR generates keys for DNSSEC
(Secure DNS), as defined in RFC 2535 and RFC <TBA\\>. It can also generate
keys for use with TSIG (Transaction Signatures), as
defined in RFC 2845.
\fBdnssec\-keygen\fR
generates keys for DNSSEC (Secure DNS), as defined in RFC 2535 and RFC <TBA\\>. It can also generate keys for use with TSIG (Transaction Signatures), as defined in RFC 2845.
.SH "OPTIONS"
.TP
\fB-a \fIalgorithm\fB\fR
\-a \fIalgorithm\fR
Selects the cryptographic algorithm. The value of
\fBalgorithm\fR must be one of RSAMD5 (RSA) or RSASHA1,
DSA, DH (Diffie Hellman), or HMAC-MD5. These values
are case insensitive.
Note 1: that for DNSSEC, RSASHA1 is a mandatory to implement algorithm,
and DSA is recommended. For TSIG, HMAC-MD5 is mandatory.
Note 2: HMAC-MD5 and DH automatically set the -k flag.
\fBalgorithm\fR
must be one of RSAMD5 (RSA) or RSASHA1, DSA, DH (Diffie Hellman), or HMAC\-MD5. These values are case insensitive.
.sp
Note 1: that for DNSSEC, RSASHA1 is a mandatory to implement algorithm, and DSA is recommended. For TSIG, HMAC\-MD5 is mandatory.
.sp
Note 2: HMAC\-MD5 and DH automatically set the \-k flag.
.TP
\fB-b \fIkeysize\fB\fR
Specifies the number of bits in the key. The choice of key
size depends on the algorithm used. RSAMD5 / RSASHA1 keys must be between
512 and 2048 bits. Diffie Hellman keys must be between
128 and 4096 bits. DSA keys must be between 512 and 1024
bits and an exact multiple of 64. HMAC-MD5 keys must be
between 1 and 512 bits.
\-b \fIkeysize\fR
Specifies the number of bits in the key. The choice of key size depends on the algorithm used. RSAMD5 / RSASHA1 keys must be between 512 and 2048 bits. Diffie Hellman keys must be between 128 and 4096 bits. DSA keys must be between 512 and 1024 bits and an exact multiple of 64. HMAC\-MD5 keys must be between 1 and 512 bits.
.TP
\fB-n \fInametype\fB\fR
\-n \fInametype\fR
Specifies the owner type of the key. The value of
\fBnametype\fR must either be ZONE (for a DNSSEC
zone key (KEY/DNSKEY)), HOST or ENTITY (for a key associated with a host (KEY)),
USER (for a key associated with a user(KEY)) or OTHER (DNSKEY). These values are
case insensitive.
\fBnametype\fR
must either be ZONE (for a DNSSEC zone key (KEY/DNSKEY)), HOST or ENTITY (for a key associated with a host (KEY)), USER (for a key associated with a user(KEY)) or OTHER (DNSKEY). These values are case insensitive.
.TP
\fB-c \fIclass\fB\fR
Indicates that the DNS record containing the key should have
the specified class. If not specified, class IN is used.
\-c \fIclass\fR
Indicates that the DNS record containing the key should have the specified class. If not specified, class IN is used.
.TP
\fB-e\fR
\-e
If generating an RSAMD5/RSASHA1 key, use a large exponent.
.TP
\fB-f \fIflag\fB\fR
Set the specified flag in the flag field of the KEY/DNSKEY record.
The only recognized flag is KSK (Key Signing Key) DNSKEY.
\-f \fIflag\fR
Set the specified flag in the flag field of the KEY/DNSKEY record. The only recognized flag is KSK (Key Signing Key) DNSKEY.
.TP
\fB-g \fIgenerator\fB\fR
If generating a Diffie Hellman key, use this generator.
Allowed values are 2 and 5. If no generator
is specified, a known prime from RFC 2539 will be used
if possible; otherwise the default is 2.
\-g \fIgenerator\fR
If generating a Diffie Hellman key, use this generator. Allowed values are 2 and 5. If no generator is specified, a known prime from RFC 2539 will be used if possible; otherwise the default is 2.
.TP
\fB-h\fR
\-h
Prints a short summary of the options and arguments to
\fBdnssec-keygen\fR.
\fBdnssec\-keygen\fR.
.TP
\fB-k\fR
\-k
Generate KEY records rather than DNSKEY records.
.TP
\fB-p \fIprotocol\fB\fR
Sets the protocol value for the generated key. The protocol
is a number between 0 and 255. The default is 3 (DNSSEC).
Other possible values for this argument are listed in
RFC 2535 and its successors.
\-p \fIprotocol\fR
Sets the protocol value for the generated key. The protocol is a number between 0 and 255. The default is 3 (DNSSEC). Other possible values for this argument are listed in RFC 2535 and its successors.
.TP
\fB-r \fIrandomdev\fB\fR
Specifies the source of randomness. If the operating
system does not provide a \fI/dev/random\fR
or equivalent device, the default source of randomness
is keyboard input. \fIrandomdev\fR specifies
the name of a character device or file containing random
data to be used instead of the default. The special value
\fIkeyboard\fR indicates that keyboard
input should be used.
\-r \fIrandomdev\fR
Specifies the source of randomness. If the operating system does not provide a
\fI/dev/random\fR
or equivalent device, the default source of randomness is keyboard input.
\fIrandomdev\fR
specifies the name of a character device or file containing random data to be used instead of the default. The special value
\fIkeyboard\fR
indicates that keyboard input should be used.
.TP
\fB-s \fIstrength\fB\fR
Specifies the strength value of the key. The strength is
a number between 0 and 15, and currently has no defined
purpose in DNSSEC.
\-s \fIstrength\fR
Specifies the strength value of the key. The strength is a number between 0 and 15, and currently has no defined purpose in DNSSEC.
.TP
\fB-t \fItype\fB\fR
Indicates the use of the key. \fBtype\fR must be
one of AUTHCONF, NOAUTHCONF, NOAUTH, or NOCONF. The default
is AUTHCONF. AUTH refers to the ability to authenticate
data, and CONF the ability to encrypt data.
\-t \fItype\fR
Indicates the use of the key.
\fBtype\fR
must be one of AUTHCONF, NOAUTHCONF, NOAUTH, or NOCONF. The default is AUTHCONF. AUTH refers to the ability to authenticate data, and CONF the ability to encrypt data.
.TP
\fB-v \fIlevel\fB\fR
\-v \fIlevel\fR
Sets the debugging level.
.SH "GENERATED KEYS"
.PP
When \fBdnssec-keygen\fR completes successfully,
it prints a string of the form \fIKnnnn.+aaa+iiiii\fR
to the standard output. This is an identification string for
the key it has generated. These strings can be used as arguments
to \fBdnssec-makekeyset\fR.
.TP 0.2i
When
\fBdnssec\-keygen\fR
completes successfully, it prints a string of the form
\fIKnnnn.+aaa+iiiii\fR
to the standard output. This is an identification string for the key it has generated.
.TP 3
\(bu
\fInnnn\fR is the key name.
.TP 0.2i
\fInnnn\fR
is the key name.
.TP
\(bu
\fIaaa\fR is the numeric representation of the
algorithm.
.TP 0.2i
\fIaaa\fR
is the numeric representation of the algorithm.
.TP
\(bu
\fIiiiii\fR is the key identifier (or footprint).
\fIiiiii\fR
is the key identifier (or footprint).
.PP
\fBdnssec-keygen\fR creates two file, with names based
on the printed string. \fIKnnnn.+aaa+iiiii.key\fR
\fBdnssec\-keygen\fR
creates two file, with names based on the printed string.
\fIKnnnn.+aaa+iiiii.key\fR
contains the public key, and
\fIKnnnn.+aaa+iiiii.private\fR contains the private
key.
\fIKnnnn.+aaa+iiiii.private\fR
contains the private key.
.PP
The
\fI.key\fR
file contains a DNS KEY record that can be inserted into a zone file (directly or with a $INCLUDE statement).
.PP
The \fI.key\fR file contains a DNS KEY record that
can be inserted into a zone file (directly or with a $INCLUDE
statement).
.PP
.PP
The \fI.private\fR file contains algorithm specific
fields. For obvious security reasons, this file does not have
general read permission.
.PP
.PP
Both \fI.key\fR and \fI.private\fR
files are generated for symmetric encryption algorithm such as
HMAC-MD5, even though the public and private key are equivalent.
The
\fI.private\fR
file contains algorithm specific fields. For obvious security reasons, this file does not have general read permission.
.PP
Both
\fI.key\fR
and
\fI.private\fR
files are generated for symmetric encryption algorithm such as HMAC\-MD5, even though the public and private key are equivalent.
.SH "EXAMPLE"
.PP
To generate a 768-bit DSA key for the domain
\fBexample.com\fR, the following command would be
issued:
To generate a 768\-bit DSA key for the domain
\fBexample.com\fR, the following command would be issued:
.PP
\fBdnssec-keygen -a DSA -b 768 -n ZONE example.com\fR
\fBdnssec\-keygen \-a DSA \-b 768 \-n ZONE example.com\fR
.PP
The command would print a string of the form:
.PP
\fBKexample.com.+003+26160\fR
.PP
In this example, \fBdnssec-keygen\fR creates
the files \fIKexample.com.+003+26160.key\fR and
In this example,
\fBdnssec\-keygen\fR
creates the files
\fIKexample.com.+003+26160.key\fR
and
\fIKexample.com.+003+26160.private\fR
.SH "SEE ALSO"
.PP
\fBdnssec-signzone\fR(8),
\fIBIND 9 Administrator Reference Manual\fR,
\fIRFC 2535\fR,
\fIRFC 2845\fR,
\fIRFC 2539\fR.
\fBdnssec\-signzone\fR(8),
BIND 9 Administrator Reference Manual,
RFC 2535,
RFC 2845,
RFC 2539.
.SH "AUTHOR"
.PP
Internet Systems Consortium
+22 -6
View File
@@ -1,7 +1,9 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001-2003 Internet Software Consortium.
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2003 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: dnssec-keygen.docbook,v 1.3.12.6 2004/06/11 01:17:34 marka Exp $ -->
<!-- $Id: dnssec-keygen.docbook,v 1.3.12.9 2005/08/30 01:41:41 marka Exp $ -->
<refentry>
<refentryinfo>
@@ -29,6 +31,21 @@
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<docinfo>
<copyright>
<year>2004</year>
<year>2005</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo>
<refnamediv>
<refname><application>dnssec-keygen</application></refname>
<refpurpose>DNSSEC key generation tool</refpurpose>
@@ -244,8 +261,7 @@
When <command>dnssec-keygen</command> completes successfully,
it prints a string of the form <filename>Knnnn.+aaa+iiiii</filename>
to the standard output. This is an identification string for
the key it has generated. These strings can be used as arguments
to <command>dnssec-makekeyset</command>.
the key it has generated.
</para>
<itemizedlist>
<listitem>
+175 -491
View File
@@ -1,544 +1,228 @@
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001-2003 Internet Software Consortium.
-
- Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000-2003 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: dnssec-keygen.html,v 1.5.2.1.4.6 2004/08/22 23:38:58 marka Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML
><HEAD
><TITLE
>dnssec-keygen</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.7"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#840084"
ALINK="#0000FF"
><H1
><A
NAME="AEN1"
></A
><SPAN
CLASS="APPLICATION"
>dnssec-keygen</SPAN
></H1
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN9"
></A
><H2
>Name</H2
><SPAN
CLASS="APPLICATION"
>dnssec-keygen</SPAN
>&nbsp;--&nbsp;DNSSEC key generation tool</DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN13"
></A
><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>dnssec-keygen</B
> {-a <VAR
CLASS="REPLACEABLE"
>algorithm</VAR
>} {-b <VAR
CLASS="REPLACEABLE"
>keysize</VAR
>} {-n <VAR
CLASS="REPLACEABLE"
>nametype</VAR
>} [<VAR
CLASS="OPTION"
>-c <VAR
CLASS="REPLACEABLE"
>class</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-e</VAR
>] [<VAR
CLASS="OPTION"
>-f <VAR
CLASS="REPLACEABLE"
>flag</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-g <VAR
CLASS="REPLACEABLE"
>generator</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-h</VAR
>] [<VAR
CLASS="OPTION"
>-k</VAR
>] [<VAR
CLASS="OPTION"
>-p <VAR
CLASS="REPLACEABLE"
>protocol</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-r <VAR
CLASS="REPLACEABLE"
>randomdev</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-s <VAR
CLASS="REPLACEABLE"
>strength</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-t <VAR
CLASS="REPLACEABLE"
>type</VAR
></VAR
>] [<VAR
CLASS="OPTION"
>-v <VAR
CLASS="REPLACEABLE"
>level</VAR
></VAR
>] {name}</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN53"
></A
><H2
>DESCRIPTION</H2
><P
> <B
CLASS="COMMAND"
>dnssec-keygen</B
> generates keys for DNSSEC
<!-- $Id: dnssec-keygen.html,v 1.5.2.1.4.13 2005/10/13 02:33:45 marka Exp $ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>dnssec-keygen</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
<a name="id2463721"></a><div class="titlepage"></div>
<div class="refnamediv">
<h2>Name</h2>
<p><span class="application">dnssec-keygen</span> &#8212; DNSSEC key generation tool</p>
</div>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p><code class="command">dnssec-keygen</code> {-a <em class="replaceable"><code>algorithm</code></em>} {-b <em class="replaceable"><code>keysize</code></em>} {-n <em class="replaceable"><code>nametype</code></em>} [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-e</code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-g <em class="replaceable"><code>generator</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k</code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-s <em class="replaceable"><code>strength</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] {name}</p></div>
</div>
<div class="refsect1" lang="en">
<a name="id2525956"></a><h2>DESCRIPTION</h2>
<p>
<span><strong class="command">dnssec-keygen</strong></span> generates keys for DNSSEC
(Secure DNS), as defined in RFC 2535 and RFC &lt;TBA\&gt;. It can also generate
keys for use with TSIG (Transaction Signatures), as
defined in RFC 2845.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN57"
></A
><H2
>OPTIONS</H2
><P
></P
><DIV
CLASS="VARIABLELIST"
><DL
><DT
>-a <VAR
CLASS="REPLACEABLE"
>algorithm</VAR
></DT
><DD
><P
> Selects the cryptographic algorithm. The value of
<VAR
CLASS="OPTION"
>algorithm</VAR
> must be one of RSAMD5 (RSA) or RSASHA1,
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2525969"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
<dd>
<p>
Selects the cryptographic algorithm. The value of
<code class="option">algorithm</code> must be one of RSAMD5 (RSA) or RSASHA1,
DSA, DH (Diffie Hellman), or HMAC-MD5. These values
are case insensitive.
</P
><P
> Note 1: that for DNSSEC, RSASHA1 is a mandatory to implement algorithm,
</p>
<p>
Note 1: that for DNSSEC, RSASHA1 is a mandatory to implement algorithm,
and DSA is recommended. For TSIG, HMAC-MD5 is mandatory.
</P
><P
> Note 2: HMAC-MD5 and DH automatically set the -k flag.
</P
></DD
><DT
>-b <VAR
CLASS="REPLACEABLE"
>keysize</VAR
></DT
><DD
><P
> Specifies the number of bits in the key. The choice of key
</p>
<p>
Note 2: HMAC-MD5 and DH automatically set the -k flag.
</p>
</dd>
<dt><span class="term">-b <em class="replaceable"><code>keysize</code></em></span></dt>
<dd><p>
Specifies the number of bits in the key. The choice of key
size depends on the algorithm used. RSAMD5 / RSASHA1 keys must be between
512 and 2048 bits. Diffie Hellman keys must be between
128 and 4096 bits. DSA keys must be between 512 and 1024
bits and an exact multiple of 64. HMAC-MD5 keys must be
between 1 and 512 bits.
</P
></DD
><DT
>-n <VAR
CLASS="REPLACEABLE"
>nametype</VAR
></DT
><DD
><P
> Specifies the owner type of the key. The value of
<VAR
CLASS="OPTION"
>nametype</VAR
> must either be ZONE (for a DNSSEC
</p></dd>
<dt><span class="term">-n <em class="replaceable"><code>nametype</code></em></span></dt>
<dd><p>
Specifies the owner type of the key. The value of
<code class="option">nametype</code> must either be ZONE (for a DNSSEC
zone key (KEY/DNSKEY)), HOST or ENTITY (for a key associated with a host (KEY)),
USER (for a key associated with a user(KEY)) or OTHER (DNSKEY). These values are
case insensitive.
</P
></DD
><DT
>-c <VAR
CLASS="REPLACEABLE"
>class</VAR
></DT
><DD
><P
> Indicates that the DNS record containing the key should have
</p></dd>
<dt><span class="term">-c <em class="replaceable"><code>class</code></em></span></dt>
<dd><p>
Indicates that the DNS record containing the key should have
the specified class. If not specified, class IN is used.
</P
></DD
><DT
>-e</DT
><DD
><P
> If generating an RSAMD5/RSASHA1 key, use a large exponent.
</P
></DD
><DT
>-f <VAR
CLASS="REPLACEABLE"
>flag</VAR
></DT
><DD
><P
> Set the specified flag in the flag field of the KEY/DNSKEY record.
</p></dd>
<dt><span class="term">-e</span></dt>
<dd><p>
If generating an RSAMD5/RSASHA1 key, use a large exponent.
</p></dd>
<dt><span class="term">-f <em class="replaceable"><code>flag</code></em></span></dt>
<dd><p>
Set the specified flag in the flag field of the KEY/DNSKEY record.
The only recognized flag is KSK (Key Signing Key) DNSKEY.
</P
></DD
><DT
>-g <VAR
CLASS="REPLACEABLE"
>generator</VAR
></DT
><DD
><P
> If generating a Diffie Hellman key, use this generator.
</p></dd>
<dt><span class="term">-g <em class="replaceable"><code>generator</code></em></span></dt>
<dd><p>
If generating a Diffie Hellman key, use this generator.
Allowed values are 2 and 5. If no generator
is specified, a known prime from RFC 2539 will be used
if possible; otherwise the default is 2.
</P
></DD
><DT
>-h</DT
><DD
><P
> Prints a short summary of the options and arguments to
<B
CLASS="COMMAND"
>dnssec-keygen</B
>.
</P
></DD
><DT
>-k</DT
><DD
><P
> Generate KEY records rather than DNSKEY records.
</P
></DD
><DT
>-p <VAR
CLASS="REPLACEABLE"
>protocol</VAR
></DT
><DD
><P
> Sets the protocol value for the generated key. The protocol
</p></dd>
<dt><span class="term">-h</span></dt>
<dd><p>
Prints a short summary of the options and arguments to
<span><strong class="command">dnssec-keygen</strong></span>.
</p></dd>
<dt><span class="term">-k</span></dt>
<dd><p>
Generate KEY records rather than DNSKEY records.
</p></dd>
<dt><span class="term">-p <em class="replaceable"><code>protocol</code></em></span></dt>
<dd><p>
Sets the protocol value for the generated key. The protocol
is a number between 0 and 255. The default is 3 (DNSSEC).
Other possible values for this argument are listed in
RFC 2535 and its successors.
</P
></DD
><DT
>-r <VAR
CLASS="REPLACEABLE"
>randomdev</VAR
></DT
><DD
><P
> Specifies the source of randomness. If the operating
system does not provide a <TT
CLASS="FILENAME"
>/dev/random</TT
>
</p></dd>
<dt><span class="term">-r <em class="replaceable"><code>randomdev</code></em></span></dt>
<dd><p>
Specifies the source of randomness. If the operating
system does not provide a <code class="filename">/dev/random</code>
or equivalent device, the default source of randomness
is keyboard input. <TT
CLASS="FILENAME"
>randomdev</TT
> specifies
is keyboard input. <code class="filename">randomdev</code> specifies
the name of a character device or file containing random
data to be used instead of the default. The special value
<TT
CLASS="FILENAME"
>keyboard</TT
> indicates that keyboard
<code class="filename">keyboard</code> indicates that keyboard
input should be used.
</P
></DD
><DT
>-s <VAR
CLASS="REPLACEABLE"
>strength</VAR
></DT
><DD
><P
> Specifies the strength value of the key. The strength is
</p></dd>
<dt><span class="term">-s <em class="replaceable"><code>strength</code></em></span></dt>
<dd><p>
Specifies the strength value of the key. The strength is
a number between 0 and 15, and currently has no defined
purpose in DNSSEC.
</P
></DD
><DT
>-t <VAR
CLASS="REPLACEABLE"
>type</VAR
></DT
><DD
><P
> Indicates the use of the key. <VAR
CLASS="OPTION"
>type</VAR
> must be
</p></dd>
<dt><span class="term">-t <em class="replaceable"><code>type</code></em></span></dt>
<dd><p>
Indicates the use of the key. <code class="option">type</code> must be
one of AUTHCONF, NOAUTHCONF, NOAUTH, or NOCONF. The default
is AUTHCONF. AUTH refers to the ability to authenticate
data, and CONF the ability to encrypt data.
</P
></DD
><DT
>-v <VAR
CLASS="REPLACEABLE"
>level</VAR
></DT
><DD
><P
> Sets the debugging level.
</P
></DD
></DL
></DIV
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN136"
></A
><H2
>GENERATED KEYS</H2
><P
> When <B
CLASS="COMMAND"
>dnssec-keygen</B
> completes successfully,
it prints a string of the form <TT
CLASS="FILENAME"
>Knnnn.+aaa+iiiii</TT
>
</p></dd>
<dt><span class="term">-v <em class="replaceable"><code>level</code></em></span></dt>
<dd><p>
Sets the debugging level.
</p></dd>
</dl></div>
</div>
<div class="refsect1" lang="en">
<a name="id2526306"></a><h2>GENERATED KEYS</h2>
<p>
When <span><strong class="command">dnssec-keygen</strong></span> completes successfully,
it prints a string of the form <code class="filename">Knnnn.+aaa+iiiii</code>
to the standard output. This is an identification string for
the key it has generated. These strings can be used as arguments
to <B
CLASS="COMMAND"
>dnssec-makekeyset</B
>.
</P
><P
></P
><UL
><LI
><P
> <TT
CLASS="FILENAME"
>nnnn</TT
> is the key name.
</P
></LI
><LI
><P
> <TT
CLASS="FILENAME"
>aaa</TT
> is the numeric representation of the
the key it has generated.
</p>
<div class="itemizedlist"><ul type="disc">
<li><p>
<code class="filename">nnnn</code> is the key name.
</p></li>
<li><p>
<code class="filename">aaa</code> is the numeric representation of the
algorithm.
</P
></LI
><LI
><P
> <TT
CLASS="FILENAME"
>iiiii</TT
> is the key identifier (or footprint).
</P
></LI
></UL
><P
> <B
CLASS="COMMAND"
>dnssec-keygen</B
> creates two file, with names based
on the printed string. <TT
CLASS="FILENAME"
>Knnnn.+aaa+iiiii.key</TT
>
</p></li>
<li><p>
<code class="filename">iiiii</code> is the key identifier (or footprint).
</p></li>
</ul></div>
<p>
<span><strong class="command">dnssec-keygen</strong></span> creates two file, with names based
on the printed string. <code class="filename">Knnnn.+aaa+iiiii.key</code>
contains the public key, and
<TT
CLASS="FILENAME"
>Knnnn.+aaa+iiiii.private</TT
> contains the private
<code class="filename">Knnnn.+aaa+iiiii.private</code> contains the private
key.
</P
><P
> The <TT
CLASS="FILENAME"
>.key</TT
> file contains a DNS KEY record that
</p>
<p>
The <code class="filename">.key</code> file contains a DNS KEY record that
can be inserted into a zone file (directly or with a $INCLUDE
statement).
</P
><P
> The <TT
CLASS="FILENAME"
>.private</TT
> file contains algorithm specific
</p>
<p>
The <code class="filename">.private</code> file contains algorithm specific
fields. For obvious security reasons, this file does not have
general read permission.
</P
><P
> Both <TT
CLASS="FILENAME"
>.key</TT
> and <TT
CLASS="FILENAME"
>.private</TT
>
</p>
<p>
Both <code class="filename">.key</code> and <code class="filename">.private</code>
files are generated for symmetric encryption algorithm such as
HMAC-MD5, even though the public and private key are equivalent.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN163"
></A
><H2
>EXAMPLE</H2
><P
> To generate a 768-bit DSA key for the domain
<KBD
CLASS="USERINPUT"
>example.com</KBD
>, the following command would be
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526394"></a><h2>EXAMPLE</h2>
<p>
To generate a 768-bit DSA key for the domain
<strong class="userinput"><code>example.com</code></strong>, the following command would be
issued:
</P
><P
> <KBD
CLASS="USERINPUT"
>dnssec-keygen -a DSA -b 768 -n ZONE example.com</KBD
>
</P
><P
> The command would print a string of the form:
</P
><P
> <KBD
CLASS="USERINPUT"
>Kexample.com.+003+26160</KBD
>
</P
><P
> In this example, <B
CLASS="COMMAND"
>dnssec-keygen</B
> creates
the files <TT
CLASS="FILENAME"
>Kexample.com.+003+26160.key</TT
> and
<TT
CLASS="FILENAME"
>Kexample.com.+003+26160.private</TT
>
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN176"
></A
><H2
>SEE ALSO</H2
><P
> <SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>dnssec-signzone</SPAN
>(8)</SPAN
>,
<I
CLASS="CITETITLE"
>BIND 9 Administrator Reference Manual</I
>,
<I
CLASS="CITETITLE"
>RFC 2535</I
>,
<I
CLASS="CITETITLE"
>RFC 2845</I
>,
<I
CLASS="CITETITLE"
>RFC 2539</I
>.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN186"
></A
><H2
>AUTHOR</H2
><P
> Internet Systems Consortium
</P
></DIV
></BODY
></HTML
>
</p>
<p>
<strong class="userinput"><code>dnssec-keygen -a DSA -b 768 -n ZONE example.com</code></strong>
</p>
<p>
The command would print a string of the form:
</p>
<p>
<strong class="userinput"><code>Kexample.com.+003+26160</code></strong>
</p>
<p>
In this example, <span><strong class="command">dnssec-keygen</strong></span> creates
the files <code class="filename">Kexample.com.+003+26160.key</code> and
<code class="filename">Kexample.com.+003+26160.private</code>
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526440"></a><h2>SEE ALSO</h2>
<p>
<span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>,
<em class="citetitle">RFC 2535</em>,
<em class="citetitle">RFC 2845</em>,
<em class="citetitle">RFC 2539</em>.
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2526473"></a><h2>AUTHOR</h2>
<p>
<span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
</div></body>
</html>
@@ -1,113 +0,0 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: dnssec-makekeyset.8,v 1.16.2.2.4.1 2004/03/06 07:41:39 marka Exp $
.\"
.TH "DNSSEC-MAKEKEYSET" "8" "June 30, 2000" "BIND9" ""
.SH NAME
dnssec-makekeyset \- DNSSEC zone signing tool
.SH SYNOPSIS
.sp
\fBdnssec-makekeyset\fR [ \fB-a\fR ] [ \fB-s \fIstart-time\fB\fR ] [ \fB-e \fIend-time\fB\fR ] [ \fB-h\fR ] [ \fB-p\fR ] [ \fB-r \fIrandomdev\fB\fR ] [ \fB-t\fIttl\fB\fR ] [ \fB-v \fIlevel\fB\fR ] \fBkey\fR\fI...\fR
.SH "DESCRIPTION"
.PP
\fBdnssec-makekeyset\fR generates a key set from one
or more keys created by \fBdnssec-keygen\fR. It creates
a file containing a KEY record for each key, and self-signs the key
set with each zone key. The output file is of the form
\fIkeyset-nnnn.\fR, where \fInnnn\fR
is the zone name.
.SH "OPTIONS"
.TP
\fB-a\fR
Verify all generated signatures.
.TP
\fB-s \fIstart-time\fB\fR
Specify the date and time when the generated SIG records
become valid. This can be either an absolute or relative
time. An absolute start time is indicated by a number
in YYYYMMDDHHMMSS notation; 20000530144500 denotes
14:45:00 UTC on May 30th, 2000. A relative start time is
indicated by +N, which is N seconds from the current time.
If no \fBstart-time\fR is specified, the current
time is used.
.TP
\fB-e \fIend-time\fB\fR
Specify the date and time when the generated SIG records
expire. As with \fBstart-time\fR, an absolute
time is indicated in YYYYMMDDHHMMSS notation. A time relative
to the start time is indicated with +N, which is N seconds from
the start time. A time relative to the current time is
indicated with now+N. If no \fBend-time\fR is
specified, 30 days from the start time is used as a default.
.TP
\fB-h\fR
Prints a short summary of the options and arguments to
\fBdnssec-makekeyset\fR.
.TP
\fB-p\fR
Use pseudo-random data when signing the zone. This is faster,
but less secure, than using real random data. This option
may be useful when signing large zones or when the entropy
source is limited.
.TP
\fB-r \fIrandomdev\fB\fR
Specifies the source of randomness. If the operating
system does not provide a \fI/dev/random\fR
or equivalent device, the default source of randomness
is keyboard input. \fIrandomdev\fR specifies
the name of a character device or file containing random
data to be used instead of the default. The special value
\fIkeyboard\fR indicates that keyboard
input should be used.
.TP
\fB-t \fIttl\fB\fR
Specify the TTL (time to live) of the KEY and SIG records.
The default is 3600 seconds.
.TP
\fB-v \fIlevel\fB\fR
Sets the debugging level.
.TP
\fBkey\fR
The list of keys to be included in the keyset file. These keys
are expressed in the form \fIKnnnn.+aaa+iiiii\fR
as generated by \fBdnssec-keygen\fR.
.SH "EXAMPLE"
.PP
The following command generates a keyset containing the DSA key for
\fBexample.com\fR generated in the
\fBdnssec-keygen\fR man page.
.PP
\fBdnssec-makekeyset -t 86400 -s 20000701120000 -e +2592000 Kexample.com.+003+26160\fR
.PP
In this example, \fBdnssec-makekeyset\fR creates
the file \fIkeyset-example.com.\fR. This file
contains the specified key and a self-generated signature.
.PP
The DNS administrator for \fBexample.com\fR could
send \fIkeyset-example.com.\fR to the DNS
administrator for \fB.com\fR for signing, if the
\&.com zone is DNSSEC-aware and the administrators of the two zones
have some mechanism for authenticating each other and exchanging
the keys and signatures securely.
.SH "SEE ALSO"
.PP
\fBdnssec-keygen\fR(8),
\fBdnssec-signkey\fR(8),
\fIBIND 9 Administrator Reference Manual\fR,
\fIRFC 2535\fR.
.SH "AUTHOR"
.PP
Internet Software Consortium
@@ -1,401 +0,0 @@
/*
* Portions Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2000-2003 Internet Software Consortium.
* Portions Copyright (C) 1995-2000 by Network Associates, Inc.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE
* FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-makekeyset.c,v 1.52.2.1.10.7 2004/08/28 06:25:27 marka Exp $ */
#include <config.h>
#include <stdlib.h>
#include <isc/commandline.h>
#include <isc/entropy.h>
#include <isc/mem.h>
#include <isc/print.h>
#include <isc/string.h>
#include <isc/util.h>
#include <dns/db.h>
#include <dns/diff.h>
#include <dns/dnssec.h>
#include <dns/fixedname.h>
#include <dns/log.h>
#include <dns/rdata.h>
#include <dns/rdataset.h>
#include <dns/result.h>
#include <dns/secalg.h>
#include <dns/time.h>
#include <dst/dst.h>
#include "dnssectool.h"
const char *program = "dnssec-makekeyset";
int verbose;
typedef struct keynode keynode_t;
struct keynode {
dst_key_t *key;
ISC_LINK(keynode_t) link;
};
typedef ISC_LIST(keynode_t) keylist_t;
static isc_stdtime_t starttime = 0, endtime = 0, now;
static int ttl = -1;
static isc_mem_t *mctx = NULL;
static isc_entropy_t *ectx = NULL;
static keylist_t keylist;
static void
usage(void) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, "\t%s [options] keys\n", program);
fprintf(stderr, "\n");
fprintf(stderr, "Version: %s\n", VERSION);
fprintf(stderr, "Options: (default value in parenthesis) \n");
fprintf(stderr, "\t-a\n");
fprintf(stderr, "\t\tverify generated signatures\n");
fprintf(stderr, "\t-s YYYYMMDDHHMMSS|+offset:\n");
fprintf(stderr, "\t\tSIG start time - absolute|offset (now)\n");
fprintf(stderr, "\t-e YYYYMMDDHHMMSS|+offset|\"now\"+offset]:\n");
fprintf(stderr, "\t\tSIG end time - "
"absolute|from start|from now (now + 30 days)\n");
fprintf(stderr, "\t-t ttl\n");
fprintf(stderr, "\t-p\n");
fprintf(stderr, "\t\tuse pseudorandom data (faster but less secure)\n");
fprintf(stderr, "\t-r randomdev:\n");
fprintf(stderr, "\t\ta file containing random data\n");
fprintf(stderr, "\t-v level:\n");
fprintf(stderr, "\t\tverbose level (0)\n");
fprintf(stderr, "\n");
fprintf(stderr, "keys:\n");
fprintf(stderr, "\tkeyfile (Kname+alg+tag)\n");
fprintf(stderr, "\n");
fprintf(stderr, "Output:\n");
fprintf(stderr, "\tkeyset (keyset-<name>)\n");
exit(0);
}
static isc_boolean_t
zonekey_on_list(dst_key_t *key) {
keynode_t *keynode;
for (keynode = ISC_LIST_HEAD(keylist);
keynode != NULL;
keynode = ISC_LIST_NEXT(keynode, link))
{
if (dst_key_compare(keynode->key, key))
return (ISC_TRUE);
}
return (ISC_FALSE);
}
int
main(int argc, char *argv[]) {
int i, ch;
char *startstr = NULL, *endstr = NULL;
dns_fixedname_t fdomain;
dns_name_t *domain = NULL;
char *output = NULL;
char *endp;
unsigned char data[65536];
dns_db_t *db;
dns_dbversion_t *version;
dns_diff_t diff;
dns_difftuple_t *tuple;
dns_fixedname_t tname;
dst_key_t *key = NULL;
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdataset_t rdataset;
dns_rdataclass_t rdclass;
isc_result_t result;
isc_buffer_t b;
isc_region_t r;
isc_log_t *log = NULL;
keynode_t *keynode;
unsigned int eflags;
isc_boolean_t pseudorandom = ISC_FALSE;
isc_boolean_t tryverify = ISC_FALSE;
result = isc_mem_create(0, 0, &mctx);
if (result != ISC_R_SUCCESS)
fatal("failed to create memory context: %s",
isc_result_totext(result));
dns_result_register();
while ((ch = isc_commandline_parse(argc, argv, "as:e:t:r:v:ph")) != -1)
{
switch (ch) {
case 'a':
tryverify = ISC_TRUE;
break;
case 's':
startstr = isc_commandline_argument;
break;
case 'e':
endstr = isc_commandline_argument;
break;
case 't':
endp = NULL;
ttl = strtol(isc_commandline_argument, &endp, 0);
if (*endp != '\0')
fatal("TTL must be numeric");
break;
case 'r':
setup_entropy(mctx, isc_commandline_argument, &ectx);
break;
case 'v':
endp = NULL;
verbose = strtol(isc_commandline_argument, &endp, 0);
if (*endp != '\0')
fatal("verbose level must be numeric");
break;
case 'p':
pseudorandom = ISC_TRUE;
break;
case 'h':
default:
usage();
}
}
argc -= isc_commandline_index;
argv += isc_commandline_index;
if (argc < 1)
usage();
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
eflags = ISC_ENTROPY_BLOCKING;
if (!pseudorandom)
eflags |= ISC_ENTROPY_GOODONLY;
result = dst_lib_init(mctx, ectx, eflags);
if (result != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",
isc_result_totext(result));
isc_stdtime_get(&now);
if (startstr != NULL)
starttime = strtotime(startstr, now, now);
else
starttime = now;
if (endstr != NULL)
endtime = strtotime(endstr, now, starttime);
else
endtime = starttime + (30 * 24 * 60 * 60);
if (ttl == -1) {
ttl = 3600;
fprintf(stderr, "%s: TTL not specified, assuming 3600\n",
program);
}
setup_logging(verbose, mctx, &log);
dns_diff_init(mctx, &diff);
rdclass = 0;
ISC_LIST_INIT(keylist);
for (i = 0; i < argc; i++) {
char namestr[DNS_NAME_FORMATSIZE];
isc_buffer_t namebuf;
key = NULL;
result = dst_key_fromnamedfile(argv[i], DST_TYPE_PUBLIC,
mctx, &key);
if (result != ISC_R_SUCCESS)
fatal("error loading key from %s: %s", argv[i],
isc_result_totext(result));
if (rdclass == 0)
rdclass = dst_key_class(key);
isc_buffer_init(&namebuf, namestr, sizeof(namestr));
result = dns_name_tofilenametext(dst_key_name(key),
ISC_FALSE,
&namebuf);
check_result(result, "dns_name_tofilenametext");
isc_buffer_putuint8(&namebuf, 0);
if (domain == NULL) {
dns_fixedname_init(&fdomain);
domain = dns_fixedname_name(&fdomain);
dns_name_copy(dst_key_name(key), domain, NULL);
} else if (!dns_name_equal(domain, dst_key_name(key))) {
char str[DNS_NAME_FORMATSIZE];
dns_name_format(domain, str, sizeof(str));
fatal("all keys must have the same owner - %s "
"and %s do not match", str, namestr);
}
if (output == NULL) {
output = isc_mem_allocate(mctx,
strlen("keyset-") +
strlen(namestr) + 1);
if (output == NULL)
fatal("out of memory");
sprintf(output, "keyset-%s", namestr);
}
if (dst_key_iszonekey(key)) {
dst_key_t *zonekey = NULL;
result = dst_key_fromnamedfile(argv[i],
DST_TYPE_PUBLIC |
DST_TYPE_PRIVATE,
mctx, &zonekey);
if (result != ISC_R_SUCCESS)
fatal("failed to read private key %s: %s",
argv[i], isc_result_totext(result));
if (!zonekey_on_list(zonekey)) {
keynode = isc_mem_get(mctx, sizeof(keynode_t));
if (keynode == NULL)
fatal("out of memory");
keynode->key = zonekey;
ISC_LIST_INITANDAPPEND(keylist, keynode, link);
} else
dst_key_free(&zonekey);
}
dns_rdata_reset(&rdata);
isc_buffer_init(&b, data, sizeof(data));
result = dst_key_todns(key, &b);
dst_key_free(&key);
if (result != ISC_R_SUCCESS)
fatal("failed to convert key %s to a DNS KEY: %s",
argv[i], isc_result_totext(result));
isc_buffer_usedregion(&b, &r);
dns_rdata_fromregion(&rdata, rdclass, dns_rdatatype_dnskey, &r);
tuple = NULL;
result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
domain, ttl, &rdata, &tuple);
check_result(result, "dns_difftuple_create");
dns_diff_append(&diff, &tuple);
}
db = NULL;
result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone,
rdclass, 0, NULL, &db);
if (result != ISC_R_SUCCESS)
fatal("failed to create a database");
version = NULL;
dns_db_newversion(db, &version);
result = dns_diff_apply(&diff, db, version);
check_result(result, "dns_diff_apply");
dns_diff_clear(&diff);
dns_fixedname_init(&tname);
dns_rdataset_init(&rdataset);
result = dns_db_find(db, domain, version, dns_rdatatype_dnskey, 0, 0,
NULL, dns_fixedname_name(&tname), &rdataset,
NULL);
check_result(result, "dns_db_find");
if (ISC_LIST_EMPTY(keylist))
fprintf(stderr,
"%s: no private zone key found; not self-signing\n",
program);
for (keynode = ISC_LIST_HEAD(keylist);
keynode != NULL;
keynode = ISC_LIST_NEXT(keynode, link))
{
dns_rdata_reset(&rdata);
isc_buffer_init(&b, data, sizeof(data));
result = dns_dnssec_sign(domain, &rdataset, keynode->key,
&starttime, &endtime, mctx, &b,
&rdata);
isc_entropy_stopcallbacksources(ectx);
if (result != ISC_R_SUCCESS) {
char keystr[KEY_FORMATSIZE];
key_format(keynode->key, keystr, sizeof(keystr));
fatal("failed to sign keyset with key %s: %s",
keystr, isc_result_totext(result));
}
if (tryverify) {
result = dns_dnssec_verify(domain, &rdataset,
keynode->key, ISC_TRUE,
mctx, &rdata);
if (result != ISC_R_SUCCESS) {
char keystr[KEY_FORMATSIZE];
key_format(keynode->key, keystr, sizeof(keystr));
fatal("signature from key '%s' failed to "
"verify: %s",
keystr, isc_result_totext(result));
}
}
tuple = NULL;
result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
domain, ttl, &rdata, &tuple);
check_result(result, "dns_difftuple_create");
dns_diff_append(&diff, &tuple);
}
result = dns_diff_apply(&diff, db, version);
check_result(result, "dns_diff_apply");
dns_diff_clear(&diff);
dns_rdataset_disassociate(&rdataset);
dns_db_closeversion(db, &version, ISC_TRUE);
result = dns_db_dump(db, version, output);
if (result != ISC_R_SUCCESS) {
char domainstr[DNS_NAME_FORMATSIZE];
dns_name_format(domain, domainstr, sizeof(domainstr));
fatal("failed to write database for %s to %s",
domainstr, output);
}
printf("%s\n", output);
dns_db_detach(&db);
while (!ISC_LIST_EMPTY(keylist)) {
keynode = ISC_LIST_HEAD(keylist);
ISC_LIST_UNLINK(keylist, keynode, link);
dst_key_free(&keynode->key);
isc_mem_put(mctx, keynode, sizeof(keynode_t));
}
cleanup_logging(&log);
cleanup_entropy(&ectx);
isc_mem_free(mctx, output);
dst_lib_destroy();
if (verbose > 10)
isc_mem_stats(mctx, stdout);
isc_mem_destroy(&mctx);
return (0);
}
@@ -1,233 +0,0 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001, 2003 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: dnssec-makekeyset.docbook,v 1.2.2.3.4.2 2004/06/03 02:24:55 marka Exp $ -->
<refentry>
<refentryinfo>
<date>June 30, 2000</date>
</refentryinfo>
<refmeta>
<refentrytitle><application>dnssec-makekeyset</application></refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<refnamediv>
<refname><application>dnssec-makekeyset</application></refname>
<refpurpose>DNSSEC zone signing tool</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>dnssec-makekeyset</command>
<arg><option>-a</option></arg>
<arg><option>-s <replaceable class="parameter">start-time</replaceable></option></arg>
<arg><option>-e <replaceable class="parameter">end-time</replaceable></option></arg>
<arg><option>-h</option></arg>
<arg><option>-p</option></arg>
<arg><option>-r <replaceable class="parameter">randomdev</replaceable></option></arg>
<arg><option>-t</option><replaceable class="parameter">ttl</replaceable></arg>
<arg><option>-v <replaceable class="parameter">level</replaceable></option></arg>
<arg choice="req" rep="repeat">key</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
<command>dnssec-makekeyset</command> generates a key set from one
or more keys created by <command>dnssec-keygen</command>. It creates
a file containing a KEY record for each key, and self-signs the key
set with each zone key. The output file is of the form
<filename>keyset-nnnn.</filename>, where <filename>nnnn</filename>
is the zone name.
</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<variablelist>
<varlistentry>
<term>-a</term>
<listitem>
<para>
Verify all generated signatures.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-s <replaceable class="parameter">start-time</replaceable></term>
<listitem>
<para>
Specify the date and time when the generated SIG records
become valid. This can be either an absolute or relative
time. An absolute start time is indicated by a number
in YYYYMMDDHHMMSS notation; 20000530144500 denotes
14:45:00 UTC on May 30th, 2000. A relative start time is
indicated by +N, which is N seconds from the current time.
If no <option>start-time</option> is specified, the current
time is used.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-e <replaceable class="parameter">end-time</replaceable></term>
<listitem>
<para>
Specify the date and time when the generated SIG records
expire. As with <option>start-time</option>, an absolute
time is indicated in YYYYMMDDHHMMSS notation. A time relative
to the start time is indicated with +N, which is N seconds from
the start time. A time relative to the current time is
indicated with now+N. If no <option>end-time</option> is
specified, 30 days from the start time is used as a default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-h</term>
<listitem>
<para>
Prints a short summary of the options and arguments to
<command>dnssec-makekeyset</command>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-p</term>
<listitem>
<para>
Use pseudo-random data when signing the zone. This is faster,
but less secure, than using real random data. This option
may be useful when signing large zones or when the entropy
source is limited.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-r <replaceable class="parameter">randomdev</replaceable></term>
<listitem>
<para>
Specifies the source of randomness. If the operating
system does not provide a <filename>/dev/random</filename>
or equivalent device, the default source of randomness
is keyboard input. <filename>randomdev</filename> specifies
the name of a character device or file containing random
data to be used instead of the default. The special value
<filename>keyboard</filename> indicates that keyboard
input should be used.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-t <replaceable class="parameter">ttl</replaceable></term>
<listitem>
<para>
Specify the TTL (time to live) of the KEY and SIG records.
The default is 3600 seconds.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-v <replaceable class="parameter">level</replaceable></term>
<listitem>
<para>
Sets the debugging level.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>key</term>
<listitem>
<para>
The list of keys to be included in the keyset file. These keys
are expressed in the form <filename>Knnnn.+aaa+iiiii</filename>
as generated by <command>dnssec-keygen</command>.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>EXAMPLE</title>
<para>
The following command generates a keyset containing the DSA key for
<userinput>example.com</userinput> generated in the
<command>dnssec-keygen</command> man page.
</para>
<para>
<userinput>dnssec-makekeyset -t 86400 -s 20000701120000 -e +2592000 Kexample.com.+003+26160</userinput>
</para>
<para>
In this example, <command>dnssec-makekeyset</command> creates
the file <filename>keyset-example.com.</filename>. This file
contains the specified key and a self-generated signature.
</para>
<para>
The DNS administrator for <userinput>example.com</userinput> could
send <filename>keyset-example.com.</filename> to the DNS
administrator for <userinput>.com</userinput> for signing, if the
.com zone is DNSSEC-aware and the administrators of the two zones
have some mechanism for authenticating each other and exchanging
the keys and signatures securely.
</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para>
<citerefentry>
<refentrytitle>dnssec-keygen</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>dnssec-signkey</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>,
<citetitle>BIND 9 Administrator Reference Manual</citetitle>,
<citetitle>RFC 2535</citetitle>.
</para>
</refsect1>
<refsect1>
<title>AUTHOR</title>
<para>
<corpauthor>Internet Systems Consortium</corpauthor>
</para>
</refsect1>
</refentry>
<!--
- Local variables:
- mode: sgml
- End:
-->
@@ -1,407 +0,0 @@
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001, 2003 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: dnssec-makekeyset.html,v 1.4.2.2.4.1 2004/03/06 10:21:15 marka Exp $ -->
<HTML
><HEAD
><TITLE
>dnssec-makekeyset</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.73
"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#0000FF"
VLINK="#840084"
ALINK="#0000FF"
><H1
><A
NAME="AEN1"
><SPAN
CLASS="APPLICATION"
>dnssec-makekeyset</SPAN
></A
></H1
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN9"
></A
><H2
>Name</H2
><SPAN
CLASS="APPLICATION"
>dnssec-makekeyset</SPAN
>&nbsp;--&nbsp;DNSSEC zone signing tool</DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN13"
></A
><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>dnssec-makekeyset</B
> [<TT
CLASS="OPTION"
>-a</TT
>] [<TT
CLASS="OPTION"
>-s <TT
CLASS="REPLACEABLE"
><I
>start-time</I
></TT
></TT
>] [<TT
CLASS="OPTION"
>-e <TT
CLASS="REPLACEABLE"
><I
>end-time</I
></TT
></TT
>] [<TT
CLASS="OPTION"
>-h</TT
>] [<TT
CLASS="OPTION"
>-p</TT
>] [<TT
CLASS="OPTION"
>-r <TT
CLASS="REPLACEABLE"
><I
>randomdev</I
></TT
></TT
>] [<TT
CLASS="OPTION"
>-t</TT
><TT
CLASS="REPLACEABLE"
><I
>ttl</I
></TT
>] [<TT
CLASS="OPTION"
>-v <TT
CLASS="REPLACEABLE"
><I
>level</I
></TT
></TT
>] {key...}</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN38"
></A
><H2
>DESCRIPTION</H2
><P
> <B
CLASS="COMMAND"
>dnssec-makekeyset</B
> generates a key set from one
or more keys created by <B
CLASS="COMMAND"
>dnssec-keygen</B
>. It creates
a file containing a KEY record for each key, and self-signs the key
set with each zone key. The output file is of the form
<TT
CLASS="FILENAME"
>keyset-nnnn.</TT
>, where <TT
CLASS="FILENAME"
>nnnn</TT
>
is the zone name.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN45"
></A
><H2
>OPTIONS</H2
><P
></P
><DIV
CLASS="VARIABLELIST"
><DL
><DT
>-a</DT
><DD
><P
> Verify all generated signatures.
</P
></DD
><DT
>-s <TT
CLASS="REPLACEABLE"
><I
>start-time</I
></TT
></DT
><DD
><P
> Specify the date and time when the generated SIG records
become valid. This can be either an absolute or relative
time. An absolute start time is indicated by a number
in YYYYMMDDHHMMSS notation; 20000530144500 denotes
14:45:00 UTC on May 30th, 2000. A relative start time is
indicated by +N, which is N seconds from the current time.
If no <TT
CLASS="OPTION"
>start-time</TT
> is specified, the current
time is used.
</P
></DD
><DT
>-e <TT
CLASS="REPLACEABLE"
><I
>end-time</I
></TT
></DT
><DD
><P
> Specify the date and time when the generated SIG records
expire. As with <TT
CLASS="OPTION"
>start-time</TT
>, an absolute
time is indicated in YYYYMMDDHHMMSS notation. A time relative
to the start time is indicated with +N, which is N seconds from
the start time. A time relative to the current time is
indicated with now+N. If no <TT
CLASS="OPTION"
>end-time</TT
> is
specified, 30 days from the start time is used as a default.
</P
></DD
><DT
>-h</DT
><DD
><P
> Prints a short summary of the options and arguments to
<B
CLASS="COMMAND"
>dnssec-makekeyset</B
>.
</P
></DD
><DT
>-p</DT
><DD
><P
> Use pseudo-random data when signing the zone. This is faster,
but less secure, than using real random data. This option
may be useful when signing large zones or when the entropy
source is limited.
</P
></DD
><DT
>-r <TT
CLASS="REPLACEABLE"
><I
>randomdev</I
></TT
></DT
><DD
><P
> Specifies the source of randomness. If the operating
system does not provide a <TT
CLASS="FILENAME"
>/dev/random</TT
>
or equivalent device, the default source of randomness
is keyboard input. <TT
CLASS="FILENAME"
>randomdev</TT
> specifies
the name of a character device or file containing random
data to be used instead of the default. The special value
<TT
CLASS="FILENAME"
>keyboard</TT
> indicates that keyboard
input should be used.
</P
></DD
><DT
>-t <TT
CLASS="REPLACEABLE"
><I
>ttl</I
></TT
></DT
><DD
><P
> Specify the TTL (time to live) of the KEY and SIG records.
The default is 3600 seconds.
</P
></DD
><DT
>-v <TT
CLASS="REPLACEABLE"
><I
>level</I
></TT
></DT
><DD
><P
> Sets the debugging level.
</P
></DD
><DT
>key</DT
><DD
><P
> The list of keys to be included in the keyset file. These keys
are expressed in the form <TT
CLASS="FILENAME"
>Knnnn.+aaa+iiiii</TT
>
as generated by <B
CLASS="COMMAND"
>dnssec-keygen</B
>.
</P
></DD
></DL
></DIV
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN98"
></A
><H2
>EXAMPLE</H2
><P
> The following command generates a keyset containing the DSA key for
<TT
CLASS="USERINPUT"
><B
>example.com</B
></TT
> generated in the
<B
CLASS="COMMAND"
>dnssec-keygen</B
> man page.
</P
><P
> <TT
CLASS="USERINPUT"
><B
>dnssec-makekeyset -t 86400 -s 20000701120000 -e +2592000 Kexample.com.+003+26160</B
></TT
>
</P
><P
> In this example, <B
CLASS="COMMAND"
>dnssec-makekeyset</B
> creates
the file <TT
CLASS="FILENAME"
>keyset-example.com.</TT
>. This file
contains the specified key and a self-generated signature.
</P
><P
> The DNS administrator for <TT
CLASS="USERINPUT"
><B
>example.com</B
></TT
> could
send <TT
CLASS="FILENAME"
>keyset-example.com.</TT
> to the DNS
administrator for <TT
CLASS="USERINPUT"
><B
>.com</B
></TT
> for signing, if the
.com zone is DNSSEC-aware and the administrators of the two zones
have some mechanism for authenticating each other and exchanging
the keys and signatures securely.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN112"
></A
><H2
>SEE ALSO</H2
><P
> <SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>dnssec-keygen</SPAN
>(8)</SPAN
>,
<SPAN
CLASS="CITEREFENTRY"
><SPAN
CLASS="REFENTRYTITLE"
>dnssec-signkey</SPAN
>(8)</SPAN
>,
<I
CLASS="CITETITLE"
>BIND 9 Administrator Reference Manual</I
>,
<I
CLASS="CITETITLE"
>RFC 2535</I
>.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
NAME="AEN123"
></A
><H2
>AUTHOR</H2
><P
> Internet Software Consortium
</P
></DIV
></BODY
></HTML
>
-108
View File
@@ -1,108 +0,0 @@
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\" $Id: dnssec-signkey.8,v 1.18.2.1.4.1 2004/03/06 07:41:39 marka Exp $
.\"
.TH "DNSSEC-SIGNKEY" "8" "June 30, 2000" "BIND9" ""
.SH NAME
dnssec-signkey \- DNSSEC key set signing tool
.SH SYNOPSIS
.sp
\fBdnssec-signkey\fR [ \fB-a\fR ] [ \fB-c \fIclass\fB\fR ] [ \fB-s \fIstart-time\fB\fR ] [ \fB-e \fIend-time\fB\fR ] [ \fB-h\fR ] [ \fB-p\fR ] [ \fB-r \fIrandomdev\fB\fR ] [ \fB-v \fIlevel\fB\fR ] \fBkeyset\fR \fBkey\fR\fI...\fR
.SH "DESCRIPTION"
.PP
\fBdnssec-signkey\fR signs a keyset. Typically
the keyset will be for a child zone, and will have been generated
by \fBdnssec-makekeyset\fR. The child zone's keyset
is signed with the zone keys for its parent zone. The output file
is of the form \fIsignedkey-nnnn.\fR, where
\fInnnn\fR is the zone name.
.SH "OPTIONS"
.TP
\fB-a\fR
Verify all generated signatures.
.TP
\fB-c \fIclass\fB\fR
Specifies the DNS class of the key sets.
.TP
\fB-s \fIstart-time\fB\fR
Specify the date and time when the generated SIG records
become valid. This can be either an absolute or relative
time. An absolute start time is indicated by a number
in YYYYMMDDHHMMSS notation; 20000530144500 denotes
14:45:00 UTC on May 30th, 2000. A relative start time is
indicated by +N, which is N seconds from the current time.
If no \fBstart-time\fR is specified, the current
time is used.
.TP
\fB-e \fIend-time\fB\fR
Specify the date and time when the generated SIG records
expire. As with \fBstart-time\fR, an absolute
time is indicated in YYYYMMDDHHMMSS notation. A time relative
to the start time is indicated with +N, which is N seconds from
the start time. A time relative to the current time is
indicated with now+N. If no \fBend-time\fR is
specified, 30 days from the start time is used as a default.
.TP
\fB-h\fR
Prints a short summary of the options and arguments to
\fBdnssec-signkey\fR.
.TP
\fB-p\fR
Use pseudo-random data when signing the zone. This is faster,
but less secure, than using real random data. This option
may be useful when signing large zones or when the entropy
source is limited.
.TP
\fB-r \fIrandomdev\fB\fR
Specifies the source of randomness. If the operating
system does not provide a \fI/dev/random\fR
or equivalent device, the default source of randomness
is keyboard input. \fIrandomdev\fR specifies
the name of a character device or file containing random
data to be used instead of the default. The special value
\fIkeyboard\fR indicates that keyboard
input should be used.
.TP
\fB-v \fIlevel\fB\fR
Sets the debugging level.
.TP
\fBkeyset\fR
The file containing the child's keyset.
.TP
\fBkey\fR
The keys used to sign the child's keyset.
.SH "EXAMPLE"
.PP
The DNS administrator for a DNSSEC-aware \fB.com\fR
zone would use the following command to sign the
\fIkeyset\fR file for \fBexample.com\fR
created by \fBdnssec-makekeyset\fR with a key generated
by \fBdnssec-keygen\fR:
.PP
\fBdnssec-signkey keyset-example.com. Kcom.+003+51944\fR
.PP
In this example, \fBdnssec-signkey\fR creates
the file \fIsignedkey-example.com.\fR, which
contains the \fBexample.com\fR keys and the
signatures by the \fB.com\fR keys.
.SH "SEE ALSO"
.PP
\fBdnssec-keygen\fR(8),
\fBdnssec-makekeyset\fR(8),
\fBdnssec-signzone\fR(8).
.SH "AUTHOR"
.PP
Internet Software Consortium
-448
View File
@@ -1,448 +0,0 @@
/*
* Portions Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2000-2003 Internet Software Consortium.
* Portions Copyright (C) 1995-2000 by Network Associates, Inc.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE
* FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signkey.c,v 1.50.2.2.2.7 2004/08/28 06:25:28 marka Exp $ */
#include <config.h>
#include <stdlib.h>
#include <isc/string.h>
#include <isc/commandline.h>
#include <isc/entropy.h>
#include <isc/mem.h>
#include <isc/print.h>
#include <isc/util.h>
#include <dns/db.h>
#include <dns/dbiterator.h>
#include <dns/diff.h>
#include <dns/dnssec.h>
#include <dns/fixedname.h>
#include <dns/log.h>
#include <dns/rdata.h>
#include <dns/rdataclass.h>
#include <dns/rdataset.h>
#include <dns/rdatasetiter.h>
#include <dns/rdatastruct.h>
#include <dns/result.h>
#include <dns/secalg.h>
#include <dst/dst.h>
#include "dnssectool.h"
const char *program = "dnssec-signkey";
int verbose;
typedef struct keynode keynode_t;
struct keynode {
dst_key_t *key;
isc_boolean_t verified;
ISC_LINK(keynode_t) link;
};
typedef ISC_LIST(keynode_t) keylist_t;
static isc_stdtime_t starttime = 0, endtime = 0, now;
static isc_mem_t *mctx = NULL;
static isc_entropy_t *ectx = NULL;
static keylist_t keylist;
static void
usage(void) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, "\t%s [options] keyset keys\n", program);
fprintf(stderr, "\n");
fprintf(stderr, "Version: %s\n", VERSION);
fprintf(stderr, "Options: (default value in parenthesis) \n");
fprintf(stderr, "\t-a\n");
fprintf(stderr, "\t\tverify generated signatures\n");
fprintf(stderr, "\t-c class (IN)\n");
fprintf(stderr, "\t-s YYYYMMDDHHMMSS|+offset:\n");
fprintf(stderr, "\t\tSIG start time - absolute|offset (from keyset)\n");
fprintf(stderr, "\t-e YYYYMMDDHHMMSS|+offset|\"now\"+offset]:\n");
fprintf(stderr, "\t\tSIG end time - absolute|from start|from now "
"(from keyset)\n");
fprintf(stderr, "\t-v level:\n");
fprintf(stderr, "\t\tverbose level (0)\n");
fprintf(stderr, "\t-p\n");
fprintf(stderr, "\t\tuse pseudorandom data (faster but less secure)\n");
fprintf(stderr, "\t-r randomdev:\n");
fprintf(stderr, "\t\ta file containing random data\n");
fprintf(stderr, "\n");
fprintf(stderr, "keyset:\n");
fprintf(stderr, "\tfile with keyset to be signed (keyset-<name>)\n");
fprintf(stderr, "keys:\n");
fprintf(stderr, "\tkeyfile (Kname+alg+tag)\n");
fprintf(stderr, "\n");
fprintf(stderr, "Output:\n");
fprintf(stderr, "\tsigned keyset (signedkey-<name>)\n");
exit(0);
}
static void
loadkeys(dns_name_t *name, dns_rdataset_t *rdataset) {
dst_key_t *key;
dns_rdata_t rdata = DNS_RDATA_INIT;
keynode_t *keynode;
isc_result_t result;
ISC_LIST_INIT(keylist);
result = dns_rdataset_first(rdataset);
check_result(result, "dns_rdataset_first");
for (; result == ISC_R_SUCCESS; result = dns_rdataset_next(rdataset)) {
dns_rdata_reset(&rdata);
dns_rdataset_current(rdataset, &rdata);
key = NULL;
result = dns_dnssec_keyfromrdata(name, &rdata, mctx, &key);
if (result != ISC_R_SUCCESS)
continue;
if (!dst_key_iszonekey(key)) {
dst_key_free(&key);
continue;
}
keynode = isc_mem_get(mctx, sizeof(keynode_t));
if (keynode == NULL)
fatal("out of memory");
keynode->key = key;
keynode->verified = ISC_FALSE;
ISC_LIST_INITANDAPPEND(keylist, keynode, link);
}
if (result != ISC_R_NOMORE)
fatal("failure traversing key list");
}
static dst_key_t *
findkey(dns_rdata_rrsig_t *sig) {
keynode_t *keynode;
for (keynode = ISC_LIST_HEAD(keylist);
keynode != NULL;
keynode = ISC_LIST_NEXT(keynode, link))
{
if (dst_key_id(keynode->key) == sig->keyid &&
dst_key_alg(keynode->key) == sig->algorithm) {
keynode->verified = ISC_TRUE;
return (keynode->key);
}
}
fatal("signature generated by non-zone or missing key");
return (NULL);
}
int
main(int argc, char *argv[]) {
int i, ch;
char *startstr = NULL, *endstr = NULL, *classname = NULL;
char tdomain[1025];
dns_fixedname_t fdomain;
dns_name_t *domain;
char *output = NULL;
char *endp;
unsigned char data[65536];
dns_db_t *db;
dns_dbnode_t *node;
dns_dbversion_t *version;
dns_diff_t diff;
dns_difftuple_t *tuple;
dns_dbiterator_t *dbiter;
dns_rdatasetiter_t *rdsiter;
dst_key_t *key = NULL;
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdata_t sigrdata = DNS_RDATA_INIT;
dns_rdataset_t rdataset, sigrdataset;
dns_rdata_rrsig_t sig;
isc_result_t result;
isc_buffer_t b;
isc_log_t *log = NULL;
keynode_t *keynode;
isc_boolean_t pseudorandom = ISC_FALSE;
unsigned int eflags;
dns_rdataclass_t rdclass;
isc_boolean_t tryverify = ISC_FALSE;
isc_boolean_t settime = ISC_FALSE;
result = isc_mem_create(0, 0, &mctx);
check_result(result, "isc_mem_create()");
dns_result_register();
while ((ch = isc_commandline_parse(argc, argv, "ac:s:e:pr:v:h")) != -1)
{
switch (ch) {
case 'a':
tryverify = ISC_TRUE;
break;
case 'c':
classname = isc_commandline_argument;
break;
case 's':
startstr = isc_commandline_argument;
break;
case 'e':
endstr = isc_commandline_argument;
break;
case 'p':
pseudorandom = ISC_TRUE;
break;
case 'r':
setup_entropy(mctx, isc_commandline_argument, &ectx);
break;
case 'v':
endp = NULL;
verbose = strtol(isc_commandline_argument, &endp, 0);
if (*endp != '\0')
fatal("verbose level must be numeric");
break;
case 'h':
default:
usage();
}
}
argc -= isc_commandline_index;
argv += isc_commandline_index;
if (argc < 2)
usage();
rdclass = strtoclass(classname);
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
eflags = ISC_ENTROPY_BLOCKING;
if (!pseudorandom)
eflags |= ISC_ENTROPY_GOODONLY;
result = dst_lib_init(mctx, ectx, eflags);
if (result != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",
isc_result_totext(result));
isc_stdtime_get(&now);
if ((startstr == NULL || endstr == NULL) &&
!(startstr == NULL && endstr == NULL))
fatal("if -s or -e is specified, both must be");
if (startstr != NULL) {
starttime = strtotime(startstr, now, now);
endtime = strtotime(endstr, now, starttime);
settime = ISC_TRUE;
}
setup_logging(verbose, mctx, &log);
if (strlen(argv[0]) < 8U || strncmp(argv[0], "keyset-", 7) != 0)
fatal("keyset file '%s' must start with keyset-", argv[0]);
db = NULL;
result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone,
rdclass, 0, NULL, &db);
check_result(result, "dns_db_create()");
result = dns_db_load(db, argv[0]);
if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE)
fatal("failed to load database from '%s': %s", argv[0],
isc_result_totext(result));
dns_fixedname_init(&fdomain);
domain = dns_fixedname_name(&fdomain);
dbiter = NULL;
result = dns_db_createiterator(db, ISC_FALSE, &dbiter);
check_result(result, "dns_db_createiterator()");
result = dns_dbiterator_first(dbiter);
check_result(result, "dns_dbiterator_first()");
while (result == ISC_R_SUCCESS) {
node = NULL;
dns_dbiterator_current(dbiter, &node, domain);
rdsiter = NULL;
result = dns_db_allrdatasets(db, node, NULL, 0, &rdsiter);
check_result(result, "dns_db_allrdatasets()");
result = dns_rdatasetiter_first(rdsiter);
dns_rdatasetiter_destroy(&rdsiter);
if (result == ISC_R_SUCCESS)
break;
dns_db_detachnode(db, &node);
result = dns_dbiterator_next(dbiter);
}
dns_dbiterator_destroy(&dbiter);
if (result != ISC_R_SUCCESS)
fatal("failed to find data in keyset file");
isc_buffer_init(&b, tdomain, sizeof(tdomain) - 1);
result = dns_name_tofilenametext(domain, ISC_FALSE, &b);
check_result(result, "dns_name_tofilenametext()");
isc_buffer_putuint8(&b, 0);
output = isc_mem_allocate(mctx,
strlen("signedkey-") + strlen(tdomain) + 1);
if (output == NULL)
fatal("out of memory");
sprintf(output, "signedkey-%s", tdomain);
version = NULL;
dns_db_newversion(db, &version);
dns_rdataset_init(&rdataset);
dns_rdataset_init(&sigrdataset);
result = dns_db_findrdataset(db, node, version, dns_rdatatype_dnskey, 0,
0, &rdataset, &sigrdataset);
if (result != ISC_R_SUCCESS) {
char domainstr[DNS_NAME_FORMATSIZE];
dns_name_format(domain, domainstr, sizeof(domainstr));
fatal("failed to find rdataset '%s KEY': %s",
domainstr, isc_result_totext(result));
}
loadkeys(domain, &rdataset);
dns_diff_init(mctx, &diff);
if (!dns_rdataset_isassociated(&sigrdataset))
fatal("no SIG KEY set present");
result = dns_rdataset_first(&sigrdataset);
check_result(result, "dns_rdataset_first()");
do {
dns_rdataset_current(&sigrdataset, &sigrdata);
result = dns_rdata_tostruct(&sigrdata, &sig, mctx);
check_result(result, "dns_rdata_tostruct()");
key = findkey(&sig);
result = dns_dnssec_verify(domain, &rdataset, key,
ISC_TRUE, mctx, &sigrdata);
if (result != ISC_R_SUCCESS) {
char keystr[KEY_FORMATSIZE];
key_format(key, keystr, sizeof(keystr));
fatal("signature by key '%s' did not verify: %s",
keystr, isc_result_totext(result));
}
if (!settime) {
starttime = sig.timesigned;
endtime = sig.timeexpire;
settime = ISC_TRUE;
}
dns_rdata_freestruct(&sig);
dns_rdata_reset(&sigrdata);
result = dns_rdataset_next(&sigrdataset);
} while (result == ISC_R_SUCCESS);
for (keynode = ISC_LIST_HEAD(keylist);
keynode != NULL;
keynode = ISC_LIST_NEXT(keynode, link))
if (!keynode->verified)
fatal("not all zone keys self signed the key set");
argc -= 1;
argv += 1;
for (i = 0; i < argc; i++) {
key = NULL;
result = dst_key_fromnamedfile(argv[i],
DST_TYPE_PUBLIC |
DST_TYPE_PRIVATE,
mctx, &key);
if (result != ISC_R_SUCCESS)
fatal("failed to read key %s from disk: %s",
argv[i], isc_result_totext(result));
dns_rdata_reset(&rdata);
isc_buffer_init(&b, data, sizeof(data));
result = dns_dnssec_sign(domain, &rdataset, key,
&starttime, &endtime,
mctx, &b, &rdata);
isc_entropy_stopcallbacksources(ectx);
if (result != ISC_R_SUCCESS) {
char keystr[KEY_FORMATSIZE];
key_format(key, keystr, sizeof(keystr));
fatal("key '%s' failed to sign data: %s",
keystr, isc_result_totext(result));
}
if (tryverify) {
result = dns_dnssec_verify(domain, &rdataset, key,
ISC_TRUE, mctx, &rdata);
if (result != ISC_R_SUCCESS) {
char keystr[KEY_FORMATSIZE];
key_format(key, keystr, sizeof(keystr));
fatal("signature from key '%s' failed to "
"verify: %s",
keystr, isc_result_totext(result));
}
}
tuple = NULL;
result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
domain, rdataset.ttl,
&rdata, &tuple);
check_result(result, "dns_difftuple_create");
dns_diff_append(&diff, &tuple);
dst_key_free(&key);
}
result = dns_db_deleterdataset(db, node, version, dns_rdatatype_rrsig,
dns_rdatatype_dnskey);
check_result(result, "dns_db_deleterdataset");
result = dns_diff_apply(&diff, db, version);
check_result(result, "dns_diff_apply");
dns_diff_clear(&diff);
dns_db_detachnode(db, &node);
dns_db_closeversion(db, &version, ISC_TRUE);
result = dns_db_dump(db, version, output);
if (result != ISC_R_SUCCESS)
fatal("failed to write database to '%s': %s",
output, isc_result_totext(result));
printf("%s\n", output);
dns_rdataset_disassociate(&rdataset);
dns_rdataset_disassociate(&sigrdataset);
dns_db_detach(&db);
while (!ISC_LIST_EMPTY(keylist)) {
keynode = ISC_LIST_HEAD(keylist);
ISC_LIST_UNLINK(keylist, keynode, link);
dst_key_free(&keynode->key);
isc_mem_put(mctx, keynode, sizeof(keynode_t));
}
cleanup_logging(&log);
isc_mem_free(mctx, output);
cleanup_entropy(&ectx);
dst_lib_destroy();
if (verbose > 10)
isc_mem_stats(mctx, stdout);
isc_mem_destroy(&mctx);
return (0);
}
@@ -1,237 +0,0 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2001, 2003 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: dnssec-signkey.docbook,v 1.2.2.2.4.2 2004/06/03 02:24:55 marka Exp $ -->
<refentry>
<refentryinfo>
<date>June 30, 2000</date>
</refentryinfo>
<refmeta>
<refentrytitle><application>dnssec-signkey</application></refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<refnamediv>
<refname><application>dnssec-signkey</application></refname>
<refpurpose>DNSSEC key set signing tool</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>dnssec-signkey</command>
<arg><option>-a</option></arg>
<arg><option>-c <replaceable class="parameter">class</replaceable></option></arg>
<arg><option>-s <replaceable class="parameter">start-time</replaceable></option></arg>
<arg><option>-e <replaceable class="parameter">end-time</replaceable></option></arg>
<arg><option>-h</option></arg>
<arg><option>-p</option></arg>
<arg><option>-r <replaceable class="parameter">randomdev</replaceable></option></arg>
<arg><option>-v <replaceable class="parameter">level</replaceable></option></arg>
<arg choice="req">keyset</arg>
<arg choice="req" rep="repeat">key</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
<command>dnssec-signkey</command> signs a keyset. Typically
the keyset will be for a child zone, and will have been generated
by <command>dnssec-makekeyset</command>. The child zone's keyset
is signed with the zone keys for its parent zone. The output file
is of the form <filename>signedkey-nnnn.</filename>, where
<filename>nnnn</filename> is the zone name.
</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<variablelist>
<varlistentry>
<term>-a</term>
<listitem>
<para>
Verify all generated signatures.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-c <replaceable class="parameter">class</replaceable></term>
<listitem>
<para>
Specifies the DNS class of the key sets.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-s <replaceable class="parameter">start-time</replaceable></term>
<listitem>
<para>
Specify the date and time when the generated SIG records
become valid. This can be either an absolute or relative
time. An absolute start time is indicated by a number
in YYYYMMDDHHMMSS notation; 20000530144500 denotes
14:45:00 UTC on May 30th, 2000. A relative start time is
indicated by +N, which is N seconds from the current time.
If no <option>start-time</option> is specified, the current
time is used.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-e <replaceable class="parameter">end-time</replaceable></term>
<listitem>
<para>
Specify the date and time when the generated SIG records
expire. As with <option>start-time</option>, an absolute
time is indicated in YYYYMMDDHHMMSS notation. A time relative
to the start time is indicated with +N, which is N seconds from
the start time. A time relative to the current time is
indicated with now+N. If no <option>end-time</option> is
specified, 30 days from the start time is used as a default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-h</term>
<listitem>
<para>
Prints a short summary of the options and arguments to
<command>dnssec-signkey</command>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-p</term>
<listitem>
<para>
Use pseudo-random data when signing the zone. This is faster,
but less secure, than using real random data. This option
may be useful when signing large zones or when the entropy
source is limited.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-r <replaceable class="parameter">randomdev</replaceable></term>
<listitem>
<para>
Specifies the source of randomness. If the operating
system does not provide a <filename>/dev/random</filename>
or equivalent device, the default source of randomness
is keyboard input. <filename>randomdev</filename> specifies
the name of a character device or file containing random
data to be used instead of the default. The special value
<filename>keyboard</filename> indicates that keyboard
input should be used.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-v <replaceable class="parameter">level</replaceable></term>
<listitem>
<para>
Sets the debugging level.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>keyset</term>
<listitem>
<para>
The file containing the child's keyset.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>key</term>
<listitem>
<para>
The keys used to sign the child's keyset.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>EXAMPLE</title>
<para>
The DNS administrator for a DNSSEC-aware <userinput>.com</userinput>
zone would use the following command to sign the
<filename>keyset</filename> file for <userinput>example.com</userinput>
created by <command>dnssec-makekeyset</command> with a key generated
by <command>dnssec-keygen</command>:
</para>
<para>
<userinput>dnssec-signkey keyset-example.com. Kcom.+003+51944</userinput>
</para>
<para>
In this example, <command>dnssec-signkey</command> creates
the file <filename>signedkey-example.com.</filename>, which
contains the <userinput>example.com</userinput> keys and the
signatures by the <userinput>.com</userinput> keys.
</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para>
<citerefentry>
<refentrytitle>dnssec-keygen</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>dnssec-makekeyset</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>dnssec-signzone</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>.
</para>
</refsect1>
<refsect1>
<title>AUTHOR</title>
<para>
<corpauthor>Internet Systems Consortium</corpauthor>
</para>
</refsect1>
</refentry>
<!--
- Local variables:
- mode: sgml
- End:
-->
Loaded 100 of 4948 files, more files were not shown because too many files have changed in this diff. Show more