PERFORCE change 103398 for review
John Birrell
jb at FreeBSD.org
Mon Aug 7 20:53:44 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103398
Change 103398 by jb at jb_freebsd2 on 2006/08/07 20:52:48
IFC
Affected files ...
.. //depot/projects/dtrace/ports/MOVED#11 integrate
.. //depot/projects/dtrace/src/libexec/tftpd/tftpd.8#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/acpi.4#6 integrate
.. //depot/projects/dtrace/src/sys/conf/files#26 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#5 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_proto.c#4 delete
.. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#11 integrate
.. //depot/projects/dtrace/src/sys/sys/domain.h#3 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#10 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wesside/README#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mailwrapper/mailwrapper.8#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/mailwrapper/mailwrapper.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/Makefile#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/main.c#4 integrate
.. //depot/projects/dtrace/www/tools/portsgrowth/ports.log#3 integrate
Differences ...
==== //depot/projects/dtrace/ports/MOVED#11 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1111 2006/08/07 07:00:18 vanilla Exp $
+# $FreeBSD: ports/MOVED,v 1.1113 2006/08/07 13:18:43 vd Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -2432,3 +2432,10 @@
devel/p5-Readonly-XS|devel/p5-Readonly|2006-08-02|p5-Readonly installs XS automatically
chinese/arnettf||2006-08-06|Renamed to chinese/CJKUnifonts
devel/SGE||2006-08-07|Has expired
+editors/eshell-emacs20|editors/emacs|2006-08-07|expired
+devel/openorb||2006-08-07|Has expired: not really maintained anymore (last beta version is 2 years old)
+japanese/xemacs-devel-canna+freewnn||2006-08-07|Has expired: Unsupported and broken very long time
+japanese/xemacs-devel-canna+wnn6||2006-08-07|Has expired: Unsupported and broken very long time
+japanese/xemacs-devel-freewnn||2006-08-07|Has expired: Unsupported and broken very long time
+japanese/xemacs-devel-wnn6||2006-08-07|Has expired: Unsupported and broken very long time
+x11/gtk2-theme-switch||2006-08-07|Has expired: nothing new in over 2 years, use x11/gtkchtheme
==== //depot/projects/dtrace/src/libexec/tftpd/tftpd.8#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.18 2004/07/07 19:57:14 ru Exp $
+.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.19 2006/08/07 16:05:55 yar Exp $
.\"
.Dd September 14, 2000
.Dt TFTPD 8
@@ -39,7 +39,7 @@
.Nm tftpd
.Nd Internet Trivial File Transfer Protocol server
.Sh SYNOPSIS
-.Nm /usr/libexec/tftpd
+.Nm tftpd
.Op Fl cClnw
.Op Fl s Ar directory
.Op Fl u Ar user
@@ -70,8 +70,11 @@
.Nm
will allow only publicly readable files to be
accessed.
-Files containing the string ``/\|\fB.\|.\fP\|/'' or starting with
-``\|\fB.\|.\fP\|/'' are not allowed.
+Files containing the string
+.Dq Li "/../"
+or starting with
+.Dq Li "../"
+are not allowed.
Files may be written only if they already exist and are publicly writable.
Note that this extends the concept of
.Dq public
@@ -85,7 +88,7 @@
.Nm
with a list of directories by including up to 20 pathnames
as server program arguments in
-.Pa /etc/inetd.conf .
+.Xr inetd.conf 5 .
In this case access is restricted to files whose
names are prefixed by the one of the given directories.
The given directories are also treated as a search path for
@@ -94,21 +97,24 @@
The
.Fl s
option provides additional security by changing
-.Nm Ns No 's
-root directory, thereby prohibiting accesses outside of the specified
+the root directory of
+.Nm ,
+thereby prohibiting accesses to outside of the specified
.Ar directory .
Because
.Xr chroot 2
requires super-user privileges,
.Nm
-must be run as root.
+must be run as
+.Li root .
However, after performing the
-.Fn chroot ,
+.Xr chroot 2
+call,
.Nm
-will set its user id to that of the specified
+will set its user ID to that of the specified
.Ar user ,
or
-.Dq nobody
+.Dq Li nobody
if no
.Fl u
option is specified.
@@ -116,8 +122,9 @@
The options are:
.Bl -tag -width Ds
.It Fl c
-Changes the default root directory of a connecting host via chroot based on the
-connecting IP address.
+Changes the default root directory of a connecting host via
+.Xr chroot 2
+based on the connecting IP address.
This prevents multiple clients from writing to the same file at the same time.
If the directory does not exist, the client connection is refused.
The
@@ -131,15 +138,17 @@
Operates the same as
.Fl c
except it falls back to
-.Fl s Ns No 's
.Ar directory
+specified via
+.Fl s
if a directory does not exist for the client's IP.
.It Fl l
Log all requests using
.Xr syslog 3
with the facility of
.Dv LOG_FTP .
-Note: Logging of
+.Sy Note :
+Logging of
.Dv LOG_FTP
messages
must also be enabled in the syslog configuration file,
@@ -151,15 +160,15 @@
Cause
.Nm
to change its root directory to
-.Pa directory .
-After changing roots but before accepting commands,
+.Ar directory .
+After doing that but before accepting commands,
.Nm
will switch credentials to an unprivileged user.
.It Fl u Ar user
Switch credentials to
.Ar user
(default
-.Dq nobody )
+.Dq Li nobody )
when the
.Fl s
option is used.
@@ -169,7 +178,7 @@
.Ar umask
for newly created files.
The default is 022
-.Pq Dv S_IWGRP | S_IWOTH .
+.Pq Dv S_IWGRP No | Dv S_IWOTH .
.It Fl w
Allow writes requests to create new files.
By default
@@ -179,8 +188,11 @@
.Sh SEE ALSO
.Xr tftp 1 ,
.Xr chroot 2 ,
-.Xr inetd 8 ,
-.Xr syslogd 8
+.Xr syslog 3 ,
+.Xr inetd.conf 5 ,
+.Xr services 5 ,
+.Xr syslog.conf 5 ,
+.Xr inetd 8
.Rs
.%A K. R. Sollins
.%T The TFTP Protocol (Revision 2)
==== //depot/projects/dtrace/src/share/man/man4/acpi.4#6 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.58 2006/08/04 07:19:01 njl Exp $
+.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.59 2006/08/07 07:28:47 yar Exp $
.\"
.Dd July 29, 2006
.Dt ACPI 4
@@ -71,7 +71,9 @@
is modified.
.It Va hw.acpi.cpu.cx_lowest
Lowest Cx state to use for idling the CPU.
-A scheduling algorithm will select states between C1 and this setting
+A scheduling algorithm will select states between
+.Li C1
+and this setting
as system load dictates.
To enable ACPI CPU idling control,
.Va machdep.cpu_idle_hlt
@@ -79,12 +81,24 @@
.It Va hw.acpi.cpu.cx_supported
List of supported CPU idle states and their transition latency
in microseconds.
-Each state has a type (e.g., C2).
-C1 is equivalent to the ia32 HLT instruction, C2 provides a deeper
-sleep with the same semantics, and C3 provides the deepest sleep
+Each state has a type (e.g.,
+.Li C2 ) .
+.Li C1
+is equivalent to the ia32
+.Li HLT
+instruction,
+.Li C2
+provides a deeper
+sleep with the same semantics, and
+.Li C3
+provides the deepest sleep
but additionally requires bus mastering to be disabled.
-States greater than C3 provide even more power savings with the same
-semantics as the C3 state.
+States greater than
+.Li C3
+provide even more power savings with the same
+semantics as the
+.Li C3
+state.
Deeper sleeps provide more power savings but increased transition
latency when an interrupt occurs.
.It Va hw.acpi.disable_on_reboot
@@ -99,15 +113,17 @@
with legacy rebooting support.
.It Va hw.acpi.lid_switch_state
Suspend state
-.Pq Dv S1 Ns No \- Ns Dv S5
+.Pq Li S1 Ns \[en] Ns Li S5
to enter when the lid switch (i.e., a notebook screen) is closed.
-Default is NONE (do nothing).
+Default is
+.Dq Li NONE
+(do nothing).
.It Va hw.acpi.power_button_state
Suspend state
-.Pq Dv S1 Ns No \- Ns Dv S5
+.Pq Li S1 Ns \[en] Ns Li S5
to enter when the power button is pressed.
Default is
-.Dv S5
+.Li S5
(power-off nicely).
.It Va hw.acpi.reset_video
Reset the video adapter from real mode during the resume path.
@@ -115,20 +131,20 @@
Default is 0 (disabled).
.It Va hw.acpi.s4bios
Indicate whether the system supports
-.Dv S4BIOS .
+.Li S4BIOS .
This means that the BIOS can handle all the functions of suspending the
system to disk.
Otherwise, the OS is responsible for suspending to disk
-.Pq Dv S4OS .
+.Pq Li S4OS .
Most current systems do not support
-.Dv S4BIOS .
+.Li S4BIOS .
.It Va hw.acpi.sleep_button_state
Suspend state
-.Pq Dv S1 Ns No \- Ns Dv S5
+.Pq Li S1 Ns \[en] Ns Li S5
to enter when the sleep button is pressed.
This is usually a special function button on the keyboard.
Default is
-.Dv S3
+.Li S3
(suspend-to-RAM).
.It Va hw.acpi.sleep_delay
Wait this number of seconds between preparing the system to suspend and
@@ -136,31 +152,31 @@
Default is 1 second.
.It Va hw.acpi.supported_sleep_state
Suspend states
-.Pq Dv S1 Ns No \- Ns Dv S5
+.Pq Li S1 Ns \[en] Ns Li S5
supported by the BIOS.
.Bl -tag -width indent
-.It Dv S1
+.It Li S1
Quick suspend to RAM.
-The CPU enters a lower power state but most peripherals are left running.
-.It Dv S2
+The CPU enters a lower power state, but most peripherals are left running.
+.It Li S2
Lower power state than
-.Dv S1 ,
+.Li S1 ,
but with the same basic characteristics.
Not supported by many systems.
-.It Dv S3
+.It Li S3
Suspend to RAM.
-Most devices are powered off and the system stops running except for
+Most devices are powered off, and the system stops running except for
memory refresh.
-.It Dv S4
+.It Li S4
Suspend to disk.
-All devices are powered off and the system stops running.
+All devices are powered off, and the system stops running.
When resuming, the system starts as if from a cold power on.
Not yet supported by
.Fx
unless
-.Dv S4BIOS
+.Li S4BIOS
is available.
-.It Dv S5
+.It Li S5
System shuts down cleanly and powers off.
.El
.It Va hw.acpi.verbose
@@ -585,7 +601,7 @@
Disable APIC mode with
.Va hint.apic.0.disabled
or don't use the
-.Dv C2
+.Li C2
and
-.Dv C3
+.Li C3
states if APIC mode is enabled.
==== //depot/projects/dtrace/src/sys/conf/files#26 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1136 2006/07/29 18:38:53 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1137 2006/08/07 12:02:42 rwatson Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1434,7 +1434,6 @@
kern/uipc_mbuf.c standard
kern/uipc_mbuf2.c standard
kern/uipc_mqueue.c optional p1003_1b_mqueue
-kern/uipc_proto.c standard
kern/uipc_sem.c optional p1003_1b_semaphores
kern/uipc_sockbuf.c standard
kern/uipc_socket.c standard
==== //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci_link.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.53 2006/01/06 16:14:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.54 2006/08/07 19:52:30 jhb Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -941,19 +941,27 @@
KASSERT(!PCI_INTERRUPT_VALID(link->l_irq),
("%s: link already has an IRQ", __func__));
- /* Check for a tunable override and use it if it is valid. */
+ /* Check for a tunable override. */
if (ACPI_SUCCESS(acpi_short_name(acpi_get_handle(dev), link_name,
sizeof(link_name)))) {
snprintf(tunable_buffer, sizeof(tunable_buffer),
"hw.pci.link.%s.%d.irq", link_name, link->l_res_index);
- if (getenv_int(tunable_buffer, &i) &&
- PCI_INTERRUPT_VALID(i) && link_valid_irq(link, i))
+ if (getenv_int(tunable_buffer, &i) && PCI_INTERRUPT_VALID(i)) {
+ if (!link_valid_irq(link, i))
+ device_printf(dev,
+ "Warning, IRQ %d is not listed as valid\n",
+ i);
return (i);
+ }
snprintf(tunable_buffer, sizeof(tunable_buffer),
"hw.pci.link.%s.irq", link_name);
- if (getenv_int(tunable_buffer, &i) &&
- PCI_INTERRUPT_VALID(i) && link_valid_irq(link, i))
+ if (getenv_int(tunable_buffer, &i) && PCI_INTERRUPT_VALID(i)) {
+ if (!link_valid_irq(link, i))
+ device_printf(dev,
+ "Warning, IRQ %d is not listed as valid\n",
+ i);
return (i);
+ }
}
/*
==== //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#9 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.135 2006/06/29 06:38:21 glebius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.136 2006/08/07 12:51:50 glebius Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -247,6 +247,7 @@
{ BGE_CHIPID_BCM5750_B1, "BCM5750 B1" },
{ BGE_CHIPID_BCM5750_C0, "BCM5750 C0" },
{ BGE_CHIPID_BCM5750_C1, "BCM5750 C1" },
+ { BGE_CHIPID_BCM5750_C2, "BCM5750 C2" },
{ BGE_CHIPID_BCM5714_A0, "BCM5714 A0" },
{ BGE_CHIPID_BCM5752_A0, "BCM5752 A0" },
{ BGE_CHIPID_BCM5752_A1, "BCM5752 A1" },
==== //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.50 2006/06/28 09:12:29 glebius Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.51 2006/08/07 12:51:50 glebius Exp $
*/
/*
@@ -257,6 +257,7 @@
#define BGE_CHIPID_BCM5750_B1 0x41010000
#define BGE_CHIPID_BCM5750_C0 0x42000000
#define BGE_CHIPID_BCM5750_C1 0x42010000
+#define BGE_CHIPID_BCM5750_C2 0x42020000
#define BGE_CHIPID_BCM5714_A0 0x50000000
#define BGE_CHIPID_BCM5752_A0 0x60000000
#define BGE_CHIPID_BCM5752_A1 0x60010000
==== //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#11 (text+ko) ====
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.185 2006/08/06 10:39:21 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.186 2006/08/07 12:02:42 rwatson Exp $");
#include "opt_mac.h"
@@ -124,17 +124,18 @@
static int unp_rights; /* file descriptors in flight */
-SYSCTL_DECL(_net_local_stream);
+SYSCTL_NODE(_net, PF_LOCAL, local, CTLFLAG_RW, 0, "Local domain");
+SYSCTL_NODE(_net_local, SOCK_STREAM, stream, CTLFLAG_RW, 0, "SOCK_STREAM");
+SYSCTL_NODE(_net_local, SOCK_DGRAM, dgram, CTLFLAG_RW, 0, "SOCK_DGRAM");
+
SYSCTL_ULONG(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW,
&unpst_sendspace, 0, "");
SYSCTL_ULONG(_net_local_stream, OID_AUTO, recvspace, CTLFLAG_RW,
&unpst_recvspace, 0, "");
-SYSCTL_DECL(_net_local_dgram);
SYSCTL_ULONG(_net_local_dgram, OID_AUTO, maxdgram, CTLFLAG_RW,
&unpdg_sendspace, 0, "");
SYSCTL_ULONG(_net_local_dgram, OID_AUTO, recvspace, CTLFLAG_RW,
&unpdg_recvspace, 0, "");
-SYSCTL_DECL(_net_local);
SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, "");
/*
@@ -187,6 +188,37 @@
static int unp_listen(struct socket *, struct unpcb *, int,
struct thread *);
+/*
+ * Definitions of protocols supported in the LOCAL domain.
+ */
+static struct domain localdomain;
+static struct protosw localsw[] = {
+{
+ .pr_type = SOCK_STREAM,
+ .pr_domain = &localdomain,
+ .pr_flags = PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS,
+ .pr_ctloutput = &uipc_ctloutput,
+ .pr_usrreqs = &uipc_usrreqs
+},
+{
+ .pr_type = SOCK_DGRAM,
+ .pr_domain = &localdomain,
+ .pr_flags = PR_ATOMIC|PR_ADDR|PR_RIGHTS,
+ .pr_usrreqs = &uipc_usrreqs
+},
+};
+
+static struct domain localdomain = {
+ .dom_family = AF_LOCAL,
+ .dom_name = "local",
+ .dom_init = unp_init,
+ .dom_externalize = unp_externalize,
+ .dom_dispose = unp_dispose,
+ .dom_protosw = localsw,
+ .dom_protoswNPROTOSW = &localsw[sizeof(localsw)/sizeof(localsw[0])]
+};
+DOMAIN_SET(local);
+
static void
uipc_abort(struct socket *so)
{
==== //depot/projects/dtrace/src/sys/sys/domain.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)domain.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/sys/domain.h,v 1.21 2005/01/07 02:29:23 imp Exp $
+ * $FreeBSD: src/sys/sys/domain.h,v 1.22 2006/08/07 12:02:43 rwatson Exp $
*/
#ifndef _SYS_DOMAIN_H_
@@ -66,7 +66,6 @@
#ifdef _KERNEL
extern int domain_init_status;
extern struct domain *domains;
-extern struct domain localdomain;
extern void net_add_domain(void *);
#define DOMAIN_SET(name) \
==== //depot/projects/dtrace/src/sys/sys/param.h#10 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)param.h 8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.270 2006/08/05 20:35:11 jb Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.271 2006/08/07 10:33:07 keramida Exp $
*/
#ifndef _SYS_PARAM_H_
@@ -340,7 +340,7 @@
/*
* The OpenSolaris version is set according to the version last imported
* from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header
- * files it can be used to detemine the level of compatibility that the
+ * files it can be used to determine the level of compatibility that the
* FreeBSD headers provide to OpenSolaris code. Perhaps one day there
* will be a really, really Single Unix Specification.
*/
==== //depot/projects/dtrace/src/tools/tools/net80211/wesside/README#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/tools/tools/net80211/wesside/README,v 1.1 2006/08/07 00:05:03 sam Exp $
+$FreeBSD: src/tools/tools/net80211/wesside/README,v 1.2 2006/08/07 17:08:05 keramida Exp $
This is an implementation of the frag attack described in:
http://tapir.cs.ucl.ac.uk/bittau-wep.pdf
@@ -17,9 +17,8 @@
- Or, by contacting someone on the Internet [udps] and telling it to flood.
* Uses aircrack periodically to attempt to crack the WEP key. The supplied
aircrack is modified to work with wesside.
-* Binds to a tap interface to allow TX. RX works if a dictionary is being buil
-t
- [dics] and a packt with a known IV traverses the network.
+* Binds to a tap interface to allow TX. RX works if a dictionary is being built
+ [dics] and a packet with a known IV traverses the network.
Examples:
=========
@@ -31,6 +30,6 @@
./wesside -s ip_of_internet_box
To build a dictionary:
-[Internet box]~# ./dicts source_ip_of_box 100
+[Internet box]~# ./dics source_ip_of_box 100
./wesside -s ip_of_internet_box
Use tap3 as if it were the wifi.
==== //depot/projects/dtrace/src/usr.sbin/mailwrapper/mailwrapper.8#3 (text+ko) ====
@@ -1,5 +1,6 @@
-.\" $NetBSD: mailwrapper.8,v 1.6 1999/03/25 16:40:17 is Exp $
-.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.12 2004/07/02 23:12:48 ru Exp $
+.\" $NetBSD: mailwrapper.8,v 1.11 2002/02/08 01:38:50 ross Exp $
+.\" $OpenBSD: mailwrapper.8,v 1.8 2003/06/12 12:59:51 jmc Exp $
+.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.13 2006/08/07 10:22:08 delphij Exp $
.\"
.\" Copyright (c) 1998
.\" Perry E. Metzger. All rights reserved.
@@ -31,7 +32,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" The following requests are required for all man pages.
-.Dd December 16, 1998
+.Dd August 7, 2006
.Dt MAILWRAPPER 8
.Os
.Sh NAME
@@ -84,10 +85,10 @@
based on calling name, or through a set of programs that provide
similar functionality.
.Pp
-Although having replacement programs that plug replace
+Although having drop-in replacements for
.Xr sendmail 8
helps in installing alternative MTAs, it essentially makes the
-configuration of the system depend on hard installing new programs in
+configuration of the system depend on hand installing new programs in
.Pa /usr .
This leads to configuration problems for many administrators, since
they may wish to install a new MTA without altering the system
@@ -131,14 +132,15 @@
is typically set up as a symbolic link to
.Nm
which is not usually invoked on its own.
+.Sh EXIT STATUS
+The
+.Nm
+exits 0 on success, and \*[Gt]0 if an error occurs.
.Sh DIAGNOSTICS
The
.Nm
-utility will return an error value and print a diagnostic if its configuration
-file is missing or malformed, or does not contain a mapping for the
-name under which
-.Nm
-was invoked.
+will print a diagnostic if its configuration file is missing or malformed,
+or does not contain a mapping for the name under which it was invoked.
.Sh SEE ALSO
.Xr mail 1 ,
.Xr mailq 1 ,
==== //depot/projects/dtrace/src/usr.sbin/mailwrapper/mailwrapper.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
-/* $OpenBSD: mailwrapper.c,v 1.15 2003/03/09 01:24:26 millert Exp $ */
-/* $NetBSD: mailwrapper.c,v 1.7 2003/02/17 21:18:46 is Exp $ */
+/* $OpenBSD: mailwrapper.c,v 1.16 2004/07/06 03:38:14 millert Exp $ */
+/* $NetBSD: mailwrapper.c,v 1.9 2003/03/09 08:10:43 mjl Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.10 2006/06/06 05:01:12 delphij Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.11 2006/08/07 10:29:18 delphij Exp $");
#include <err.h>
#include <stdio.h>
==== //depot/projects/dtrace/src/usr.sbin/ngctl/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.14 2004/01/26 10:27:18 ru Exp $
+# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.15 2006/08/07 14:17:05 glebius Exp $
# $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
PROG= ngctl
@@ -6,7 +6,18 @@
SRCS= main.c mkpeer.c config.c connect.c dot.c name.c show.c list.c \
msg.c debug.c shutdown.c rmhook.c status.c types.c write.c
WARNS?= 3
+
+.if defined(RELEASE_CRUNCH)
+NGCTL_NO_LIBEDIT=
+.endif
+
DPADD= ${LIBNETGRAPH}
LDADD= -lnetgraph
+.if !defined(NGCTL_NO_LIBEDIT)
+CFLAGS+= -DEDITLINE
+DPADD+= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
+LDADD+= -pthread -ledit -ltermcap
+.endif
+
.include <bsd.prog.mk>
==== //depot/projects/dtrace/src/usr.sbin/ngctl/main.c#4 (text+ko) ====
@@ -34,7 +34,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.20 2006/06/28 10:38:38 glebius Exp $
+ * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.21 2006/08/07 14:17:05 glebius Exp $
* $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $
*/
@@ -51,6 +51,11 @@
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
+#ifdef EDITLINE
+#include <signal.h>
+#include <histedit.h>
+#include <pthread.h>
+#endif
#include <netgraph.h>
@@ -63,6 +68,7 @@
/* Internal functions */
static int ReadFile(FILE *fp);
+static void ReadSockets(fd_set);
static int DoParseCommand(char *line);
static int DoCommand(int ac, char **av);
static int DoInteractive(void);
@@ -72,6 +78,11 @@
static int ReadCmd(int ac, char **av);
static int HelpCmd(int ac, char **av);
static int QuitCmd(int ac, char **av);
+#ifdef EDITLINE
+static sig_atomic_t unblock;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+#endif
/* List of commands */
static const struct ngcmd *const cmds[] = {
@@ -211,8 +222,122 @@
return (CMDRTN_OK);
}
+#ifdef EDITLINE
+/* Signal handler for Monitor() thread. */
+static void
+Unblock(int signal)
+{
+ unblock = 1;
+}
+
/*
- * Interactive mode
+ * Thread that monitors csock and dsock while main thread
+ * can be blocked in el_gets().
+ */
+static void *
+Monitor(void *v)
+{
+ struct sigaction act;
+ const int maxfd = MAX(csock, dsock) + 1;
+
+ act.sa_handler = Unblock;
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+ sigaction(SIGUSR1, &act, NULL);
+
+ pthread_mutex_lock(&mutex);
+ for (;;) {
+ fd_set rfds;
+
+ /* See if any data or control messages are arriving. */
+ FD_ZERO(&rfds);
+ FD_SET(csock, &rfds);
+ FD_SET(dsock, &rfds);
+ unblock = 0;
+ if (select(maxfd, &rfds, NULL, NULL, NULL) <= 0) {
+ if (errno == EINTR) {
+ if (unblock == 1)
+ pthread_cond_wait(&cond, &mutex);
+ continue;
+ }
+ err(EX_OSERR, "select");
+ }
+
+ ReadSockets(rfds);
+ }
+
+ return (NULL);
+}
+
+static char *
+Prompt(EditLine *el)
+{
+ return PROMPT;
+}
+
+/*
+ * Here we start a thread, that will monitor the netgraph
+ * sockets and catch any unexpected messages or data on them,
+ * that can arrive while user edits his/her commands.
+ *
+ * Whenever we expect data on netgraph sockets, we send signal
+ * to monitoring thread. The signal forces it to exit select()
+ * system call and sleep on condvar until we wake it. While
+ * monitoring thread sleeps, we can do our work with netgraph
+ * sockets.
+ */
+static int
+DoInteractive(void)
+{
+ pthread_t monitor;
+ EditLine *el;
+ History *hist;
+ HistEvent hev = { 0, "" };
+
+ (*help_cmd.func)(0, NULL);
+ pthread_create(&monitor, NULL, Monitor, NULL);
+ el = el_init(getprogname(), stdin, stdout, stderr);
+ if (el == NULL)
+ return (CMDRTN_ERROR);
+ el_set(el, EL_PROMPT, Prompt);
+ el_set(el, EL_SIGNAL, 1);
+ el_set(el, EL_EDITOR, "emacs");
+ hist = history_init();
+ if (hist == NULL)
+ return (CMDRTN_ERROR);
+ history(hist, &hev, H_SETSIZE, 100);
+ history(hist, &hev, H_SETUNIQUE, 1);
+ el_set(el, EL_HIST, history, (const char *)hist);
+ el_source(el, NULL);
+
+ for (;;) {
+ const char *buf;
+ int count;
+
+ if ((buf = el_gets(el, &count)) == NULL) {
+ printf("\n");
+ break;
+ }
+ history(hist, &hev, H_ENTER, buf);
+ pthread_kill(monitor, SIGUSR1);
+ pthread_mutex_lock(&mutex);
+ if (DoParseCommand((char *)buf) == CMDRTN_QUIT)
+ break;
+ pthread_cond_signal(&cond);
+ pthread_mutex_unlock(&mutex);
+ }
+
+ history_end(hist);
+ el_end(el);
+ pthread_cancel(monitor);
+
+ return (CMDRTN_QUIT);
+}
+
+#else /* !EDITLINE */
+
+/*
+ * Interactive mode w/o libedit functionality.
*/
static int
DoInteractive(void)
@@ -246,28 +371,8 @@
printf("\n");
}
- /* Display any incoming control message */
- if (FD_ISSET(csock, &rfds))
- MsgRead();
-
- /* Display any incoming data packet */
- if (FD_ISSET(dsock, &rfds)) {
- u_char *buf;
- char hook[NG_HOOKSIZ];
- int rl;
-
- /* Read packet from socket */
- if ((rl = NgAllocRecvData(dsock, &buf, hook)) < 0)
- err(EX_OSERR, "reading hook \"%s\"", hook);
- if (rl == 0)
- errx(EX_OSERR, "EOF from hook \"%s\"?", hook);
+ ReadSockets(rfds);
- /* Write packet to stdout */
- printf("Rec'd data packet on hook \"%s\":\n", hook);
- DumpAscii(buf, rl);
- free(buf);
- }
-
/* Get any user input */
if (FD_ISSET(0, &rfds)) {
char buf[LINE_MAX];
@@ -282,6 +387,36 @@
}
return (CMDRTN_QUIT);
}
+#endif /* !EDITLINE */
+
+/*
+ * Read and process data on netgraph control and data sockets.
+ */
+static void
+ReadSockets(fd_set rfds)
+{
+ /* Display any incoming control message. */
+ if (FD_ISSET(csock, &rfds))
+ MsgRead();
+
+ /* Display any incoming data packet. */
+ if (FD_ISSET(dsock, &rfds)) {
+ char hook[NG_HOOKSIZ];
+ u_char *buf;
+ int rl;
+
+ /* Read packet from socket. */
+ if ((rl = NgAllocRecvData(dsock, &buf, hook)) < 0)
+ err(EX_OSERR, "reading hook \"%s\"", hook);
+ if (rl == 0)
+ errx(EX_OSERR, "EOF from hook \"%s\"?", hook);
+
+ /* Write packet to stdout. */
+ printf("Rec'd data packet on hook \"%s\":\n", hook);
+ DumpAscii(buf, rl);
+ free(buf);
+ }
+}
/*
* Parse a command line and execute the command
==== //depot/projects/dtrace/www/tools/portsgrowth/ports.log#3 (text+ko) ====
@@ -1383,3 +1383,179 @@
2006/05/10 05:18:29 14590
2006/05/10 21:03:27 14610
2006/05/11 05:16:43 14613
+2006/05/11 21:16:11 14628
+2006/05/12 05:32:20 14630
+2006/05/12 21:06:19 14633
+2006/05/13 09:03:03 14632
+2006/05/13 21:00:59 14635
+2006/05/14 05:15:44 14636
+2006/05/14 21:01:56 14639
+2006/05/15 05:15:39 14645
+2006/05/15 21:01:46 14668
+2006/05/16 05:19:12 14671
+2006/05/16 21:01:50 14676
+2006/05/17 05:15:45 14677
+2006/05/17 21:04:17 14689
+2006/05/18 05:16:13 14689
+2006/05/18 21:02:03 14693
+2006/05/19 05:15:56 14694
+2006/05/19 21:02:07 14698
+2006/05/20 05:23:17 14707
+2006/05/20 21:02:07 14709
+2006/05/21 05:16:00 14709
+2006/05/21 21:02:25 14711
+2006/05/22 05:16:17 14727
+2006/05/22 21:02:51 14737
+2006/05/23 05:16:59 14737
+2006/05/23 21:02:43 14740
+2006/05/24 05:15:50 14742
+2006/05/24 21:05:40 14748
+2006/05/25 05:16:00 14750
+2006/05/25 21:01:53 14759
+2006/05/26 05:16:01 14767
+2006/05/26 21:01:55 14779
+2006/05/27 05:24:15 14780
+2006/05/27 13:16:17 14794
+2006/05/28 05:16:16 14798
+2006/05/28 05:16:16 14798
+2006/05/29 05:16:39 14802
+2006/05/29 21:03:04 14804
+2006/05/30 05:17:39 14807
+2006/05/30 21:02:40 14811
+2006/05/31 05:16:23 14814
+2006/05/31 21:02:06 14823
+2006/06/01 05:16:44 14825
+2006/06/01 21:02:24 14829
+2006/06/02 05:16:40 14830
+2006/06/02 21:15:48 14831
+2006/06/03 05:23:20 14836
+2006/06/03 17:16:22 14838
+2006/06/04 05:16:58 14839
+2006/06/04 21:03:32 14840
+2006/06/05 05:17:01 14840
+2006/06/05 21:07:51 14855
+2006/06/06 05:16:17 14860
+2006/06/06 21:05:28 14871
+2006/06/07 05:22:12 14871
+2006/06/07 21:03:22 14875
+2006/06/08 05:18:38 14881
+2006/06/08 21:03:08 14886
+2006/06/09 05:17:29 14886
+2006/06/09 17:16:53 14889
+2006/06/10 05:25:20 14892
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list