From owner-p4-projects@FreeBSD.ORG Mon Jun 6 00:33:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABD7516A420; Mon, 6 Jun 2005 00:33:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8793716A41C for ; Mon, 6 Jun 2005 00:33:08 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31B4F43D58 for ; Mon, 6 Jun 2005 00:33:08 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j560X85U005568 for ; Mon, 6 Jun 2005 00:33:08 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j560X7h9005565 for perforce@freebsd.org; Mon, 6 Jun 2005 00:33:07 GMT (envelope-from wsalamon@computer.org) Date: Mon, 6 Jun 2005 00:33:07 GMT Message-Id: <200506060033.j560X7h9005565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 78047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 00:33:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=78047 Change 78047 by wsalamon@rickenbacker on 2005/06/06 00:32:38 Changes necessary to sync with the current kernel; specifically, the auditctl() system call. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#6 (text+ko) ==== @@ -32,8 +32,11 @@ /* * Triggers for the audit daemon */ -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_FILE_FULL 2 +#define AUDIT_TRIGGER_LOW_SPACE 1 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_NO_SPACE 5 /* * Pre-defined audit IDs @@ -146,6 +149,13 @@ #define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ +/* + * auditctl(2) commands + */ +#define AC_SETLOGFILE 1 +#define AC_SHUTDOWN 2 +#define AC_SENDTRIGGER 3 + __BEGIN_DECLS typedef uid_t au_id_t; @@ -281,7 +291,7 @@ int audit (const void *, int); int auditon (int, void *, int); -int auditctl (const char *); +int auditctl (int, const void *, u_int); int getauid (au_id_t *); int setauid (const au_id_t *); int getaudit (struct auditinfo *); From owner-p4-projects@FreeBSD.ORG Mon Jun 6 02:48:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32FDA16A420; Mon, 6 Jun 2005 02:48:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BA0216A41C for ; Mon, 6 Jun 2005 02:48:04 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C05E043D4C for ; Mon, 6 Jun 2005 02:48:03 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j562m3WH017784 for ; Mon, 6 Jun 2005 02:48:03 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j562m36q017781 for perforce@freebsd.org; Mon, 6 Jun 2005 02:48:03 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Jun 2005 02:48:03 GMT Message-Id: <200506060248.j562m36q017781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 02:48:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=78058 Change 78058 by marcel@marcel_nfs on 2005/06/06 02:47:41 o Don't forget to call kobj_init() for the newly created TE. o Change device special file names from ttyv# to ttyV# so that we don't have syscons specific rc.d scripts trying to do syscons specific (and unspeakable) things to VTC. o Implement UTF-8 to UTF-32 conversion in the TTY oproc function and actually call the TE write method. Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_core.c#6 edit .. //depot/projects/tty/sys/dev/vtc/vtc_te.h#4 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/vtc_core.c#6 (text+ko) ==== @@ -81,6 +81,8 @@ vtc_tty_oproc(struct tty *tp) { struct vtc_te_softc *te; + __wchar_t utf32; + int c, error, utfbytes; te = tp->t_sc; if (te == NULL) @@ -91,7 +93,47 @@ if (tp->t_outq.c_cc > 0) { tp->t_state |= TS_BUSY; - /* XXX loop to display all characters in the buffer. */ + utf32 = te->te_utf32; + utfbytes = te->te_utfbytes; + while (tp->t_outq.c_cc) { + c = getc(&tp->t_outq); + /* + * Conditionalize on the two major character types: + * initial and followup characters. + */ + if ((c & 0xc0) != 0x80) { + /* Initial characters. */ + if (utfbytes != 0) + VTC_TE_WRITE(te, -1); + if ((c & 0xf8) == 0xf0) { + utf32 = c & 0x07; + utfbytes = 3; + } else if ((c & 0xf0) == 0xe0) { + utf32 = c & 0x0f; + utfbytes = 2; + } else if ((c & 0xe0) == 0xc0) { + utf32 = c & 0x1f; + utfbytes = 1; + } else { + KASSERT((c & 0x80) == 0x00, ("oops")); + utf32 = c & 0x7f; + utfbytes = 0; + } + } else { + /* Followup characters. */ + KASSERT((c & 0xc0) == 0x80, ("oops")); + if (utfbytes > 0) { + utf32 = (utf32 << 6) + (c & 0x3f); + utfbytes--; + } + else if (utfbytes == 0) + utfbytes = -1; + } + if (utfbytes == 0) + VTC_TE_WRITE(te, utf32); + } + te->te_utf32 = utf32; + te->te_utfbytes = utfbytes; tp->t_state &= ~TS_BUSY; } @@ -143,6 +185,7 @@ vo->vo_height = height; te = malloc(vt102_class.size, M_VTC, M_WAITOK|M_ZERO); + kobj_init((kobj_t)te, (kobj_class_t)&vt102_class); TAILQ_INSERT_TAIL(&vtc_te_devs, te, te_alldevs); TAILQ_INIT(&te->te_vodevs); TAILQ_INSERT_TAIL(&te->te_vodevs, vo, vo_tedevs); @@ -167,7 +210,7 @@ */ ttyconsolemode(tp, 0); - ttycreate(tp, NULL, 0, MINOR_CALLOUT, "v%r", 0); + ttycreate(tp, NULL, 0, MINOR_CALLOUT, "V%r", 0); return (0); } ==== //depot/projects/tty/sys/dev/vtc/vtc_te.h#4 (text+ko) ==== @@ -41,9 +41,11 @@ struct vtc_te_class *te_class; TAILQ_ENTRY(vtc_te_softc) te_alldevs; TAILQ_HEAD(, vtc_vtout_softc) te_vodevs; - struct tty *te_tty; - int te_maxcol; - int te_maxrow; + struct tty *te_tty; + __wchar_t te_utf32; + int te_utfbytes; + int te_maxcol; + int te_maxrow; }; /* From owner-p4-projects@FreeBSD.ORG Mon Jun 6 03:00:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81F8C16A421; Mon, 6 Jun 2005 03:00:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BC8816A41C for ; Mon, 6 Jun 2005 03:00:20 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0178343D53 for ; Mon, 6 Jun 2005 03:00:20 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5630Jo2018312 for ; Mon, 6 Jun 2005 03:00:19 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5630I3E018283 for perforce@freebsd.org; Mon, 6 Jun 2005 03:00:18 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Jun 2005 03:00:18 GMT Message-Id: <200506060300.j5630I3E018283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 03:00:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=78059 Change 78059 by marcel@marcel_nfs on 2005/06/06 03:00:03 IFC @78057 Affected files ... .. //depot/projects/tty/MAINTAINERS#13 integrate .. //depot/projects/tty/UPDATING#20 integrate .. //depot/projects/tty/contrib/hostapd/COPYING#1 branch .. //depot/projects/tty/contrib/hostapd/ChangeLog#1 branch .. //depot/projects/tty/contrib/hostapd/FREEBSD-Xlist#1 branch .. //depot/projects/tty/contrib/hostapd/FREEBSD-upgrade#1 branch .. //depot/projects/tty/contrib/hostapd/Makefile#1 branch .. //depot/projects/tty/contrib/hostapd/README#1 branch .. //depot/projects/tty/contrib/hostapd/accounting.c#1 branch .. //depot/projects/tty/contrib/hostapd/accounting.h#1 branch .. //depot/projects/tty/contrib/hostapd/aes.c#1 branch .. //depot/projects/tty/contrib/hostapd/aes_wrap.c#1 branch .. //depot/projects/tty/contrib/hostapd/aes_wrap.h#1 branch .. //depot/projects/tty/contrib/hostapd/ap.h#1 branch .. //depot/projects/tty/contrib/hostapd/common.c#1 branch .. //depot/projects/tty/contrib/hostapd/common.h#1 branch .. //depot/projects/tty/contrib/hostapd/config.c#1 branch .. //depot/projects/tty/contrib/hostapd/config.h#1 branch .. //depot/projects/tty/contrib/hostapd/crypto.c#1 branch .. //depot/projects/tty/contrib/hostapd/crypto.h#1 branch .. //depot/projects/tty/contrib/hostapd/ctrl_iface.c#1 branch .. //depot/projects/tty/contrib/hostapd/ctrl_iface.h#1 branch .. //depot/projects/tty/contrib/hostapd/defconfig#1 branch .. //depot/projects/tty/contrib/hostapd/defs.h#1 branch .. //depot/projects/tty/contrib/hostapd/developer.txt#1 branch .. //depot/projects/tty/contrib/hostapd/driver.h#1 branch .. //depot/projects/tty/contrib/hostapd/driver_test.c#1 branch .. //depot/projects/tty/contrib/hostapd/driver_wired.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_defs.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_gtc.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_i.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_identity.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_md5.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_mschapv2.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_peap.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_sim.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_sim_common.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_sim_common.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_sim_db.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_sim_db.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_tls.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_tls_common.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_tls_common.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_tlv.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_ttls.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_ttls.h#1 branch .. //depot/projects/tty/contrib/hostapd/eapol_sm.c#1 branch .. //depot/projects/tty/contrib/hostapd/eapol_sm.h#1 branch .. //depot/projects/tty/contrib/hostapd/eloop.c#1 branch .. //depot/projects/tty/contrib/hostapd/eloop.h#1 branch .. //depot/projects/tty/contrib/hostapd/hostap_common.h#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.accept#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.c#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.conf#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.deny#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.eap_user#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.h#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.sim_db#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd_cli.c#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd_ctrl.c#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd_ctrl.h#1 branch .. //depot/projects/tty/contrib/hostapd/iapp.c#1 branch .. //depot/projects/tty/contrib/hostapd/iapp.h#1 branch .. //depot/projects/tty/contrib/hostapd/ieee802_11.c#1 branch .. //depot/projects/tty/contrib/hostapd/ieee802_11.h#1 branch .. //depot/projects/tty/contrib/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/tty/contrib/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/tty/contrib/hostapd/ieee802_1x.c#1 branch .. //depot/projects/tty/contrib/hostapd/ieee802_1x.h#1 branch .. //depot/projects/tty/contrib/hostapd/l2_packet.h#1 branch .. //depot/projects/tty/contrib/hostapd/madwifi.conf#1 branch .. //depot/projects/tty/contrib/hostapd/md5.c#1 branch .. //depot/projects/tty/contrib/hostapd/md5.h#1 branch .. //depot/projects/tty/contrib/hostapd/ms_funcs.c#1 branch .. //depot/projects/tty/contrib/hostapd/ms_funcs.h#1 branch .. //depot/projects/tty/contrib/hostapd/radius.c#1 branch .. //depot/projects/tty/contrib/hostapd/radius.h#1 branch .. //depot/projects/tty/contrib/hostapd/radius_client.c#1 branch .. //depot/projects/tty/contrib/hostapd/radius_client.h#1 branch .. //depot/projects/tty/contrib/hostapd/radius_server.c#1 branch .. //depot/projects/tty/contrib/hostapd/radius_server.h#1 branch .. //depot/projects/tty/contrib/hostapd/rc4.c#1 branch .. //depot/projects/tty/contrib/hostapd/rc4.h#1 branch .. //depot/projects/tty/contrib/hostapd/sha1.c#1 branch .. //depot/projects/tty/contrib/hostapd/sha1.h#1 branch .. //depot/projects/tty/contrib/hostapd/sta_info.c#1 branch .. //depot/projects/tty/contrib/hostapd/sta_info.h#1 branch .. //depot/projects/tty/contrib/hostapd/tls.h#1 branch .. //depot/projects/tty/contrib/hostapd/tls_none.c#1 branch .. //depot/projects/tty/contrib/hostapd/tls_openssl.c#1 branch .. //depot/projects/tty/contrib/hostapd/version.h#1 branch .. //depot/projects/tty/contrib/hostapd/wired.conf#1 branch .. //depot/projects/tty/contrib/hostapd/wpa.c#1 branch .. //depot/projects/tty/contrib/hostapd/wpa.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/COPYING#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/FREEBSD-Xlist#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/FREEBSD-upgrade#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/Makefile#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/README#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/aes.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/aes_wrap.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/aes_wrap.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/common.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/common.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/config.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/config.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/crypto.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/crypto.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/defconfig#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/defs.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/developer.txt#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/driver.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/drivers.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_aka.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_defs.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_fast.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_gtc.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_i.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_leap.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_md5.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_mschapv2.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_otp.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_peap.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_psk.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_sim.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_sim_common.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_sim_common.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_tls.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_tls_common.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_tls_common.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_tlv.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_tlv.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_ttls.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_ttls.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eapol_sm.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eapol_sm.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eloop.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eloop.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/hostap_common.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/l2_packet.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/md5.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/md5.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/ms_funcs.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/ms_funcs.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/openssl-tls-extensions.patch#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/pcsc_funcs.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/pcsc_funcs.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/radius_client.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/radius_client.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/rc4.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/rc4.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/sha1.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/sha1.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/tls.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/tls_none.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/tls_openssl.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/todo.txt#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/version.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_ctrl.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_ctrl.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/tty/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/tty/crypto/openssh/FREEBSD-tricks#4 integrate .. //depot/projects/tty/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/tty/crypto/openssh/INSTALL#4 integrate .. //depot/projects/tty/crypto/openssh/LICENCE#3 integrate .. //depot/projects/tty/crypto/openssh/Makefile.in#5 integrate .. //depot/projects/tty/crypto/openssh/README#5 integrate .. //depot/projects/tty/crypto/openssh/README.platform#3 integrate .. //depot/projects/tty/crypto/openssh/README.privsep#5 integrate .. //depot/projects/tty/crypto/openssh/TODO#4 integrate .. //depot/projects/tty/crypto/openssh/WARNING.RNG#3 integrate .. //depot/projects/tty/crypto/openssh/acconfig.h#5 integrate .. //depot/projects/tty/crypto/openssh/audit-bsm.c#1 branch .. //depot/projects/tty/crypto/openssh/audit.c#1 branch .. //depot/projects/tty/crypto/openssh/audit.h#1 branch .. //depot/projects/tty/crypto/openssh/auth-bsdauth.c#2 integrate .. //depot/projects/tty/crypto/openssh/auth-chall.c#6 integrate .. //depot/projects/tty/crypto/openssh/auth-krb5.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/tty/crypto/openssh/auth-pam.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth-pam.h#4 integrate .. //depot/projects/tty/crypto/openssh/auth-passwd.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth-rsa.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/tty/crypto/openssh/auth-sia.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth-sia.h#4 integrate .. //depot/projects/tty/crypto/openssh/auth.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth.h#5 integrate .. //depot/projects/tty/crypto/openssh/auth1.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth2-chall.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/tty/crypto/openssh/auth2-none.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/tty/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth2.c#5 integrate .. //depot/projects/tty/crypto/openssh/authfile.c#5 integrate .. //depot/projects/tty/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/tty/crypto/openssh/bufaux.h#3 integrate .. //depot/projects/tty/crypto/openssh/buffer.c#4 integrate .. //depot/projects/tty/crypto/openssh/buffer.h#2 integrate .. //depot/projects/tty/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/tty/crypto/openssh/canohost.c#5 integrate .. //depot/projects/tty/crypto/openssh/canohost.h#2 integrate .. //depot/projects/tty/crypto/openssh/channels.c#6 integrate .. //depot/projects/tty/crypto/openssh/channels.h#5 integrate .. //depot/projects/tty/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/tty/crypto/openssh/cipher.c#5 integrate .. //depot/projects/tty/crypto/openssh/clientloop.c#5 integrate .. //depot/projects/tty/crypto/openssh/clientloop.h#4 integrate .. //depot/projects/tty/crypto/openssh/compat.c#4 integrate .. //depot/projects/tty/crypto/openssh/compat.h#5 integrate .. //depot/projects/tty/crypto/openssh/config.guess#5 integrate .. //depot/projects/tty/crypto/openssh/config.h#5 integrate .. //depot/projects/tty/crypto/openssh/configure.ac#5 integrate .. //depot/projects/tty/crypto/openssh/defines.h#5 integrate .. //depot/projects/tty/crypto/openssh/hostfile.c#4 integrate .. //depot/projects/tty/crypto/openssh/hostfile.h#4 integrate .. //depot/projects/tty/crypto/openssh/includes.h#5 integrate .. //depot/projects/tty/crypto/openssh/key.c#5 integrate .. //depot/projects/tty/crypto/openssh/log.c#5 integrate .. //depot/projects/tty/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/tty/crypto/openssh/loginrec.h#3 integrate .. //depot/projects/tty/crypto/openssh/misc.c#6 integrate .. //depot/projects/tty/crypto/openssh/misc.h#4 integrate .. //depot/projects/tty/crypto/openssh/moduli#3 integrate .. //depot/projects/tty/crypto/openssh/moduli.c#3 integrate .. //depot/projects/tty/crypto/openssh/monitor.c#6 integrate .. //depot/projects/tty/crypto/openssh/monitor.h#3 integrate .. //depot/projects/tty/crypto/openssh/monitor_mm.c#4 integrate .. //depot/projects/tty/crypto/openssh/monitor_wrap.c#5 integrate .. //depot/projects/tty/crypto/openssh/monitor_wrap.h#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-cray.h#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-misc.h#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-snprintf.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/mktemp.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-aix.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-aix.h#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/realpath.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/xmmap.c#4 integrate .. //depot/projects/tty/crypto/openssh/packet.c#6 integrate .. //depot/projects/tty/crypto/openssh/readconf.c#5 integrate .. //depot/projects/tty/crypto/openssh/readconf.h#5 integrate .. //depot/projects/tty/crypto/openssh/readpass.c#4 integrate .. //depot/projects/tty/crypto/openssh/regress/Makefile#5 integrate .. //depot/projects/tty/crypto/openssh/regress/agent-ptrace.sh#3 integrate .. //depot/projects/tty/crypto/openssh/regress/brokenkeys.sh#1 branch .. //depot/projects/tty/crypto/openssh/regress/dynamic-forward.sh#3 integrate .. //depot/projects/tty/crypto/openssh/regress/envpass.sh#2 integrate .. //depot/projects/tty/crypto/openssh/regress/login-timeout.sh#3 integrate .. //depot/projects/tty/crypto/openssh/regress/multiplex.sh#2 integrate .. //depot/projects/tty/crypto/openssh/regress/reexec.sh#2 integrate .. //depot/projects/tty/crypto/openssh/regress/rekey.sh#2 integrate .. //depot/projects/tty/crypto/openssh/regress/scp.sh#2 integrate .. //depot/projects/tty/crypto/openssh/regress/sftp-glob.sh#1 branch .. //depot/projects/tty/crypto/openssh/regress/sshd-log-wrapper.sh#1 branch .. //depot/projects/tty/crypto/openssh/regress/test-exec.sh#4 integrate .. //depot/projects/tty/crypto/openssh/scp.1#5 integrate .. //depot/projects/tty/crypto/openssh/scp.c#5 integrate .. //depot/projects/tty/crypto/openssh/servconf.c#5 integrate .. //depot/projects/tty/crypto/openssh/servconf.h#4 integrate .. //depot/projects/tty/crypto/openssh/session.c#6 integrate .. //depot/projects/tty/crypto/openssh/sftp-client.c#5 integrate .. //depot/projects/tty/crypto/openssh/sftp-client.h#3 integrate .. //depot/projects/tty/crypto/openssh/sftp.1#5 integrate .. //depot/projects/tty/crypto/openssh/sftp.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh-add.1#4 integrate .. //depot/projects/tty/crypto/openssh/ssh-add.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh-agent.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-keygen.1#5 integrate .. //depot/projects/tty/crypto/openssh/ssh-keygen.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh-keyscan.1#5 integrate .. //depot/projects/tty/crypto/openssh/ssh-keyscan.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh-keysign.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh-rand-helper.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh.1#5 integrate .. //depot/projects/tty/crypto/openssh/ssh.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh.h#4 integrate .. //depot/projects/tty/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/tty/crypto/openssh/ssh_config#7 integrate .. //depot/projects/tty/crypto/openssh/ssh_config.5#7 integrate .. //depot/projects/tty/crypto/openssh/sshconnect.c#5 integrate .. //depot/projects/tty/crypto/openssh/sshd.8#6 integrate .. //depot/projects/tty/crypto/openssh/sshd.c#6 integrate .. //depot/projects/tty/crypto/openssh/sshd_config#7 integrate .. //depot/projects/tty/crypto/openssh/sshd_config.5#8 integrate .. //depot/projects/tty/crypto/openssh/survey.sh.in#1 branch .. //depot/projects/tty/crypto/openssh/uidswap.c#3 integrate .. //depot/projects/tty/crypto/openssh/version.h#8 integrate .. //depot/projects/tty/etc/devd.conf#13 integrate .. //depot/projects/tty/lib/libarchive/Makefile#6 integrate .. //depot/projects/tty/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/tty/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/tty/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write.3#5 integrate .. //depot/projects/tty/lib/libarchive/configure.ac.in#5 integrate .. //depot/projects/tty/lib/libc/sys/kqueue.2#7 integrate .. //depot/projects/tty/lib/librpcsvc/Makefile#3 integrate .. //depot/projects/tty/lib/libusbhid/Makefile#3 integrate .. //depot/projects/tty/libexec/rtld-elf/sparc64/reloc.c#5 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 integrate .. //depot/projects/tty/sbin/ifconfig/Makefile#5 integrate .. //depot/projects/tty/sbin/ifconfig/ifbridge.c#1 branch .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#16 integrate .. //depot/projects/tty/secure/lib/libssh/Makefile#6 integrate .. //depot/projects/tty/secure/libexec/sftp-server/Makefile#5 integrate .. //depot/projects/tty/secure/libexec/ssh-keysign/Makefile#3 integrate .. //depot/projects/tty/secure/usr.bin/sftp/Makefile#4 integrate .. //depot/projects/tty/secure/usr.bin/ssh/Makefile#6 integrate .. //depot/projects/tty/secure/usr.sbin/sshd/Makefile#7 integrate .. //depot/projects/tty/share/man/man4/Makefile#18 integrate .. //depot/projects/tty/share/man/man4/if_bridge.4#1 branch .. //depot/projects/tty/share/man/man9/ifnet.9#9 integrate .. //depot/projects/tty/sys/boot/alpha/libalpha/delay.c#3 integrate .. //depot/projects/tty/sys/boot/alpha/libalpha/getsecs.c#3 integrate .. //depot/projects/tty/sys/conf/NOTES#23 integrate .. //depot/projects/tty/sys/conf/files#30 integrate .. //depot/projects/tty/sys/conf/kern.post.mk#15 integrate .. //depot/projects/tty/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#20 integrate .. //depot/projects/tty/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/tty/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/tty/sys/dev/fb/creator.c#6 integrate .. //depot/projects/tty/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxpvar.h#9 integrate .. //depot/projects/tty/sys/dev/hifn/hifn7751.c#11 integrate .. //depot/projects/tty/sys/dev/ichsmb/ichsmb_pci.c#6 integrate .. //depot/projects/tty/sys/dev/mc146818/mc146818.c#3 integrate .. //depot/projects/tty/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/tty/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/tty/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/tty/sys/dev/puc/puc_ebus.c#5 integrate .. //depot/projects/tty/sys/dev/sab/sab.c#12 integrate .. //depot/projects/tty/sys/dev/uart/uart_bus_ebus.c#5 integrate .. //depot/projects/tty/sys/dev/uart/uart_cpu_sparc64.c#8 integrate .. //depot/projects/tty/sys/dev/uart/uart_kbd_sun.c#5 integrate .. //depot/projects/tty/sys/dev/usb/ohci_pci.c#11 integrate .. //depot/projects/tty/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/tty/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/tty/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/tty/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/tty/sys/kern/sched_ule.c#13 integrate .. //depot/projects/tty/sys/kern/subr_witness.c#16 integrate .. //depot/projects/tty/sys/kern/uipc_cow.c#8 integrate .. //depot/projects/tty/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/tty/sys/kern/vfs_aio.c#14 integrate .. //depot/projects/tty/sys/modules/Makefile#21 integrate .. //depot/projects/tty/sys/modules/cam/Makefile#5 integrate .. //depot/projects/tty/sys/modules/i2c/controllers/Makefile#3 integrate .. //depot/projects/tty/sys/modules/i2c/controllers/ichsmb/Makefile#1 branch .. //depot/projects/tty/sys/modules/if_bridge/Makefile#1 branch .. //depot/projects/tty/sys/modules/linux/Makefile#4 integrate .. //depot/projects/tty/sys/modules/pf/Makefile#4 integrate .. //depot/projects/tty/sys/modules/udbp/Makefile#3 integrate .. //depot/projects/tty/sys/modules/ugen/Makefile#4 integrate .. //depot/projects/tty/sys/modules/uhid/Makefile#4 integrate .. //depot/projects/tty/sys/modules/ukbd/Makefile#5 integrate .. //depot/projects/tty/sys/modules/ulpt/Makefile#4 integrate .. //depot/projects/tty/sys/modules/umass/Makefile#3 integrate .. //depot/projects/tty/sys/modules/umodem/Makefile#4 integrate .. //depot/projects/tty/sys/modules/ums/Makefile#4 integrate .. //depot/projects/tty/sys/modules/usb/Makefile#6 integrate .. //depot/projects/tty/sys/modules/uscanner/Makefile#5 integrate .. //depot/projects/tty/sys/net/bridgestp.c#1 branch .. //depot/projects/tty/sys/net/if.c#15 integrate .. //depot/projects/tty/sys/net/if.h#8 integrate .. //depot/projects/tty/sys/net/if_bridge.c#1 branch .. //depot/projects/tty/sys/net/if_bridgevar.h#1 branch .. //depot/projects/tty/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/tty/sys/net/if_llc.h#4 integrate .. //depot/projects/tty/sys/net/if_types.h#7 integrate .. //depot/projects/tty/sys/net/if_var.h#9 integrate .. //depot/projects/tty/sys/netinet/if_ether.c#11 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/tty/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/tty/sys/netinet/tcp_var.h#16 integrate .. //depot/projects/tty/sys/sparc64/creator/creator.h#4 integrate .. //depot/projects/tty/sys/sparc64/creator/creator_upa.c#6 integrate .. //depot/projects/tty/sys/sparc64/ebus/ebus.c#9 integrate .. //depot/projects/tty/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/tty/sys/sparc64/sparc64/rtc.c#3 integrate .. //depot/projects/tty/sys/sys/param.h#20 integrate .. //depot/projects/tty/sys/sys/sockio.h#3 integrate .. //depot/projects/tty/tools/tools/README#9 integrate .. //depot/projects/tty/usr.bin/ktrdump/ktrdump.c#5 integrate .. //depot/projects/tty/usr.bin/w/w.c#3 integrate .. //depot/projects/tty/usr.sbin/wpa/Makefile#1 branch .. //depot/projects/tty/usr.sbin/wpa/Makefile.inc#1 branch .. //depot/projects/tty/usr.sbin/wpa/hostapd/Makefile#1 branch .. //depot/projects/tty/usr.sbin/wpa/hostapd/driver_freebsd.c#1 branch .. //depot/projects/tty/usr.sbin/wpa/hostapd/hostapd.1#1 branch .. //depot/projects/tty/usr.sbin/wpa/hostapd_cli/Makefile#1 branch .. //depot/projects/tty/usr.sbin/wpa/hostapd_cli/hostapd_cli.1#1 branch .. //depot/projects/tty/usr.sbin/wpa/l2_packet.c#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_cli/Makefile#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_cli/wpa_cli.1#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/Makefile#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.1#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#1 branch Differences ... ==== //depot/projects/tty/MAINTAINERS#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.119 2005/06/03 18:42:49 jmallett Exp $ +$FreeBSD: src/MAINTAINERS,v 1.121 2005/06/04 16:56:35 imp Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -124,6 +124,7 @@ truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. pkg_install krion Pre-commit review or approval from portmgr@ requested. +linux emul emulation Please discuss changes here. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. @@ -137,28 +138,15 @@ bin/dd/Makefile:MAINTAINER= green@FreeBSD.org games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch -lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG sbin/dhclient/Makefile.inc:MAINTAINER= mbr sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org sys/dev/asr/MAINTAINER:MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org -sys/modules/cam/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/linux/Makefile:MAINTAINER= emulation@FreeBSD.org sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org -sys/modules/udbp/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/ugen/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/uhid/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/ukbd/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/ulpt/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/umass/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/umodem/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/ums/Makefile:MAINTAINER= n_hibma@freebsd.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi -sys/modules/usb/Makefile:MAINTAINER= n_hibma@freebsd.org -sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org usr.bin/locate/Makefile:MAINTAINER= wosch usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/tty/UPDATING#20 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20050605: + if_bridge was added to the tree. This has changed struct ifnet. + Please recompile userland and all network related modules. + 20050603: The n_net of a struct netent was changed to an uint32_t, and 1st argument of getnetbyaddr() was changed to an uint32_t, to @@ -357,4 +361,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.409 2005/06/03 10:19:26 ume Exp $ +$FreeBSD: src/UPDATING,v 1.410 2005/06/05 03:38:03 thompsa Exp $ ==== //depot/projects/tty/crypto/openssh/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,845 @@ +20050524 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update spec file versions to 4.1p1 + - (dtucker) [auth-pam.c] Since people don't seem to be getting the message + that USE_POSIX_THREADS is unsupported, not recommended and generally a bad + idea, it is now known as UNSUPPORTED_POSIX_THREADS_HACK. Attempting to use + USE_POSIX_THREADS will now generate an error so we don't silently change + behaviour. ok djm@ + - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Ensure sufficient memory + allocation when retrieving core Windows environment. Add CYGWIN variable + to propagated variables. Patch from vinschen at redhat.com, ok djm@ + - (djm) Release 4.1p1 + +20050524 + - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure + terminal modes are reset correctly. Fix from peak AT argo.troja.mff.cuni.cz; + "looks ok" dtucker@ + +20050512 + - (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script + hard link section. Bug 1038. + +20050509 + - (dtucker) [contrib/cygwin/ssh-host-config] Add a test and warning for a + user-mode mounts in Cygwin installation. Patch from vinschen at redhat.com. + +20050504 + - (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used + unix domain socket, so catch that too; from jakob@ ok dtucker@ + +20050503 + - (dtucker) [canohost.c] normalise socket addresses returned by + get_remote_hostname(). This means that IPv4 addresses in log messages + on IPv6 enabled machines will no longer be prefixed by "::ffff:" and + AllowUsers, DenyUsers, AllowGroups, DenyGroups will match IPv4-style + addresses only for 4-in-6 mapped connections, regardless of whether + or not the machine is IPv6 enabled. ok djm@ + +20050425 + - (dtucker) [regress/multiplex.sh] Use "kill -0 $pid" to check for the + existence of a process since it's more portable. Found by jbasney at + ncsa.uiuc.edu; ok tim@ + - (dtucker) [regress/multiplex.sh] Remove cleanup call since test-exec.sh + will clean up anyway. From tim@ + - (dtucker) [regress/multiplex.sh] Put control socket in /tmp so running + "make tests" works even if you're building on a filesystem that doesn't + support sockets. From deengert at anl.gov, ok djm@ + +20050424 + - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or + 1.2.1.2 or higher. With tim@, ok djm@ + +20050423 + - (tim) [config.guess] Add support for OpenServer 6. + +20050421 + - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if + UseLogin is set as PAM is not used to establish credentials in that + case. Found by Michael Selvesteen, ok djm@ + +20050419 + - (dtucker) [INSTALL] Reference README.privsep for the privilege separation + requirements. Pointed out by Bengt Svensson. + - (dtucker) [INSTALL] Put the s/key text and URL back together. + - (dtucker) [INSTALL] Fix s/key text too. + +20050411 + - (tim) [configure.ac] UnixWare needs PASSWD_NEEDS_USERNAME + +20050405 + - (dtucker) [configure.ac] Define HAVE_SO_PEERCRED if we have it. ok djm@ + - (dtucker) [auth-sia.c] Constify sys_auth_passwd, fixes build error on + Tru64. Patch from cmadams at hiwaay.net. + - (dtucker) [auth-passwd.c auth-sia.h] Remove duplicate definitions of + sys_auth_passwd, pointed out by cmadams at hiwaay.net. + +20050403 + - (djm) OpenBSD CVS Sync + - deraadt@cvs.openbsd.org 2005/03/31 18:39:21 + [scp.c] + copy argv[] element instead of smashing the one that ps will see; ok otto + - djm@cvs.openbsd.org 2005/04/02 12:41:16 + [scp.c] + since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror + build + - (dtucker) [monitor.c] Don't free buffers in audit functions, monitor_read + will free as needed. ok tim@ djm@ + +20050331 + - (dtucker) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2005/03/16 11:10:38 + [ssh_config.5] + get the syntax right for {Local,Remote}Forward; + based on a diff from markus; + problem report from ponraj; + ok dtucker@ markus@ deraadt@ + - markus@cvs.openbsd.org 2005/03/16 21:17:39 + [version.h] + 4.1 + - jmc@cvs.openbsd.org 2005/03/18 17:05:00 + [sshd_config.5] + typo; + - (dtucker) [auth.h sshd.c openbsd-compat/port-aix.c] Bug #1006: fix bug in + handling of password expiry messages returned by AIX's authentication + routines, originally reported by robvdwal at sara.nl. + - (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug + message on some platforms. Patch from pete at seebeyond.com via djm. + - (dtucker) [monitor.c] Remaining part of fix for bug #1006. + +20050329 + - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're + interested in which is much faster in large (eg LDAP or NIS) environments. + Patch from dleonard at vintela.com. + +20050321 + - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes + and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net, + with & ok tim@ + - (dtucker) [configure.ac] Make configure error out if the user specifies + --with-libedit but the required libs can't be found, rather than silently + ignoring and continuing. ok tim@ + - (dtucker) [configure.ac openbsd-compat/port-aix.h] Prevent redefinitions + of setauthdb on AIX 5.3, reported by anders.liljegren at its.uu.se. + +20050317 + - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. + Make --without-opensc work. + - (tim) [configure.ac] portability changes on test statements. Some shells + have problems with -a operator. + - (tim) [configure.ac] make some configure options a little more error proof. + - (tim) [configure.ac] remove trailing white space. + +20050314 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2005/03/10 10:15:02 + [readconf.c] + Check listen addresses for null, prevents xfree from dying during + ClearAllForwardings (bz #996). From Craig Leres, ok markus@ + - deraadt@cvs.openbsd.org 2005/03/10 22:01:05 + [misc.c ssh-keygen.c servconf.c clientloop.c auth-options.c ssh-add.c + monitor.c sftp-client.c bufaux.h hostfile.c ssh.c sshconnect.c channels.c + readconf.c bufaux.c sftp.c] + spacing + - deraadt@cvs.openbsd.org 2005/03/10 22:40:38 + [auth-options.c] + spacing + - markus@cvs.openbsd.org 2005/03/11 14:59:06 + [ssh-keygen.c] + typo, missing \n; mpech + - jmc@cvs.openbsd.org 2005/03/12 11:55:03 + [ssh_config.5] + escape `.' at eol to avoid double spacing issues; + - dtucker@cvs.openbsd.org 2005/03/14 10:09:03 + [ssh-keygen.1] + Correct description of -H (bz #997); ok markus@, punctuation jmc@ + - dtucker@cvs.openbsd.org 2005/03/14 11:44:42 + [auth.c] + Populate host for log message for logins denied by AllowUsers and + DenyUsers (bz #999); ok markus@ (patch by tryponraj at gmail.com) + - markus@cvs.openbsd.org 2005/03/14 11:46:56 + [buffer.c buffer.h channels.c] + limit input buffer size for channels; bugzilla #896; with and ok dtucker@ + - (tim) [contrib/caldera/openssh.spec] links in rc?.d were getting trashed + with a rpm -F + +20050313 + - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the + localized name of the local administrators group more reliable. From + vinschen at redhat.com. + +20050312 + - (dtucker) [regress/test-exec.sh] DEBUG can cause problems where debug + output ends up in the client's output, causing regress failures. Found + by Corinna Vinschen. + +20050309 + - (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64 + so that regress tests behave. From Chris Adams. + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2005/03/07 23:41:54 + [ssh.1 ssh_config.5] + more macro simplification; + - djm@cvs.openbsd.org 2005/03/08 23:49:48 + [version.h] + OpenSSH 4.0 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update spec file versions + - (djm) [log.c] Fix dumb syntax error; ok dtucker@ + - (djm) Release OpenSSH 4.0p1 + +20050307 + - (dtucker) [configure.ac] Disable gettext search when configuring with + BSM audit support for the time being. ok djm@ + - (dtucker) OpenBSD CVS Sync (regress/) + - fgsch@cvs.openbsd.org 2004/12/10 01:31:30 + [Makefile sftp-glob.sh] + some globbing regress; prompted and ok djm@ + - david@cvs.openbsd.org 2005/01/14 04:21:18 + [Makefile test-exec.sh] + pass the SUDO make variable to the individual sh tests; ok dtucker@ markus@ + - dtucker@cvs.openbsd.org 2005/02/27 11:33:30 + [multiplex.sh test-exec.sh sshd-log-wrapper.sh] + Add optional capability to log output from regress commands; ok markus@ + Use with: make TEST_SSH_LOGFILE=/tmp/regress.log + - djm@cvs.openbsd.org 2005/02/27 23:13:36 + [login-timeout.sh] + avoid nameservice lookups in regress test; ok dtucker@ + - djm@cvs.openbsd.org 2005/03/04 08:48:46 + [Makefile envpass.sh] + regress test for SendEnv config parsing bug; ok dtucker@ + - (dtucker) [regress/test-exec.sh] Put SUDO in the right place. + - (tim) [configure.ac] SCO 3.2v4.2 no longer supported. + +20050306 + - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor + when attempting to audit disconnect events. Reported by Phil Dibowitz. + - (dtucker) [session.c sshd.c] Bug #125 comment #49: Send disconnect audit + events earlier, prevents mm_request_send errors reported by Matt Goebel. + +20050305 + - (djm) [contrib/cygwin/README] Improve Cygwin build documentation. Patch + from vinschen at redhat.com + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2005/03/02 11:45:01 + [ssh.1] + missing word; + - djm@cvs.openbsd.org 2005/03/04 08:48:06 + [readconf.c] + fix SendEnv config parsing bug found by Roumen Petrov; ok dtucker@ + +20050302 + - (djm) OpenBSD CVS sync: + - jmc@cvs.openbsd.org 2005/03/01 14:47:58 + [ssh.1] + remove some unneccesary macros; + do not mark up punctuation; + - jmc@cvs.openbsd.org 2005/03/01 14:55:23 + [ssh_config.5] + do not mark up punctuation; + whitespace; + - jmc@cvs.openbsd.org 2005/03/01 14:59:49 + [sshd.8] + new sentence, new line; + whitespace; + - jmc@cvs.openbsd.org 2005/03/01 15:05:00 + [ssh-keygen.1] + whitespace; + - jmc@cvs.openbsd.org 2005/03/01 15:47:14 + [ssh-keyscan.1 ssh-keyscan.c] + sort options and sync usage(); + - jmc@cvs.openbsd.org 2005/03/01 17:19:35 + [scp.1 sftp.1] + add HashKnownHosts to -o list; + ok markus@ + - jmc@cvs.openbsd.org 2005/03/01 17:22:06 + [ssh.c] + sync usage() w/ man SYNOPSIS; + ok markus@ + - jmc@cvs.openbsd.org 2005/03/01 17:32:19 + [ssh-add.1] + sort options; + - jmc@cvs.openbsd.org 2005/03/01 18:15:56 + [ssh-keygen.1] + sort options (no attempt made at synopsis clean up though); + spelling (occurance -> occurrence); + use prompt before examples; + grammar; + - djm@cvs.openbsd.org 2005/03/02 01:00:06 + [sshconnect.c] + fix addition of new hashed hostnames when CheckHostIP=yes; + found and ok dtucker@ + - djm@cvs.openbsd.org 2005/03/02 01:27:41 + [ssh-keygen.c] + ignore hostnames with metachars when hashing; ok deraadt@ + - djm@cvs.openbsd.org 2005/03/02 02:21:07 + [ssh.1] + bz#987: mention ForwardX11Trusted in ssh.1, + reported by andrew.benham AT thus.net; ok deraadt@ + - (tim) [regress/agent-ptrace.sh] add another possible gdb error. + +20050301 + - (djm) OpenBSD CVS sync: + - otto@cvs.openbsd.org 2005/02/16 09:56:44 + [ssh.c] + Better diagnostic if an identity file is not accesible. ok markus@ djm@ + - djm@cvs.openbsd.org 2005/02/18 03:05:53 + [canohost.c] + better error messages for getnameinfo failures; ok dtucker@ + - djm@cvs.openbsd.org 2005/02/20 22:59:06 + [sftp.c] + turn on ssh batch mode when in sftp batch mode, patch from + jdmossh AT nand.net; + ok markus@ + - jmc@cvs.openbsd.org 2005/02/25 10:55:13 + [sshd.8] + add /etc/motd and $HOME/.hushlogin to FILES; + from michael knudsen; + - djm@cvs.openbsd.org 2005/02/28 00:54:10 + [ssh_config.5] + bz#849: document timeout on untrusted x11 forwarding sessions. Reported by + orion AT cora.nwra.com; ok markus@ + - djm@cvs.openbsd.org 2005/03/01 10:09:52 + [auth-options.c channels.c channels.h clientloop.c compat.c compat.h] + [misc.c misc.h readconf.c readconf.h servconf.c ssh.1 ssh.c ssh_config.5] + [sshd_config.5] + bz#413: allow optional specification of bind address for port forwardings. + Patch originally by Dan Astorian, but worked on by several people + Adds GatewayPorts=clientspecified option on server to allow remote + forwards to bind to client-specified ports. + - djm@cvs.openbsd.org 2005/03/01 10:40:27 + [hostfile.c hostfile.h readconf.c readconf.h ssh.1 ssh_config.5] + [sshconnect.c sshd.8] + add support for hashing host names and addresses added to known_hosts + files, to improve privacy of which hosts user have been visiting; ok + markus@ deraadt@ + - djm@cvs.openbsd.org 2005/03/01 10:41:28 + [ssh-keyscan.1 ssh-keyscan.c] + option to hash hostnames output by ssh-keyscan; ok markus@ deraadt@ + - djm@cvs.openbsd.org 2005/03/01 10:42:49 + [ssh-keygen.1 ssh-keygen.c ssh_config.5] + add tools for managing known_hosts files with hashed hostnames, including + hashing existing files and deleting hosts by name; ok markus@ deraadt@ + +20050226 + - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] + Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com. + - (dtucker) [acconfig.h configure.ac openbsd-compat/bsd-misc.{c,h}] + Remove SETGROUPS_NOOP, was only used by Cygwin, which doesn't need it any + more. Patch from vinschen at redhat.com. + - (dtucker) [Makefile.in] Add a install-nosysconf target for installing the + binaries without the config files. Primarily useful for packaging. + Patch from phil at usc.edu. ok djm@ + +20050224 + - (djm) [configure.ac] in_addr_t test needs sys/types.h too + +20050222 + - (dtucker) [uidswap.c] Skip uid restore test on Cygwin. Patch from + vinschen at redhat.com. + +20050220 + - (dtucker) [LICENCE Makefile.in README.platform audit-bsm.c configure.ac + defines.h] Bug #125: Add *EXPERIMENTAL* BSM audit support. Configure + --with-audit=bsm to enable. Patch originally from Sun Microsystems, + parts by John R. Jackson. ok djm@ + - (dtucker) [configure.ac] Missing comma in AIX section, somehow causes + unrelated platforms to be configured incorrectly. + +20050216 + - (djm) write seed to temporary file and atomically rename into place; + ok dtucker@ + - (dtucker) [ssh-rand-helper.c] Provide seed_rng since it may be called + via mkstemp in some configurations. ok djm@ + - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is defined + by the system headers. + - (dtucker) [configure.ac] Bug #893: check for libresolv early on Reliant + Unix; prevents problems relating to the location of -lresolv in the + link order. + - (dtucker) [session.c] Bug #918: store credentials from gssapi-with-mic + authentication early enough to be available to PAM session modules when + privsep=yes. Patch from deengert at anl.gov, ok'ed in principle by Sam + Hartman and similar to Debian's ssh-krb5 package. + - (dtucker) [configure.ac openbsd-compat/port-aix.{c,h}] Silence some more + compiler warnings on AIX. + +20050215 + - (dtucker) [config.sh.in] Collect oslevel -r too. + - (dtucker) [README.platform auth.c configure.ac loginrec.c + openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #835: enable IPv6 + on AIX where possible (see README.platform for details) and work around + a misfeature of AIX's getnameinfo. ok djm@ + - (dtucker) [loginrec.c] Add missing #include. + +20050211 + - (dtucker) [configure.ac] Tidy up configure --help output. + - (dtucker) [openbsd-compat/fake-rfc2553.h] We now need EAI_SYSTEM too. + +20050210 + - (dtucker) [configure.ac] Bug #919: Provide visible feedback for the + --disable-etc-default-login configure option. + +20050209 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2005/01/28 09:45:53 + [ssh_config] + Make it clear that the example entries in ssh_config are only some of the + commonly-used options and refer the user to ssh_config(5) for more + details; ok djm@ + - jmc@cvs.openbsd.org 2005/01/28 15:05:43 + [ssh_config.5] + grammar; + - jmc@cvs.openbsd.org 2005/01/28 18:14:09 + [ssh_config.5] + wording; + ok markus@ + - dtucker@cvs.openbsd.org 2005/01/30 11:18:08 + [monitor.c] + Make code match intent; ok djm@ + - dtucker@cvs.openbsd.org 2005/02/08 22:24:57 + [sshd.c] + Provide reason in error message if getnameinfo fails; ok markus@ + - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call + disable_forwarding() from compat library. Prevent linker errrors trying + to resolve it for binaries other than sshd. ok djm@ + - (dtucker) [configure.ac] Bug #854: prepend pwd to relative --with-ssl-dir + paths. ok djm@ + - (dtucker) [configure.ac session.c] Some platforms (eg some SCO) require + the username to be passed to the passwd command when changing expired + passwords. ok djm@ + +20050208 + - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the + regress tests so newer versions of GNU head(1) behave themselves. Patch + by djm, so ok me. + - (dtucker) [openbsd-compat/port-aix.c] Silence compiler warnings. + - (dtucker) [audit.c audit.h auth.c auth1.c auth2.c loginrec.c monitor.c + monitor_wrap.c monitor_wrap.h session.c sshd.c]: Prepend all of the audit + defines and enums with SSH_ to prevent namespace collisions on some + platforms (eg AIX). + +20050204 + - (dtucker) [monitor.c] Permit INVALID_USER audit events from slave too. + - (dtucker) [auth.c] Fix parens in audit log check. + +20050202 + - (dtucker) [configure.ac openbsd-compat/realpath.c] Sync up with realpath + rev 1.11 from OpenBSD and make it use fchdir if available. ok djm@ + - (dtucker) [auth.c loginrec.h openbsd-compat/{bsd-cray,port-aix}.{c,h}] + Make record_failed_login() call provide hostname rather than having the + implementations having to do lookups themselves. Only affects AIX and + UNICOS (the latter only uses the "user" parameter anyway). ok djm@ + - (dtucker) [session.c sshd.c] Bug #445: Propogate KRB5CCNAME if set to child + the process. Since we also unset KRB5CCNAME at startup, if it's set after + authentication it must have been set by the platform's native auth system. + This was already done for AIX; this enables it for the general case. + - (dtucker) [auth.c canohost.c canohost.h configure.ac defines.h loginrec.c] + Bug #974: Teach sshd to write failed login records to btmp for failed auth + attempts (currently only for password, kbdint and C/R, only on Linux and + HP-UX), based on code from login.c from util-linux. With ashok_kovai at + hotmail.com, ok djm@ + - (dtucker) [Makefile.in auth.c auth.h auth1.c auth2.c loginrec.c monitor.c + monitor.h monitor_wrap.c monitor_wrap.h session.c sshd.c] Bug #125: + (first stage) Add audit instrumentation to sshd, currently disabled by + default. with suggestions from and ok djm@ + +20050201 + - (dtucker) [log.c] Bug #973: force log_init() to open syslog, since on some + platforms syslog will revert to its default values. This may result in + messages from external libraries (eg libwrap) being sent to a different + facility. + - (dtucker) [sshd_config.5] Bug #701: remove warning about + keyboard-interactive since this is no longer the case. + +20050124 + - (dtucker) OpenBSD CVS Sync + - otto@cvs.openbsd.org 2005/01/21 08:32:02 + [auth-passwd.c sshd.c] + Warn in advance for password and account expiry; initialize loginmsg + buffer earlier and clear it after privsep fork. ok and help dtucker@ + markus@ + - dtucker@cvs.openbsd.org 2005/01/22 08:17:59 + [auth.c] + Log source of connections denied by AllowUsers, DenyUsers, AllowGroups and + DenyGroups. bz #909, ok djm@ + - djm@cvs.openbsd.org 2005/01/23 10:18:12 + [cipher.c] + config option "Ciphers" should be case-sensitive; ok dtucker@ + - dtucker@cvs.openbsd.org 2005/01/24 10:22:06 + [scp.c sftp.c] + Have scp and sftp wait for the spawned ssh to exit before they exit + themselves. This prevents ssh from being unable to restore terminal + modes (not normally a problem on OpenBSD but common with -Portable + on POSIX platforms). From peak at argo.troja.mff.cuni.cz (bz#950); + ok djm@ markus@ + - dtucker@cvs.openbsd.org 2005/01/24 10:29:06 + [moduli] + Import new moduli; requested by deraadt@ a week ago + - dtucker@cvs.openbsd.org 2005/01/24 11:47:13 + [auth-passwd.c] + #if -> #ifdef so builds without HAVE_LOGIN_CAP work too; ok djm@ otto@ + +20050120 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/12/23 17:35:48 + [session.c] + check for NULL; from mpech + - markus@cvs.openbsd.org 2004/12/23 17:38:07 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 6 03:41:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44DBA16A420; Mon, 6 Jun 2005 03:41:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 050F316A41C for ; Mon, 6 Jun 2005 03:41:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFB0643D49 for ; Mon, 6 Jun 2005 03:41:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j563ftQo021796 for ; Mon, 6 Jun 2005 03:41:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j563ftMB021793 for perforce@freebsd.org; Mon, 6 Jun 2005 03:41:55 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Jun 2005 03:41:55 GMT Message-Id: <200506060341.j563ftMB021793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 03:41:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=78066 Change 78066 by marcel@marcel_nfs on 2005/06/06 03:41:48 Submit a bunch of changes I have for a while now. I haven't been working on this for some time and won't in the near future. I'm not sure this even compiles... Affected files ... .. //depot/projects/uart/dev/scc/scc_bfe.h#7 edit .. //depot/projects/uart/dev/scc/scc_core.c#5 edit .. //depot/projects/uart/dev/scc/scc_dev_sab82532.c#3 edit .. //depot/projects/uart/dev/scc/scc_dev_z8530.c#3 edit .. //depot/projects/uart/dev/scc/scc_if.m#2 edit .. //depot/projects/uart/dev/uart/uart_core.c#39 edit .. //depot/projects/uart/sys/serial.h#3 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_bfe.h#7 (text+ko) ==== @@ -30,6 +30,31 @@ #define _DEV_SCC_BFE_H_ /* + * Bus access structure. This structure holds the minimum information needed + * to access the SCC. The rclk field, although not important to actually + * access the SCC, is important for baudrate programming, delay loops and + * other timing related computations. + */ +struct scc_bas { + bus_space_tag_t bst; + bus_space_handle_t bsh; + u_int range; + u_int rclk; + u_int regshft; +}; + +#define scc_regofs(bas, reg) ((reg) << (bas)->regshft) + +#define scc_getreg(bas, reg) \ + bus_space_read_1((bas)->bst, (bas)->bsh, scc_regofs(bas, reg)) +#define scc_setreg(bas, reg, value) \ + bus_space_write_1((bas)->bst, (bas)->bsh, scc_regofs(bas, reg), value) + +#define scc_barrier(bas) \ + bus_space_barrier((bas)->bst, (bas)->bsh, 0, (bas)->range, \ + BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE) + +/* * SCC mode (child) and channel control structures. */ struct scc_chan; @@ -48,6 +73,8 @@ driver_intr_t *ih_rxready; driver_intr_t *ih_sigchg; driver_intr_t *ih_txidle; + void *ih_arg; + void *softih; }; struct scc_chan { @@ -78,6 +105,7 @@ struct scc_softc { KOBJ_FIELDS; struct scc_class *sc_class; + struct scc_bas sc_bas; device_t sc_dev; struct mtx sc_hwmtx; /* Spinlock protecting hardware. */ @@ -92,7 +120,10 @@ STAILQ_HEAD(, scc_chan) sc_chan; int sc_fastintr:1; + int sc_leaving:1; int sc_polled:1; + + uint32_t sc_hwsig; /* Signal state. Used by HW driver. */ }; extern devclass_t scc_devclass; ==== //depot/projects/uart/dev/scc/scc_core.c#5 (text+ko) ==== @@ -44,6 +44,8 @@ #include #include +#include "scc_if.h" + devclass_t scc_devclass; char scc_driver_name[] = "scc"; @@ -52,6 +54,23 @@ static void scc_bfe_intr(void *arg) { + struct scc_softc *sc = arg; + int ipend; + + while (!sc->sc_leaving && (ipend = SCC_IPEND(sc)) != 0) { +#if 0 + if (ipend & SER_INT_OVERRUN) + uart_intr_overrun(sc); + if (ipend & SER_INT_BREAK) + uart_intr_break(sc); + if (ipend & SER_INT_RXREADY) + uart_intr_rxready(sc); + if (ipend & SER_INT_SIGCHG) + uart_intr_sigchg(sc); + if (ipend & SER_INT_TXIDLE) + uart_intr_txidle(sc); +#endif + } } int @@ -61,18 +80,46 @@ struct scc_chan *ch; struct scc_class *cl; struct scc_mode *m; - struct scc_softc *sc; + struct scc_softc *sc, *sc0; + const char *sep; bus_space_handle_t bh; u_long size, start; int c, error, i, mode; - sc = device_get_softc(dev); - cl = sc->sc_class; + /* + * The sc_class field defines the type of SCC we're going to work + * with and thus the size of the softc. Replace the generic softc + * with one that matches the SCC now that we're certain we handle + * the device. + */ + sc0 = device_get_softc(dev); + cl = sc0->sc_class; + if (cl->size > sizeof(*sc)) { + sc = malloc(cl->size, M_SCC, M_WAITOK|M_ZERO); + bcopy(sc0, sc, sizeof(*sc)); + device_set_softc(dev, sc); + } else + sc = sc0; + + /* + * Protect ourselves against interrupts while we're not completely + * finished attaching and initializing. We don't expect interrupts + * until after SCC_ATTACH() though. + */ + sc->sc_leaving = 1; + + mtx_init(&sc->sc_hwmtx, "scc_hwmtx", NULL, MTX_SPIN); + /* + * Re-allocate. We expect that the softc contains the information + * collected by scc_bfe_probe() intact. + */ sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, - 0, ~0, cl->cl_range, RF_ACTIVE); + 0, ~0, cl->cl_channels * cl->cl_range, RF_ACTIVE); if (sc->sc_rres == NULL) return (ENXIO); + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); sc->sc_irid = 0; sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, @@ -100,8 +147,29 @@ sc->sc_polled = 1; } + error = SCC_ATTACH(sc); + if (error) + goto fail; + + if (bootverbose && (sc->sc_fastintr || sc->sc_polled)) { + sep = ""; + device_print_prettyname(dev); + if (sc->sc_fastintr) { + printf("%sfast interrupt", sep); + sep = ", "; + } + if (sc->sc_polled) { + printf("%spolled mode", sep); + sep = ", "; + } + printf("\n"); + } + + sc->sc_leaving = 0; + scc_bfe_intr(sc); + STAILQ_INIT(&sc->sc_chan); - size = cl->cl_range / cl->cl_channels; + size = cl->cl_range; start = rman_get_start(sc->sc_rres); for (c = 1; c <= cl->cl_channels; c++) { ch = malloc(sizeof(struct scc_chan), M_SCC, M_WAITOK | M_ZERO); @@ -146,8 +214,16 @@ start += size >> cl->cl_regshft; } + return (0); - return (0); + fail: + if (sc->sc_ires != NULL) { + bus_teardown_intr(dev, sc->sc_ires, sc->sc_icookie); + bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, + sc->sc_ires); + } + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + return (error); } int @@ -161,6 +237,9 @@ scc_bfe_probe(device_t dev) { struct scc_softc *sc; + struct scc_class *cl; + u_long size; + int error; /* * Initialize the instance. Note that the instance (=softc) does @@ -170,10 +249,11 @@ * while probing. */ sc = device_get_softc(dev); - kobj_init((kobj_t)sc, (kobj_class_t)sc->sc_class); + cl = sc->sc_class; + kobj_init((kobj_t)sc, (kobj_class_t)cl); sc->sc_dev = dev; if (device_get_desc(dev) == NULL) - device_set_desc(dev, sc->sc_class->name); + device_set_desc(dev, cl->name); /* * Allocate the register resource. We assume that all SCCs have a @@ -183,20 +263,32 @@ * first to satisfy the EBus code. */ sc->sc_rrid = 0; - sc->sc_rtype = SYS_RES_IOPORT; + sc->sc_rtype = SYS_RES_MEMORY; + size = cl->cl_channels * cl->cl_range; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, - 0, ~0, sc->sc_class->cl_range, RF_ACTIVE); + 0, ~0, size, RF_ACTIVE); if (sc->sc_rres == NULL) { sc->sc_rrid = 0; - sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rtype = SYS_RES_IOPORT; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, - &sc->sc_rrid, 0, ~0, sc->sc_class->cl_range, RF_ACTIVE); + &sc->sc_rrid, 0, ~0, size, RF_ACTIVE); if (sc->sc_rres == NULL) return (ENXIO); } + /* + * Fill in the bus access structure and call the hardware specific + * probe method. + */ + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); + sc->sc_bas.range = sc->sc_class->cl_range; + sc->sc_bas.rclk = sc->sc_class->cl_rclk; + sc->sc_bas.regshft = sc->sc_class->cl_regshft; + + error = SCC_PROBE(sc); bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); - return (0); + return (error); } struct resource * ==== //depot/projects/uart/dev/scc/scc_dev_sab82532.c#3 (text+ko) ==== @@ -32,13 +32,25 @@ #include #include #include +#include #include #include +#include + +#include "scc_if.h" + #define DEFAULT_RCLK 29491200 +static int sab82532_bfe_attach(struct scc_softc *); +static int sab82532_bfe_ipend(struct scc_softc *); +static int sab82532_bfe_probe(struct scc_softc *); + static kobj_method_t sab82532_methods[] = { + KOBJMETHOD(scc_attach, sab82532_bfe_attach), + KOBJMETHOD(scc_ipend, sab82532_bfe_ipend), + KOBJMETHOD(scc_probe, sab82532_bfe_probe), { 0, 0 } }; @@ -46,10 +58,63 @@ "sab82532 class", sab82532_methods, sizeof(struct scc_softc), - .cl_channels = 2, + .cl_channels = SAB_NCHAN, .cl_class = SCC_CLASS_SAB82532, .cl_modes = SCC_MODE_ASYNC | SCC_MODE_BISYNC | SCC_MODE_HDLC, - .cl_range = 64, + .cl_range = SAB_CHANLEN, .cl_rclk = DEFAULT_RCLK, .cl_regshft = 0 }; + +static int +sab82532_bfe_attach(struct scc_softc *sc) +{ + struct scc_bas *bas; + + bas = &sc->sc_bas; + return (0); +} + +static int +sab82532_bfe_ipend(struct scc_softc *sc) +{ + struct scc_bas *bas; + int ipend; + uint8_t isr0, isr1; + + bas = &sc->sc_bas; + mtx_lock_spin(&sc->sc_hwmtx); + isr0 = scc_getreg(bas, SAB_ISR0); + isr1 = scc_getreg(bas, SAB_ISR1); + scc_barrier(bas); + if (isr0 & SAB_ISR0_TIME) { + while (scc_getreg(bas, SAB_STAR) & SAB_STAR_CEC) + ; + scc_setreg(bas, SAB_CMDR, SAB_CMDR_RFRD); + scc_barrier(bas); + } + mtx_unlock_spin(&sc->sc_hwmtx); + + ipend = 0; + if (isr1 & SAB_ISR1_BRKT) + ipend |= SER_INT_BREAK; + if (isr0 & SAB_ISR0_RFO) + ipend |= SER_INT_OVERRUN; + if (isr0 & (SAB_ISR0_TCD|SAB_ISR0_RPF)) + ipend |= SER_INT_RXREADY; + if ((isr0 & SAB_ISR0_CDSC) || (isr1 & SAB_ISR1_CSC)) + ipend |= SER_INT_SIGCHG; + if (isr1 & SAB_ISR1_ALLS) + ipend |= SER_INT_TXIDLE; + + return (ipend); +} + +static int +sab82532_bfe_probe(struct scc_softc *sc) +{ + struct scc_bas *bas; + + bas = &sc->sc_bas; + return (0); +} ==== //depot/projects/uart/dev/scc/scc_dev_z8530.c#3 (text+ko) ==== @@ -32,13 +32,25 @@ #include #include #include +#include #include #include +#include + +#include "scc_if.h" + #define DEFAULT_RCLK 307200 +static int z8530_bfe_attach(struct scc_softc *); +static int z8530_bfe_ipend(struct scc_softc *); +static int z8530_bfe_probe(struct scc_softc *); + static kobj_method_t z8530_methods[] = { + KOBJMETHOD(scc_attach, z8530_bfe_attach), + KOBJMETHOD(scc_ipend, z8530_bfe_ipend), + KOBJMETHOD(scc_probe, z8530_bfe_probe), { 0, 0 } }; @@ -49,7 +61,53 @@ .cl_channels = 2, .cl_class = SCC_CLASS_Z8530, .cl_modes = SCC_MODE_ASYNC | SCC_MODE_BISYNC | SCC_MODE_HDLC, - .cl_range = 2, + .cl_range = CHAN_A - CHAN_B, .cl_rclk = DEFAULT_RCLK, .cl_regshft = 1, }; + +/* Multiplexed I/O. */ +static __inline void +scc_setmreg(struct scc_bas *bas, int ch, int reg, int val) +{ + + scc_setreg(bas, ch + REG_CTRL, reg); + scc_barrier(bas); + scc_setreg(bas, ch + REG_CTRL, val); +} + +static __inline uint8_t +scc_getmreg(struct scc_bas *bas, int ch, int reg) +{ + + scc_setreg(bas, ch + REG_CTRL, reg); + scc_barrier(bas); + return (scc_getreg(bas, ch + REG_CTRL)); +} + +static int +z8530_bfe_attach(struct scc_softc *sc) +{ + struct scc_bas *bas; + + bas = &sc->sc_bas; + return (0); +} + +static int +z8530_bfe_ipend(struct scc_softc *sc) +{ + struct scc_bas *bas; + + bas = &sc->sc_bas; + return (0); +} + +static int +z8530_bfe_probe(struct scc_softc *sc) +{ + struct scc_bas *bas; + + bas = &sc->sc_bas; + return (0); +} ==== //depot/projects/uart/dev/scc/scc_if.m#2 (text+ko) ==== @@ -36,6 +36,14 @@ INTERFACE scc; +# attach() - attach hardware. +# This method is called when the device is being attached. All resources +# have been allocated. The intend of this method is to setup the hardware +# for normal operation. +METHOD int attach { + struct scc_softc *this; +}; + # ipend() - query SCC for pending interrupts. # When an interrupt is signalled, the handler will call this method to find # out which of the interrupt sources needs attention. The handler will use @@ -48,3 +56,11 @@ METHOD int ipend { struct scc_softc *this; } + +# probe() - detect hardware. +# This method is called as part of the bus probe to make sure the +# hardware exists. This function should also set the device description +# to something that represents the hardware. +METHOD int probe { + struct scc_softc *this; +}; ==== //depot/projects/uart/dev/uart/uart_core.c#39 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 Marcel Moolenaar * All rights reserved. * @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.11 2004/11/14 23:12:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.13 2005/03/02 11:30:14 marius Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -90,10 +90,8 @@ return; } #endif - if (sc->sc_opened) { + if (sc->sc_opened) atomic_set_32(&sc->sc_ttypend, SER_INT_BREAK); - swi_sched(sc->sc_softih, 0); - } } /* @@ -121,7 +119,6 @@ if (uart_rx_put(sc, UART_STAT_OVERRUN)) sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; atomic_set_32(&sc->sc_ttypend, SER_INT_RXREADY); - swi_sched(sc->sc_softih, 0); } UART_FLUSH(sc, UART_FLUSH_RECEIVER); } @@ -147,10 +144,9 @@ } } #endif - if (sc->sc_opened) { + if (sc->sc_opened) atomic_set_32(&sc->sc_ttypend, SER_INT_RXREADY); - swi_sched(sc->sc_softih, 0); - } else + else sc->sc_rxput = sc->sc_rxget; /* Ignore received data. */ } @@ -190,8 +186,6 @@ new |= sig & SER_INT_SIGMASK; new |= SER_INT_SIGCHG; } while (!atomic_cmpset_32(&sc->sc_ttypend, old, new)); - if (sc->sc_opened) - swi_sched(sc->sc_softih, 0); } /* @@ -204,10 +198,7 @@ if (sc->sc_txbusy) { sc->sc_txbusy = 0; - if (sc->sc_opened) { - atomic_set_32(&sc->sc_ttypend, SER_INT_TXIDLE); - swi_sched(sc->sc_softih, 0); - } + atomic_set_32(&sc->sc_ttypend, SER_INT_TXIDLE); } } @@ -229,6 +220,9 @@ if (ipend & SER_INT_TXIDLE) uart_intr_txidle(sc); } + + if (sc->sc_opened && sc->sc_ttypend != 0) + swi_sched(sc->sc_softih, 0); } int @@ -334,14 +328,16 @@ */ sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, 0, ~0, sc->sc_class->uc_range, RF_ACTIVE); - if (sc->sc_rres == NULL) + if (sc->sc_rres == NULL) { + mtx_destroy(&sc->sc_hwmtx); return (ENXIO); + } sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); sc->sc_irid = 0; sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, - RF_ACTIVE); + RF_ACTIVE | RF_SHAREABLE); if (sc->sc_ires != NULL) { error = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, uart_intr, @@ -451,6 +447,8 @@ } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + mtx_destroy(&sc->sc_hwmtx); + return (error); } @@ -480,6 +478,8 @@ } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + mtx_destroy(&sc->sc_hwmtx); + if (sc->sc_class->size > sizeof(*sc)) { device_set_softc(dev, NULL); free(sc, M_UART); ==== //depot/projects/uart/sys/serial.h#3 (text+ko) ==== @@ -40,26 +40,30 @@ * that identity is enforced with CTASSERT at the bottom of kern/tty.c * Both the modem bits and delta bits must fit in 16 bit. */ -#define SER_DTR 0x0001 /* data terminal ready */ -#define SER_RTS 0x0002 /* request to send */ -#define SER_STX 0x0004 /* secondary transmit */ -#define SER_SRX 0x0008 /* secondary receive */ -#define SER_CTS 0x0010 /* clear to send */ -#define SER_DCD 0x0020 /* data carrier detect */ -#define SER_RI 0x0040 /* ring indicate */ -#define SER_DSR 0x0080 /* data set ready */ +#define SER_DTR 0x0001 /* data terminal ready */ +#define SER_RTS 0x0002 /* request to send */ +#define SER_STX 0x0004 /* secondary transmit */ +#define SER_SRX 0x0008 /* secondary receive */ +#define SER_CTS 0x0010 /* clear to send */ +#define SER_DCD 0x0020 /* data carrier detect */ +#define SER_RI 0x0040 /* ring indicate */ +#define SER_DSR 0x0080 /* data set ready */ + +#define SER_MASK_STATE 0x00ff /* Delta bits, used to indicate which signals should/was affected */ -#define SER_DELTA(x) ((x) << 8) +#define SER_DELTA(x) ((x) << 8) + +#define SER_DDTR SER_DELTA(SER_DTR) +#define SER_DRTS SER_DELTA(SER_RTS) +#define SER_DSTX SER_DELTA(SER_STX) +#define SER_DSRX SER_DELTA(SER_SRX) +#define SER_DCTS SER_DELTA(SER_CTS) +#define SER_DDCD SER_DELTA(SER_DCD) +#define SER_DRI SER_DELTA(SER_RI) +#define SER_DDSR SER_DELTA(SER_DSR) -#define SER_DDTR SER_DELTA(SER_DTR) -#define SER_DRTS SER_DELTA(SER_RTS) -#define SER_DSTX SER_DELTA(SER_STX) -#define SER_DSRX SER_DELTA(SER_SRX) -#define SER_DCTS SER_DELTA(SER_CTS) -#define SER_DDCD SER_DELTA(SER_DCD) -#define SER_DRI SER_DELTA(SER_RI) -#define SER_DDSR SER_DELTA(SER_DSR) +#define SER_MASK_DELTA SER_DELTA(SER_MASK_STATE) /* * Specification of interrupt sources typical for serial ports. These are @@ -69,13 +73,13 @@ * resource for which inferior drivers can install handlers. The lower 16 * bits are kept free for the signals above. */ -#define SER_INT_OVERRUN 0x010000 -#define SER_INT_BREAK 0x020000 -#define SER_INT_RXREADY 0x040000 -#define SER_INT_SIGCHG 0x080000 -#define SER_INT_TXIDLE 0x100000 +#define SER_INT_OVERRUN 0x010000 +#define SER_INT_BREAK 0x020000 +#define SER_INT_RXREADY 0x040000 +#define SER_INT_SIGCHG 0x080000 +#define SER_INT_TXIDLE 0x100000 -#define SER_INT_MASK 0xff0000 -#define SER_INT_SIGMASK 0x00ffff +#define SER_INT_MASK 0xff0000 +#define SER_INT_SIGMASK (SER_MASK_DELTA | SER_MASK_STATE) #endif /* !_SYS_SERIAL_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 6 03:59:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA28B16A420; Mon, 6 Jun 2005 03:59:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF07F16A41C for ; Mon, 6 Jun 2005 03:59:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75CD143D49 for ; Mon, 6 Jun 2005 03:59:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j563xNPV022557 for ; Mon, 6 Jun 2005 03:59:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j563xNFH022554 for perforce@freebsd.org; Mon, 6 Jun 2005 03:59:23 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Jun 2005 03:59:23 GMT Message-Id: <200506060359.j563xNFH022554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 03:59:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=78067 Change 78067 by marcel@marcel_nfs on 2005/06/06 03:58:22 Remove unused variable error. Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_core.c#7 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/vtc_core.c#7 (text+ko) ==== @@ -82,7 +82,7 @@ { struct vtc_te_softc *te; __wchar_t utf32; - int c, error, utfbytes; + int c, utfbytes; te = tp->t_sc; if (te == NULL) From owner-p4-projects@FreeBSD.ORG Mon Jun 6 04:30:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57E0E16A421; Mon, 6 Jun 2005 04:30:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2096C16A41C for ; Mon, 6 Jun 2005 04:30:11 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D951843D48 for ; Mon, 6 Jun 2005 04:30:10 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j564UAP4023819 for ; Mon, 6 Jun 2005 04:30:10 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j564U0v7023763 for perforce@freebsd.org; Mon, 6 Jun 2005 04:30:00 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Jun 2005 04:30:00 GMT Message-Id: <200506060430.j564U0v7023763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 04:30:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=78069 Change 78069 by marcel@marcel_nfs on 2005/06/06 04:29:22 IFC @78057 Affected files ... .. //depot/projects/uart/alpha/alpha/autoconf.c#5 integrate .. //depot/projects/uart/alpha/alpha/busdma_machdep.c#8 integrate .. //depot/projects/uart/alpha/alpha/clock.c#5 integrate .. //depot/projects/uart/alpha/alpha/critical.c#4 delete .. //depot/projects/uart/alpha/alpha/interrupt.c#6 integrate .. //depot/projects/uart/alpha/alpha/machdep.c#14 integrate .. //depot/projects/uart/alpha/alpha/mp_machdep.c#12 integrate .. //depot/projects/uart/alpha/alpha/timerreg.h#4 delete .. //depot/projects/uart/alpha/alpha/trap.c#6 integrate .. //depot/projects/uart/alpha/alpha/vm_machdep.c#10 integrate .. //depot/projects/uart/alpha/conf/GENERIC#9 integrate .. //depot/projects/uart/alpha/include/_bus.h#1 branch .. //depot/projects/uart/alpha/include/bus.h#9 integrate .. //depot/projects/uart/alpha/include/bus_memio.h#3 delete .. //depot/projects/uart/alpha/include/bus_pio.h#3 delete .. //depot/projects/uart/alpha/include/critical.h#6 delete .. //depot/projects/uart/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/uart/alpha/include/ppireg.h#1 branch .. //depot/projects/uart/alpha/include/proc.h#3 integrate .. //depot/projects/uart/alpha/include/timerreg.h#1 branch .. //depot/projects/uart/alpha/isa/isa_dma.c#6 integrate .. //depot/projects/uart/alpha/isa/mcclock_isa.c#4 integrate .. //depot/projects/uart/alpha/linux/linux_proto.h#4 integrate .. //depot/projects/uart/alpha/linux/linux_syscall.h#4 integrate .. //depot/projects/uart/alpha/linux/linux_sysent.c#4 integrate .. //depot/projects/uart/alpha/linux/syscalls.master#4 integrate .. //depot/projects/uart/alpha/osf1/imgact_osf1.c#5 integrate .. //depot/projects/uart/alpha/osf1/osf1_misc.c#6 integrate .. //depot/projects/uart/alpha/osf1/osf1_mount.c#6 integrate .. //depot/projects/uart/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/uart/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/uart/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/uart/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/uart/amd64/acpica/madt.c#3 integrate .. //depot/projects/uart/amd64/amd64/autoconf.c#4 integrate .. //depot/projects/uart/amd64/amd64/critical.c#6 delete .. //depot/projects/uart/amd64/amd64/db_disasm.c#4 integrate .. //depot/projects/uart/amd64/amd64/exception.S#7 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/uart/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/uart/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#14 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/uart/amd64/amd64/mptable.c#4 integrate .. //depot/projects/uart/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/uart/amd64/amd64/support.S#4 integrate .. //depot/projects/uart/amd64/amd64/sys_machdep.c#4 integrate .. //depot/projects/uart/amd64/amd64/trap.c#6 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/uart/amd64/conf/GENERIC#10 integrate .. //depot/projects/uart/amd64/conf/NOTES#3 integrate .. //depot/projects/uart/amd64/ia32/ia32_syscall.c#6 integrate .. //depot/projects/uart/amd64/include/_bus.h#1 branch .. //depot/projects/uart/amd64/include/apicvar.h#4 integrate .. //depot/projects/uart/amd64/include/asm.h#3 integrate .. //depot/projects/uart/amd64/include/bus.h#2 integrate .. //depot/projects/uart/amd64/include/bus_amd64.h#5 delete .. //depot/projects/uart/amd64/include/bus_memio.h#3 delete .. //depot/projects/uart/amd64/include/bus_pio.h#3 delete .. //depot/projects/uart/amd64/include/cpufunc.h#4 integrate .. //depot/projects/uart/amd64/include/critical.h#6 delete .. //depot/projects/uart/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/uart/amd64/include/ieeefp.h#6 integrate .. //depot/projects/uart/amd64/include/legacyvar.h#4 integrate .. //depot/projects/uart/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/uart/amd64/include/ppireg.h#1 branch .. //depot/projects/uart/amd64/include/proc.h#4 integrate .. //depot/projects/uart/amd64/include/smp.h#6 integrate .. //depot/projects/uart/amd64/include/sysarch.h#3 integrate .. //depot/projects/uart/amd64/include/timerreg.h#1 branch .. //depot/projects/uart/amd64/include/tss.h#3 integrate .. //depot/projects/uart/amd64/isa/clock.c#7 integrate .. //depot/projects/uart/amd64/isa/isa.h#3 integrate .. //depot/projects/uart/amd64/isa/isa_dma.c#5 integrate .. //depot/projects/uart/amd64/isa/timerreg.h#4 delete .. //depot/projects/uart/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/uart/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/uart/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/uart/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/uart/arm/arm/autoconf.c#2 integrate .. //depot/projects/uart/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/uart/arm/arm/bcopyinout_xscale.S#4 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/uart/arm/arm/cpufunc.c#5 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm3.S#4 delete .. //depot/projects/uart/arm/arm/cpufunc_asm_arm67.S#4 delete .. //depot/projects/uart/arm/arm/critical.c#3 delete .. //depot/projects/uart/arm/arm/fusu.S#5 integrate .. //depot/projects/uart/arm/arm/in_cksum.c#4 integrate .. //depot/projects/uart/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/uart/arm/arm/intr.c#5 integrate .. //depot/projects/uart/arm/arm/machdep.c#6 integrate .. //depot/projects/uart/arm/arm/pmap.c#7 integrate .. //depot/projects/uart/arm/arm/support.S#4 integrate .. //depot/projects/uart/arm/arm/swtch.S#6 integrate .. //depot/projects/uart/arm/arm/trap.c#6 integrate .. //depot/projects/uart/arm/arm/undefined.c#6 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/uart/arm/conf/IQ31244#6 integrate .. //depot/projects/uart/arm/include/_bus.h#1 branch .. //depot/projects/uart/arm/include/asmacros.h#3 integrate .. //depot/projects/uart/arm/include/atomic.h#4 integrate .. //depot/projects/uart/arm/include/bus.h#5 integrate .. //depot/projects/uart/arm/include/bus_memio.h#3 delete .. //depot/projects/uart/arm/include/bus_pio.h#3 delete .. //depot/projects/uart/arm/include/cpuconf.h#4 integrate .. //depot/projects/uart/arm/include/cpufunc.h#5 integrate .. //depot/projects/uart/arm/include/critical.h#2 delete .. //depot/projects/uart/arm/include/endian.h#7 integrate .. //depot/projects/uart/arm/include/in_cksum.h#2 integrate .. //depot/projects/uart/arm/include/pmap.h#5 integrate .. //depot/projects/uart/arm/include/pmc_mdep.h#1 branch .. //depot/projects/uart/arm/include/proc.h#5 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#8 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321.c#5 integrate .. //depot/projects/uart/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/uart/boot/alpha/common/main.c#3 integrate .. //depot/projects/uart/boot/alpha/libalpha/delay.c#3 integrate .. //depot/projects/uart/boot/alpha/libalpha/devicename.c#3 integrate .. //depot/projects/uart/boot/alpha/libalpha/getsecs.c#3 integrate .. //depot/projects/uart/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/uart/boot/alpha/libalpha/srmdisk.c#3 integrate .. //depot/projects/uart/boot/common/boot.c#3 integrate .. //depot/projects/uart/boot/common/console.c#3 integrate .. //depot/projects/uart/boot/common/help.common#3 integrate .. //depot/projects/uart/boot/common/loader.8#6 integrate .. //depot/projects/uart/boot/ficl/Makefile#4 integrate .. //depot/projects/uart/boot/forth/loader.conf#7 integrate .. //depot/projects/uart/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/uart/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/biosacpi.c#6 integrate .. //depot/projects/uart/boot/i386/libi386/bioscd.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/bootinfo.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/uart/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/uart/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/vidconsole.c#3 integrate .. //depot/projects/uart/boot/i386/loader/Makefile#4 integrate .. //depot/projects/uart/boot/i386/loader/main.c#4 integrate .. //depot/projects/uart/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/uart/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/uart/boot/pc98/boot2/boot.h#3 integrate .. //depot/projects/uart/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/uart/boot/pc98/boot2/disk.c#4 integrate .. //depot/projects/uart/boot/pc98/boot2/io.c#4 integrate .. //depot/projects/uart/boot/pc98/boot2/sys.c#4 integrate .. //depot/projects/uart/boot/pc98/boot2/table.c#3 integrate .. //depot/projects/uart/boot/pc98/btx/btx/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/uart/boot/pc98/btx/btxldr/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/uart/boot/pc98/kgzldr/Makefile#5 integrate .. //depot/projects/uart/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosmem.c#3 integrate .. //depot/projects/uart/boot/pc98/libpc98/comconsole.c#4 integrate .. //depot/projects/uart/boot/pc98/libpc98/gatea20.c#3 integrate .. //depot/projects/uart/boot/pc98/libpc98/time.c#3 integrate .. //depot/projects/uart/boot/pc98/libpc98/vidconsole.c#4 integrate .. //depot/projects/uart/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/loader/main.c#4 integrate .. //depot/projects/uart/bsm/audit.h#1 branch .. //depot/projects/uart/bsm/audit_kevents.h#2 integrate .. //depot/projects/uart/cam/cam_xpt.c#7 integrate .. //depot/projects/uart/cam/scsi/scsi_all.c#6 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#10 integrate .. //depot/projects/uart/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/uart/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/uart/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/uart/coda/coda_fbsd.c#6 integrate .. //depot/projects/uart/coda/coda_vfsops.c#8 integrate .. //depot/projects/uart/coda/coda_vnops.c#9 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/uart/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/uart/compat/linux/linux_file.c#5 integrate .. //depot/projects/uart/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#9 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#6 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#5 integrate .. //depot/projects/uart/compat/ndis/hal_var.h#5 integrate .. //depot/projects/uart/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/uart/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/uart/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/uart/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/uart/compat/ndis/pe_var.h#5 integrate .. //depot/projects/uart/compat/ndis/subr_hal.c#5 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/uart/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/uart/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/uart/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/uart/compat/svr4/imgact_svr4.c#4 integrate .. //depot/projects/uart/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/uart/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/uart/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/uart/compat/svr4/syscalls.master#3 integrate .. //depot/projects/uart/conf/Makefile.alpha#4 integrate .. //depot/projects/uart/conf/Makefile.amd64#5 integrate .. //depot/projects/uart/conf/Makefile.arm#4 integrate .. //depot/projects/uart/conf/Makefile.i386#4 integrate .. //depot/projects/uart/conf/Makefile.ia64#4 integrate .. //depot/projects/uart/conf/Makefile.pc98#4 integrate .. //depot/projects/uart/conf/Makefile.powerpc#4 integrate .. //depot/projects/uart/conf/Makefile.sparc64#4 integrate .. //depot/projects/uart/conf/NOTES#25 integrate .. //depot/projects/uart/conf/files#42 integrate .. //depot/projects/uart/conf/files.alpha#10 integrate .. //depot/projects/uart/conf/files.amd64#12 integrate .. //depot/projects/uart/conf/files.arm#3 integrate .. //depot/projects/uart/conf/files.i386#17 integrate .. //depot/projects/uart/conf/files.ia64#12 integrate .. //depot/projects/uart/conf/files.pc98#15 integrate .. //depot/projects/uart/conf/files.powerpc#3 integrate .. //depot/projects/uart/conf/files.sparc64#10 integrate .. //depot/projects/uart/conf/kern.mk#4 integrate .. //depot/projects/uart/conf/kern.post.mk#8 integrate .. //depot/projects/uart/conf/kern.pre.mk#10 integrate .. //depot/projects/uart/conf/kmod.mk#14 integrate .. //depot/projects/uart/conf/majors#9 delete .. //depot/projects/uart/conf/majors.awk#2 delete .. //depot/projects/uart/conf/options#19 integrate .. //depot/projects/uart/conf/options.amd64#4 integrate .. //depot/projects/uart/conf/options.i386#8 integrate .. //depot/projects/uart/conf/options.pc98#7 integrate .. //depot/projects/uart/conf/options.sparc64#5 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.c#6 delete .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil_freebsd.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_frag.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_frag.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_htable.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_htable.h#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_irc_pxy.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_lookup.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_lookup.h#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pool.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pool.h#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pptp_pxy.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rcmd_pxy.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rpcb_pxy.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rules.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rules.h#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_scan.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_scan.h#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_sync.c#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ip_sync.h#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/uart/contrib/ngatm/netnatm/api/ccpriv.h#2 integrate .. //depot/projects/uart/contrib/ngatm/netnatm/api/unisap.h#2 integrate .. //depot/projects/uart/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/uart/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/uart/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/uart/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/uart/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/uart/contrib/pf/net/pf.c#6 integrate .. //depot/projects/uart/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/uart/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/uart/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/uart/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/uart/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/uart/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/uart/ddb/db_print.c#4 integrate .. //depot/projects/uart/ddb/db_run.c#5 integrate .. //depot/projects/uart/ddb/ddb.h#5 integrate .. //depot/projects/uart/dev/aac/aac.c#14 integrate .. //depot/projects/uart/dev/aac/aac_disk.c#7 integrate .. //depot/projects/uart/dev/aac/aac_pci.c#10 integrate .. //depot/projects/uart/dev/aac/aac_tables.h#2 integrate .. //depot/projects/uart/dev/aac/aacreg.h#5 integrate .. //depot/projects/uart/dev/acpi_support/acpi_asus.c#5 integrate .. //depot/projects/uart/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/uart/dev/acpi_support/acpi_panasonic.c#4 integrate .. //depot/projects/uart/dev/acpi_support/acpi_toshiba.c#4 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdHardware.c#5 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi.c#17 integrate .. //depot/projects/uart/dev/acpica/acpi_acad.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#14 integrate .. //depot/projects/uart/dev/acpica/acpi_if.m#4 integrate .. //depot/projects/uart/dev/acpica/acpi_package.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#9 integrate .. //depot/projects/uart/dev/advansys/adv_eisa.c#6 integrate .. //depot/projects/uart/dev/advansys/adv_isa.c#6 integrate .. //depot/projects/uart/dev/advansys/adv_pci.c#9 integrate .. //depot/projects/uart/dev/advansys/advansys.c#5 integrate .. //depot/projects/uart/dev/advansys/advlib.c#4 integrate .. //depot/projects/uart/dev/advansys/adw_pci.c#9 integrate .. //depot/projects/uart/dev/advansys/adwcam.c#5 integrate .. //depot/projects/uart/dev/advansys/adwlib.c#5 integrate .. //depot/projects/uart/dev/aha/aha.c#7 integrate .. //depot/projects/uart/dev/aha/aha_isa.c#8 integrate .. //depot/projects/uart/dev/ahb/ahb.c#6 integrate .. //depot/projects/uart/dev/aic/aic.c#5 integrate .. //depot/projects/uart/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/uart/dev/aic/aic_isa.c#4 integrate .. //depot/projects/uart/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.h#6 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.c#7 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.h#6 integrate .. //depot/projects/uart/dev/amd/amd.c#9 integrate .. //depot/projects/uart/dev/amr/amr.c#9 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#10 integrate .. //depot/projects/uart/dev/an/if_an.c#7 integrate .. //depot/projects/uart/dev/ar/if_ar.c#6 integrate .. //depot/projects/uart/dev/ar/if_ar_isa.c#4 integrate .. //depot/projects/uart/dev/ar/if_ar_pci.c#6 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.c#1 branch .. //depot/projects/uart/dev/arcmsr/arcmsr.h#1 branch .. //depot/projects/uart/dev/asr/asr.c#8 integrate .. //depot/projects/uart/dev/ata/ata-all.c#12 integrate .. //depot/projects/uart/dev/ata/ata-all.h#6 integrate .. //depot/projects/uart/dev/ata/ata-card.c#8 integrate .. //depot/projects/uart/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/uart/dev/ata/ata-commands.h#3 delete .. //depot/projects/uart/dev/ata/ata-disk.c#8 integrate .. //depot/projects/uart/dev/ata/ata-disk.h#4 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#9 integrate .. //depot/projects/uart/dev/ata/ata-isa.c#5 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#16 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#8 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#9 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#9 integrate .. //depot/projects/uart/dev/ata/ata-raid.c#6 integrate .. //depot/projects/uart/dev/ata/ata-raid.h#4 integrate .. //depot/projects/uart/dev/ata/ata_if.m#1 branch .. //depot/projects/uart/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#13 integrate .. //depot/projects/uart/dev/ata/atapi-cd.h#7 integrate .. //depot/projects/uart/dev/ata/atapi-fd.c#5 integrate .. //depot/projects/uart/dev/ata/atapi-fd.h#4 integrate .. //depot/projects/uart/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/uart/dev/ata/atapi-tape.h#4 integrate .. //depot/projects/uart/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/uart/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/uart/dev/ath/if_ath.c#16 integrate .. //depot/projects/uart/dev/ath/if_athioctl.h#6 integrate .. //depot/projects/uart/dev/ath/if_athrate.h#2 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#11 integrate .. //depot/projects/uart/dev/auxio/auxio.c#3 integrate .. //depot/projects/uart/dev/awi/am79c930.c#4 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/uart/dev/bge/if_bge.c#17 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#11 integrate .. //depot/projects/uart/dev/bktr/bktr_audio.c#7 integrate .. //depot/projects/uart/dev/bktr/bktr_card.c#9 integrate .. //depot/projects/uart/dev/bktr/bktr_core.c#9 integrate .. //depot/projects/uart/dev/bktr/bktr_i2c.c#6 integrate .. //depot/projects/uart/dev/bktr/bktr_os.c#9 integrate .. //depot/projects/uart/dev/bktr/bktr_reg.h#6 integrate .. //depot/projects/uart/dev/bktr/bktr_tuner.c#8 integrate .. //depot/projects/uart/dev/buslogic/bt.c#7 integrate .. //depot/projects/uart/dev/buslogic/bt_eisa.c#6 integrate .. //depot/projects/uart/dev/buslogic/bt_isa.c#6 integrate .. //depot/projects/uart/dev/buslogic/bt_pci.c#7 integrate .. //depot/projects/uart/dev/ciss/ciss.c#11 integrate .. //depot/projects/uart/dev/ciss/cissio.h#3 integrate .. //depot/projects/uart/dev/ciss/cissreg.h#3 integrate .. //depot/projects/uart/dev/ciss/cissvar.h#3 integrate .. //depot/projects/uart/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/uart/dev/ct/ct_isa.c#6 integrate .. //depot/projects/uart/dev/digi/CX.bios.h#2 integrate .. //depot/projects/uart/dev/digi/CX.fepos.h#2 integrate .. //depot/projects/uart/dev/digi/CX_PCI.bios.h#2 integrate .. //depot/projects/uart/dev/digi/CX_PCI.fepos.h#2 integrate .. //depot/projects/uart/dev/digi/EPCX.bios.h#2 integrate .. //depot/projects/uart/dev/digi/EPCX.fepos.h#2 integrate .. //depot/projects/uart/dev/digi/EPCX_PCI.bios.h#2 integrate .. //depot/projects/uart/dev/digi/EPCX_PCI.fepos.h#2 integrate .. //depot/projects/uart/dev/digi/Xe.bios.h#2 integrate .. //depot/projects/uart/dev/digi/Xe.fepos.h#2 integrate .. //depot/projects/uart/dev/digi/Xem.bios.h#2 integrate .. //depot/projects/uart/dev/digi/Xem.fepos.h#2 integrate .. //depot/projects/uart/dev/dpt/dpt_eisa.c#5 integrate .. //depot/projects/uart/dev/dpt/dpt_isa.c#5 integrate .. //depot/projects/uart/dev/dpt/dpt_pci.c#8 integrate .. //depot/projects/uart/dev/dpt/dpt_scsi.c#6 integrate .. //depot/projects/uart/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/uart/dev/drm/ati_pcigart.h#5 delete .. //depot/projects/uart/dev/drm/drm.h#5 integrate .. //depot/projects/uart/dev/drm/drmP.h#6 integrate .. //depot/projects/uart/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/uart/dev/drm/drm_agpsupport.h#4 delete .. //depot/projects/uart/dev/drm/drm_atomic.h#1 branch .. //depot/projects/uart/dev/drm/drm_auth.c#1 branch .. //depot/projects/uart/dev/drm/drm_auth.h#5 delete .. //depot/projects/uart/dev/drm/drm_bufs.c#1 branch .. //depot/projects/uart/dev/drm/drm_bufs.h#6 delete .. //depot/projects/uart/dev/drm/drm_context.c#1 branch .. //depot/projects/uart/dev/drm/drm_context.h#6 delete .. //depot/projects/uart/dev/drm/drm_dma.c#1 branch .. //depot/projects/uart/dev/drm/drm_dma.h#5 delete .. //depot/projects/uart/dev/drm/drm_drawable.c#1 branch .. //depot/projects/uart/dev/drm/drm_drawable.h#4 delete .. //depot/projects/uart/dev/drm/drm_drv.c#1 branch .. //depot/projects/uart/dev/drm/drm_drv.h#5 delete .. //depot/projects/uart/dev/drm/drm_fops.c#1 branch .. //depot/projects/uart/dev/drm/drm_fops.h#5 delete .. //depot/projects/uart/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/uart/dev/drm/drm_ioctl.h#5 delete .. //depot/projects/uart/dev/drm/drm_irq.c#1 branch .. //depot/projects/uart/dev/drm/drm_irq.h#3 delete .. //depot/projects/uart/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/uart/dev/drm/drm_lock.c#1 branch .. //depot/projects/uart/dev/drm/drm_lock.h#4 delete .. //depot/projects/uart/dev/drm/drm_memory.c#1 branch .. //depot/projects/uart/dev/drm/drm_memory.h#6 delete .. //depot/projects/uart/dev/drm/drm_memory_debug.h#4 delete .. //depot/projects/uart/dev/drm/drm_os_freebsd.h#6 delete .. //depot/projects/uart/dev/drm/drm_pci.c#1 branch .. //depot/projects/uart/dev/drm/drm_pci.h#4 delete .. //depot/projects/uart/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/uart/dev/drm/drm_sarea.h#5 integrate .. //depot/projects/uart/dev/drm/drm_scatter.c#1 branch .. //depot/projects/uart/dev/drm/drm_scatter.h#4 delete .. //depot/projects/uart/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/uart/dev/drm/drm_sysctl.h#5 delete .. //depot/projects/uart/dev/drm/drm_vm.c#1 branch .. //depot/projects/uart/dev/drm/drm_vm.h#5 delete .. //depot/projects/uart/dev/drm/i915_dma.c#1 branch .. //depot/projects/uart/dev/drm/i915_drm.h#1 branch .. //depot/projects/uart/dev/drm/i915_drv.c#1 branch .. //depot/projects/uart/dev/drm/i915_drv.h#1 branch .. //depot/projects/uart/dev/drm/i915_irq.c#1 branch .. //depot/projects/uart/dev/drm/i915_mem.c#1 branch .. //depot/projects/uart/dev/drm/mach64_dma.c#1 branch .. //depot/projects/uart/dev/drm/mach64_drm.h#1 branch .. //depot/projects/uart/dev/drm/mach64_drv.c#1 branch .. //depot/projects/uart/dev/drm/mach64_drv.h#1 branch .. //depot/projects/uart/dev/drm/mach64_irq.c#1 branch .. //depot/projects/uart/dev/drm/mach64_state.c#1 branch .. //depot/projects/uart/dev/drm/mga.h#5 delete .. //depot/projects/uart/dev/drm/mga_dma.c#5 integrate .. //depot/projects/uart/dev/drm/mga_drm.h#4 integrate .. //depot/projects/uart/dev/drm/mga_drv.c#5 integrate .. //depot/projects/uart/dev/drm/mga_drv.h#5 integrate .. //depot/projects/uart/dev/drm/mga_irq.c#5 integrate .. //depot/projects/uart/dev/drm/mga_state.c#4 integrate .. //depot/projects/uart/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/uart/dev/drm/mga_warp.c#4 integrate .. //depot/projects/uart/dev/drm/r128.h#5 delete .. //depot/projects/uart/dev/drm/r128_cce.c#5 integrate .. //depot/projects/uart/dev/drm/r128_drm.h#5 integrate .. //depot/projects/uart/dev/drm/r128_drv.c#5 integrate .. //depot/projects/uart/dev/drm/r128_drv.h#5 integrate .. //depot/projects/uart/dev/drm/r128_irq.c#5 integrate .. //depot/projects/uart/dev/drm/r128_state.c#5 integrate .. //depot/projects/uart/dev/drm/radeon.h#6 delete .. //depot/projects/uart/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/uart/dev/drm/radeon_drm.h#6 integrate .. //depot/projects/uart/dev/drm/radeon_drv.c#6 integrate .. //depot/projects/uart/dev/drm/radeon_drv.h#6 integrate .. //depot/projects/uart/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/uart/dev/drm/radeon_mem.c#6 integrate .. //depot/projects/uart/dev/drm/radeon_state.c#7 integrate .. //depot/projects/uart/dev/drm/savage_bci.c#1 branch .. //depot/projects/uart/dev/drm/savage_drm.h#1 branch .. //depot/projects/uart/dev/drm/savage_drv.c#1 branch .. //depot/projects/uart/dev/drm/savage_drv.h#1 branch .. //depot/projects/uart/dev/drm/savage_state.c#1 branch .. //depot/projects/uart/dev/drm/sis.h#4 delete .. //depot/projects/uart/dev/drm/sis_drm.h#2 integrate .. //depot/projects/uart/dev/drm/sis_drv.c#4 integrate .. //depot/projects/uart/dev/drm/sis_drv.h#3 integrate .. //depot/projects/uart/dev/drm/sis_ds.c#3 integrate .. //depot/projects/uart/dev/drm/sis_ds.h#4 integrate .. //depot/projects/uart/dev/drm/sis_mm.c#4 integrate .. //depot/projects/uart/dev/drm/tdfx.h#5 delete .. //depot/projects/uart/dev/drm/tdfx_drv.c#5 integrate .. //depot/projects/uart/dev/drm/tdfx_drv.h#1 branch .. //depot/projects/uart/dev/ed/if_ed98.h#3 integrate .. //depot/projects/uart/dev/em/README#3 integrate .. //depot/projects/uart/dev/em/if_em.c#14 integrate .. //depot/projects/uart/dev/em/if_em.h#12 integrate .. //depot/projects/uart/dev/em/if_em_hw.c#5 integrate .. //depot/projects/uart/dev/em/if_em_hw.h#4 integrate .. //depot/projects/uart/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/uart/dev/ep/if_ep.c#10 integrate .. //depot/projects/uart/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/uart/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/uart/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/uart/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/uart/dev/fb/boot_font.c#4 integrate .. //depot/projects/uart/dev/fb/creator.c#3 integrate .. //depot/projects/uart/dev/fb/gfb.c#4 integrate .. //depot/projects/uart/dev/fb/machfb.c#1 branch .. //depot/projects/uart/dev/fb/machfbreg.h#1 branch .. //depot/projects/uart/dev/fb/s3_pci.c#6 integrate .. //depot/projects/uart/dev/fb/tga.c#5 integrate .. //depot/projects/uart/dev/fb/vga.c#5 integrate .. //depot/projects/uart/dev/firewire/fwdev.c#8 integrate .. //depot/projects/uart/dev/firewire/fwohci.c#13 integrate .. //depot/projects/uart/dev/firewire/fwohci_pci.c#11 integrate .. //depot/projects/uart/dev/firewire/fwohcireg.h#7 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/uart/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/uart/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/uart/dev/fxp/rcvbundl.h#3 integrate .. //depot/projects/uart/dev/gfb/gfb_pci.c#7 integrate .. //depot/projects/uart/dev/hatm/if_hatm_tx.c#8 integrate .. //depot/projects/uart/dev/hfa/hfa_freebsd.c#4 integrate .. //depot/projects/uart/dev/hfa/hfa_pci.c#4 integrate .. //depot/projects/uart/dev/hifn/hifn7751.c#12 integrate .. //depot/projects/uart/dev/hme/if_hme.c#9 integrate .. //depot/projects/uart/dev/hme/if_hme_sbus.c#8 integrate .. //depot/projects/uart/dev/hptmv/entry.c#4 integrate .. //depot/projects/uart/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/uart/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/uart/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/uart/dev/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/uart/dev/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/uart/dev/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/uart/dev/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/uart/dev/ic/i8237.h#3 integrate .. //depot/projects/uart/dev/ic/i8253reg.h#1 branch .. //depot/projects/uart/dev/ichsmb/ichsmb_pci.c#8 integrate .. //depot/projects/uart/dev/ida/ida.c#6 integrate .. //depot/projects/uart/dev/ida/ida_disk.c#4 integrate .. //depot/projects/uart/dev/ida/ida_eisa.c#6 integrate .. //depot/projects/uart/dev/ida/ida_pci.c#9 integrate .. //depot/projects/uart/dev/ida/idareg.h#3 integrate .. //depot/projects/uart/dev/ida/idavar.h#4 integrate .. //depot/projects/uart/dev/idt/idt_harp.c#5 integrate .. //depot/projects/uart/dev/idt/idt_pci.c#6 integrate .. //depot/projects/uart/dev/ie/if_ie.c#5 integrate .. //depot/projects/uart/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/uart/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/uart/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/uart/dev/iir/iir.c#7 integrate .. //depot/projects/uart/dev/iir/iir_ctrl.c#6 integrate .. //depot/projects/uart/dev/iir/iir_pci.c#9 integrate .. //depot/projects/uart/dev/ips/ips.c#6 integrate .. //depot/projects/uart/dev/ips/ips.h#6 integrate .. //depot/projects/uart/dev/ips/ips_disk.h#4 integrate .. //depot/projects/uart/dev/ipw/if_ipw.c#1 branch .. //depot/projects/uart/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/uart/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/uart/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/uart/dev/isp/isp_inline.h#5 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#8 integrate .. //depot/projects/uart/dev/isp/ispvar.h#7 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#1 branch .. //depot/projects/uart/dev/iwi/if_iwireg.h#1 branch .. //depot/projects/uart/dev/iwi/if_iwivar.h#1 branch .. //depot/projects/uart/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb.h#3 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb_osdep.h#3 integrate .. //depot/projects/uart/dev/kbd/atkbdc.c#3 integrate .. //depot/projects/uart/dev/kbd/kbdtables.h#2 integrate .. //depot/projects/uart/dev/lge/if_lge.c#9 integrate .. //depot/projects/uart/dev/mc146818/mc146818.c#3 integrate .. //depot/projects/uart/dev/mc146818/mc146818var.h#3 integrate .. //depot/projects/uart/dev/mcd/mcd.c#8 integrate .. //depot/projects/uart/dev/mcd/mcd_isa.c#4 integrate .. //depot/projects/uart/dev/mii/brgphy.c#10 integrate .. //depot/projects/uart/dev/mii/dcphy.c#6 integrate .. //depot/projects/uart/dev/mii/miidevs#6 integrate .. //depot/projects/uart/dev/mii/pnphy.c#4 integrate .. //depot/projects/uart/dev/mk48txx/mk48txx.c#6 integrate .. //depot/projects/uart/dev/mk48txx/mk48txxreg.h#4 integrate .. //depot/projects/uart/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/uart/dev/mlx/mlx.c#6 integrate .. //depot/projects/uart/dev/mlx/mlx_pci.c#7 integrate .. //depot/projects/uart/dev/mly/mly.c#8 integrate .. //depot/projects/uart/dev/mpt/mpt_freebsd.h#3 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#9 integrate .. //depot/projects/uart/dev/mse/mse.c#3 integrate .. //depot/projects/uart/dev/mse/mse_cbus.c#3 integrate .. //depot/projects/uart/dev/mse/mse_isa.c#3 integrate .. //depot/projects/uart/dev/mse/msevar.h#3 integrate .. //depot/projects/uart/dev/musycc/musycc.c#7 delete .. //depot/projects/uart/dev/my/if_my.c#6 integrate .. //depot/projects/uart/dev/ncv/ncr53c500.c#5 integrate .. //depot/projects/uart/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/uart/dev/nge/if_nge.c#9 integrate .. //depot/projects/uart/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/uart/dev/nsp/nsp.c#5 integrate .. //depot/projects/uart/dev/nve/if_nve.c#2 integrate .. //depot/projects/uart/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/uart/dev/ofw/openfirmio.h#4 integrate .. //depot/projects/uart/dev/ofw/openpromio.c#4 integrate .. //depot/projects/uart/dev/pbio/pbio.c#5 integrate .. //depot/projects/uart/dev/pccard/pccard.c#11 integrate .. //depot/projects/uart/dev/pccard/pccard_cis.c#9 integrate .. //depot/projects/uart/dev/pccard/pccard_cis_quirks.c#6 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#15 integrate .. //depot/projects/uart/dev/pccard/pccardvar.h#7 integrate .. //depot/projects/uart/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/uart/dev/pcf/envctrl.c#2 integrate .. //depot/projects/uart/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/uart/dev/pci/pci.c#18 integrate .. //depot/projects/uart/dev/pci/pci_pci.c#6 integrate .. //depot/projects/uart/dev/pci/pci_user.c#7 integrate .. //depot/projects/uart/dev/pci/pcib_if.m#3 integrate .. //depot/projects/uart/dev/pci/pcireg.h#8 integrate .. //depot/projects/uart/dev/pci/pcivar.h#6 integrate .. //depot/projects/uart/dev/pdq/if_fpa.c#5 integrate .. //depot/projects/uart/dev/pdq/pdq_freebsd.h#3 integrate .. //depot/projects/uart/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/uart/dev/ppbus/pps.c#6 integrate .. //depot/projects/uart/dev/ppc/ppc.c#4 integrate .. //depot/projects/uart/dev/puc/puc_ebus.c#8 integrate .. //depot/projects/uart/dev/puc/pucdata.c#13 integrate .. //depot/projects/uart/dev/ral/if_ral.c#1 branch .. //depot/projects/uart/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/uart/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/uart/dev/ral/if_ralrate.c#1 branch .. //depot/projects/uart/dev/ral/if_ralrate.h#1 branch .. //depot/projects/uart/dev/ral/if_ralreg.h#1 branch .. //depot/projects/uart/dev/ral/if_ralvar.h#1 branch .. //depot/projects/uart/dev/random/probe.c#3 integrate .. //depot/projects/uart/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/uart/dev/re/if_re.c#10 integrate .. //depot/projects/uart/dev/rp/rp_pci.c#6 integrate .. //depot/projects/uart/dev/sab/sab.c#7 integrate .. //depot/projects/uart/dev/scd/scd.c#7 integrate .. //depot/projects/uart/dev/scd/scd_isa.c#4 integrate .. //depot/projects/uart/dev/sio/sio.c#13 integrate .. //depot/projects/uart/dev/sio/sio_isa.c#6 integrate .. //depot/projects/uart/dev/sio/sio_pccard.c#7 integrate .. //depot/projects/uart/dev/sio/sio_pci.c#6 integrate .. //depot/projects/uart/dev/sio/sio_puc.c#4 integrate .. //depot/projects/uart/dev/snp/snp.c#7 integrate .. //depot/projects/uart/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#13 integrate .. //depot/projects/uart/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/uart/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/uart/dev/sound/usb/uaudio_pcm.c#6 integrate .. //depot/projects/uart/dev/sr/if_sr.c#6 integrate .. //depot/projects/uart/dev/sr/if_sr_isa.c#4 integrate .. //depot/projects/uart/dev/sr/if_sr_pci.c#7 integrate .. //depot/projects/uart/dev/stg/tmc18c30.c#5 integrate .. //depot/projects/uart/dev/stg/tmc18c30_isa.c#4 integrate .. //depot/projects/uart/dev/stg/tmc18c30_pccard.c#5 integrate .. //depot/projects/uart/dev/stg/tmc18c30_pci.c#6 integrate .. //depot/projects/uart/dev/stg/tmc18c30_subr.c#5 integrate .. //depot/projects/uart/dev/sym/sym_hipd.c#9 integrate .. //depot/projects/uart/dev/syscons/apm/apm_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/scgfbrndr.c#5 integrate .. //depot/projects/uart/dev/syscons/scmouse.c#4 integrate .. //depot/projects/uart/dev/syscons/scvesactl.c#4 integrate .. //depot/projects/uart/dev/syscons/scvgarndr.c#4 integrate .. //depot/projects/uart/dev/syscons/scvidctl.c#5 integrate .. //depot/projects/uart/dev/syscons/scvtb.c#3 integrate .. //depot/projects/uart/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/syscons.c#9 integrate .. //depot/projects/uart/dev/syscons/syscons.h#4 integrate .. //depot/projects/uart/dev/tga/tga_pci.c#7 integrate .. //depot/projects/uart/dev/trm/trm.c#11 integrate .. //depot/projects/uart/dev/twa/tw_cl.h#1 branch .. //depot/projects/uart/dev/twa/tw_cl_externs.h#1 branch .. //depot/projects/uart/dev/twa/tw_cl_fwif.h#1 branch .. //depot/projects/uart/dev/twa/tw_cl_fwimg.c#1 branch .. //depot/projects/uart/dev/twa/tw_cl_init.c#1 branch .. //depot/projects/uart/dev/twa/tw_cl_intr.c#1 branch .. //depot/projects/uart/dev/twa/tw_cl_io.c#1 branch .. //depot/projects/uart/dev/twa/tw_cl_ioctl.h#1 branch .. //depot/projects/uart/dev/twa/tw_cl_misc.c#1 branch .. //depot/projects/uart/dev/twa/tw_cl_share.h#1 branch .. //depot/projects/uart/dev/twa/tw_osl.h#1 branch .. //depot/projects/uart/dev/twa/tw_osl_cam.c#1 branch .. //depot/projects/uart/dev/twa/tw_osl_externs.h#1 branch .. //depot/projects/uart/dev/twa/tw_osl_freebsd.c#1 branch .. //depot/projects/uart/dev/twa/tw_osl_includes.h#1 branch .. //depot/projects/uart/dev/twa/tw_osl_ioctl.h#1 branch .. //depot/projects/uart/dev/twa/tw_osl_share.h#1 branch .. //depot/projects/uart/dev/twa/tw_osl_types.h#1 branch .. //depot/projects/uart/dev/twa/twa.c#3 delete .. //depot/projects/uart/dev/twa/twa.h#4 delete .. //depot/projects/uart/dev/twa/twa_cam.c#4 delete .. //depot/projects/uart/dev/twa/twa_externs.h#3 delete .. //depot/projects/uart/dev/twa/twa_freebsd.c#4 delete .. //depot/projects/uart/dev/twa/twa_fwimg.c#3 delete .. //depot/projects/uart/dev/twa/twa_globals.c#4 delete .. //depot/projects/uart/dev/twa/twa_includes.h#2 delete .. //depot/projects/uart/dev/twa/twa_ioctl.h#3 delete .. //depot/projects/uart/dev/twa/twa_reg.h#3 delete .. //depot/projects/uart/dev/twe/twe_compat.h#6 integrate .. //depot/projects/uart/dev/tx/if_tx.c#8 integrate .. //depot/projects/uart/dev/txp/if_txp.c#8 integrate .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#9 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#23 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#23 integrate .. //depot/projects/uart/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/uart/dev/uart/uart_tty.c#22 integrate .. //depot/projects/uart/dev/usb/ehci.c#12 integrate .. //depot/projects/uart/dev/usb/if_aue.c#8 integrate .. //depot/projects/uart/dev/usb/if_auereg.h#5 integrate .. //depot/projects/uart/dev/usb/if_axe.c#8 integrate .. //depot/projects/uart/dev/usb/if_axereg.h#4 integrate .. //depot/projects/uart/dev/usb/if_cdce.c#1 branch .. //depot/projects/uart/dev/usb/if_cdcereg.h#1 branch .. //depot/projects/uart/dev/usb/if_cue.c#8 integrate .. //depot/projects/uart/dev/usb/if_cuereg.h#5 integrate .. //depot/projects/uart/dev/usb/if_kue.c#7 integrate .. //depot/projects/uart/dev/usb/if_kuereg.h#5 integrate .. //depot/projects/uart/dev/usb/if_rue.c#6 integrate .. //depot/projects/uart/dev/usb/if_ruereg.h#4 integrate .. //depot/projects/uart/dev/usb/if_udav.c#3 integrate .. //depot/projects/uart/dev/usb/if_udavreg.h#3 integrate .. //depot/projects/uart/dev/usb/if_ural.c#1 branch .. //depot/projects/uart/dev/usb/if_uralreg.h#1 branch .. //depot/projects/uart/dev/usb/if_uralvar.h#1 branch .. //depot/projects/uart/dev/usb/ohci.c#12 integrate .. //depot/projects/uart/dev/usb/ohci_pci.c#8 integrate .. //depot/projects/uart/dev/usb/ucom.c#9 integrate .. //depot/projects/uart/dev/usb/uftdi.c#8 integrate .. //depot/projects/uart/dev/usb/uhci.c#13 integrate .. //depot/projects/uart/dev/usb/uhub.c#10 integrate .. //depot/projects/uart/dev/usb/ukbd.c#7 integrate .. //depot/projects/uart/dev/usb/umass.c#11 integrate .. //depot/projects/uart/dev/usb/uplcom.c#9 integrate .. //depot/projects/uart/dev/usb/usb.c#9 integrate .. //depot/projects/uart/dev/usb/usb_ethersubr.c#5 integrate .. //depot/projects/uart/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/uart/dev/usb/usbdevs#13 integrate .. //depot/projects/uart/dev/usb/usbdi.h#7 integrate .. //depot/projects/uart/dev/usb/uvisor.c#7 integrate .. //depot/projects/uart/dev/vge/if_vge.c#4 integrate .. //depot/projects/uart/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/uart/dev/vkbd/vkbd.c#4 integrate .. //depot/projects/uart/dev/vx/if_vx.c#6 integrate .. //depot/projects/uart/dev/vx/if_vx_pci.c#8 integrate .. //depot/projects/uart/dev/wi/if_wi.c#12 integrate .. //depot/projects/uart/dev/wi/if_wi_pccard.c#15 integrate .. //depot/projects/uart/dev/wl/if_wl.c#5 integrate .. //depot/projects/uart/dev/wl/if_wl_i82586.h#1 branch .. //depot/projects/uart/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/uart/fs/devfs/devfs_vfsops.c#7 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vfsops.c#7 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#9 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vnops.c#9 integrate .. //depot/projects/uart/fs/msdosfs/denode.h#5 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_lookup.c#5 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/uart/fs/ntfs/ntfs_subr.c#7 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#12 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vnops.c#9 integrate .. //depot/projects/uart/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/uart/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/uart/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/uart/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vfsops.c#6 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vnops.c#7 integrate .. //depot/projects/uart/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/uart/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#9 integrate .. //depot/projects/uart/fs/smbfs/smbfs_smb.c#4 integrate .. //depot/projects/uart/fs/smbfs/smbfs_subr.c#3 integrate .. //depot/projects/uart/fs/smbfs/smbfs_subr.h#4 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/uart/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/uart/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/uart/fs/umapfs/umap_vfsops.c#6 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/uart/fs/unionfs/union_vfsops.c#7 integrate .. //depot/projects/uart/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/uart/gdb/gdb_main.c#3 integrate .. //depot/projects/uart/geom/concat/g_concat.c#3 integrate .. //depot/projects/uart/geom/geom_ctl.c#6 integrate .. //depot/projects/uart/geom/geom_event.c#5 integrate .. //depot/projects/uart/geom/geom_kern.c#5 integrate .. //depot/projects/uart/geom/geom_pc98.c#5 integrate .. //depot/projects/uart/geom/geom_pc98_enc.c#2 integrate .. //depot/projects/uart/geom/geom_subr.c#6 integrate .. //depot/projects/uart/geom/geom_sunlabel.c#3 integrate .. //depot/projects/uart/geom/geom_sunlabel_enc.c#4 integrate .. //depot/projects/uart/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/uart/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/uart/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/uart/geom/raid3/g_raid3_ctl.c#4 integrate .. //depot/projects/uart/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_init.c#5 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_lookup.c#5 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/uart/gnu/reiserfs/README#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_fs.h#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_fs_i.h#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_fs_sb.h#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_hashes.c#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_inode.c#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_item_ops.c#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_mount.h#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_namei.c#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_prints.c#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_stree.c#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_vfsops.c#1 branch .. //depot/projects/uart/gnu/reiserfs/reiserfs_vnops.c#1 branch .. //depot/projects/uart/i386/acpica/acpi_wakecode.S#4 integrate .. //depot/projects/uart/i386/acpica/madt.c#3 integrate .. //depot/projects/uart/i386/bios/apm.c#5 integrate .. //depot/projects/uart/i386/conf/GENERIC#9 integrate .. //depot/projects/uart/i386/conf/NOTES#11 integrate .. //depot/projects/uart/i386/conf/PAE#6 integrate .. //depot/projects/uart/i386/cpufreq/est.c#2 integrate .. //depot/projects/uart/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/uart/i386/cpufreq/powernow.c#1 branch .. //depot/projects/uart/i386/cpufreq/smist.c#1 branch .. //depot/projects/uart/i386/i386/autoconf.c#4 integrate .. //depot/projects/uart/i386/i386/bios.c#6 integrate .. //depot/projects/uart/i386/i386/critical.c#5 delete .. //depot/projects/uart/i386/i386/genassym.c#5 integrate .. //depot/projects/uart/i386/i386/identcpu.c#11 integrate .. //depot/projects/uart/i386/i386/initcpu.c#5 integrate .. //depot/projects/uart/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/uart/i386/i386/io_apic.c#4 integrate .. //depot/projects/uart/i386/i386/local_apic.c#5 integrate .. //depot/projects/uart/i386/i386/locore.s#8 integrate .. //depot/projects/uart/i386/i386/machdep.c#15 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/uart/i386/i386/mptable.c#5 integrate .. //depot/projects/uart/i386/i386/nexus.c#5 integrate .. //depot/projects/uart/i386/i386/ptrace_machdep.c#1 branch .. //depot/projects/uart/i386/i386/support.s#6 integrate .. //depot/projects/uart/i386/i386/swtch.s#5 integrate .. //depot/projects/uart/i386/i386/sys_machdep.c#12 integrate .. //depot/projects/uart/i386/i386/trap.c#8 integrate .. //depot/projects/uart/i386/i386/vm86bios.s#2 integrate .. //depot/projects/uart/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#6 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/uart/i386/include/_bus.h#1 branch .. //depot/projects/uart/i386/include/apicvar.h#4 integrate .. //depot/projects/uart/i386/include/apm_bios.h#3 integrate .. //depot/projects/uart/i386/include/bus.h#2 integrate .. //depot/projects/uart/i386/include/bus_at386.h#6 delete .. //depot/projects/uart/i386/include/bus_memio.h#3 delete .. //depot/projects/uart/i386/include/bus_pc98.h#5 delete .. //depot/projects/uart/i386/include/bus_pio.h#3 delete .. //depot/projects/uart/i386/include/clock.h#8 integrate .. //depot/projects/uart/i386/include/cpufunc.h#6 integrate .. //depot/projects/uart/i386/include/critical.h#6 delete .. //depot/projects/uart/i386/include/floatingpoint.h#2 integrate .. //depot/projects/uart/i386/include/legacyvar.h#3 integrate .. //depot/projects/uart/i386/include/md_var.h#5 integrate .. //depot/projects/uart/i386/include/npx.h#4 integrate .. //depot/projects/uart/i386/include/pc/display.h#2 integrate .. //depot/projects/uart/i386/include/pcb.h#4 integrate .. //depot/projects/uart/i386/include/pci_cfgreg.h#5 integrate .. //depot/projects/uart/i386/include/pcpu.h#5 integrate .. //depot/projects/uart/i386/include/pmc_mdep.h#1 branch .. //depot/projects/uart/i386/include/ppireg.h#1 branch .. //depot/projects/uart/i386/include/proc.h#4 integrate .. //depot/projects/uart/i386/include/ptrace.h#4 integrate .. //depot/projects/uart/i386/include/reg.h#3 integrate .. //depot/projects/uart/i386/include/segments.h#4 integrate .. //depot/projects/uart/i386/include/smp.h#5 integrate .. //depot/projects/uart/i386/include/sysarch.h#6 integrate .. //depot/projects/uart/i386/include/timerreg.h#1 branch .. //depot/projects/uart/i386/isa/atpic.c#3 integrate .. //depot/projects/uart/i386/isa/clock.c#9 integrate .. //depot/projects/uart/i386/isa/ic/if_wl_i82586.h#3 delete .. //depot/projects/uart/i386/isa/if_el.c#4 integrate .. //depot/projects/uart/i386/isa/isa.h#5 integrate .. //depot/projects/uart/i386/isa/isa_dma.c#4 integrate .. //depot/projects/uart/i386/isa/lptreg.h#2 delete .. //depot/projects/uart/i386/isa/npx.c#7 integrate .. //depot/projects/uart/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/uart/i386/isa/spkr.c#4 integrate .. //depot/projects/uart/i386/isa/timerreg.h#3 delete .. //depot/projects/uart/i386/isa/vesa.c#5 integrate .. //depot/projects/uart/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/uart/i386/linux/linux.h#3 integrate .. //depot/projects/uart/i386/linux/linux_proto.h#4 integrate .. //depot/projects/uart/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/uart/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/uart/i386/linux/syscalls.master#4 integrate .. //depot/projects/uart/i386/pci/pci_bus.c#8 integrate .. //depot/projects/uart/i386/pci/pci_pir.c#4 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_isic.h#3 integrate .. //depot/projects/uart/i4b/layer1/itjc/i4b_itjc_pci.c#7 integrate .. //depot/projects/uart/ia64/conf/GENERIC#7 integrate .. //depot/projects/uart/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/uart/ia64/ia64/autoconf.c#4 integrate .. //depot/projects/uart/ia64/ia64/clock.c#5 integrate .. //depot/projects/uart/ia64/ia64/clock_if.m#3 delete .. //depot/projects/uart/ia64/ia64/critical.c#4 delete .. //depot/projects/uart/ia64/ia64/db_trace.c#6 integrate .. //depot/projects/uart/ia64/ia64/eficlock.c#3 delete .. //depot/projects/uart/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#20 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#7 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#17 integrate .. //depot/projects/uart/ia64/ia64/trap.c#11 integrate .. //depot/projects/uart/ia64/ia64/unwind.c#7 integrate .. //depot/projects/uart/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/uart/ia64/include/_bus.h#1 branch .. //depot/projects/uart/ia64/include/bus.h#9 integrate .. //depot/projects/uart/ia64/include/bus_memio.h#3 delete .. //depot/projects/uart/ia64/include/bus_pio.h#3 delete .. //depot/projects/uart/ia64/include/clockvar.h#3 delete .. //depot/projects/uart/ia64/include/critical.h#6 delete .. //depot/projects/uart/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/uart/ia64/include/proc.h#4 integrate .. //depot/projects/uart/ia64/isa/isa_dma.c#5 integrate .. //depot/projects/uart/isa/atkbdc_isa.c#4 integrate .. //depot/projects/uart/isa/isa_dmareg.h#1 branch .. //depot/projects/uart/isa/isahint.c#4 integrate .. //depot/projects/uart/isa/isareg.h#4 integrate .. //depot/projects/uart/isa/isavar.h#6 integrate .. //depot/projects/uart/isa/syscons_isa.c#4 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_lookup.c#5 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/uart/kern/imgact_aout.c#7 integrate .. //depot/projects/uart/kern/imgact_elf.c#5 integrate .. //depot/projects/uart/kern/imgact_gzip.c#5 integrate .. //depot/projects/uart/kern/imgact_shell.c#6 integrate .. //depot/projects/uart/kern/init_sysent.c#10 integrate .. //depot/projects/uart/kern/kern_alq.c#5 integrate .. //depot/projects/uart/kern/kern_clock.c#5 integrate .. //depot/projects/uart/kern/kern_conf.c#7 integrate .. //depot/projects/uart/kern/kern_cpu.c#2 integrate .. //depot/projects/uart/kern/kern_descrip.c#16 integrate .. //depot/projects/uart/kern/kern_event.c#6 integrate .. //depot/projects/uart/kern/kern_exec.c#12 integrate .. //depot/projects/uart/kern/kern_exit.c#6 integrate .. //depot/projects/uart/kern/kern_fork.c#11 integrate .. //depot/projects/uart/kern/kern_idle.c#5 integrate .. //depot/projects/uart/kern/kern_intr.c#8 integrate .. //depot/projects/uart/kern/kern_jail.c#5 integrate .. //depot/projects/uart/kern/kern_kse.c#6 integrate .. //depot/projects/uart/kern/kern_ktr.c#8 integrate .. //depot/projects/uart/kern/kern_linker.c#5 integrate .. //depot/projects/uart/kern/kern_lock.c#8 integrate .. //depot/projects/uart/kern/kern_lockf.c#6 integrate .. //depot/projects/uart/kern/kern_mac.c#9 integrate .. //depot/projects/uart/kern/kern_malloc.c#8 integrate .. //depot/projects/uart/kern/kern_mutex.c#7 integrate .. //depot/projects/uart/kern/kern_ntptime.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 6 04:36:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02BE416A420; Mon, 6 Jun 2005 04:36:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D199C16A41C for ; Mon, 6 Jun 2005 04:36:18 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 980F443D4C for ; Mon, 6 Jun 2005 04:36:18 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j564aIOu024095 for ; Mon, 6 Jun 2005 04:36:18 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j564aItM024092 for perforce@freebsd.org; Mon, 6 Jun 2005 04:36:18 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Jun 2005 04:36:18 GMT Message-Id: <200506060436.j564aItM024092@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 04:36:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=78070 Change 78070 by marcel@marcel_nfs on 2005/06/06 04:35:55 Submit a bunch of changes I have for a while now. This definitely doesn't compile. Includes changes by prior integrations. Affected files ... .. //depot/projects/ia64/sys/boot/ia64/ski/Makefile#3 edit .. //depot/projects/ia64/sys/boot/ia64/ski/elf_freebsd.c#2 edit .. //depot/projects/ia64/sys/ia64/ia64/efi.c#8 edit .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#115 edit .. //depot/projects/ia64/sys/ia64/include/bootinfo.h#10 edit Differences ... ==== //depot/projects/ia64/sys/boot/ia64/ski/Makefile#3 (text+ko) ==== @@ -10,6 +10,7 @@ skiconsole.c skifs.c ssc.c start.S time.c vers.c CFLAGS+= -DLOADER +CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../efi/include @@ -43,4 +44,8 @@ FILES= ${PROG}.help +CLEANFILES+= machine +beforedepend: + ln -s ${.CURDIR}/../../../ia64/include ${.OBJDIR}/machine + .include ==== //depot/projects/ia64/sys/boot/ia64/ski/elf_freebsd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -/* +/*- * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/elf_freebsd.c,v 1.11 2004/09/24 03:53:50 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/elf_freebsd.c,v 1.12 2005/01/05 22:16:58 imp Exp $"); #include #include @@ -86,9 +86,9 @@ #include "bootstrap.h" #include "libski.h" -#define _KERNEL +extern uint64_t *pgtbl; -static int elf64_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); struct file_format ia64_elf = { elf64_loadfile, elf64_exec }; @@ -170,33 +170,56 @@ bzero(bi, sizeof(struct bootinfo)); bi_load(bi, fp); - /* - * Region 6 is direct mapped UC and region 7 is direct mapped - * WC. The details of this is controlled by the Alt {I,D}TLB - * handlers. Here we just make sure that they have the largest - * possible page size to minimise TLB usage. - */ - ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (28 << 2)); - ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2)); + if (pgtbl == NULL) { + /* + * Region 6 is direct mapped UC and region 7 is direct mapped + * WC. The details of this is controlled by the Alt {I,D}TLB + * handlers. Here we just make sure that they have the largest + * possible page size to minimise TLB usage. + */ + ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (28 << 2)); + ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2)); + + bzero(&pte, sizeof(pte)); + pte.pte_p = 1; + pte.pte_ma = PTE_MA_WB; + pte.pte_a = 1; + pte.pte_d = 1; + pte.pte_pl = PTE_PL_KERN; + pte.pte_ar = PTE_AR_RWX; + pte.pte_ppn = 0; + + __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7))); + __asm __volatile("mov cr.itir=%0" :: "r"(28 << 2)); + __asm __volatile("srlz.i;;"); + __asm __volatile("itr.i itr[%0]=%1;;" + :: "r"(0), "r"(*(u_int64_t*)&pte)); + __asm __volatile("srlz.i;;"); + __asm __volatile("itr.d dtr[%0]=%1;;" + :: "r"(0), "r"(*(u_int64_t*)&pte)); + __asm __volatile("srlz.i;;"); + } else { + ia64_set_rr(IA64_RR_BASE(5), (5 << 8) | (20 << 2) | 1); - bzero(&pte, sizeof(pte)); - pte.pte_p = 1; - pte.pte_ma = PTE_MA_WB; - pte.pte_a = 1; - pte.pte_d = 1; - pte.pte_pl = PTE_PL_KERN; - pte.pte_ar = PTE_AR_RWX; - pte.pte_ppn = 0; + bzero(&pte, sizeof(pte)); + pte.pte_p = 1; + pte.pte_ma = PTE_MA_WB; + pte.pte_a = 1; + pte.pte_d = 1; + pte.pte_pl = PTE_PL_KERN; + pte.pte_ar = PTE_AR_RWX; + pte.pte_ppn = pgtbl[0] >> 12; - __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7))); - __asm __volatile("mov cr.itir=%0" :: "r"(28 << 2)); - __asm __volatile("srlz.i;;"); - __asm __volatile("itr.i itr[%0]=%1;;" + __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_KERNELBASE)); + __asm __volatile("mov cr.itir=%0" :: "r"(20 << 2)); + __asm __volatile("srlz.i;;"); + __asm __volatile("itr.i itr[%0]=%1;;" :: "r"(0), "r"(*(u_int64_t*)&pte)); - __asm __volatile("srlz.i;;"); - __asm __volatile("itr.d dtr[%0]=%1;;" + __asm __volatile("srlz.i;;"); + __asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(*(u_int64_t*)&pte)); - __asm __volatile("srlz.i;;"); + __asm __volatile("srlz.i;;"); + } enter_kernel(fp->f_name, hdr->e_entry, bi); } ==== //depot/projects/ia64/sys/ia64/ia64/efi.c#8 (text+ko) ==== @@ -90,8 +90,8 @@ md = efi_md_next(md); } status = ia64_call_efi_physical((uint64_t)efi_runtime->rt_setvirtual, - bootinfo.bi_memmap_size, bootinfo.bi_memdesc_size, - bootinfo.bi_memdesc_version, bootinfo.bi_memmap, 0); + ia64_bi_lookup(BI_TAG_MM_SIZE), ia64_bi_lookup(BI_TAG_MMD_SIZE), + ia64_bi_lookup(BI_TAG_MMD_VERS), ia64_bi_lookup(BI_TAG_MM_ADDR), 0); return ((status < 0) ? EFAULT : 0); } @@ -123,10 +123,12 @@ struct efi_md * efi_md_first(void) { + uint64_t pa; - if (bootinfo.bi_memmap == 0) + pa = ia64_bi_lookup(BI_TAG_MM_ADDR); + if (pa == 0) return (NULL); - return ((struct efi_md *)IA64_PHYS_TO_RR7(bootinfo.bi_memmap)); + return ((struct efi_md *)IA64_PHYS_TO_RR7(pa)); } struct efi_md * @@ -134,9 +136,9 @@ { uint64_t plim; - plim = IA64_PHYS_TO_RR7(bootinfo.bi_memmap + bootinfo.bi_memmap_size); - md = (struct efi_md *)((uintptr_t)md + bootinfo.bi_memdesc_size); - return ((md >= (struct efi_md *)plim) ? NULL : md); + plim = ia64_bi_lookup(BI_TAG_MM_ADDR) + ia64_bi_lookup(BI_TAG_MM_SIZE); + md = (struct efi_md *)((uintptr_t)md + ia64_bi_lookup(BI_TAG_MMD_SIZE)); + return ((md >= (struct efi_md *)IA64_PHYS_TO_RR7(plim)) ? NULL : md); } void ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#115 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.193 2004/12/08 05:46:54 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.199 2005/04/04 21:53:54 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -34,63 +34,70 @@ #include "opt_msgbuf.h" #include +#include #include +#include +#include +#include +#include +#include #include +#include +#include #include -#include -#include -#include #include -#include +#include #include -#include #include -#include -#include -#include #include -#include #include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include -#include -#include -#include #include -#include +#include +#include + +#include + #include + #include +#include #include #include #include -#include #include #include -#include + +#include #include #include -#include -#include +#include +#include #include #include +#include +#include #include +#include +#include #include +#include #ifdef SMP #include #endif -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include + #include -#include u_int64_t processor_frequency; u_int64_t bus_frequency; @@ -98,7 +105,7 @@ int cold = 1; u_int64_t pa_bootinfo; -struct bootinfo bootinfo; +struct bi_tagval *bootinfo; struct pcpu early_pcpu; extern char kstack[]; @@ -136,6 +143,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; vm_offset_t phys_avail[100]; @@ -239,6 +247,7 @@ #endif printf("real memory = %ld (%ld MB)\n", ia64_ptob(Maxmem), ia64_ptob(Maxmem) / 1048576); + realmem = ia64_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. @@ -287,6 +296,17 @@ efi_reset_system(); } +/* Get current clock frequency for the given cpu id. */ +int +cpu_est_clockrate(int cpu_id, uint64_t *rate) +{ + + if (pcpu_find(cpu_id) == NULL || rate == NULL) + return (EINVAL); + *rate = processor_frequency; + return (0); +} + void cpu_halt() { @@ -381,6 +401,30 @@ } void +spinlock_enter(void) +{ + struct thread *td; + + td = curthread; + if (td->td_md.md_spinlock_count == 0) + td->td_md.md_saved_intr = intr_disable(); + td->td_md.md_spinlock_count++; + critical_enter(); +} + +void +spinlock_exit(void) +{ + struct thread *td; + + td = curthread; + critical_exit(); + td->td_md.md_spinlock_count--; + if (td->td_md.md_spinlock_count == 0) + intr_restore(td->td_md.md_saved_intr); +} + +void map_pal_code(void) { pt_entry_t pte; @@ -471,15 +515,28 @@ } } +uint64_t +ia64_bi_lookup(uint64_t tag) +{ + struct bi_tagval *bi; + + bi = bootinfo; + if (bi == NULL) + return (0); + while (bi->tag != 0 && bi->tag != tag) + bi = (bi->tag == BI_TAG_BI_REDIR) ? (void *)bi->val : bi + 1; + return (bi->val); +} + void ia64_init(void) { - int phys_avail_cnt; vm_offset_t kernstart, kernend; vm_offset_t kernstartpfn, kernendpfn, pfn0, pfn1; char *p; struct efi_md *md; - int metadata_missing; + uint64_t val; + int phys_avail_cnt; /* NO OUTPUT ALLOWED UNTIL FURTHER NOTICE */ @@ -495,15 +552,13 @@ */ /* - * pa_bootinfo is the physical address of the bootinfo block as - * passed to us by the loader and set in locore.s. + * pa_bootinfo is the physical address of the first (tag,val) + * pair. This must have the magic tag and value. */ - bootinfo = *(struct bootinfo *)(IA64_PHYS_TO_RR7(pa_bootinfo)); - - if (bootinfo.bi_magic != BOOTINFO_MAGIC || bootinfo.bi_version != 1) { - bzero(&bootinfo, sizeof(bootinfo)); - bootinfo.bi_kernend = (vm_offset_t) round_page(_end); - } + bootinfo = (struct bi_tagval *)(IA64_PHYS_TO_RR7(pa_bootinfo)); + if (bootinfo->tag != BI_TAG_BI_MAGIC || + bootinfo->val != BI_VAL_BI_MAGIC) + bootinfo = NULL; /* * Look for the I/O ports first - we need them for console @@ -520,22 +575,12 @@ } } - metadata_missing = 0; - if (bootinfo.bi_modulep) - preload_metadata = (caddr_t)bootinfo.bi_modulep; - else - metadata_missing = 1; - if (envmode == 1) - kern_envp = static_env; - else - kern_envp = (caddr_t)bootinfo.bi_envp; + boothowto = ia64_bi_lookup(BI_TAG_BOOTHOW); + kern_envp = (envmode != 1) ? (void *)ia64_bi_lookup(BI_TAG_ENVIRON) : + static_env; + preload_metadata = (void *)ia64_bi_lookup(BI_TAG_PRELOAD); /* - * Look at arguments passed to us and compute boothowto. - */ - boothowto = bootinfo.bi_boothowto; - - /* * Catch case of boot_verbose set in environment. */ if ((p = getenv("boot_verbose")) != NULL) { @@ -570,7 +615,7 @@ * Wire things up so we can call the firmware. */ map_pal_code(); - efi_boot_minimal(bootinfo.bi_systab); + efi_boot_minimal(ia64_bi_lookup(BI_TAG_SYSTABLE)); ia64_sal_init(); calculate_frequencies(); @@ -579,21 +624,26 @@ */ kernstart = trunc_page(kernel_text); #ifdef DDB - ksym_start = bootinfo.bi_symtab; - ksym_end = bootinfo.bi_esymtab; - kernend = (vm_offset_t)round_page(ksym_end); + ksym_start = ia64_bi_lookup(BI_TAG_SSYMTAB); + ksym_end = ia64_bi_lookup(BI_TAG_ESYMTAB); + kernend = (ksym_end != 0) ? (vm_offset_t)round_page(ksym_end) : + (vm_offset_t)round_page(_end); #else kernend = (vm_offset_t)round_page(_end); #endif /* But if the bootstrap tells us otherwise, believe it! */ - if (bootinfo.bi_kernend) - kernend = round_page(bootinfo.bi_kernend); - if (metadata_missing) + val = ia64_bi_lookup(BI_TAG_KERNEND); + if (val != 0) + kernend = round_page(val); + + if (preload_metadata == NULL) printf("WARNING: loader(8) metadata is missing!\n"); /* Get FPSWA interface */ - fpswa_iface = (struct fpswa_iface *)IA64_PHYS_TO_RR7(bootinfo.bi_fpswa); + val = ia64_bi_lookup(BI_TAG_FPSWA); + if (val != 0) + fpswa_iface = (struct fpswa_iface *)IA64_PHYS_TO_RR7(val); /* Init basic tunables, including hz */ init_param1(); @@ -781,7 +831,7 @@ ia64_get_hcdp(void) { - return (bootinfo.bi_hcdp); + return (ia64_bi_lookup(BI_TAG_HCDP)); } void ==== //depot/projects/ia64/sys/ia64/include/bootinfo.h#10 (text+ko) ==== @@ -1,37 +1,41 @@ -/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.7 2004/11/28 04:34:17 marcel Exp $ */ -/* - * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. +/*- + * Copyright (c) 2004,2005 Marcel Moolenaar * All rights reserved. * - * Author: Chris G. Demetriou - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to + * 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. * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 + * 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. * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. + * $FreeBSD$ */ +#ifndef _MACHINE_BOOTINFO_H_ +#define _MACHINE_BOOTINFO_H_ + +#ifdef LOADER_BACKWARD_COMPATIBILITY + struct bootinfo { uint64_t bi_magic; /* BOOTINFO_MAGIC */ #define BOOTINFO_MAGIC 0xdeadbeeffeedface uint64_t bi_version; /* version 1 */ - uint64_t bi_spare[5]; /* was: name of kernel */ - uint64_t bi_pgtbl; /* PA of loader page table */ + uint64_t bi_spare[6]; /* was: name of kernel */ uint64_t bi_hcdp; /* DIG64 HCDP table */ uint64_t bi_fpswa; /* FPSWA interface */ uint64_t bi_boothowto; /* value for boothowto */ @@ -40,7 +44,7 @@ uint64_t bi_memmap_size; /* size of EFI memory map */ uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ uint32_t bi_memdesc_version; /* EFI memory desc version */ - uint32_t bi_pgtblsz; /* Size of loader page table */ + uint32_t bi_spare2; uint64_t bi_symtab; /* start of kernel sym table */ uint64_t bi_esymtab; /* end of kernel sym table */ uint64_t bi_kernend; /* end of kernel space */ @@ -49,3 +53,43 @@ }; extern struct bootinfo bootinfo; + +#endif + +/* + * (tag,val) array based hand-off. + */ + +struct bi_tagval { + uint64_t tag; + uint64_t val; +}; + +/* Non-optional tags. */ +#define BI_TAG_BI_MAGIC 0x62695f6d61676963ul /* bi_magic */ +#define BI_VAL_BI_MAGIC 0x3d46726565425344ul +#define BI_TAG_BI_REDIR 0x62695f7265646972ul /* bi_redir */ + +/* Tags for MI (meta) data. */ +#define BI_TAG_BOOTHOW 0x626f6f74686f7700ul /* boothow */ +#define BI_TAG_ENVIRON 0x656e7669726f6e00ul /* environ */ +#define BI_TAG_KERNEND 0x1 +#define BI_TAG_PRELOAD 0x7072656c6f616400ul /* preload */ +#define BI_TAG_SSYMTAB 0x7373796d74616200ul /* ssymtab */ +#define BI_TAG_ESYMTAB 0x6573796d74616200ul /* esymtab */ + +/* Tags for MD (meta) data. */ +#define BI_TAG_FPSWA 0x2 +#define BI_TAG_HCDP 0x3 +#define BI_TAG_MM_ADDR 0x6d6d5f6164647200ul /* mm_addr */ +#define BI_TAG_MM_SIZE 0x6d6d5f73697a6500ul /* mm_size */ +#define BI_TAG_MMD_SIZE 0x6d6d645f73697a65ul /* mmd_size */ +#define BI_TAG_MMD_VERS 0x6d6d645f76657273ul /* mmd_vers */ +#define BI_TAG_SYSTABLE 0x4 + +#define BI_TAG_PGTBL 0x10 +#define BI_TAG_PGTBLSZ 0x11 + +uint64_t ia64_bi_lookup(uint64_t); + +#endif /* _MACHINE_BOOTINFO_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 6 05:20:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B23216A420; Mon, 6 Jun 2005 05:20:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E36D16A41C for ; Mon, 6 Jun 2005 05:20:47 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D39CF43D48 for ; Mon, 6 Jun 2005 05:20:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j565KkTx032906 for ; Mon, 6 Jun 2005 05:20:46 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j565KEl1032623 for perforce@freebsd.org; Mon, 6 Jun 2005 05:20:14 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Jun 2005 05:20:14 GMT Message-Id: <200506060520.j565KEl1032623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 05:20:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=78075 Change 78075 by marcel@marcel_nfs on 2005/06/06 05:19:45 IFC @78057 Affected files ... .. //depot/projects/ia64/LOCKS#1 branch .. //depot/projects/ia64/MAINTAINERS#47 integrate .. //depot/projects/ia64/Makefile.inc1#104 integrate .. //depot/projects/ia64/UPDATING#79 integrate .. //depot/projects/ia64/bin/ls/cmp.c#8 integrate .. //depot/projects/ia64/bin/ls/extern.h#9 integrate .. //depot/projects/ia64/bin/ls/ls.1#25 integrate .. //depot/projects/ia64/bin/ls/ls.c#23 integrate .. //depot/projects/ia64/bin/ls/util.c#12 integrate .. //depot/projects/ia64/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/ia64/bin/stty/print.c#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/ia64/contrib/bzip2/bzlib.c#4 integrate .. //depot/projects/ia64/contrib/diff/diff.c#3 integrate .. //depot/projects/ia64/contrib/gcc/ChangeLog#14 integrate .. //depot/projects/ia64/contrib/gcc/Makefile.in#14 integrate .. //depot/projects/ia64/contrib/gcc/attribs.c#6 integrate .. //depot/projects/ia64/contrib/gcc/builtins.c#10 integrate .. //depot/projects/ia64/contrib/gcc/c-common.c#12 integrate .. //depot/projects/ia64/contrib/gcc/c-decl.c#15 integrate .. //depot/projects/ia64/contrib/gcc/c-format.c#10 integrate .. //depot/projects/ia64/contrib/gcc/c-opts.c#4 integrate .. //depot/projects/ia64/contrib/gcc/c-parse.in#9 integrate .. //depot/projects/ia64/contrib/gcc/c-ppoutput.c#3 integrate .. //depot/projects/ia64/contrib/gcc/c-semantics.c#6 integrate .. //depot/projects/ia64/contrib/gcc/c-typeck.c#13 integrate .. //depot/projects/ia64/contrib/gcc/c.opt#2 integrate .. //depot/projects/ia64/contrib/gcc/calls.c#13 integrate .. //depot/projects/ia64/contrib/gcc/cfglayout.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cfgrtl.c#8 integrate .. //depot/projects/ia64/contrib/gcc/collect2.c#9 integrate .. //depot/projects/ia64/contrib/gcc/combine.c#10 integrate .. //depot/projects/ia64/contrib/gcc/common.opt#2 integrate .. //depot/projects/ia64/contrib/gcc/config.gcc#9 integrate .. //depot/projects/ia64/contrib/gcc/config.in#8 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.c#10 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.md#8 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/qrnnd.asm#2 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/t-osf4#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.c#7 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.md#7 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-netbsd#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/ia64/contrib/gcc/config/darwin-protos.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#17 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/darwin.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#23 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/gthr-win32.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-modes.def#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-protos.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.c#13 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.h#14 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.md#10 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-rtems-i386#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/xmmintrin.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64.c#7 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/t-glibc#2 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/ia64/contrib/gcc/config/ia64/t-hpux#4 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix41.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix43.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix52.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/altivec.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/altivec.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/beos.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabi.asm#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux64.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000-protos.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.c#11 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.md#10 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rtems.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/spe.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/spe.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#11 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-aix43#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-linux64#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-newas#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/s390.md#4 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.c#11 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.md#9 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/t-elf#4 integrate .. //depot/projects/ia64/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/ia64/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/ia64/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/ia64/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate .. //depot/projects/ia64/contrib/gcc/config/t-slibgcc-sld#4 integrate .. //depot/projects/ia64/contrib/gcc/configure#12 integrate .. //depot/projects/ia64/contrib/gcc/configure.ac#2 integrate .. //depot/projects/ia64/contrib/gcc/cp-demangle.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog#14 integrate .. //depot/projects/ia64/contrib/gcc/cp/Make-lang.in#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/call.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cp/class.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-tree.h#12 integrate .. //depot/projects/ia64/contrib/gcc/cp/cvt.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl.c#14 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl2.c#14 integrate .. //depot/projects/ia64/contrib/gcc/cp/error.c#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/except.c#7 integrate .. //depot/projects/ia64/contrib/gcc/cp/g++spec.c#6 integrate .. //depot/projects/ia64/contrib/gcc/cp/init.c#13 integrate .. //depot/projects/ia64/contrib/gcc/cp/mangle.c#7 integrate .. //depot/projects/ia64/contrib/gcc/cp/method.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/pt.c#12 integrate .. //depot/projects/ia64/contrib/gcc/cp/search.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/semantics.c#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/tree.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/typeck.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/typeck2.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cppfiles.c#6 integrate .. //depot/projects/ia64/contrib/gcc/cpplib.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cppmacro.c#7 integrate .. //depot/projects/ia64/contrib/gcc/crtstuff.c#6 integrate .. //depot/projects/ia64/contrib/gcc/cse.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cselib.c#6 integrate .. //depot/projects/ia64/contrib/gcc/cselib.h#4 integrate .. //depot/projects/ia64/contrib/gcc/dbxout.c#11 integrate .. //depot/projects/ia64/contrib/gcc/defaults.h#7 integrate .. //depot/projects/ia64/contrib/gcc/doc/extend.texi#9 integrate .. //depot/projects/ia64/contrib/gcc/doc/include/gcc-common.texi#7 integrate .. //depot/projects/ia64/contrib/gcc/doc/invoke.texi#12 integrate .. //depot/projects/ia64/contrib/gcc/doc/md.texi#7 integrate .. //depot/projects/ia64/contrib/gcc/doc/tm.texi#9 integrate .. //depot/projects/ia64/contrib/gcc/doc/trouble.texi#6 integrate .. //depot/projects/ia64/contrib/gcc/dojump.c#2 integrate .. //depot/projects/ia64/contrib/gcc/dwarf2out.c#10 integrate .. //depot/projects/ia64/contrib/gcc/emit-rtl.c#12 integrate .. //depot/projects/ia64/contrib/gcc/explow.c#7 integrate .. //depot/projects/ia64/contrib/gcc/expmed.c#9 integrate .. //depot/projects/ia64/contrib/gcc/expr.c#13 integrate .. //depot/projects/ia64/contrib/gcc/expr.h#10 integrate .. //depot/projects/ia64/contrib/gcc/f/ChangeLog#13 integrate .. //depot/projects/ia64/contrib/gcc/f/bld.c#5 integrate .. //depot/projects/ia64/contrib/gcc/f/malloc.c#4 integrate .. //depot/projects/ia64/contrib/gcc/f/news.texi#8 integrate .. //depot/projects/ia64/contrib/gcc/flow.c#10 integrate .. //depot/projects/ia64/contrib/gcc/fold-const.c#10 integrate .. //depot/projects/ia64/contrib/gcc/function.c#13 integrate .. //depot/projects/ia64/contrib/gcc/gcc.c#17 integrate .. //depot/projects/ia64/contrib/gcc/gcov-io.h#5 integrate .. //depot/projects/ia64/contrib/gcc/gcse.c#7 integrate .. //depot/projects/ia64/contrib/gcc/ginclude/stddef.h#6 integrate .. //depot/projects/ia64/contrib/gcc/gthr-win32.h#4 integrate .. //depot/projects/ia64/contrib/gcc/hooks.c#6 integrate .. //depot/projects/ia64/contrib/gcc/hooks.h#6 integrate .. //depot/projects/ia64/contrib/gcc/ifcvt.c#8 integrate .. //depot/projects/ia64/contrib/gcc/jump.c#9 integrate .. //depot/projects/ia64/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/ia64/contrib/gcc/libgcc-std.ver#6 integrate .. //depot/projects/ia64/contrib/gcc/libgcc2.c#8 integrate .. //depot/projects/ia64/contrib/gcc/libgcc2.h#4 integrate .. //depot/projects/ia64/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/ia64/contrib/gcc/loop.c#14 integrate .. //depot/projects/ia64/contrib/gcc/mkheaders.in#3 integrate .. //depot/projects/ia64/contrib/gcc/mklibgcc.in#8 integrate .. //depot/projects/ia64/contrib/gcc/objc/objc-act.c#6 integrate .. //depot/projects/ia64/contrib/gcc/params.def#4 integrate .. //depot/projects/ia64/contrib/gcc/params.h#4 integrate .. //depot/projects/ia64/contrib/gcc/postreload.c#2 integrate .. //depot/projects/ia64/contrib/gcc/predict.c#5 integrate .. //depot/projects/ia64/contrib/gcc/real.c#6 integrate .. //depot/projects/ia64/contrib/gcc/reg-stack.c#8 integrate .. //depot/projects/ia64/contrib/gcc/regclass.c#7 integrate .. //depot/projects/ia64/contrib/gcc/regrename.c#5 integrate .. //depot/projects/ia64/contrib/gcc/regs.h#5 integrate .. //depot/projects/ia64/contrib/gcc/reload.c#11 integrate .. //depot/projects/ia64/contrib/gcc/reload1.c#10 integrate .. //depot/projects/ia64/contrib/gcc/rtl.h#10 integrate .. //depot/projects/ia64/contrib/gcc/sibcall.c#6 integrate .. //depot/projects/ia64/contrib/gcc/simplify-rtx.c#5 integrate .. //depot/projects/ia64/contrib/gcc/target-def.h#5 integrate .. //depot/projects/ia64/contrib/gcc/target.h#5 integrate .. //depot/projects/ia64/contrib/gcc/toplev.c#14 integrate .. //depot/projects/ia64/contrib/gcc/tree-inline.c#8 integrate .. //depot/projects/ia64/contrib/gcc/tree.c#10 integrate .. //depot/projects/ia64/contrib/gcc/tree.h#11 integrate .. //depot/projects/ia64/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/ia64/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/ia64/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/ia64/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate .. //depot/projects/ia64/contrib/gcc/unwind-dw2.c#6 integrate .. //depot/projects/ia64/contrib/gcc/varasm.c#12 integrate .. //depot/projects/ia64/contrib/gcc/version.c#15 integrate .. //depot/projects/ia64/contrib/hostapd/COPYING#1 branch .. //depot/projects/ia64/contrib/hostapd/ChangeLog#1 branch .. //depot/projects/ia64/contrib/hostapd/FREEBSD-Xlist#1 branch .. //depot/projects/ia64/contrib/hostapd/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/contrib/hostapd/Makefile#1 branch .. //depot/projects/ia64/contrib/hostapd/README#1 branch .. //depot/projects/ia64/contrib/hostapd/accounting.c#1 branch .. //depot/projects/ia64/contrib/hostapd/accounting.h#1 branch .. //depot/projects/ia64/contrib/hostapd/aes.c#1 branch .. //depot/projects/ia64/contrib/hostapd/aes_wrap.c#1 branch .. //depot/projects/ia64/contrib/hostapd/aes_wrap.h#1 branch .. //depot/projects/ia64/contrib/hostapd/ap.h#1 branch .. //depot/projects/ia64/contrib/hostapd/common.c#1 branch .. //depot/projects/ia64/contrib/hostapd/common.h#1 branch .. //depot/projects/ia64/contrib/hostapd/config.c#1 branch .. //depot/projects/ia64/contrib/hostapd/config.h#1 branch .. //depot/projects/ia64/contrib/hostapd/crypto.c#1 branch .. //depot/projects/ia64/contrib/hostapd/crypto.h#1 branch .. //depot/projects/ia64/contrib/hostapd/ctrl_iface.c#1 branch .. //depot/projects/ia64/contrib/hostapd/ctrl_iface.h#1 branch .. //depot/projects/ia64/contrib/hostapd/defconfig#1 branch .. //depot/projects/ia64/contrib/hostapd/defs.h#1 branch .. //depot/projects/ia64/contrib/hostapd/developer.txt#1 branch .. //depot/projects/ia64/contrib/hostapd/driver.h#1 branch .. //depot/projects/ia64/contrib/hostapd/driver_test.c#1 branch .. //depot/projects/ia64/contrib/hostapd/driver_wired.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_defs.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_gtc.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_i.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_identity.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_md5.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_mschapv2.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_peap.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_sim.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_sim_common.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_sim_common.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_sim_db.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_sim_db.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_tls.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_tls_common.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_tls_common.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_tlv.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_ttls.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_ttls.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eapol_sm.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eapol_sm.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eloop.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eloop.h#1 branch .. //depot/projects/ia64/contrib/hostapd/hostap_common.h#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.accept#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.c#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.conf#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.deny#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.eap_user#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.h#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.sim_db#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd_cli.c#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd_ctrl.c#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd_ctrl.h#1 branch .. //depot/projects/ia64/contrib/hostapd/iapp.c#1 branch .. //depot/projects/ia64/contrib/hostapd/iapp.h#1 branch .. //depot/projects/ia64/contrib/hostapd/ieee802_11.c#1 branch .. //depot/projects/ia64/contrib/hostapd/ieee802_11.h#1 branch .. //depot/projects/ia64/contrib/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/ia64/contrib/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/ia64/contrib/hostapd/ieee802_1x.c#1 branch .. //depot/projects/ia64/contrib/hostapd/ieee802_1x.h#1 branch .. //depot/projects/ia64/contrib/hostapd/l2_packet.h#1 branch .. //depot/projects/ia64/contrib/hostapd/madwifi.conf#1 branch .. //depot/projects/ia64/contrib/hostapd/md5.c#1 branch .. //depot/projects/ia64/contrib/hostapd/md5.h#1 branch .. //depot/projects/ia64/contrib/hostapd/ms_funcs.c#1 branch .. //depot/projects/ia64/contrib/hostapd/ms_funcs.h#1 branch .. //depot/projects/ia64/contrib/hostapd/radius.c#1 branch .. //depot/projects/ia64/contrib/hostapd/radius.h#1 branch .. //depot/projects/ia64/contrib/hostapd/radius_client.c#1 branch .. //depot/projects/ia64/contrib/hostapd/radius_client.h#1 branch .. //depot/projects/ia64/contrib/hostapd/radius_server.c#1 branch .. //depot/projects/ia64/contrib/hostapd/radius_server.h#1 branch .. //depot/projects/ia64/contrib/hostapd/rc4.c#1 branch .. //depot/projects/ia64/contrib/hostapd/rc4.h#1 branch .. //depot/projects/ia64/contrib/hostapd/sha1.c#1 branch .. //depot/projects/ia64/contrib/hostapd/sha1.h#1 branch .. //depot/projects/ia64/contrib/hostapd/sta_info.c#1 branch .. //depot/projects/ia64/contrib/hostapd/sta_info.h#1 branch .. //depot/projects/ia64/contrib/hostapd/tls.h#1 branch .. //depot/projects/ia64/contrib/hostapd/tls_none.c#1 branch .. //depot/projects/ia64/contrib/hostapd/tls_openssl.c#1 branch .. //depot/projects/ia64/contrib/hostapd/version.h#1 branch .. //depot/projects/ia64/contrib/hostapd/wired.conf#1 branch .. //depot/projects/ia64/contrib/hostapd/wpa.c#1 branch .. //depot/projects/ia64/contrib/hostapd/wpa.h#1 branch .. //depot/projects/ia64/contrib/ipfilter/man/ipfstat.8#5 integrate .. //depot/projects/ia64/contrib/libf2c/ChangeLog#12 integrate .. //depot/projects/ia64/contrib/libf2c/libI77/err.c#5 integrate .. //depot/projects/ia64/contrib/libobjc/ChangeLog#13 integrate .. //depot/projects/ia64/contrib/libobjc/gc.c#5 integrate .. //depot/projects/ia64/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/ia64/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/ia64/contrib/libpcap/FILES#4 integrate .. //depot/projects/ia64/contrib/libpcap/INSTALL.txt#3 integrate .. //depot/projects/ia64/contrib/libpcap/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/libpcap/README#4 integrate .. //depot/projects/ia64/contrib/libpcap/README.hpux#2 integrate .. //depot/projects/ia64/contrib/libpcap/README.macosx#1 branch .. //depot/projects/ia64/contrib/libpcap/VERSION#5 integrate .. //depot/projects/ia64/contrib/libpcap/bpf/net/bpf_filter.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/bpf_dump.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/bpf_image.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/ia64/contrib/libpcap/configure#4 integrate .. //depot/projects/ia64/contrib/libpcap/configure.in#4 integrate .. //depot/projects/ia64/contrib/libpcap/etherent.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/ia64/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/fad-null.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/gencode.c#6 integrate .. //depot/projects/ia64/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/ia64/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/ia64/contrib/libpcap/inet.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/nametoaddr.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/optimize.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dos.c#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap-dos.h#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap-enet.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-namedb.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-nit.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-null.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-pf.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-snit.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-snoop.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.3#6 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.c#5 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.h#5 integrate .. //depot/projects/ia64/contrib/libpcap/pcap1.h#1 branch .. //depot/projects/ia64/contrib/libpcap/pf.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/ppp.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/scanner.l#5 integrate .. //depot/projects/ia64/contrib/libpcap/snprintf.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/ChangeLog#14 integrate .. //depot/projects/ia64/contrib/libstdc++/ChangeLog-2004#1 branch .. //depot/projects/ia64/contrib/libstdc++/README#3 integrate .. //depot/projects/ia64/contrib/libstdc++/acconfig.h#6 integrate .. //depot/projects/ia64/contrib/libstdc++/acinclude.m4#9 integrate .. //depot/projects/ia64/contrib/libstdc++/aclocal.m4#9 integrate .. //depot/projects/ia64/contrib/libstdc++/config.h.in#7 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/alpha-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/arm-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/i386-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/abi/i486-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/ia64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/m68k-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/powerpc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/abi/s390-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/abi/s390x-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/x86_64-linux-gnu/32/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#3 integrate .. //depot/projects/ia64/contrib/libstdc++/config/io/basic_file_stdio.cc#4 integrate .. //depot/projects/ia64/contrib/libstdc++/config/io/c_io_stdio.h#3 integrate .. //depot/projects/ia64/contrib/libstdc++/config/linker-map.gnu#7 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/generic/c_locale.cc#6 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/generic/c_locale.h#6 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/generic/time_members.cc#6 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/c_locale.h#6 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/monetary_members.cc#7 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/time_members.cc#7 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#5 integrate .. //depot/projects/ia64/contrib/libstdc++/configure#10 integrate .. //depot/projects/ia64/contrib/libstdc++/configure.ac#2 integrate .. //depot/projects/ia64/contrib/libstdc++/configure.host#4 integrate .. //depot/projects/ia64/contrib/libstdc++/crossconfig.m4#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/Makefile.am#7 integrate .. //depot/projects/ia64/contrib/libstdc++/include/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/basic_string.h#5 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/basic_string.tcc#6 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/boost_concept_check.h#4 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/c++config#11 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/fstream.tcc#7 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/ios_base.h#5 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/istream.tcc#7 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/locale_facets.h#8 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/locale_facets.tcc#11 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/sstream.tcc#5 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_algo.h#4 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_algobase.h#3 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_list.h#4 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_tree.h#4 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/vector.tcc#3 integrate .. //depot/projects/ia64/contrib/libstdc++/include/debug/map.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/pool_allocator.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/rope#3 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/ropeimpl.h#3 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_complex.h#4 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_fstream.h#6 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_memory.h#5 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_sstream.h#5 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_globals.cc#3 integrate .. //depot/projects/ia64/contrib/libstdc++/linkage.m4#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/allocator.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/debug.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/ios.cc#6 integrate .. //depot/projects/ia64/contrib/libstdc++/src/ios_init.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/locale_init.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/localename.cc#7 integrate .. //depot/projects/ia64/contrib/ngatm/snmp_atm/atm.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/.cvsignore#2 integrate .. //depot/projects/ia64/contrib/tcpdump/CHANGES#5 integrate .. //depot/projects/ia64/contrib/tcpdump/CREDITS#5 integrate .. //depot/projects/ia64/contrib/tcpdump/FILES#5 integrate .. //depot/projects/ia64/contrib/tcpdump/INSTALL#4 integrate .. //depot/projects/ia64/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/tcpdump/README#5 integrate .. //depot/projects/ia64/contrib/tcpdump/VERSION#6 integrate .. //depot/projects/ia64/contrib/tcpdump/acconfig.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/addrtoname.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/appletalk.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/bgp.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/bpf_dump.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/config.h.in#5 integrate .. //depot/projects/ia64/contrib/tcpdump/configure#5 integrate .. //depot/projects/ia64/contrib/tcpdump/configure.in#5 integrate .. //depot/projects/ia64/contrib/tcpdump/cpack.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/cpack.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/decode_prefix.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ethertype.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/extract.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/gmt2local.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/icmp6.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/ieee802_11_radio.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/interface.h#6 integrate .. //depot/projects/ia64/contrib/tcpdump/ip.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/ipproto.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/l2vpn.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/l2vpn.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/llc.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/machdep.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/bittypes.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/datalinks.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/dlnames.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/getaddrinfo.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/getnameinfo.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/inet_aton.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/inet_ntop.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/inet_pton.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/snprintf.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/strlcat.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/strlcpy.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/mpls.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/netdissect.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/nlpid.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/nlpid.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ntp.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/oui.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/oui.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/parsenfsfh.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/pcap-missing.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/pf.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/pmap_prot.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ppp.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ah.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-aodv.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-arcnet.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-arp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ascii.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-atalk.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-atm.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-beep.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bgp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bootp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-cdp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-chdlc.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-cip.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-cnfp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-decnet.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dhcp6.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-domain.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dvmrp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-eap.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-egp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-eigrp.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-enc.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-esp.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ether.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fddi.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-frag6.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-gre.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-hsrp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp6.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-igmp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-igrp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip6.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip6opts.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipcomp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipx.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isakmp.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isoclns.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-juniper.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-krb.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-l2tp.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lane.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-llc.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lmp.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-lspping.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-lwres.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-mobile.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-mobility.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-mpls.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-msdp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-netbios.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-nfs.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ntp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-null.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ospf.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ospf6.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pim.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ppp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pppoe.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pptp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-radius.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-raw.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rip.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ripng.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rt6.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rx.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sctp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sip.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-sl.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sll.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-smb.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-snmp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-stp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sunatm.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sunrpc.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-symantec.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-syslog.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-tcp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-telnet.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-tftp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-timed.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-token.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-udp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-vjc.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-vrrp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-wb.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-zephyr.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/rpc_auth.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/rpc_msg.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/setsignal.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/smb.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/smbutil.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/strcasecmp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/tcp.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/udp.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/util.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/vfprintf.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/COPYING#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/FREEBSD-Xlist#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/Makefile#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/README#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/aes.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/aes_wrap.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/aes_wrap.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/common.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/common.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/config.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/config.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/crypto.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/crypto.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/defconfig#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/defs.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/developer.txt#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/driver.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/drivers.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_aka.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_defs.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_fast.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_gtc.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_i.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_leap.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_md5.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_mschapv2.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_otp.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_peap.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_psk.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim_common.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim_common.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tls.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tls_common.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tls_common.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tlv.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tlv.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_ttls.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_ttls.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_sm.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_sm.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eloop.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eloop.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/hostap_common.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/l2_packet.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/md5.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/md5.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/ms_funcs.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/ms_funcs.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/openssl-tls-extensions.patch#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/pcsc_funcs.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/pcsc_funcs.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/radius_client.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/radius_client.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/rc4.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/rc4.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/sha1.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/sha1.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tls.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tls_none.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tls_openssl.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/todo.txt#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/version.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_ctrl.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_ctrl.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/ia64/crypto/openssh/ChangeLog#9 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-tricks#4 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#8 integrate .. //depot/projects/ia64/crypto/openssh/INSTALL#7 integrate .. //depot/projects/ia64/crypto/openssh/LICENCE#7 integrate .. //depot/projects/ia64/crypto/openssh/Makefile.in#8 integrate .. //depot/projects/ia64/crypto/openssh/README#8 integrate .. //depot/projects/ia64/crypto/openssh/README.platform#3 integrate .. //depot/projects/ia64/crypto/openssh/README.privsep#7 integrate .. //depot/projects/ia64/crypto/openssh/TODO#7 integrate .. //depot/projects/ia64/crypto/openssh/WARNING.RNG#3 integrate .. //depot/projects/ia64/crypto/openssh/acconfig.h#10 integrate .. //depot/projects/ia64/crypto/openssh/audit-bsm.c#1 branch .. //depot/projects/ia64/crypto/openssh/audit.c#1 branch .. //depot/projects/ia64/crypto/openssh/audit.h#1 branch .. //depot/projects/ia64/crypto/openssh/auth-bsdauth.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth-chall.c#8 integrate .. //depot/projects/ia64/crypto/openssh/auth-krb5.c#11 integrate .. //depot/projects/ia64/crypto/openssh/auth-options.c#6 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.c#12 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.h#9 integrate .. //depot/projects/ia64/crypto/openssh/auth-passwd.c#11 integrate .. //depot/projects/ia64/crypto/openssh/auth-rsa.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/ia64/crypto/openssh/auth-sia.c#6 integrate .. //depot/projects/ia64/crypto/openssh/auth-sia.h#5 integrate .. //depot/projects/ia64/crypto/openssh/auth.c#10 integrate .. //depot/projects/ia64/crypto/openssh/auth.h#11 integrate .. //depot/projects/ia64/crypto/openssh/auth1.c#13 integrate .. //depot/projects/ia64/crypto/openssh/auth2-chall.c#9 integrate .. //depot/projects/ia64/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/ia64/crypto/openssh/auth2-none.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth2-passwd.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pubkey.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth2.c#13 integrate .. //depot/projects/ia64/crypto/openssh/authfile.c#11 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.c#8 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.h#6 integrate .. //depot/projects/ia64/crypto/openssh/buffer.c#7 integrate .. //depot/projects/ia64/crypto/openssh/buffer.h#3 integrate .. //depot/projects/ia64/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/ia64/crypto/openssh/canohost.c#11 integrate .. //depot/projects/ia64/crypto/openssh/canohost.h#3 integrate .. //depot/projects/ia64/crypto/openssh/channels.c#13 integrate .. //depot/projects/ia64/crypto/openssh/channels.h#9 integrate .. //depot/projects/ia64/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/ia64/crypto/openssh/cipher.c#11 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.c#10 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.h#6 integrate .. //depot/projects/ia64/crypto/openssh/compat.c#8 integrate .. //depot/projects/ia64/crypto/openssh/compat.h#10 integrate .. //depot/projects/ia64/crypto/openssh/config.guess#6 integrate .. //depot/projects/ia64/crypto/openssh/config.h#8 integrate .. //depot/projects/ia64/crypto/openssh/configure.ac#9 integrate .. //depot/projects/ia64/crypto/openssh/defines.h#9 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.c#8 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.h#6 integrate .. //depot/projects/ia64/crypto/openssh/includes.h#10 integrate .. //depot/projects/ia64/crypto/openssh/key.c#11 integrate .. //depot/projects/ia64/crypto/openssh/log.c#9 integrate .. //depot/projects/ia64/crypto/openssh/loginrec.c#9 integrate .. //depot/projects/ia64/crypto/openssh/loginrec.h#3 integrate .. //depot/projects/ia64/crypto/openssh/misc.c#9 integrate .. //depot/projects/ia64/crypto/openssh/misc.h#6 integrate .. //depot/projects/ia64/crypto/openssh/moduli#3 integrate .. //depot/projects/ia64/crypto/openssh/moduli.c#4 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#11 integrate .. //depot/projects/ia64/crypto/openssh/monitor.h#6 integrate .. //depot/projects/ia64/crypto/openssh/monitor_mm.c#6 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.c#9 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.h#8 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-arc4random.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cray.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cray.h#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.h#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-snprintf.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-rfc2553.h#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntop.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/mktemp.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.h#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/readpassphrase.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/realpath.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/xmmap.c#4 integrate .. //depot/projects/ia64/crypto/openssh/packet.c#11 integrate .. //depot/projects/ia64/crypto/openssh/readconf.c#12 integrate .. //depot/projects/ia64/crypto/openssh/readconf.h#9 integrate .. //depot/projects/ia64/crypto/openssh/readpass.c#6 integrate .. //depot/projects/ia64/crypto/openssh/regress/Makefile#7 integrate .. //depot/projects/ia64/crypto/openssh/regress/agent-ptrace.sh#4 integrate .. //depot/projects/ia64/crypto/openssh/regress/brokenkeys.sh#1 branch .. //depot/projects/ia64/crypto/openssh/regress/dynamic-forward.sh#4 integrate .. //depot/projects/ia64/crypto/openssh/regress/envpass.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/login-timeout.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/multiplex.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/reexec.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/rekey.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/scp.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/sftp-glob.sh#1 branch .. //depot/projects/ia64/crypto/openssh/regress/sshd-log-wrapper.sh#1 branch .. //depot/projects/ia64/crypto/openssh/regress/test-exec.sh#6 integrate .. //depot/projects/ia64/crypto/openssh/scp.1#10 integrate .. //depot/projects/ia64/crypto/openssh/scp.c#10 integrate .. //depot/projects/ia64/crypto/openssh/servconf.c#14 integrate .. //depot/projects/ia64/crypto/openssh/servconf.h#8 integrate .. //depot/projects/ia64/crypto/openssh/session.c#22 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.c#11 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.h#6 integrate .. //depot/projects/ia64/crypto/openssh/sftp.1#10 integrate .. //depot/projects/ia64/crypto/openssh/sftp.c#11 integrate .. //depot/projects/ia64/crypto/openssh/ssh-add.1#7 integrate .. //depot/projects/ia64/crypto/openssh/ssh-add.c#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#13 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.1#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.1#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#11 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keysign.c#7 integrate .. //depot/projects/ia64/crypto/openssh/ssh-rand-helper.c#7 integrate .. //depot/projects/ia64/crypto/openssh/ssh.1#11 integrate .. //depot/projects/ia64/crypto/openssh/ssh.c#12 integrate .. //depot/projects/ia64/crypto/openssh/ssh.h#9 integrate .. //depot/projects/ia64/crypto/openssh/ssh1.h#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#17 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#13 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#11 integrate .. //depot/projects/ia64/crypto/openssh/sshd.8#13 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#14 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#19 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#15 integrate .. //depot/projects/ia64/crypto/openssh/survey.sh.in#1 branch .. //depot/projects/ia64/crypto/openssh/uidswap.c#7 integrate .. //depot/projects/ia64/crypto/openssh/version.h#18 integrate .. //depot/projects/ia64/etc/devd.conf#19 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#33 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#16 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#49 integrate .. //depot/projects/ia64/games/random/random.c#8 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#20 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/contrib/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/doc/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#10 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/libdiff/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/i386/config.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#7 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/search.c#6 integrate .. //depot/projects/ia64/include/Makefile#48 integrate .. //depot/projects/ia64/include/netdb.h#10 integrate .. //depot/projects/ia64/include/proc_service.h#2 integrate .. //depot/projects/ia64/include/pthread.h#12 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#15 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_private.h#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.3#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_bzip2.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_none.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#10 integrate .. //depot/projects/ia64/lib/libarchive/configure.ac.in#4 integrate .. //depot/projects/ia64/lib/libc/net/getnetbydns.c#8 integrate .. //depot/projects/ia64/lib/libc/net/getnetbyht.c#5 integrate .. //depot/projects/ia64/lib/libc/net/getnetbynis.c#4 integrate .. //depot/projects/ia64/lib/libc/net/getnetent.3#6 integrate .. //depot/projects/ia64/lib/libc/net/getnetnamadr.c#5 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#18 integrate .. //depot/projects/ia64/lib/libc/posix1e/Makefile.inc#11 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_explode.c#5 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#6 integrate .. //depot/projects/ia64/lib/libc/sys/kqueue.2#12 integrate .. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#24 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_exit.c#7 integrate .. //depot/projects/ia64/lib/libpcap/Makefile#8 integrate .. //depot/projects/ia64/lib/libpcap/config.h#5 integrate .. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/enter_uts.S#3 integrate .. //depot/projects/ia64/lib/librpcsvc/Makefile#7 integrate .. //depot/projects/ia64/lib/librpcsvc/xcrypt.c#3 integrate .. //depot/projects/ia64/lib/libsdp/sdp.3#6 integrate .. //depot/projects/ia64/lib/libsdp/sdp.h#4 integrate .. //depot/projects/ia64/lib/libsdp/util.c#5 integrate .. //depot/projects/ia64/lib/libstand/Makefile#21 integrate .. //depot/projects/ia64/lib/libstand/net.c#4 integrate .. //depot/projects/ia64/lib/libstand/udp.c#3 integrate .. //depot/projects/ia64/lib/libstand/zalloc_defs.h#7 integrate .. //depot/projects/ia64/lib/libthread_db/arch/i386/libpthread_md.c#2 integrate .. //depot/projects/ia64/lib/libthread_db/libc_r_db.c#3 integrate .. //depot/projects/ia64/lib/libthread_db/libpthread_db.c#4 integrate .. //depot/projects/ia64/lib/libthread_db/libpthread_db.h#2 integrate .. //depot/projects/ia64/lib/libthread_db/libthr_db.c#5 integrate .. //depot/projects/ia64/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/ia64/lib/libthread_db/thread_db.h#3 integrate .. //depot/projects/ia64/lib/libthread_db/thread_db_int.h#2 integrate .. //depot/projects/ia64/lib/libusbhid/Makefile#4 integrate .. //depot/projects/ia64/lib/libz/Makefile#4 integrate .. //depot/projects/ia64/libexec/getty/ttys.5#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/alpha/reloc.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/reloc.c#9 integrate .. //depot/projects/ia64/libexec/tftpd/tftpd.c#14 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#152 integrate .. //depot/projects/ia64/sbin/Makefile#44 integrate .. //depot/projects/ia64/sbin/clri/clri.c#12 integrate .. //depot/projects/ia64/sbin/ifconfig/Makefile#9 integrate .. //depot/projects/ia64/sbin/ifconfig/ifbridge.c#1 branch .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#30 integrate .. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#10 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#45 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#46 integrate .. //depot/projects/ia64/sbin/mount/mntopts.h#8 integrate .. //depot/projects/ia64/sbin/mount/mount_ufs.c#5 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.c#10 integrate .. //depot/projects/ia64/sbin/mount_ext2fs/mount_ext2fs.c#9 integrate .. //depot/projects/ia64/sbin/mount_hpfs/mount_hpfs.c#5 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#11 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#16 integrate .. //depot/projects/ia64/sbin/mount_nfs4/mount_nfs4.c#5 integrate .. //depot/projects/ia64/sbin/mount_ntfs/mount_ntfs.c#8 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.c#8 integrate .. //depot/projects/ia64/sbin/mount_reiserfs/mount_reiserfs.c#2 integrate .. //depot/projects/ia64/sbin/mount_std/mount_std.c#10 integrate .. //depot/projects/ia64/sbin/mount_udf/mount_udf.c#10 integrate .. //depot/projects/ia64/sbin/mount_ufs/mount_ufs.c#3 integrate .. //depot/projects/ia64/sbin/mount_umapfs/mount_umapfs.c#6 integrate .. //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.c#9 integrate .. //depot/projects/ia64/sbin/restore/interactive.c#8 integrate .. //depot/projects/ia64/sbin/restore/main.c#11 integrate .. //depot/projects/ia64/sbin/restore/restore.c#10 integrate .. //depot/projects/ia64/sbin/restore/tape.c#14 integrate .. //depot/projects/ia64/sbin/routed/if.c#7 integrate .. //depot/projects/ia64/sbin/routed/input.c#5 integrate .. //depot/projects/ia64/sbin/routed/main.c#5 integrate .. //depot/projects/ia64/sbin/routed/output.c#6 integrate .. //depot/projects/ia64/sbin/routed/parms.c#6 integrate .. //depot/projects/ia64/sbin/routed/radix.c#4 integrate .. //depot/projects/ia64/sbin/routed/rdisc.c#4 integrate .. //depot/projects/ia64/sbin/routed/table.c#7 integrate .. //depot/projects/ia64/sbin/routed/trace.c#6 integrate .. //depot/projects/ia64/sbin/savecore/savecore.c#23 integrate .. //depot/projects/ia64/secure/lib/libssh/Makefile#16 integrate .. //depot/projects/ia64/secure/libexec/sftp-server/Makefile#10 integrate .. //depot/projects/ia64/secure/libexec/ssh-keysign/Makefile#4 integrate .. //depot/projects/ia64/secure/usr.bin/sftp/Makefile#10 integrate .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#13 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#20 integrate .. //depot/projects/ia64/share/doc/papers/contents/contents.ms#2 integrate .. //depot/projects/ia64/share/man/man4/Makefile#87 integrate .. //depot/projects/ia64/share/man/man4/amr.4#12 integrate .. //depot/projects/ia64/share/man/man4/em.4#15 integrate .. //depot/projects/ia64/share/man/man4/if_bridge.4#1 branch .. //depot/projects/ia64/share/man/man4/ipw.4#2 integrate .. //depot/projects/ia64/share/man/man4/iwi.4#3 integrate .. //depot/projects/ia64/share/man/man4/led.4#7 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#17 integrate .. //depot/projects/ia64/share/mk/bsd.subdir.mk#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/autoconf.c#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#26 integrate .. //depot/projects/ia64/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/ia64/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/ia64/sys/alpha/include/timerreg.h#2 integrate .. //depot/projects/ia64/sys/alpha/isa/mcclock_isa.c#5 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_proto.h#13 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_syscall.h#12 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysent.c#12 integrate .. //depot/projects/ia64/sys/alpha/linux/syscalls.master#12 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_proto.h#8 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_syscall.h#7 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysent.c#7 integrate .. //depot/projects/ia64/sys/alpha/osf1/syscalls.master#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/autoconf.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#21 integrate .. //depot/projects/ia64/sys/amd64/include/bus.h#6 integrate .. //depot/projects/ia64/sys/amd64/include/bus_memio.h#4 delete .. //depot/projects/ia64/sys/amd64/include/bus_pio.h#4 delete .. //depot/projects/ia64/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/ia64/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/ia64/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#8 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm3.S#4 delete .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm67.S#4 delete .. //depot/projects/ia64/sys/arm/arm/intr.c#7 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/ia64/sys/arm/arm/trap.c#11 integrate .. //depot/projects/ia64/sys/arm/include/bus_memio.h#3 delete .. //depot/projects/ia64/sys/arm/include/bus_pio.h#3 delete .. //depot/projects/ia64/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/ia64/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321.c#5 integrate .. //depot/projects/ia64/sys/boot/alpha/common/main.c#3 integrate .. //depot/projects/ia64/sys/boot/alpha/libalpha/delay.c#3 integrate .. //depot/projects/ia64/sys/boot/alpha/libalpha/devicename.c#3 integrate .. //depot/projects/ia64/sys/boot/alpha/libalpha/getsecs.c#3 integrate .. //depot/projects/ia64/sys/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/ia64/sys/boot/alpha/libalpha/srmdisk.c#4 integrate .. //depot/projects/ia64/sys/boot/common/console.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 9 04:43:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A959816A420; Thu, 9 Jun 2005 04:43:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 826B516A41C for ; Thu, 9 Jun 2005 04:43:03 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53CF643D48 for ; Thu, 9 Jun 2005 04:43:03 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j594h3d5087253 for ; Thu, 9 Jun 2005 04:43:03 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j594h2kT087250 for perforce@freebsd.org; Thu, 9 Jun 2005 04:43:02 GMT (envelope-from csjp@freebsd.org) Date: Thu, 9 Jun 2005 04:43:02 GMT Message-Id: <200506090443.j594h2kT087250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 78222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 04:43:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=78222 Change 78222 by csjp@csjp_xor on 2005/06/09 04:42:31 Introduce two new entry points: mac_syscall_enter mac_syscall_exit These entry points can be used for controlling access to to execution paths within the kernel. Currently we do not check the return value of mac_syscall_exit as we can only run into problems by allowing the mac_syscall_exit entry point to propagate return values back to the syscall. Currently we only support the i386 architecture, but I will be adding support for the others once we test this concept. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#36 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_system.c#9 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#274 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#231 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#36 (text+ko) ==== @@ -50,6 +50,7 @@ #include "opt_ktrace.h" #include "opt_npx.h" #include "opt_trap.h" +#include "opt_mac.h" #include #include @@ -61,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -879,6 +881,9 @@ int narg; int args[8]; u_int code; +#ifdef MAC + int mac_error; +#endif /* * note: PCPU_LAZY_INC() can only be used if we can afford @@ -933,11 +938,10 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -972,8 +976,14 @@ STOPEVENT(p, S_SCE, narg); PTRACESTOP_SC(p, td, S_PT_SCE); - +#ifdef MAC + mac_error = mac_syscall_enter(td, args, code); + if (mac_error == 0) + error = (*callp->sy_call)(td, args); + mac_syscall_exit(td, args, code, error, mac_error); +#else error = (*callp->sy_call)(td, args); +#endif } switch (error) { ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_system.c#9 (text+ko) ==== @@ -49,6 +49,10 @@ #include +static int mac_enforce_syscall = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_syscall, CTLFLAG_RW, + &mac_enforce_syscall, 0, "Enforce MAC policy on system calls"); + static int mac_enforce_kld = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_kld, CTLFLAG_RW, &mac_enforce_kld, 0, "Enforce MAC policy on kld operations"); @@ -266,3 +270,32 @@ return (error); } + +int +mac_syscall_enter(struct thread *td, int *args, int code) +{ + int error; + + if (!mac_enforce_syscall) + return (0); + MAC_CHECK(syscall_enter, td, args, code); + return (error); +} + +int +mac_syscall_exit(struct thread *td, int *args, int code, int errcode, + int mac_error) +{ + int error; + + if (!mac_enforce_syscall) + return (0); + MAC_CHECK(syscall_exit, td, args, code, errcode, mac_error); + /* + * Since we do not care about this return value, unconditioanlly + * return 0. We can only run into problems by allowing this entry + * point to propagate return values back to the syscall. + */ + + return (0); +} ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#274 (text+ko) ==== @@ -390,6 +390,9 @@ int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); +int mac_syscall_enter(struct thread *td, int *args, int code); +int mac_syscall_exit(struct thread *td, int *args, int code, + int errcode, int mac_error); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int acc_mode); int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#231 (text+ko) ==== @@ -491,6 +491,9 @@ int (*mpo_check_system_sysctl)(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); + int (*mpo_syscall_enter)(struct thread *td, int *args, int code); + int (*mpo_syscall_exit)(struct thread *td, int *args, int code, + int error, int mac_error); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode); int (*mpo_check_vnode_chdir)(struct ucred *cred, From owner-p4-projects@FreeBSD.ORG Thu Jun 9 04:50:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0EFC16A420; Thu, 9 Jun 2005 04:50:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8ACA316A41C for ; Thu, 9 Jun 2005 04:50:12 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64AC343D48 for ; Thu, 9 Jun 2005 04:50:12 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j594oC2j094547 for ; Thu, 9 Jun 2005 04:50:12 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j594oCAk094544 for perforce@freebsd.org; Thu, 9 Jun 2005 04:50:12 GMT (envelope-from csjp@freebsd.org) Date: Thu, 9 Jun 2005 04:50:12 GMT Message-Id: <200506090450.j594oCAk094544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 78223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 04:50:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=78223 Change 78223 by csjp@csjp_xor on 2005/06/09 04:49:14 Be sure to propagate the error generated by the mac_syscall_enter entry back to the system call so we know there was a failure. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#37 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#37 (text+ko) ==== @@ -980,6 +980,8 @@ mac_error = mac_syscall_enter(td, args, code); if (mac_error == 0) error = (*callp->sy_call)(td, args); + else + error = mac_error; mac_syscall_exit(td, args, code, error, mac_error); #else error = (*callp->sy_call)(td, args); From owner-p4-projects@FreeBSD.ORG Thu Jun 9 15:58:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5640E16A420; Thu, 9 Jun 2005 15:58:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 04C6B16A41C for ; Thu, 9 Jun 2005 15:58:32 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D83AD43D1F for ; Thu, 9 Jun 2005 15:58:31 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j59FwV1G038931 for ; Thu, 9 Jun 2005 15:58:31 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j59FwV8Z038928 for perforce@freebsd.org; Thu, 9 Jun 2005 15:58:31 GMT (envelope-from csjp@freebsd.org) Date: Thu, 9 Jun 2005 15:58:31 GMT Message-Id: <200506091558.j59FwV8Z038928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 78250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 15:58:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=78250 Change 78250 by csjp@csjp_xor on 2005/06/09 15:58:10 Remove mac_error, I am not sure why this was here but I can seem to see any good reason to have it here. Because mac_syscall_exit can no longer return a value, use MAC_PERFORM instead of MAC_CHECK. Pointed out by: rwatson Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#38 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_system.c#10 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#275 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#232 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#38 (text+ko) ==== @@ -881,9 +881,6 @@ int narg; int args[8]; u_int code; -#ifdef MAC - int mac_error; -#endif /* * note: PCPU_LAZY_INC() can only be used if we can afford @@ -977,12 +974,10 @@ PTRACESTOP_SC(p, td, S_PT_SCE); #ifdef MAC - mac_error = mac_syscall_enter(td, args, code); - if (mac_error == 0) + error = mac_syscall_enter(td, args, code); + if (error == 0) error = (*callp->sy_call)(td, args); - else - error = mac_error; - mac_syscall_exit(td, args, code, error, mac_error); + mac_syscall_exit(td, args, code, error); #else error = (*callp->sy_call)(td, args); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_system.c#10 (text+ko) ==== @@ -282,20 +282,11 @@ return (error); } -int -mac_syscall_exit(struct thread *td, int *args, int code, int errcode, - int mac_error) +void +mac_syscall_exit(struct thread *td, int *args, int code, int errcode) { - int error; if (!mac_enforce_syscall) - return (0); - MAC_CHECK(syscall_exit, td, args, code, errcode, mac_error); - /* - * Since we do not care about this return value, unconditioanlly - * return 0. We can only run into problems by allowing this entry - * point to propagate return values back to the syscall. - */ - - return (0); + return; + MAC_PERFORM(syscall_exit, td, args, code, errcode); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#275 (text+ko) ==== @@ -391,8 +391,8 @@ int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); int mac_syscall_enter(struct thread *td, int *args, int code); -int mac_syscall_exit(struct thread *td, int *args, int code, - int errcode, int mac_error); +void mac_syscall_exit(struct thread *td, int *args, int code, + int errcode); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int acc_mode); int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#232 (text+ko) ==== @@ -492,8 +492,8 @@ struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); int (*mpo_syscall_enter)(struct thread *td, int *args, int code); - int (*mpo_syscall_exit)(struct thread *td, int *args, int code, - int error, int mac_error); + void (*mpo_syscall_exit)(struct thread *td, int *args, int code, + int error); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode); int (*mpo_check_vnode_chdir)(struct ucred *cred, From owner-p4-projects@FreeBSD.ORG Thu Jun 9 17:05:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB3BE16A420; Thu, 9 Jun 2005 17:05:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F53E16A41C for ; Thu, 9 Jun 2005 17:05:53 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84C5443D1F for ; Thu, 9 Jun 2005 17:05:53 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j59H5riC050316 for ; Thu, 9 Jun 2005 17:05:53 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j59H5rKw050313 for perforce@freebsd.org; Thu, 9 Jun 2005 17:05:53 GMT (envelope-from des@freebsd.org) Date: Thu, 9 Jun 2005 17:05:53 GMT Message-Id: <200506091705.j59H5rKw050313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 78252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 17:05:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=78252 Change 78252 by des@des.at.des.no on 2005/06/09 17:05:38 Add a pam.conf(5) manual page. Affected files ... .. //depot/projects/openpam/MANIFEST#21 edit .. //depot/projects/openpam/doc/man/Makefile.am#3 edit .. //depot/projects/openpam/doc/man/pam.conf.5#1 add Differences ... ==== //depot/projects/openpam/MANIFEST#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#20 $ +# $P4: //depot/projects/openpam/MANIFEST#21 $ # CREDITS HISTORY @@ -47,6 +47,7 @@ doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 doc/man/pam.3 +doc/man/pam.conf.5 doc/man/pam.man doc/man/pam_acct_mgmt.3 doc/man/pam_authenticate.3 ==== //depot/projects/openpam/doc/man/Makefile.am#3 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/doc/man/Makefile.am#3 $ + NULL = # Standard PAM API @@ -58,6 +60,8 @@ man3_MANS = $(ALLCMAN) openpam.3 pam.3 pam_conv.3 +man5_MANS = pam.conf.5 + CLEANFILES = $(ALLCMAN) $(LINKS) openpam.3 pam.3 symlink-stamp GENDOC = $(top_srcdir)/misc/gendoc.pl From owner-p4-projects@FreeBSD.ORG Thu Jun 9 17:06:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15E5916A420; Thu, 9 Jun 2005 17:06:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E462316A41C for ; Thu, 9 Jun 2005 17:06:55 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B30C943D1D for ; Thu, 9 Jun 2005 17:06:55 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j59H6tBj050385 for ; Thu, 9 Jun 2005 17:06:55 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j59H6thN050382 for perforce@freebsd.org; Thu, 9 Jun 2005 17:06:55 GMT (envelope-from des@freebsd.org) Date: Thu, 9 Jun 2005 17:06:55 GMT Message-Id: <200506091706.j59H6thN050382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 78254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 17:06:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=78254 Change 78254 by des@des.at.des.no on 2005/06/09 17:06:41 s/\$Id\$/\$P4\$/ Affected files ... .. //depot/projects/openpam/doc/man/pam.conf.5#2 edit Differences ... ==== //depot/projects/openpam/doc/man/pam.conf.5#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ +.\" $P4: //depot/projects/openpam/doc/man/pam.conf.5#2 $ .\" .Dd June 9, 2005 .Dt PAM.CONF 5 From owner-p4-projects@FreeBSD.ORG Thu Jun 9 17:11:01 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 642FF16A420; Thu, 9 Jun 2005 17:11:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F79116A41C for ; Thu, 9 Jun 2005 17:11:01 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25C5C43D48 for ; Thu, 9 Jun 2005 17:11:01 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j59HB1l8050643 for ; Thu, 9 Jun 2005 17:11:01 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j59HB0Pj050640 for perforce@freebsd.org; Thu, 9 Jun 2005 17:11:00 GMT (envelope-from des@freebsd.org) Date: Thu, 9 Jun 2005 17:11:00 GMT Message-Id: <200506091711.j59HB0Pj050640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 78255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 17:11:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=78255 Change 78255 by des@des.at.des.no on 2005/06/09 17:10:01 Add Hubert Feyrer, also of NetBSD. Affected files ... .. //depot/projects/openpam/CREDITS#12 edit Differences ... ==== //depot/projects/openpam/CREDITS#12 (text+ko) ==== @@ -21,6 +21,7 @@ Gary Winiger Joe Marcus Clarke Juli Mallett + Hubert Feyrer Mark Murray Mike Petullo Mikko Työläjärvi @@ -30,4 +31,4 @@ Takanori Saneto Yar Tikhiy -$P4: //depot/projects/openpam/CREDITS#11 $ +$P4: //depot/projects/openpam/CREDITS#12 $ From owner-p4-projects@FreeBSD.ORG Thu Jun 9 19:33:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DE4E16A420; Thu, 9 Jun 2005 19:33:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CA5416A41C for ; Thu, 9 Jun 2005 19:33:01 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01E4D43D53 for ; Thu, 9 Jun 2005 19:33:01 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j59JX05G057603 for ; Thu, 9 Jun 2005 19:33:00 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j59JX0gf057596 for perforce@freebsd.org; Thu, 9 Jun 2005 19:33:00 GMT (envelope-from des@freebsd.org) Date: Thu, 9 Jun 2005 19:33:00 GMT Message-Id: <200506091933.j59JX0gf057596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 78271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 19:33:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=78271 Change 78271 by des@des.at.des.no on 2005/06/09 19:32:00 If the module path is relative, prepend the module installation directory which was specified at configure time. Inspired by: NetBSD Affected files ... .. //depot/projects/openpam/lib/Makefile.am#4 edit .. //depot/projects/openpam/lib/openpam_dynamic.c#14 edit Differences ... ==== //depot/projects/openpam/lib/Makefile.am#4 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/lib/Makefile.am#4 $ + NULL = INCLUDES = -I$(top_srcdir)/include @@ -48,6 +50,8 @@ pam_vprompt.c \ $(NULL) +libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@"' + libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@ @DL_LIBS@ # Not implemented yet: ==== //depot/projects/openpam/lib/openpam_dynamic.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#13 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#14 $ */ #include @@ -57,6 +57,7 @@ openpam_dynamic(const char *path) { pam_module_t *module; + const char *prefix; char *vpath; void *dlh; int i; @@ -65,8 +66,14 @@ if ((module = calloc(1, sizeof *module)) == NULL) goto buf_err; + /* Prepend the standard prefix if not an absolute pathname. */ + if (path[0] != '/') + prefix = OPENPAM_MODULES_DIR; + else + prefix = ""; + /* try versioned module first, then unversioned module */ - if (asprintf(&vpath, "%s.%d", path, LIB_MAJ) < 0) + if (asprintf(&vpath, "%s%s.%d", prefix, path, LIB_MAJ) < 0) goto buf_err; if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); From owner-p4-projects@FreeBSD.ORG Thu Jun 9 19:36:06 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCB1116A420; Thu, 9 Jun 2005 19:36:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A5A216A41C for ; Thu, 9 Jun 2005 19:36:05 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4109243D49 for ; Thu, 9 Jun 2005 19:36:05 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j59Ja50K057736 for ; Thu, 9 Jun 2005 19:36:05 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j59Ja4tU057733 for perforce@freebsd.org; Thu, 9 Jun 2005 19:36:04 GMT (envelope-from des@freebsd.org) Date: Thu, 9 Jun 2005 19:36:04 GMT Message-Id: <200506091936.j59Ja4tU057733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 78272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 19:36:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=78272 Change 78272 by des@des.at.des.no on 2005/06/09 19:35:39 Add $P4$ tags to files that didn't already have them. Affected files ... .. //depot/projects/openpam/Makefile.am#3 edit .. //depot/projects/openpam/autogen.sh#2 edit .. //depot/projects/openpam/bin/Makefile.am#2 edit .. //depot/projects/openpam/bin/su/Makefile.am#2 edit .. //depot/projects/openpam/doc/Makefile.am#2 edit .. //depot/projects/openpam/include/Makefile.am#2 edit .. //depot/projects/openpam/include/security/Makefile.am#3 edit .. //depot/projects/openpam/modules/Makefile.am#2 edit .. //depot/projects/openpam/modules/pam_deny/Makefile.am#2 edit .. //depot/projects/openpam/modules/pam_permit/Makefile.am#2 edit .. //depot/projects/openpam/modules/pam_unix/Makefile.am#2 edit Differences ... ==== //depot/projects/openpam/Makefile.am#3 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/Makefile.am#3 $ + SUBDIRS = lib bin modules doc include EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES ==== //depot/projects/openpam/autogen.sh#2 (text+ko) ==== @@ -1,4 +1,7 @@ #!/bin/sh -ex +# +# $P4: //depot/projects/openpam/autogen.sh#2 $ +# libtoolize --copy --force aclocal ==== //depot/projects/openpam/bin/Makefile.am#2 (text+ko) ==== @@ -1,1 +1,3 @@ +# $P4: //depot/projects/openpam/bin/Makefile.am#2 $ + SUBDIRS = su ==== //depot/projects/openpam/bin/su/Makefile.am#2 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/bin/su/Makefile.am#2 $ + INCLUDES = -I$(top_srcdir)/include if WITH_PAM_SU ==== //depot/projects/openpam/doc/Makefile.am#2 (text+ko) ==== @@ -1,1 +1,3 @@ +# $P4: //depot/projects/openpam/doc/Makefile.am#2 $ + SUBDIRS = man ==== //depot/projects/openpam/include/Makefile.am#2 (text+ko) ==== @@ -1,1 +1,3 @@ +# $P4: //depot/projects/openpam/include/Makefile.am#2 $ + SUBDIRS = security ==== //depot/projects/openpam/include/security/Makefile.am#3 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/include/security/Makefile.am#3 $ + openpamdir = $(includedir)/security openpam_HEADERS = \ ==== //depot/projects/openpam/modules/Makefile.am#2 (text+ko) ==== @@ -1,1 +1,3 @@ +# $P4: //depot/projects/openpam/modules/Makefile.am#2 $ + SUBDIRS = pam_unix pam_deny pam_permit ==== //depot/projects/openpam/modules/pam_deny/Makefile.am#2 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/modules/pam_deny/Makefile.am#2 $ + pkglibdir = @OPENPAM_MODULES_DIR@ INCLUDES = -I$(top_srcdir)/include ==== //depot/projects/openpam/modules/pam_permit/Makefile.am#2 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/modules/pam_permit/Makefile.am#2 $ + pkglibdir = @OPENPAM_MODULES_DIR@ INCLUDES = -I$(top_srcdir)/include ==== //depot/projects/openpam/modules/pam_unix/Makefile.am#2 (text+ko) ==== @@ -1,3 +1,5 @@ +# $P4: //depot/projects/openpam/modules/pam_unix/Makefile.am#2 $ + pkglibdir = @OPENPAM_MODULES_DIR@ INCLUDES = -I$(top_srcdir)/include From owner-p4-projects@FreeBSD.ORG Thu Jun 9 23:36:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EE1B16A420; Thu, 9 Jun 2005 23:36:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 296D716A41C for ; Thu, 9 Jun 2005 23:36:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1B7A43D1F for ; Thu, 9 Jun 2005 23:36:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j59NaTI1076574 for ; Thu, 9 Jun 2005 23:36:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j59NaTj7076571 for perforce@freebsd.org; Thu, 9 Jun 2005 23:36:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Jun 2005 23:36:29 GMT Message-Id: <200506092336.j59NaTj7076571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 78294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2005 23:36:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=78294 Change 78294 by rwatson@rwatson_fledge on 2005/06/09 23:35:43 Add a new MAC Framework entry point to decide whether or not a socket of a given domain/type/protocol can be allocated. Requested by: SCC Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#50 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_socket.c#8 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#276 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#233 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#50 (text+ko) ==== @@ -158,6 +158,12 @@ struct file *fp; int fd, error; +#ifdef MAC + error = mac_check_socket_create(td->td_ucred, uap->domain, uap->type, + uap->protocol); + if (error) + return (error); +#endif fdp = td->td_proc->p_fd; error = falloc(td, &fp, &fd); if (error) ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_socket.c#8 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2005 Networks Associates Technology, Inc. + * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -322,6 +323,20 @@ } int +mac_check_socket_create(struct ucred *cred, int domain, int type, + int protocol) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(check_socket_create, cred, domain, type, protocol); + + return (error); +} + +int mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf) { struct label *label; ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#276 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. + * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -374,6 +375,8 @@ struct sockaddr *sockaddr); int mac_check_socket_connect(struct ucred *cred, struct socket *so, struct sockaddr *sockaddr); +int mac_check_socket_create(struct ucred *cred, int domain, int type, + int protocol); int mac_check_socket_deliver(struct socket *so, struct mbuf *m); int mac_check_socket_listen(struct ucred *cred, struct socket *so); int mac_check_socket_poll(struct ucred *cred, struct socket *so); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#233 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. + * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -460,6 +461,8 @@ int (*mpo_check_socket_connect)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); + int (*mpo_check_socket_create)(struct ucred *cred, int domain, + int type, int protocol); int (*mpo_check_socket_deliver)(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel); From owner-p4-projects@FreeBSD.ORG Fri Jun 10 01:30:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31DA216A420; Fri, 10 Jun 2005 01:30:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03BD016A41C for ; Fri, 10 Jun 2005 01:30:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBFC143D1F for ; Fri, 10 Jun 2005 01:30:13 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5A1UDmp090535 for ; Fri, 10 Jun 2005 01:30:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5A1UCbf090528 for perforce@freebsd.org; Fri, 10 Jun 2005 01:30:12 GMT (envelope-from marcel@freebsd.org) Date: Fri, 10 Jun 2005 01:30:12 GMT Message-Id: <200506100130.j5A1UCbf090528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 01:30:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=78297 Change 78297 by marcel@marcel_nfs on 2005/06/10 01:29:36 IFC @78292 Affected files ... .. //depot/projects/tty/Makefile.inc1#21 integrate .. //depot/projects/tty/UPDATING#21 integrate .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#9 integrate .. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#9 integrate .. //depot/projects/tty/contrib/sendmail/cf/README#8 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#9 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#9 integrate .. //depot/projects/tty/contrib/sendmail/doc/op/op.me#8 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/conf.h#8 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/sem.h#1 branch .. //depot/projects/tty/contrib/sendmail/include/sm/shm.h#4 integrate .. //depot/projects/tty/contrib/sendmail/libsm/Makefile.m4#4 integrate .. //depot/projects/tty/contrib/sendmail/libsm/ldap.c#6 integrate .. //depot/projects/tty/contrib/sendmail/libsm/sem.c#1 branch .. //depot/projects/tty/contrib/sendmail/libsm/shm.c#4 integrate .. //depot/projects/tty/contrib/sendmail/libsm/t-sem.c#1 branch .. //depot/projects/tty/contrib/sendmail/libsm/t-shm.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/README#9 integrate .. //depot/projects/tty/contrib/sendmail/src/TRACEFLAGS#5 integrate .. //depot/projects/tty/contrib/sendmail/src/collect.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.c#11 integrate .. //depot/projects/tty/contrib/sendmail/src/daemon.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/deliver.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/domain.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/envelope.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/map.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/mci.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/milter.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/parseaddr.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/queue.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.h#9 integrate .. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/tls.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/usersmtp.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/version.c#9 integrate .. //depot/projects/tty/contrib/tcpdump/print-bgp.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-isoclns.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/tty/etc/defaults/rc.conf#13 integrate .. //depot/projects/tty/etc/devd.conf#14 integrate .. //depot/projects/tty/etc/ftpusers#5 integrate .. //depot/projects/tty/etc/group#5 integrate .. //depot/projects/tty/etc/mail/aliases#6 integrate .. //depot/projects/tty/etc/master.passwd#5 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#14 integrate .. //depot/projects/tty/etc/network.subr#6 integrate .. //depot/projects/tty/etc/pccard_ether#8 integrate .. //depot/projects/tty/etc/rc.d/altqd#2 delete .. //depot/projects/tty/etc/rc.d/dhclient#6 integrate .. //depot/projects/tty/etc/rc.d/dhcpd#2 delete .. //depot/projects/tty/etc/rc.d/dhcrelay#2 delete .. //depot/projects/tty/etc/rc.d/downinterfaces#2 delete .. //depot/projects/tty/etc/rc.d/dumpon#6 integrate .. //depot/projects/tty/etc/rc.d/gated#2 delete .. //depot/projects/tty/etc/rc.d/ifwatchd#2 delete .. //depot/projects/tty/etc/rc.d/kdc#2 delete .. //depot/projects/tty/etc/rc.d/lkm1#2 delete .. //depot/projects/tty/etc/rc.d/lkm2#2 delete .. //depot/projects/tty/etc/rc.d/lkm3#2 delete .. //depot/projects/tty/etc/rc.d/mixerctl#2 delete .. //depot/projects/tty/etc/rc.d/mopd#2 delete .. //depot/projects/tty/etc/rc.d/mountall#2 delete .. //depot/projects/tty/etc/rc.d/ndbootd#2 delete .. //depot/projects/tty/etc/rc.d/netif#6 integrate .. //depot/projects/tty/etc/rc.d/network#3 delete .. //depot/projects/tty/etc/rc.d/poffd#2 delete .. //depot/projects/tty/etc/rc.d/postfix#2 delete .. //depot/projects/tty/etc/rc.d/ppp#2 delete .. //depot/projects/tty/etc/rc.d/racoon#2 delete .. //depot/projects/tty/etc/rc.d/raidframe#2 delete .. //depot/projects/tty/etc/rc.d/rbootd#2 delete .. //depot/projects/tty/etc/rc.d/rtsold#2 delete .. //depot/projects/tty/etc/rc.d/screenblank#2 delete .. //depot/projects/tty/etc/rc.d/swap2#2 delete .. //depot/projects/tty/etc/rc.d/sysdb#2 delete .. //depot/projects/tty/etc/rc.d/wscons#2 delete .. //depot/projects/tty/etc/rc.d/xdm#2 delete .. //depot/projects/tty/etc/rc.d/xfs#2 delete .. //depot/projects/tty/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/tty/games/morse/morse.6#5 integrate .. //depot/projects/tty/games/morse/morse.c#4 integrate .. //depot/projects/tty/gnu/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/tty/include/Makefile#17 integrate .. //depot/projects/tty/lib/libpam/modules/pam_ssh/Makefile#6 integrate .. //depot/projects/tty/lib/libpmc/Makefile#3 integrate .. //depot/projects/tty/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/tty/lib/libpmc/pmc.3#3 integrate .. //depot/projects/tty/lib/libpmc/pmc.h#3 integrate .. //depot/projects/tty/lib/libpmc/pmclog.3#1 branch .. //depot/projects/tty/lib/libpmc/pmclog.c#1 branch .. //depot/projects/tty/lib/libpmc/pmclog.h#1 branch .. //depot/projects/tty/lib/libsm/Makefile#7 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate .. //depot/projects/tty/rescue/rescue/Makefile#10 integrate .. //depot/projects/tty/sbin/Makefile#16 integrate .. //depot/projects/tty/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/tty/sbin/dhclient/Makefile#4 integrate .. //depot/projects/tty/sbin/dhclient/Makefile.inc#6 delete .. //depot/projects/tty/sbin/dhclient/alloc.c#1 branch .. //depot/projects/tty/sbin/dhclient/bpf.c#1 branch .. //depot/projects/tty/sbin/dhclient/client/Makefile#3 delete .. //depot/projects/tty/sbin/dhclient/clparse.c#1 branch .. //depot/projects/tty/sbin/dhclient/common/Makefile#3 delete .. //depot/projects/tty/sbin/dhclient/conflex.c#1 branch .. //depot/projects/tty/sbin/dhclient/convert.c#1 branch .. //depot/projects/tty/sbin/dhclient/dhclient-script#1 branch .. //depot/projects/tty/sbin/dhclient/dhclient-script.8#1 branch .. //depot/projects/tty/sbin/dhclient/dhclient-script.sh#2 delete .. //depot/projects/tty/sbin/dhclient/dhclient.8#1 branch .. //depot/projects/tty/sbin/dhclient/dhclient.c#1 branch .. //depot/projects/tty/sbin/dhclient/dhclient.conf#1 branch .. //depot/projects/tty/sbin/dhclient/dhclient.conf.5#1 branch .. //depot/projects/tty/sbin/dhclient/dhclient.leases.5#1 branch .. //depot/projects/tty/sbin/dhclient/dhcp-options.5#1 branch .. //depot/projects/tty/sbin/dhclient/dhcp.h#1 branch .. //depot/projects/tty/sbin/dhclient/dhcpctl/Makefile#3 delete .. //depot/projects/tty/sbin/dhclient/dhcpd.h#1 branch .. //depot/projects/tty/sbin/dhclient/dhctoken.h#1 branch .. //depot/projects/tty/sbin/dhclient/dispatch.c#1 branch .. //depot/projects/tty/sbin/dhclient/dst/Makefile#3 delete .. //depot/projects/tty/sbin/dhclient/errwarn.c#1 branch .. //depot/projects/tty/sbin/dhclient/hash.c#1 branch .. //depot/projects/tty/sbin/dhclient/inet.c#1 branch .. //depot/projects/tty/sbin/dhclient/minires/Makefile#3 delete .. //depot/projects/tty/sbin/dhclient/omapip/Makefile#3 delete .. //depot/projects/tty/sbin/dhclient/omshell/Makefile#3 delete .. //depot/projects/tty/sbin/dhclient/options.c#1 branch .. //depot/projects/tty/sbin/dhclient/packet.c#1 branch .. //depot/projects/tty/sbin/dhclient/parse.c#1 branch .. //depot/projects/tty/sbin/dhclient/privsep.c#1 branch .. //depot/projects/tty/sbin/dhclient/privsep.h#1 branch .. //depot/projects/tty/sbin/dhclient/tables.c#1 branch .. //depot/projects/tty/sbin/dhclient/tree.c#1 branch .. //depot/projects/tty/sbin/dhclient/tree.h#1 branch .. //depot/projects/tty/sbin/ipfw/ipfw2.c#15 integrate .. //depot/projects/tty/sbin/savecore/savecore.8#6 integrate .. //depot/projects/tty/secure/lib/libssh/Makefile#7 integrate .. //depot/projects/tty/secure/libexec/sftp-server/Makefile#6 integrate .. //depot/projects/tty/secure/libexec/ssh-keysign/Makefile#4 integrate .. //depot/projects/tty/secure/usr.bin/scp/Makefile#4 integrate .. //depot/projects/tty/secure/usr.bin/sftp/Makefile#5 integrate .. //depot/projects/tty/secure/usr.bin/ssh-add/Makefile#4 integrate .. //depot/projects/tty/secure/usr.bin/ssh-agent/Makefile#4 integrate .. //depot/projects/tty/secure/usr.bin/ssh-keygen/Makefile#4 integrate .. //depot/projects/tty/secure/usr.bin/ssh-keyscan/Makefile#3 integrate .. //depot/projects/tty/secure/usr.bin/ssh/Makefile#7 integrate .. //depot/projects/tty/secure/usr.sbin/sshd/Makefile#8 integrate .. //depot/projects/tty/share/examples/pppd/ppp.deny.sample#5 integrate .. //depot/projects/tty/share/man/man4/ata.4#7 integrate .. //depot/projects/tty/share/man/man4/ataraid.4#2 integrate .. //depot/projects/tty/share/man/man4/fwohci.4#9 integrate .. //depot/projects/tty/share/man/man4/gif.4#4 integrate .. //depot/projects/tty/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/tty/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/acpi_ibm.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_maestro3.4#3 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/tty/share/man/man8/crash.8#2 integrate .. //depot/projects/tty/share/misc/bsd-family-tree#13 integrate .. //depot/projects/tty/sys/alpha/conf/GENERIC#14 integrate .. //depot/projects/tty/sys/alpha/include/pmc_mdep.h#2 integrate .. //depot/projects/tty/sys/alpha/linux/linux_proto.h#8 integrate .. //depot/projects/tty/sys/alpha/linux/linux_syscall.h#8 integrate .. //depot/projects/tty/sys/alpha/linux/linux_sysent.c#8 integrate .. //depot/projects/tty/sys/alpha/linux/syscalls.master#9 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_mount.c#8 integrate .. //depot/projects/tty/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/tty/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/tty/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/tty/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/tty/sys/arm/arm/intr.c#5 integrate .. //depot/projects/tty/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/tty/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/tty/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/tty/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/tty/sys/arm/include/intr.h#4 integrate .. //depot/projects/tty/sys/arm/include/pmap.h#5 integrate .. //depot/projects/tty/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/tty/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/tty/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/tty/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/tty/sys/conf/NOTES#24 integrate .. //depot/projects/tty/sys/conf/files#31 integrate .. //depot/projects/tty/sys/conf/files.alpha#14 integrate .. //depot/projects/tty/sys/conf/files.amd64#17 integrate .. //depot/projects/tty/sys/conf/files.arm#4 integrate .. //depot/projects/tty/sys/conf/files.i386#23 integrate .. //depot/projects/tty/sys/conf/files.ia64#17 integrate .. //depot/projects/tty/sys/conf/files.pc98#19 integrate .. //depot/projects/tty/sys/conf/files.powerpc#9 integrate .. //depot/projects/tty/sys/conf/files.sparc64#15 integrate .. //depot/projects/tty/sys/conf/kern.post.mk#16 integrate .. //depot/projects/tty/sys/conf/options#22 integrate .. //depot/projects/tty/sys/conf/options.arm#4 integrate .. //depot/projects/tty/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#21 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.c#16 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.h#17 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.c#19 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.h#11 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/tty/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_pci.c#8 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_alpha.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_amd.h#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_arm.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ia64.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_intel.c#3 delete .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_logging.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_pentium.c#2 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_pentium.h#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.h#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_powerpc.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ppro.h#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_sparc64.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_x86.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/pmc_events.h#1 branch .. //depot/projects/tty/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/tty/sys/gnu/ext2fs/ext2_vnops.c#10 integrate .. //depot/projects/tty/sys/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/tty/sys/i386/include/apicvar.h#7 integrate .. //depot/projects/tty/sys/i386/include/pmc_mdep.h#4 integrate .. //depot/projects/tty/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/tty/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysent.c#10 integrate .. //depot/projects/tty/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/tty/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/tty/sys/kern/imgact_shell.c#6 integrate .. //depot/projects/tty/sys/kern/kern_exec.c#18 integrate .. //depot/projects/tty/sys/kern/kern_jail.c#9 integrate .. //depot/projects/tty/sys/kern/kern_ktrace.c#11 integrate .. //depot/projects/tty/sys/kern/kern_pmc.c#3 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#15 integrate .. //depot/projects/tty/sys/kern/kern_switch.c#17 integrate .. //depot/projects/tty/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/tty/sys/kern/sched_ule.c#14 integrate .. //depot/projects/tty/sys/kern/subr_bus.c#13 integrate .. //depot/projects/tty/sys/kern/subr_prf.c#10 integrate .. //depot/projects/tty/sys/kern/sysv_sem.c#12 integrate .. //depot/projects/tty/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/tty/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/tty/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/tty/sys/kern/vfs_bio.c#17 integrate .. //depot/projects/tty/sys/kern/vfs_default.c#15 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/tty/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/tty/sys/kern/vnode_if.src#7 integrate .. //depot/projects/tty/sys/modules/hwpmc/Makefile#3 integrate .. //depot/projects/tty/sys/net/bpf.c#13 integrate .. //depot/projects/tty/sys/net/if.c#16 integrate .. //depot/projects/tty/sys/net/if_bridge.c#2 integrate .. //depot/projects/tty/sys/net/rtsock.c#11 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/tty/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/tty/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/tty/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/tty/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/tty/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/tty/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/tty/sys/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/tty/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/tty/sys/netgraph/ng_lmi.c#6 integrate .. //depot/projects/tty/sys/netgraph/ng_tee.c#7 integrate .. //depot/projects/tty/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/tty/sys/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/tty/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/tty/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/tty/sys/security/mac_mls/mac_mls.c#14 integrate .. //depot/projects/tty/sys/security/mac_stub/mac_stub.c#8 integrate .. //depot/projects/tty/sys/security/mac_test/mac_test.c#11 integrate .. //depot/projects/tty/sys/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/tty/sys/sys/event.h#6 integrate .. //depot/projects/tty/sys/sys/jail.h#6 integrate .. //depot/projects/tty/sys/sys/mac.h#13 integrate .. //depot/projects/tty/sys/sys/mac_policy.h#11 integrate .. //depot/projects/tty/sys/sys/mount.h#10 integrate .. //depot/projects/tty/sys/sys/pmc.h#5 integrate .. //depot/projects/tty/sys/sys/pmckern.h#3 integrate .. //depot/projects/tty/sys/sys/pmclog.h#1 branch .. //depot/projects/tty/sys/sys/syscallsubr.h#10 integrate .. //depot/projects/tty/sys/sys/user.h#8 integrate .. //depot/projects/tty/sys/sys/vnode.h#15 integrate .. //depot/projects/tty/sys/tools/vnode_if.awk#6 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_vnops.c#14 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_vnops.c#13 integrate .. //depot/projects/tty/usr.sbin/Makefile#19 integrate .. //depot/projects/tty/usr.sbin/arp/arp.c#8 integrate .. //depot/projects/tty/usr.sbin/jail/jail.8#14 integrate .. //depot/projects/tty/usr.sbin/ntp/doc/ntp.conf.5#5 integrate .. //depot/projects/tty/usr.sbin/pkg_install/create/create.h#4 integrate .. //depot/projects/tty/usr.sbin/pkg_install/create/main.c#4 integrate .. //depot/projects/tty/usr.sbin/pkg_install/create/perform.c#4 integrate .. //depot/projects/tty/usr.sbin/pkg_install/create/pkg_create.1#6 integrate .. //depot/projects/tty/usr.sbin/pmccontrol/pmccontrol.c#3 integrate .. //depot/projects/tty/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/tty/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/tty/usr.sbin/rtsold/rtsold.c#4 integrate .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/tty/Makefile.inc1#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.496 2005/05/31 04:45:47 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.497 2005/06/06 09:39:46 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -227,21 +227,21 @@ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ - CC="cc ${LIB32CC}" \ - CXX="c++ ${LIB32CXX}" \ - OBJC="cc ${LIB32OBJC}" \ - LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ - AS="as --32" \ + 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 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML \ - CC="cc ${LIB32CC}" \ - CXX="c++ ${LIB32CXX}" \ - OBJC="cc ${LIB32OBJC}" \ - LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ - AS="as --32" \ + 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 .endif ==== //depot/projects/tty/UPDATING#21 (text+ko) ==== @@ -21,6 +21,18 @@ developers choose to disable these features on build machines to maximize performance. +20050609: + Changes were made to kinfo_proc in sys/user.h. Please recompile + userland, or commands like `fstat', `pkill', `ps', `top' and `w' + will not behave correctly. + +20050606: + The OpenBSD dhclient was imported in place of the ISC dhclient + and the network interface configuration scripts were updated + accordingly. If you use DHCP to configure your interfaces, you + must now run devd. Also, DNS updating was lost so you will need + to find a workaround if you use this feature. + 20050605: if_bridge was added to the tree. This has changed struct ifnet. Please recompile userland and all network related modules. @@ -361,4 +373,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.410 2005/06/05 03:38:03 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.412 2005/06/09 19:09:38 gad Exp $ ==== //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#9 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.27 2005/02/14 02:45:25 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.28 2005/06/07 04:22:21 gshapiro Exp $ -sendmail 8.13.3 +sendmail 8.13.4 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.13.3' \ - src/contrib/sendmail SENDMAIL v8_13_3 + cvs import -m 'Import sendmail 8.13.4' \ + src/contrib/sendmail SENDMAIL v8_13_4 To make local changes to sendmail, simply patch and commit to the main @@ -93,4 +93,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -13-February-2005 +6-June-2005 ==== //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#9 (text+ko) ==== @@ -1,11 +1,65 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1709 2005/01/12 04:32:31 ca Exp $ + $Id: RELEASE_NOTES,v 8.1730 2005/03/28 00:31:23 gshapiro Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.13.4/8.13.4 2005/03/27 + The bug fixes in 8.13.3 for connection handling uncovered a + different error which could result in connections that + stay in CLOSE_WAIT state due to a variable that was not + properly initialized. Problem noted by Michael Sims. + Deal with empty hostnames in hostsignature(). This bug could lead + to an endless loop when doing LMTP deliveries to another + host. Problem first reported by Martin Lathoud and + tracked down by Gael Roualland. + Make sure return parameters are initialized in getmxrr(). Problem + found by Gael Roualland using valgrind. + If shared memory is used and the RunAsUser option is set, then the + owner and group of the shared memory segment is set to + the ids specified RunAsUser and the access mode is set + to 0660 to allow for updates by sendmail processes. + The number of queue entries that is (optionally) kept in shared + memory was wrong in some cases, e.g., envelope splitting + and bounce generation. + Undo a change made in 8.13.0 to silently truncate long strings + in address rewriting because the message can be triggered + for header checks where long strings are legitimate. + Problem reported by Mary Verge DeSisto, and tracked + down with the help of John Beck of Sun Microsystems. + The internal stab map did not obey the -m flag. Patch from + Rob McMahon of Warwick University, England. + The socket map did not obey the -f flag. Problem noted by + Dan Ringdahl, forwarded by Andrzej Filip. + The addition of LDAP recursion in 8.13.0 broke enforcement of + the LDAP map -1 argument which tells the MTA to only + return success if and only if a single LDAP match is found. + Add additional error checks in the MTA for milter communication + to avoid a possible segmentation fault. Based on patch + by Joe Maimon. + Do not trigger an assertion if X509_digest() returns success but + does not assign a value to its output parameter. Based + on patch by Brian Kantor. + Add more checks when resetting internal AUTH data (applies only + to Cyrus SASL version 2). Otherwise an SMTP session might + be dropped after an AUTH failure. + Portability: + Add LA_LONGLONG as valid LA_TYPE type for systems that use + "long long" to read load average data, e.g., + AIX 5.1 in 32 bit mode. Note: this has to be set + "by hand", it is not (yet) automatically detected. + Problem noted by Burak Bilen. + Use socklen_t for accept(), etc. on AIX 5.x. This should + fix problems when compiling in 64 bit mode. + Problem first reported by Harry Meiert of + University of Bremen. + New Files: + include/sm/sem.h + libsm/sem.c + libsm/t-sem.c + 8.13.3/8.13.3 2005/01/11 Enhance handling of I/O errors, especially EOF, when STARTTLS is active. ==== //depot/projects/tty/contrib/sendmail/cf/README#8 (text+ko) ==== @@ -1593,7 +1593,7 @@ uucp-old (obsolete name: "uucp") This is the oldest, the worst (but the closest to UUCP) way of - sending messages accros UUCP connections. It does bangify + sending messages across UUCP connections. It does bangify everything and prepends $U (your UUCP name) to the sender's address (which can already be a bang path itself). It can only send to one address at a time, so it spends a lot of @@ -2662,7 +2662,7 @@ to the access map, where 10.1 is your local network. You may want to use "RELAY" instead of "OK" to allow also relaying -instead of just disabling the DNS lookups in the backlists. +instead of just disabling the DNS lookups in the blacklists. The features described above make use of the check_relay, check_mail, @@ -2870,12 +2870,12 @@ | STARTTLS | +----------+ -In this text, cert will be used as an abreviation for X.509 certificate, +In this text, cert will be used as an abbreviation for X.509 certificate, DN (CN) is the distinguished (common) name of a cert, and CA is a certification authority, which signs (issues) certs. For STARTTLS to be offered by sendmail you need to set at least -this variables (the file names and paths are just examples): +these variables (the file names and paths are just examples): define(`confCACERT_PATH', `/etc/mail/certs/') define(`confCACERT', `/etc/mail/certs/CA.cert.pem') @@ -4127,12 +4127,8 @@ then the AUTH= parameter for the MAIL FROM command is only issued when authentication succeeded. - Other values (which should be listed - one after the other without any - intervening characters except for - space or comma) are a, c, d, f, p, - and y. See doc/op/op.me for - details. + See doc/op/op.me for more options + and details. confAUTH_MAX_BITS AuthMaxBits [INT_MAX] Limit the maximum encryption strength for the security layer in SMTP AUTH (SASL). Default is @@ -4587,4 +4583,4 @@ 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.691 $, Last updated $Date: 2004/07/19 17:47:34 $ +$Revision: 8.694 $, Last updated $Date: 2005/03/23 21:41:09 $ ==== //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#9 (text+ko) ==== @@ -16,8 +16,8 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by ca@wiz.smi.sendmail.com on Tue Jan 11 20:36:44 PST 2005 -##### in /extra/home/ca/sm-8.13.3/OpenSource/sendmail-8.13.3/cf/cf +##### built by ca@wiz.smi.sendmail.com on Sun Mar 27 16:38:48 PST 2005 +##### in /extra/home/ca/sm-8.13.4/OpenSource/sendmail-8.13.4/cf/cf ##### using ../ as configuration include directory ##### ###################################################################### @@ -114,7 +114,7 @@ # Configuration version number -DZ8.13.3/Submit +DZ8.13.4/Submit ############### ==== //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#9 (text+ko) ==== @@ -11,8 +11,8 @@ # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.127 2005/01/12 04:32:32 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.132 2005/03/25 18:44:45 ca Exp $') # divert(0) # Configuration version number -DZ8.13.3`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.13.4`'ifdef(`confCF_VERSION', `/confCF_VERSION') ==== //depot/projects/tty/contrib/sendmail/doc/op/op.me#8 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. +.\" Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers. .\" All rights reserved. .\" Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. .\" Copyright (c) 1983, 1993 @@ -9,7 +9,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: op.me,v 8.699 2004/06/03 18:29:01 ca Exp $ +.\" $Id: op.me,v 8.704 2005/02/01 00:40:57 ca Exp $ .\" .\" eqn op.me | pic | troff -me .\" @@ -90,7 +90,7 @@ .de Ve Version \\$2 .. -.Ve $Revision: 8.699 $ +.Ve $Revision: 8.704 $ .rm Ve .sp For Sendmail Version 8.13 @@ -1621,7 +1621,7 @@ .i address part of the triple is looked up as the key (i.e., the left hand side) -into the alias database. +in the alias database. If there is a match, the address is deleted from the send queue and all addresses on the right hand side of the alias are added in place of the alias that was found. @@ -3916,6 +3916,11 @@ This specifies the {mailer, host, user} 3-tuple necessary to direct the mailer. +Note: the third element ( +.i user +) is often also called +.i address +part. If the mailer is local the host part may be omitted\**. .(f @@ -4781,7 +4786,8 @@ Sender's host name. Set from the .b \-p -command line flag or by the SMTP server code. +command line flag or by the SMTP server code +(in which case it is set to the EHLO/HELO parameter). .ip $t A numeric representation of the current time in the format YYYYMMDDHHmm (4 digit year 1900-9999, 2 digit month 01-12, 2 digit day 01-31, @@ -5514,7 +5520,7 @@ this host is known by. This can be used to match local hostnames. .ip $={persistentMacros} -set to the macros would should be saved across queue runs. +set to the macros that should be saved across queue runs. Care should be taken when adding macro names to this class. .pp .i Sendmail @@ -5596,7 +5602,8 @@ This flag defaults on if the SMTP greeting message includes the word .q ESMTP . .ip A -Look up the user part of the address in the alias database. +Look up the user (address) part of the resolved mailer triple, +in the alias database. Normally this is only set for local mailers. .ip b Force a blank line on the end of a message. @@ -11310,7 +11317,7 @@ .\".sz 10 .\"Eric Allman .\".sp -.\"Version $Revision: 8.699 $ +.\"Version $Revision: 8.704 $ .\".ce 0 .bp 3 .ce ==== //depot/projects/tty/contrib/sendmail/include/sm/conf.h#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Id: conf.h,v 1.118 2004/08/20 20:30:32 ca Exp $ + * $Id: conf.h,v 1.120 2005/03/22 22:07:53 ca Exp $ */ /* @@ -161,6 +161,8 @@ # ifdef _AIX5 # define _AIX4 40300 +# define SOCKADDR_LEN_T socklen_t /* e.g., arg#3 to accept, getsockname */ +# define SOCKOPT_LEN_T socklen_t /* arg#5 to getsockopt */ # if _AIX5 >= 50200 # define HASUNSETENV 1 /* has unsetenv(3) call */ # endif /* _AIX5 >= 50200 */ @@ -175,10 +177,14 @@ # define BSD4_4_SOCKADDR /* has sa_len */ # define USESETEUID 1 /* seteuid(2) works */ # define TZ_TYPE TZ_NAME /* use tzname[] vector */ -# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */ +# ifndef SOCKOPT_LEN_T +# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */ +# endif /* SOCKOPT_LEN_T */ # if _AIX4 >= 40200 # define HASSETREUID 1 /* setreuid(2) works as of AIX 4.2 */ -# define SOCKADDR_LEN_T size_t /* e.g., arg#3 to accept, getsockname */ +# ifndef SOCKADDR_LEN_T +# define SOCKADDR_LEN_T size_t /* e.g., arg#3 to accept, getsockname */ +# endif /* SOCKADDR_LEN_T */ # endif /* _AIX4 >= 40200 */ # if defined(_ILS_MACROS) /* IBM versions aren't side-effect clean */ # undef isascii @@ -208,7 +214,9 @@ # define GIDSET_T gid_t # define SFS_TYPE SFS_STATFS /* use statfs() impl */ # define SPT_PADCHAR '\0' /* pad process title with nulls */ -# define LA_TYPE LA_INT +# ifndef LA_TYPE +# define LA_TYPE LA_INT +# endif /* LA_TYPE */ # define FSHIFT 16 # define LA_AVENRUN "avenrun" # if !defined(_AIX4) || _AIX4 < 40300 @@ -1125,7 +1133,7 @@ # define _SCO_unix_4_2 # else /* ! _SCO_unix_4_2 */ # define SOCKADDR_LEN_T size_t /* e.g., arg#3 to accept, getsockname */ -# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */ +# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */ # endif /* ! _SCO_unix_4_2 */ # endif /* _SCO_DS >= 1 */ @@ -1819,7 +1827,7 @@ # define HASWAITPID 1 # define HASGETDTABLESIZE 1 # define GIDSET_T gid_t -# define SOCKADDR_LEN_T size_t +# define SOCKADDR_LEN_T size_t # define SOCKOPT_LEN_T size_t # ifndef _PATH_UNIX # define _PATH_UNIX "/stand/unix" ==== //depot/projects/tty/contrib/sendmail/include/sm/shm.h#4 (text+ko) ==== @@ -1,12 +1,12 @@ /* - * Copyright (c) 2000-2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2003, 2005 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: shm.h,v 1.10 2003/05/17 18:34:54 ca Exp $ + * $Id: shm.h,v 1.11 2005/01/13 22:57:04 ca Exp $ */ #ifndef SM_SHM_H @@ -28,6 +28,7 @@ extern void *sm_shmstart __P((key_t, int , int , int *, bool)); extern int sm_shmstop __P((void *, int, bool)); +extern int sm_shmsetowner __P((int, uid_t, gid_t, mode_t)); /* for those braindead systems... (e.g., SunOS 4) */ ==== //depot/projects/tty/contrib/sendmail/libsm/Makefile.m4#4 (text+ko) ==== @@ -1,13 +1,13 @@ -dnl $Id: Makefile.m4,v 1.67 2004/08/20 20:42:14 ca Exp $ +dnl $Id: Makefile.m4,v 1.68 2005/02/17 23:34:25 ca Exp $ define(`confREQUIRE_LIBUNIX') include(confBUILDTOOLSDIR`/M4/switch.m4') define(`confREQUIRE_LIBSM', `true') PREPENDDEF(`confENVDEF', `confMAPDEF') bldPRODUCT_START(`library', `libsm') -define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c ') +define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c ') bldPRODUCT_END -dnl sem.c msg.c +dnl msg.c dnl syslogio.c include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/sm-test.m4') @@ -27,7 +27,7 @@ smtest(`t-float', `run') smtest(`t-scanf', `run') smtest(`t-shm', `run') -dnl smtest(`t-sem', `run') +smtest(`t-sem', `run') dnl smtest(`t-msg', `run') smtest(`t-cf') smtest(`b-strcmp') ==== //depot/projects/tty/contrib/sendmail/libsm/ldap.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001-2005 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -8,7 +8,7 @@ */ #include -SM_RCSID("@(#)$Id: ldap.c,v 1.60 2004/08/03 20:42:21 ca Exp $") +SM_RCSID("@(#)$Id: ldap.c,v 1.62 2005/02/24 00:30:01 ca Exp $") #if LDAPMAP # include @@ -589,7 +589,9 @@ LDAPMessage *entry; /* If we don't want multiple values and we have one, break */ - if ((char) delim == '\0' && *result != NULL) + if ((char) delim == '\0' && + !bitset(SM_LDAP_SINGLEMATCH, flags) && + *result != NULL) break; /* Cycle through all entries */ @@ -767,19 +769,17 @@ if (*result != NULL) { /* already have a value */ + if (bitset(SM_LDAP_SINGLEMATCH, + flags)) + { + /* only wanted one match */ + SM_LDAP_ERROR_CLEANUP(); + errno = ENOENT; + return EX_NOTFOUND; + } break; } - if (bitset(SM_LDAP_SINGLEMATCH, - flags) && - *result != NULL) - { - /* only wanted one match */ - SM_LDAP_ERROR_CLEANUP(); - errno = ENOENT; - return EX_NOTFOUND; - } - if (lmap->ldap_attrsonly == LDAPMAP_TRUE) { *result = sm_rpool_strdup_x(rpool, @@ -990,7 +990,9 @@ } /* We don't want multiple values and we have one */ - if ((char) delim == '\0' && *result != NULL) + if ((char) delim == '\0' && + !bitset(SM_LDAP_SINGLEMATCH, flags) && + *result != NULL) break; } save_errno = sm_ldap_geterrno(lmap->ldap_ld); ==== //depot/projects/tty/contrib/sendmail/libsm/shm.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2003, 2005 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -8,7 +8,7 @@ */ #include -SM_RCSID("@(#)$Id: shm.c,v 1.16 2003/06/13 21:18:08 ca Exp $") +SM_RCSID("@(#)$Id: shm.c,v 1.18 2005/02/09 01:54:51 ca Exp $") #if SM_CONF_SHM # include @@ -104,4 +104,38 @@ } +/* +** SM_SHMSETOWNER -- set owner/group/mode of shared memory segment. +** +** Parameters: +** shmid -- id. +** uid -- uid to use +** gid -- gid to use +** mode -- mode to use +** +** Returns: +** 0 on success. +** < 0 on failure. +*/ + +int +sm_shmsetowner(shmid, uid, gid, mode) + int shmid; + uid_t uid; + gid_t gid; + mode_t mode; +{ + int r; + struct shmid_ds shmid_ds; + + memset(&shmid_ds, 0, sizeof(shmid_ds)); + if ((r = shmctl(shmid, IPC_STAT, &shmid_ds)) < 0) + return r; + shmid_ds.shm_perm.uid = uid; + shmid_ds.shm_perm.gid = gid; + shmid_ds.shm_perm.mode = mode; + if ((r = shmctl(shmid, IPC_SET, &shmid_ds)) < 0) + return r; + return 0; +} #endif /* SM_CONF_SHM */ ==== //depot/projects/tty/contrib/sendmail/libsm/t-shm.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004, 2005 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -8,7 +8,7 @@ */ #include -SM_RCSID("@(#)$Id: t-shm.c,v 1.20 2004/08/03 20:51:36 ca Exp $") +SM_RCSID("@(#)$Id: t-shm.c,v 1.22 2005/01/14 02:14:10 ca Exp $") #include @@ -83,6 +83,10 @@ case 'v': printf("shmval: %d\n", *shm); break; + case 'S': + i = sm_shmsetowner(shmid, getuid(), getgid(), 0644); + printf("sm_shmsetowner=%d\n", i); + break; } } return sm_shmstop((void *) shm, shmid, owner); @@ -165,6 +169,8 @@ { int r; + r = sm_shmsetowner(shmid, getuid(), getgid(), 0660); + SM_TEST(r == 0); *shm = 1; while (*shm == 1 && cnt++ < MAX_CNT) sleep(1); ==== //depot/projects/tty/contrib/sendmail/src/README#9 (text+ko) ==== @@ -9,7 +9,7 @@ # the sendmail distribution. # # -# $Id: README,v 8.385 2004/11/25 06:52:06 msk Exp $ +# $Id: README,v 8.386 2005/03/04 23:24:08 ca Exp $ # This directory contains the source files for sendmail(TM). @@ -375,6 +375,9 @@ LA_DEVSHORT (13) reads a short from a system file (default: /dev/table/avenrun) and scales it in the same manner as LA_SHORT. + LA_LONGLONG (17) to read /dev/kmem for the symbol avenrun and + interpret as a long long integer (e.g., for 64 bit + systems). LA_INT, LA_SHORT, LA_FLOAT, and LA_READKSYM have several other parameters that they try to divine: the name of your kernel, the name of the variable in the kernel to examine, @@ -1823,4 +1826,4 @@ version.c The version number and information about this version of sendmail. -(Version $Revision: 8.385 $, last update $Date: 2004/11/25 06:52:06 $ ) +(Version $Revision: 8.386 $, last update $Date: 2005/03/04 23:24:08 $ ) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 10 03:46:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B48D416A420; Fri, 10 Jun 2005 03:46:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E55E16A41C for ; Fri, 10 Jun 2005 03:46:26 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 643CE43D48 for ; Fri, 10 Jun 2005 03:46:26 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5A3kQp2002627 for ; Fri, 10 Jun 2005 03:46:26 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5A3kQlY002624 for perforce@freebsd.org; Fri, 10 Jun 2005 03:46:26 GMT (envelope-from marcel@freebsd.org) Date: Fri, 10 Jun 2005 03:46:26 GMT Message-Id: <200506100346.j5A3kQlY002624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 03:46:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=78307 Change 78307 by marcel@marcel_nfs on 2005/06/10 03:46:01 Restore the bit mask when we're done with the 16-color bitblt. None of the other bitblt variants reset it (as they don't use it). This fixes the garbled getty(8) output on ttyV0 when vtc(4) is not the console (a 16- color beastie is displayed in that case). Time to get keyboards hooked up so that I can login... Affected files ... .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#4 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#4 (text+ko) ==== @@ -413,6 +413,9 @@ dstini += 80; height--; } + + REG_WRITE(sc, VGA_GC_ADDRESS, VGA_GC_BIT_MASK); + REG_WRITE(sc, VGA_GC_DATA, 0xff); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Jun 10 03:47:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B65F16A420; Fri, 10 Jun 2005 03:47:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7600816A41C for ; Fri, 10 Jun 2005 03:47:28 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3261343D48 for ; Fri, 10 Jun 2005 03:47:28 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5A3lS7N002670 for ; Fri, 10 Jun 2005 03:47:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5A3lRLN002667 for perforce@freebsd.org; Fri, 10 Jun 2005 03:47:27 GMT (envelope-from marcel@freebsd.org) Date: Fri, 10 Jun 2005 03:47:27 GMT Message-Id: <200506100347.j5A3lRLN002667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 03:47:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=78308 Change 78308 by marcel@marcel_nfs on 2005/06/10 03:47:04 Not used. Nuke before I get confused. Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_tty.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 10 05:12:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66C3A16A420; Fri, 10 Jun 2005 05:12:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EAB316A41C for ; Fri, 10 Jun 2005 05:12:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1442C43D1F for ; Fri, 10 Jun 2005 05:12:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5A5CBw9012992 for ; Fri, 10 Jun 2005 05:12:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5A5CBf4012989 for perforce@freebsd.org; Fri, 10 Jun 2005 05:12:11 GMT (envelope-from marcel@freebsd.org) Date: Fri, 10 Jun 2005 05:12:11 GMT Message-Id: <200506100512.j5A5CBf4012989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 05:12:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=78314 Change 78314 by marcel@marcel_nfs on 2005/06/10 05:11:31 If we're the console, don't (re-)initialize the hardware nor display the logo, but do attach this device as a vtout device. We won't be associated with a TE otherwise. Affected files ... .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#5 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#5 (text+ko) ==== @@ -464,20 +464,21 @@ vga_attach(device_t dev) { struct vga_softc *sc; + uintptr_t ofs; int error; sc = device_get_softc(dev); - if (sc->vga_console) - return (0); + if (!sc->vga_console) { + error = vga_init(sc); + if (error) + return (error); - error = vga_init(sc); - if (error) - return (error); - - vga_bitblt_h4tofb(sc, vtc_logo4_image, - 640 * (480 - vtc_logo4_height) / 2 + (640 - vtc_logo4_width) / 2, - vtc_logo4_width, vtc_logo4_height); + ofs = 640 * (480 - vtc_logo4_height) / 2 + + (640 - vtc_logo4_width) / 2; + vga_bitblt_h4tofb(sc, vtc_logo4_image, ofs, vtc_logo4_width, + vtc_logo4_height); + } return (vtc_vtout_attach(sc, vga_bitblt, 640, 480)); } From owner-p4-projects@FreeBSD.ORG Fri Jun 10 05:17:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3FA616A421; Fri, 10 Jun 2005 05:17:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B500316A41C for ; Fri, 10 Jun 2005 05:17:24 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 461CB43D1D for ; Fri, 10 Jun 2005 05:17:24 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5A5HOVd013333 for ; Fri, 10 Jun 2005 05:17:24 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5A5HNhC013330 for perforce@freebsd.org; Fri, 10 Jun 2005 05:17:23 GMT (envelope-from marcel@freebsd.org) Date: Fri, 10 Jun 2005 05:17:23 GMT Message-Id: <200506100517.j5A5HNhC013330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 05:17:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=78316 Change 78316 by marcel@marcel_nfs on 2005/06/10 05:17:03 IFC @78313 Affected files ... .. //depot/projects/tty/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/tty/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/tty/share/man/man4/dummynet.4#2 integrate .. //depot/projects/tty/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/tty/sys/alpha/alpha/pmap.c#11 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/tty/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/tty/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/tty/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/tty/sys/kern/kern_switch.c#18 integrate .. //depot/projects/tty/sys/net/if_bridge.c#3 integrate .. //depot/projects/tty/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/tty/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/tty/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/tty/sys/net80211/ieee80211_input.c#8 integrate .. //depot/projects/tty/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/tty/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/tty/sys/netinet/ip_dummynet.c#12 integrate .. //depot/projects/tty/sys/netinet/ip_dummynet.h#8 integrate .. //depot/projects/tty/sys/powerpc/powerpc/pmap.c#11 integrate .. //depot/projects/tty/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/tty/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/tty/sys/vm/pmap.h#8 integrate .. //depot/projects/tty/sys/vm/vm_pageq.c#9 integrate Differences ... ==== //depot/projects/tty/lib/libpmc/libpmc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.6 2005/06/09 19:45:06 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.7 2005/06/10 03:45:04 jkoshy Exp $"); #include #include @@ -139,7 +139,8 @@ static int pmc_syscall = -1; /* filled in by pmc_init() */ -struct pmc_op_getcpuinfo cpu_info; /* filled in by pmc_init() */ +static struct pmc_cpuinfo cpu_info; /* filled in by pmc_init() */ + /* Architecture dependent event parsing */ static int (*pmc_mdep_allocate_pmc)(enum pmc_event _pe, char *_ctrspec, @@ -1752,8 +1753,7 @@ return -1; } - /* kernel<->library, library<->userland interfaces are identical */ - *pci = (struct pmc_cpuinfo *) &cpu_info; + *pci = &cpu_info; return 0; } @@ -1893,8 +1893,10 @@ pmc_init(void) { int error, pmc_mod_id; + unsigned int n; uint32_t abi_version; struct module_stat pmc_modstat; + struct pmc_op_getcpuinfo op_cpu_info; if (pmc_syscall != -1) /* already inited */ return 0; @@ -1920,9 +1922,16 @@ return (pmc_syscall = -1); } - if (PMC_CALL(GETCPUINFO, &cpu_info) < 0) + if (PMC_CALL(GETCPUINFO, &op_cpu_info) < 0) return (pmc_syscall = -1); + cpu_info.pm_cputype = op_cpu_info.pm_cputype; + cpu_info.pm_ncpu = op_cpu_info.pm_ncpu; + cpu_info.pm_npmc = op_cpu_info.pm_npmc; + cpu_info.pm_nclass = op_cpu_info.pm_nclass; + for (n = 0; n < cpu_info.pm_nclass; n++) + cpu_info.pm_classes[n] = op_cpu_info.pm_classes[n]; + /* set parser pointer */ switch (cpu_info.pm_cputype) { #if defined(__i386__) ==== //depot/projects/tty/sbin/dhclient/dhclient-script#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $ -# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.3 2005/06/08 18:21:56 brooks Exp $ +# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4 2005/06/10 03:41:18 brooks Exp $ # # Copyright (c) 2003 Kenneth R Westerback # @@ -186,6 +186,17 @@ # Start of active code. # +# Invoke the local dhcp client enter hooks, if they exist. +if [ -f /etc/dhclient-enter-hooks ]; then + exit_status=0 + . /etc/dhclient-enter-hooks + # allow the local script to abort processing of this state + # local script must set exit_status variable to nonzero. + if [ $exit_status -ne 0 ]; then + exit $exit_status + fi +fi + if [ -x $NETSTAT ]; then if_defaulroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` else ==== //depot/projects/tty/share/man/man4/dummynet.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/dummynet.4,v 1.20 2002/11/29 11:39:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/dummynet.4,v 1.21 2005/06/10 01:25:22 thompsa Exp $ .\" .Dd October 28, 2002 .Dt DUMMYNET 4 @@ -61,6 +61,7 @@ .Sh SEE ALSO .Xr setsockopt 2 , .Xr bridge 4 , +.Xr if_bridge 4 , .Xr ip 4 , .Xr ipfw 8 , .Xr sysctl 8 ==== //depot/projects/tty/share/man/man4/if_bridge.4#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.2 2005/06/07 21:20:18 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.3 2005/06/10 01:25:22 thompsa Exp $ .Dd January 4, 2004 .Dt IF_BRIDGE 4 .Os @@ -107,6 +107,9 @@ , set to .Li 0 to disable it. +This needs to be enabled for +.Xr dummynet 4 +support. When ipfw is enabled pfil_bridge and pfil_member will be disabled so that IPFW is not run twice, these can be re-enabled if desired. .El ==== //depot/projects/tty/sys/alpha/alpha/pmap.c#11 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.177 2005/01/05 20:05:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178 2005/06/10 03:33:35 alc Exp $"); #include #include @@ -302,7 +302,6 @@ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ -static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ static int nklev3, nklev2; vm_offset_t kernel_vm_end; @@ -554,29 +553,24 @@ } /* + * Initialize a vm_page's machine-dependent fields. + */ +void +pmap_page_init(vm_page_t m) +{ + + TAILQ_INIT(&m->md.pv_list); + m->md.pv_list_count = 0; +} + +/* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap * system needs to map virtual memory. - * pmap_init has been enhanced to support in a fairly consistant - * way, discontiguous physical memory. */ void pmap_init(void) { - int i; - - /* - * Allocate memory for random pmap data structures. Includes the - * pv_head_table. - */ - - for(i = 0; i < vm_page_array_size; i++) { - vm_page_t m; - - m = &vm_page_array[i]; - TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; - } /* * init the pv free list @@ -584,11 +578,6 @@ pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); uma_prealloc(pvzone, MINPV); - - /* - * Now it is safe to enable pv_table recording. - */ - pmap_initialized = TRUE; } /* @@ -1516,7 +1505,7 @@ * XXX this makes pmap_page_protect(NONE) illegal for non-managed * pages! */ - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { + if (m->flags & PG_FICTITIOUS) { panic("pmap_page_protect: illegal for unmanaged page, va: 0x%lx", VM_PAGE_TO_PHYS(m)); } #endif @@ -1745,8 +1734,7 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - if (pmap_initialized && - (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, mpte, m); managed |= PG_MANAGED; } @@ -2056,7 +2044,7 @@ pv_entry_t pv; int loops = 0; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return FALSE; /* @@ -2162,7 +2150,7 @@ pt_entry_t *pte; int changed; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || + if ((m->flags & PG_FICTITIOUS) || (!setem && bit == (PG_UWE|PG_KWE) && (m->flags & PG_WRITEABLE) == 0)) return; @@ -2247,7 +2235,7 @@ pt_entry_t *pte; int count; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return 0; /* @@ -2285,7 +2273,7 @@ boolean_t rv; rv = FALSE; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return (rv); /* @@ -2335,7 +2323,7 @@ pv_entry_t pv; pt_entry_t *pte; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return; /* @@ -2364,7 +2352,7 @@ pv_entry_t pv; pt_entry_t *pte; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return; /* ==== //depot/projects/tty/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.515 2005/02/05 19:21:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.516 2005/06/10 03:33:35 alc Exp $"); /* * Manages physical address maps. @@ -165,7 +165,6 @@ vm_paddr_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ -static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ static int nkpt; static int ndmpdp; @@ -531,29 +530,24 @@ } /* + * Initialize a vm_page's machine-dependent fields. + */ +void +pmap_page_init(vm_page_t m) +{ + + TAILQ_INIT(&m->md.pv_list); + m->md.pv_list_count = 0; +} + +/* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap * system needs to map virtual memory. - * pmap_init has been enhanced to support in a fairly consistant - * way, discontiguous physical memory. */ void pmap_init(void) { - int i; - - /* - * Allocate memory for random pmap data structures. Includes the - * pv_head_table. - */ - - for(i = 0; i < vm_page_array_size; i++) { - vm_page_t m; - - m = &vm_page_array[i]; - TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; - } /* * init the pv free list @@ -561,11 +555,6 @@ pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); uma_prealloc(pvzone, MINPV); - - /* - * Now it is safe to enable pv_table recording. - */ - pmap_initialized = TRUE; } /* @@ -1675,7 +1664,7 @@ /* * XXX This makes pmap_remove_all() illegal for non-managed pages! */ - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { + if (m->flags & PG_FICTITIOUS) { panic("pmap_remove_all: illegal for unmanaged page, va: 0x%lx", VM_PAGE_TO_PHYS(m)); } @@ -1955,8 +1944,7 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - if (pmap_initialized && - (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, m); pa |= PG_MANAGED; } @@ -2449,7 +2437,7 @@ pv_entry_t pv; int loops = 0; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return FALSE; mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -2567,7 +2555,7 @@ boolean_t rv; rv = FALSE; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return (rv); mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -2628,7 +2616,7 @@ register pv_entry_t pv; pt_entry_t pbits, *pte; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || + if ((m->flags & PG_FICTITIOUS) || (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) return; @@ -2713,7 +2701,7 @@ pt_entry_t v; int rtval = 0; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return (rtval); mtx_assert(&vm_page_queue_mtx, MA_OWNED); ==== //depot/projects/tty/sys/arm/arm/pmap.c#8 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.32 2005/06/07 23:04:24 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.33 2005/06/10 03:33:35 alc Exp $"); #include #include #include @@ -1927,33 +1927,28 @@ bcopy(kernel_pmap, pmap, sizeof(*pmap)); } +/* + * Initialize a vm_page's machine-dependent fields. + */ +void +pmap_page_init(vm_page_t m) +{ + + TAILQ_INIT(&m->md.pv_list); + m->md.pv_list_count = 0; +} /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap * system needs to map virtual memory. - * pmap_init has been enhanced to support in a fairly consistant - * way, discontiguous physical memory. */ void pmap_init(void) { - int i; PDEBUG(1, printf("pmap_init: phys_start = %08x\n")); - /* - * Allocate memory for random pmap data structures. Includes the - * pv_head_table. - */ - - for(i = 0; i < vm_page_array_size; i++) { - vm_page_t m; - m = &vm_page_array[i]; - TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; - } - /* * init the pv free list */ @@ -3156,7 +3151,7 @@ * XXX this makes pmap_page_protect(NONE) illegal for non-managed * pages! */ - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { + if (m->flags & PG_FICTITIOUS) { panic("pmap_page_protect: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); } #endif @@ -4331,7 +4326,7 @@ int loops = 0; int s; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return (FALSE); s = splvm(); ==== //depot/projects/tty/sys/i386/i386/pmap.c#16 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.521 2005/02/05 19:21:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.522 2005/06/10 03:33:35 alc Exp $"); /* * Manages physical address maps. @@ -190,7 +190,6 @@ vm_paddr_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ -static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ int pgeflag = 0; /* PG_G or-in */ int pseflag = 0; /* PG_PS or-in */ @@ -443,6 +442,17 @@ } } +/* + * Initialize a vm_page's machine-dependent fields. + */ +void +pmap_page_init(vm_page_t m) +{ + + TAILQ_INIT(&m->md.pv_list); + m->md.pv_list_count = 0; +} + #ifdef PAE static MALLOC_DEFINE(M_PMAPPDPT, "pmap", "pmap pdpt"); @@ -460,26 +470,10 @@ * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap * system needs to map virtual memory. - * pmap_init has been enhanced to support in a fairly consistant - * way, discontiguous physical memory. */ void pmap_init(void) { - int i; - - /* - * Allocate memory for random pmap data structures. Includes the - * pv_head_table. - */ - - for(i = 0; i < vm_page_array_size; i++) { - vm_page_t m; - - m = &vm_page_array[i]; - TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; - } /* * init the pv free list @@ -494,11 +488,6 @@ UMA_ZONE_VM | UMA_ZONE_NOFREE); uma_zone_set_allocf(pdptzone, pmap_pdpt_allocf); #endif - - /* - * Now it is safe to enable pv_table recording. - */ - pmap_initialized = TRUE; } /* @@ -1714,7 +1703,7 @@ /* * XXX This makes pmap_remove_all() illegal for non-managed pages! */ - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { + if (m->flags & PG_FICTITIOUS) { panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); } @@ -1997,8 +1986,7 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - if (pmap_initialized && - (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, m); pa |= PG_MANAGED; } @@ -2525,7 +2513,7 @@ pv_entry_t pv; int loops = 0; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return FALSE; mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -2645,7 +2633,7 @@ boolean_t rv; rv = FALSE; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return (rv); sched_pin(); @@ -2708,7 +2696,7 @@ register pv_entry_t pv; pt_entry_t pbits, *pte; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || + if ((m->flags & PG_FICTITIOUS) || (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) return; @@ -2800,7 +2788,7 @@ pt_entry_t v; int rtval = 0; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return (rtval); sched_pin(); ==== //depot/projects/tty/sys/ia64/ia64/pmap.c#14 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.159 2005/04/16 23:38:32 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.160 2005/06/10 03:33:36 alc Exp $"); #include #include @@ -154,7 +154,6 @@ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ -static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ vm_offset_t vhpt_base, vhpt_size; struct mtx pmap_vhptmutex; @@ -444,31 +443,26 @@ } /* + * Initialize a vm_page's machine-dependent fields. + */ +void +pmap_page_init(vm_page_t m) +{ + + TAILQ_INIT(&m->md.pv_list); + m->md.pv_list_count = 0; +} + +/* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap * system needs to map virtual memory. - * pmap_init has been enhanced to support in a fairly consistant - * way, discontiguous physical memory. */ void pmap_init(void) { - int i; /* - * Allocate memory for random pmap data structures. Includes the - * pv_head_table. - */ - - for(i = 0; i < vm_page_array_size; i++) { - vm_page_t m; - - m = &vm_page_array[i]; - TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; - } - - /* * Init the pv free list and the PTE free list. */ pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), @@ -478,11 +472,6 @@ ptezone = uma_zcreate("PT ENTRY", sizeof (struct ia64_lpte), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM|UMA_ZONE_NOFREE); uma_prealloc(ptezone, MINPV); - - /* - * Now it is safe to enable pv_table recording. - */ - pmap_initialized = TRUE; } /* @@ -1391,7 +1380,7 @@ * XXX this makes pmap_page_protect(NONE) illegal for non-managed * pages! */ - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { + if (m->flags & PG_FICTITIOUS) { panic("pmap_page_protect: illegal for unmanaged page, va: 0x%lx", VM_PAGE_TO_PHYS(m)); } #endif @@ -1572,8 +1561,7 @@ /* * Enter on the PV list if part of our managed memory. */ - if (pmap_initialized && - (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, m); managed = TRUE; } @@ -1648,8 +1636,7 @@ /* * Enter on the PV list since its part of our managed memory. */ - if (pmap_initialized && - (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, m); managed = TRUE; } @@ -1809,7 +1796,7 @@ int loops = 0; int s; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return FALSE; s = splvm(); @@ -1932,7 +1919,7 @@ pv_entry_t pv; int count = 0; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return 0; TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -1965,7 +1952,7 @@ { pv_entry_t pv; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return FALSE; TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -1996,7 +1983,7 @@ boolean_t rv; rv = FALSE; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return (rv); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -2041,7 +2028,7 @@ pmap_t oldpmap; pv_entry_t pv; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return; TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -2071,7 +2058,7 @@ pmap_t oldpmap; pv_entry_t pv; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (m->flags & PG_FICTITIOUS) return; TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { ==== //depot/projects/tty/sys/kern/kern_switch.c#18 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.115 2005/06/09 19:43:08 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.116 2005/06/10 03:00:29 ups Exp $"); #include "opt_sched.h" @@ -675,11 +675,9 @@ TD_IS_INHIBITED(ctd) || td->td_kse->ke_state != KES_THREAD) return (0); #ifndef FULL_PREEMPTION - if (pri > PRI_MAX_ITHD) + if (pri > PRI_MAX_ITHD && cpri < PRI_MIN_IDLE) return (0); #endif - if (cpri >= PRI_MIN_IDLE) - return (0); if (ctd->td_critnest > 1) { CTR1(KTR_PROC, "maybe_preempt: in critical section %d", ==== //depot/projects/tty/sys/net/if_bridge.c#3 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.3 2005/06/07 21:20:18 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.4 2005/06/10 01:25:21 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -129,7 +129,6 @@ #include #include #include -#include #define sc_if ifb_ac.ac_if /* @@ -178,6 +177,7 @@ extern struct mbuf *(*bridge_input_p)(struct ifnet *, struct mbuf *); extern int (*bridge_output_p)(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); +extern void (*bridge_dn_p)(struct mbuf *, struct ifnet *); int bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD; @@ -351,6 +351,7 @@ LIST_INIT(&bridge_list); bridge_input_p = bridge_input; bridge_output_p = bridge_output; + bridge_dn_p = bridge_dummynet; bstp_linkstate_p = bstp_linkstate; break; case MOD_UNLOAD: @@ -360,6 +361,7 @@ uma_zdestroy(bridge_rtnode_zone); bridge_input_p = NULL; bridge_output_p = NULL; + bridge_dn_p = NULL; bstp_linkstate_p = NULL; mtx_destroy(&bridge_list_mtx); break; @@ -1271,6 +1273,33 @@ } /* + * bridge_dummynet: + * + * Receive a queued packet from dummynet and pass it on to the output + * interface. + * + * The mbuf has the Ethernet header already attached. + */ +void +bridge_dummynet(struct mbuf *m, struct ifnet *ifp) +{ + struct bridge_softc *sc; + + sc = ifp->if_bridge; + + /* + * The packet didnt originate from a member interface. This should only + * ever happen if a member interface is removed while packets are + * queued for it. + */ + if (sc == NULL) + m_freem(m); + return; + + bridge_enqueue(sc, ifp, m, 1); +} + +/* * bridge_output: * * Send output from a bridge member interface. This @@ -2195,7 +2224,7 @@ # endif /* INET6 */ break; default: - /* + /* * ipfw allows layer2 protocol filtering using * 'mac-type' so we will let the packet past, if * ipfw is disabled then drop it. @@ -2214,6 +2243,43 @@ m_adj(*mp, sizeof(struct llc)); } + if (IPFW_LOADED && pfil_ipfw != 0 && dir == PFIL_OUT) { + args.rule = ip_dn_claim_rule(*mp); + if (args.rule != NULL && fw_one_pass) + goto ipfwpass; /* packet already partially processed */ + + args.m = *mp; + args.oif = ifp; + args.next_hop = NULL; + args.eh = &eh2; + i = ip_fw_chk_ptr(&args); + *mp = args.m; + + if (*mp == NULL) + return error; + + if (DUMMYNET_LOADED && (i == IP_FW_DUMMYNET)) { + + /* put the Ethernet header back on */ + M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT); + if (*mp == NULL) + return error; + bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN); + + /* + * Pass the pkt to dummynet, which consumes it. The + * packet will return to us via bridge_dummynet(). + */ + args.oif = ifp; + ip_dn_io_ptr(*mp, DN_TO_IFB_FWD, &args); + return error; + } + + if (i != IP_FW_PASS) /* drop */ + goto bad; + } + +ipfwpass: /* * Check basic packet sanity and run pfil through pfil. */ @@ -2246,10 +2312,16 @@ error = pfil_run_hooks(&inet_pfil_hook, mp, bifp, dir, NULL); + if (*mp == NULL) /* filter may consume */ + break; + if (error == 0 && pfil_member) error = pfil_run_hooks(&inet_pfil_hook, mp, ifp, dir, NULL); + if (*mp == NULL) /* filter may consume */ + break; + if (error == 0 && pfil_bridge && dir == PFIL_IN) error = pfil_run_hooks(&inet_pfil_hook, mp, bifp, dir, NULL); @@ -2270,10 +2342,16 @@ error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp, dir, NULL); + if (*mp == NULL) /* filter may consume */ + break; + if (error == 0 && pfil_member) error = pfil_run_hooks(&inet6_pfil_hook, mp, ifp, dir, NULL); + if (*mp == NULL) /* filter may consume */ + break; + if (error == 0 && pfil_bridge && dir == PFIL_IN) error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp, dir, NULL); @@ -2291,22 +2369,6 @@ error = -1; - if (IPFW_LOADED && pfil_ipfw != 0) { - args.m = *mp; - args.oif = NULL; - args.next_hop = NULL; - args.rule = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 10 06:19:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0581F16A420; Fri, 10 Jun 2005 06:19:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF21C16A41C for ; Fri, 10 Jun 2005 06:19:40 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A74C43D58 for ; Fri, 10 Jun 2005 06:19:40 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5A6JeDs016703 for ; Fri, 10 Jun 2005 06:19:40 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5A6Je4E016699 for perforce@freebsd.org; Fri, 10 Jun 2005 06:19:40 GMT (envelope-from des@freebsd.org) Date: Fri, 10 Jun 2005 06:19:40 GMT Message-Id: <200506100619.j5A6Je4E016699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 78319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 06:19:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=78319 Change 78319 by des@des.at.des.no on 2005/06/10 06:19:09 Return specific error codes for pam_sm_setcred() and pam_sm_chauthtok() instead of the generic PAM_PERM_DENIED. Affected files ... .. //depot/projects/openpam/modules/pam_deny/pam_deny.c#10 edit Differences ... ==== //depot/projects/openpam/modules/pam_deny/pam_deny.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/modules/pam_deny/pam_deny.c#9 $ + * $P4: //depot/projects/openpam/modules/pam_deny/pam_deny.c#10 $ */ #ifdef HAVE_CONFIG_H @@ -55,7 +55,7 @@ int argc, const char *argv[]) { - return (PAM_PERM_DENIED); + return (PAM_CRED_ERR); } PAM_EXTERN int @@ -87,7 +87,7 @@ int argc, const char *argv[]) { - return (PAM_PERM_DENIED); + return (PAM_AUTHTOK_ERR); } PAM_MODULE_ENTRY("pam_deny"); From owner-p4-projects@FreeBSD.ORG Fri Jun 10 16:52:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC91D16A420; Fri, 10 Jun 2005 16:52:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A38A716A41C for ; Fri, 10 Jun 2005 16:52:34 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77FB943D55 for ; Fri, 10 Jun 2005 16:52:34 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5AGqYVD077848 for ; Fri, 10 Jun 2005 16:52:34 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5AGqYr8077845 for perforce@freebsd.org; Fri, 10 Jun 2005 16:52:34 GMT (envelope-from des@freebsd.org) Date: Fri, 10 Jun 2005 16:52:34 GMT Message-Id: <200506101652.j5AGqYr8077845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 78358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 16:52:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=78358 Change 78358 by des@des.at.des.no on 2005/06/10 16:51:37 Make sure OPENPAM_MODULES_DIR has a trailing slash. Affected files ... .. //depot/projects/openpam/lib/Makefile.am#5 edit Differences ... ==== //depot/projects/openpam/lib/Makefile.am#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $P4: //depot/projects/openpam/lib/Makefile.am#4 $ +# $P4: //depot/projects/openpam/lib/Makefile.am#5 $ NULL = @@ -50,7 +50,7 @@ pam_vprompt.c \ $(NULL) -libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@"' +libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@/"' libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@ @DL_LIBS@ From owner-p4-projects@FreeBSD.ORG Fri Jun 10 16:55:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2757016A426; Fri, 10 Jun 2005 16:55:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE27116A41C for ; Fri, 10 Jun 2005 16:55:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A636343D48 for ; Fri, 10 Jun 2005 16:55:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5AGtc04078016 for ; Fri, 10 Jun 2005 16:55:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5AGtcqw078013 for perforce@freebsd.org; Fri, 10 Jun 2005 16:55:38 GMT (envelope-from jhb@freebsd.org) Date: Fri, 10 Jun 2005 16:55:38 GMT Message-Id: <200506101655.j5AGtcqw078013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 16:55:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=78359 Change 78359 by jhb@jhb_tibook on 2005/06/10 16:54:50 Another todo. Affected files ... .. //depot/projects/smpng/sys/notes#38 edit Differences ... ==== //depot/projects/smpng/sys/notes#38 (text+ko) ==== @@ -85,6 +85,7 @@ - sparc64 is in asm, marius@ doing it - arm, powerpc? - fork counts? +- Add a cache-line padded mtx_aligned union and use it for the mutex pools. Active child branches: - jhb_intr - intr_vector stuff From owner-p4-projects@FreeBSD.ORG Sat Jun 11 03:53:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B58B16A420; Sat, 11 Jun 2005 03:53:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38B8416A41C for ; Sat, 11 Jun 2005 03:53:16 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F10FA43D1D for ; Sat, 11 Jun 2005 03:53:15 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5B3rFW9026617 for ; Sat, 11 Jun 2005 03:53:15 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5B3rEk5026614 for perforce@freebsd.org; Sat, 11 Jun 2005 03:53:14 GMT (envelope-from marcel@freebsd.org) Date: Sat, 11 Jun 2005 03:53:14 GMT Message-Id: <200506110353.j5B3rEk5026614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jun 2005 03:53:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=78400 Change 78400 by marcel@marcel_nfs on 2005/06/11 03:52:29 IFC @78398 Affected files ... .. //depot/projects/tty/UPDATING#22 integrate .. //depot/projects/tty/bin/rmail/Makefile#5 integrate .. //depot/projects/tty/etc/etc.sparc64/ttys#7 integrate .. //depot/projects/tty/etc/inetd.conf#5 integrate .. //depot/projects/tty/etc/mtree/BSD.local.dist#11 integrate .. //depot/projects/tty/etc/pam.d/Makefile#6 integrate .. //depot/projects/tty/etc/pam.d/rexecd#3 delete .. //depot/projects/tty/games/fortune/datfiles/fortunes#16 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/Makefile.inc#2 integrate .. //depot/projects/tty/gnu/usr.bin/groff/Makefile.inc#4 integrate .. //depot/projects/tty/gnu/usr.bin/man/Makefile.inc#2 integrate .. //depot/projects/tty/gnu/usr.bin/rcs/Makefile.inc#2 integrate .. //depot/projects/tty/gnu/usr.bin/texinfo/Makefile.inc#2 integrate .. //depot/projects/tty/kerberos5/Makefile.inc#9 integrate .. //depot/projects/tty/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/tty/lib/libc/sys/extattr_get_file.2#6 integrate .. //depot/projects/tty/lib/libpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/tty/libexec/Makefile#12 integrate .. //depot/projects/tty/libexec/mail.local/Makefile#3 integrate .. //depot/projects/tty/libexec/rexecd/Makefile#3 delete .. //depot/projects/tty/libexec/rexecd/rexecd.8#5 delete .. //depot/projects/tty/libexec/rexecd/rexecd.c#4 delete .. //depot/projects/tty/libexec/smrsh/Makefile#3 integrate .. //depot/projects/tty/libexec/telnetd/Makefile#5 integrate .. //depot/projects/tty/sbin/mount/mntopts.h#5 integrate .. //depot/projects/tty/sbin/mount/mount_ufs.c#4 integrate .. //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.c#7 integrate .. //depot/projects/tty/sbin/mount_ext2fs/mount_ext2fs.c#5 integrate .. //depot/projects/tty/sbin/mount_hpfs/mount_hpfs.c#4 integrate .. //depot/projects/tty/sbin/mount_msdosfs/mount_msdosfs.c#7 integrate .. //depot/projects/tty/sbin/mount_nfs/mount_nfs.c#7 integrate .. //depot/projects/tty/sbin/mount_nfs4/mount_nfs4.c#5 integrate .. //depot/projects/tty/sbin/mount_ntfs/mount_ntfs.c#6 integrate .. //depot/projects/tty/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/tty/sbin/mount_reiserfs/mount_reiserfs.c#3 integrate .. //depot/projects/tty/sbin/mount_std/mount_std.c#4 integrate .. //depot/projects/tty/sbin/mount_udf/mount_udf.c#6 integrate .. //depot/projects/tty/sbin/mount_ufs/mount_ufs.c#4 integrate .. //depot/projects/tty/sbin/mount_umapfs/mount_umapfs.c#5 integrate .. //depot/projects/tty/sbin/mount_unionfs/mount_unionfs.c#5 integrate .. //depot/projects/tty/share/man/man4/Makefile#19 integrate .. //depot/projects/tty/share/man/man4/ng_tcpmss.4#1 branch .. //depot/projects/tty/share/man/man9/Makefile#13 integrate .. //depot/projects/tty/share/man/man9/ifnet.9#10 integrate .. //depot/projects/tty/share/man/man9/pmap_init.9#3 integrate .. //depot/projects/tty/share/man/man9/pmap_page_init.9#1 branch .. //depot/projects/tty/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/tty/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/tty/sys/conf/NOTES#25 integrate .. //depot/projects/tty/sys/conf/files#32 integrate .. //depot/projects/tty/sys/conf/files.alpha#15 integrate .. //depot/projects/tty/sys/conf/files.amd64#18 integrate .. //depot/projects/tty/sys/conf/files.i386#24 integrate .. //depot/projects/tty/sys/conf/files.ia64#18 integrate .. //depot/projects/tty/sys/conf/files.sparc64#16 integrate .. //depot/projects/tty/sys/conf/options#23 integrate .. //depot/projects/tty/sys/conf/options.sparc64#7 integrate .. //depot/projects/tty/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/tty/sys/contrib/dev/oltr/if_oltr.c#10 integrate .. //depot/projects/tty/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/tty/sys/contrib/dev/oltr/if_oltrvar.h#2 integrate .. //depot/projects/tty/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/tty/sys/contrib/pf/net/if_pflog.h#4 integrate .. //depot/projects/tty/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/tty/sys/contrib/pf/net/if_pfsync.h#4 integrate .. //depot/projects/tty/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/tty/sys/dev/an/if_an.c#13 integrate .. //depot/projects/tty/sys/dev/an/if_anreg.h#7 integrate .. //depot/projects/tty/sys/dev/ar/if_ar.c#11 integrate .. //depot/projects/tty/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/tty/sys/dev/arl/if_arl_isa.c#3 integrate .. //depot/projects/tty/sys/dev/arl/if_arlreg.h#3 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#22 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.c#20 integrate .. //depot/projects/tty/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/tty/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/tty/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/tty/sys/dev/atkbdc/atkbd.c#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbd_atkbdc.c#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbdc.c#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbdc_ebus.c#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbdc_isa.c#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbdc_subr.c#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbdc_subr.h#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbdcreg.h#1 branch .. //depot/projects/tty/sys/dev/atkbdc/atkbdreg.h#1 branch .. //depot/projects/tty/sys/dev/atkbdc/psm.c#1 branch .. //depot/projects/tty/sys/dev/atkbdc/psm.h#1 branch .. //depot/projects/tty/sys/dev/awi/awi.c#8 integrate .. //depot/projects/tty/sys/dev/awi/awivar.h#5 integrate .. //depot/projects/tty/sys/dev/bfe/if_bfe.c#10 integrate .. //depot/projects/tty/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/tty/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/tty/sys/dev/cm/if_cm_isa.c#5 integrate .. //depot/projects/tty/sys/dev/cm/smc90cx6.c#8 integrate .. //depot/projects/tty/sys/dev/cm/smc90cx6var.h#3 integrate .. //depot/projects/tty/sys/dev/cnw/if_cnw.c#8 integrate .. //depot/projects/tty/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/tty/sys/dev/cs/if_cs.c#8 integrate .. //depot/projects/tty/sys/dev/cs/if_csvar.h#4 integrate .. //depot/projects/tty/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/tty/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/tty/sys/dev/ed/if_ed.c#12 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_cbus.c#9 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_isa.c#8 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_pccard.c#10 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/tty/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/tty/sys/dev/ed/if_edvar.h#7 integrate .. //depot/projects/tty/sys/dev/em/if_em.c#14 integrate .. //depot/projects/tty/sys/dev/em/if_em.h#10 integrate .. //depot/projects/tty/sys/dev/en/if_en_pci.c#6 integrate .. //depot/projects/tty/sys/dev/en/midway.c#12 integrate .. //depot/projects/tty/sys/dev/en/midwayvar.h#6 integrate .. //depot/projects/tty/sys/dev/ep/if_ep.c#10 integrate .. //depot/projects/tty/sys/dev/ep/if_ep_pccard.c#8 integrate .. //depot/projects/tty/sys/dev/ep/if_epvar.h#6 integrate .. //depot/projects/tty/sys/dev/ex/if_ex.c#9 integrate .. //depot/projects/tty/sys/dev/ex/if_ex_isa.c#5 integrate .. //depot/projects/tty/sys/dev/ex/if_ex_pccard.c#8 integrate .. //depot/projects/tty/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/tty/sys/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/tty/sys/dev/fatm/if_fatmvar.h#3 integrate .. //depot/projects/tty/sys/dev/fe/if_fe.c#9 integrate .. //depot/projects/tty/sys/dev/fe/if_fe_isa.c#5 integrate .. //depot/projects/tty/sys/dev/fe/if_fe_pccard.c#7 integrate .. //depot/projects/tty/sys/dev/fe/if_fevar.h#5 integrate .. //depot/projects/tty/sys/dev/firewire/if_fwe.c#12 integrate .. //depot/projects/tty/sys/dev/firewire/if_fwevar.h#5 integrate .. //depot/projects/tty/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/tty/sys/dev/firewire/if_fwipvar.h#3 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxpvar.h#10 integrate .. //depot/projects/tty/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/tty/sys/dev/gem/if_gem_pci.c#7 integrate .. //depot/projects/tty/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/tty/sys/dev/harp/if_harp.c#6 integrate .. //depot/projects/tty/sys/dev/hatm/if_hatm.c#7 integrate .. //depot/projects/tty/sys/dev/hatm/if_hatm_intr.c#6 integrate .. //depot/projects/tty/sys/dev/hatm/if_hatm_ioctl.c#3 integrate .. //depot/projects/tty/sys/dev/hatm/if_hatm_rx.c#4 integrate .. //depot/projects/tty/sys/dev/hatm/if_hatm_tx.c#5 integrate .. //depot/projects/tty/sys/dev/hatm/if_hatmvar.h#4 integrate .. //depot/projects/tty/sys/dev/hfa/fore_output.c#5 integrate .. //depot/projects/tty/sys/dev/hfa/fore_receive.c#6 integrate .. //depot/projects/tty/sys/dev/hfa/fore_transmit.c#4 integrate .. //depot/projects/tty/sys/dev/hme/if_hme.c#10 integrate .. //depot/projects/tty/sys/dev/hme/if_hme_pci.c#8 integrate .. //depot/projects/tty/sys/dev/hme/if_hme_sbus.c#8 integrate .. //depot/projects/tty/sys/dev/hme/if_hmevar.h#4 integrate .. //depot/projects/tty/sys/dev/ichsmb/ichsmb.c#6 integrate .. //depot/projects/tty/sys/dev/ichsmb/ichsmb_pci.c#7 integrate .. //depot/projects/tty/sys/dev/ichsmb/ichsmb_var.h#3 integrate .. //depot/projects/tty/sys/dev/idt/idt.c#7 integrate .. //depot/projects/tty/sys/dev/ie/if_ie.c#9 integrate .. //depot/projects/tty/sys/dev/ie/if_ie_isa.c#4 integrate .. //depot/projects/tty/sys/dev/ie/if_ievar.h#3 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/tty/sys/dev/iicbus/if_ic.c#8 integrate .. //depot/projects/tty/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/tty/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/tty/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/tty/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/tty/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/tty/sys/dev/ixgb/if_ixgb.h#5 integrate .. //depot/projects/tty/sys/dev/kbd/atkbd.c#9 delete .. //depot/projects/tty/sys/dev/kbd/atkbdc.c#7 delete .. //depot/projects/tty/sys/dev/kbd/atkbdcreg.h#3 delete .. //depot/projects/tty/sys/dev/kbd/atkbdreg.h#3 delete .. //depot/projects/tty/sys/dev/lge/if_lge.c#12 integrate .. //depot/projects/tty/sys/dev/lge/if_lgereg.h#3 integrate .. //depot/projects/tty/sys/dev/lnc/if_lnc.c#8 integrate .. //depot/projects/tty/sys/dev/lnc/if_lnc_cbus.c#6 integrate .. //depot/projects/tty/sys/dev/lnc/if_lnc_isa.c#6 integrate .. //depot/projects/tty/sys/dev/lnc/if_lnc_pci.c#7 integrate .. //depot/projects/tty/sys/dev/lnc/if_lncvar.h#3 integrate .. //depot/projects/tty/sys/dev/mii/mii.c#8 integrate .. //depot/projects/tty/sys/dev/my/if_my.c#11 integrate .. //depot/projects/tty/sys/dev/my/if_myreg.h#3 integrate .. //depot/projects/tty/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/tty/sys/dev/nge/if_ngereg.h#4 integrate .. //depot/projects/tty/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/tty/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/tty/sys/dev/owi/if_owi.c#6 integrate .. //depot/projects/tty/sys/dev/owi/if_wivar.h#4 integrate .. //depot/projects/tty/sys/dev/patm/if_patm.c#4 integrate .. //depot/projects/tty/sys/dev/patm/if_patm_attach.c#6 integrate .. //depot/projects/tty/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/tty/sys/dev/patm/if_patm_ioctl.c#4 integrate .. //depot/projects/tty/sys/dev/patm/if_patm_rx.c#4 integrate .. //depot/projects/tty/sys/dev/patm/if_patm_tx.c#4 integrate .. //depot/projects/tty/sys/dev/patm/if_patmvar.h#3 integrate .. //depot/projects/tty/sys/dev/pdq/if_fea.c#6 integrate .. //depot/projects/tty/sys/dev/pdq/if_fpa.c#8 integrate .. //depot/projects/tty/sys/dev/pdq/pdq.c#4 integrate .. //depot/projects/tty/sys/dev/pdq/pdq_freebsd.h#7 integrate .. //depot/projects/tty/sys/dev/pdq/pdq_ifsubr.c#7 integrate .. //depot/projects/tty/sys/dev/pdq/pdqvar.h#5 integrate .. //depot/projects/tty/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/tty/sys/dev/ral/if_ral.c#3 integrate .. //depot/projects/tty/sys/dev/ral/if_ralvar.h#2 integrate .. //depot/projects/tty/sys/dev/ray/if_ray.c#11 integrate .. //depot/projects/tty/sys/dev/ray/if_rayvar.h#4 integrate .. //depot/projects/tty/sys/dev/re/if_re.c#12 integrate .. //depot/projects/tty/sys/dev/sbni/if_sbni.c#8 integrate .. //depot/projects/tty/sys/dev/sbni/if_sbni_isa.c#7 integrate .. //depot/projects/tty/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/tty/sys/dev/sbsh/if_sbsh.c#6 integrate .. //depot/projects/tty/sys/dev/sn/if_sn.c#11 integrate .. //depot/projects/tty/sys/dev/sn/if_sn_pccard.c#7 integrate .. //depot/projects/tty/sys/dev/sn/if_snvar.h#4 integrate .. //depot/projects/tty/sys/dev/snc/dp83932.c#11 integrate .. //depot/projects/tty/sys/dev/snc/dp83932var.h#4 integrate .. //depot/projects/tty/sys/dev/sound/pcm/channel.c#9 integrate .. //depot/projects/tty/sys/dev/sr/if_sr.c#11 integrate .. //depot/projects/tty/sys/dev/syscons/scvesactl.c#5 integrate .. //depot/projects/tty/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/tty/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/tty/sys/dev/tx/if_tx.c#11 integrate .. //depot/projects/tty/sys/dev/tx/if_txvar.h#4 integrate .. //depot/projects/tty/sys/dev/txp/if_txp.c#11 integrate .. //depot/projects/tty/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/tty/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/tty/sys/dev/usb/if_aue.c#12 integrate .. //depot/projects/tty/sys/dev/usb/if_auereg.h#6 integrate .. //depot/projects/tty/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/tty/sys/dev/usb/if_axereg.h#6 integrate .. //depot/projects/tty/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/tty/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/tty/sys/dev/usb/if_cue.c#13 integrate .. //depot/projects/tty/sys/dev/usb/if_cuereg.h#6 integrate .. //depot/projects/tty/sys/dev/usb/if_kue.c#12 integrate .. //depot/projects/tty/sys/dev/usb/if_kuereg.h#6 integrate .. //depot/projects/tty/sys/dev/usb/if_rue.c#8 integrate .. //depot/projects/tty/sys/dev/usb/if_ruereg.h#5 integrate .. //depot/projects/tty/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/tty/sys/dev/usb/if_udavreg.h#4 integrate .. //depot/projects/tty/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/tty/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/tty/sys/dev/utopia/utopia.c#6 integrate .. //depot/projects/tty/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/tty/sys/dev/vge/if_vgevar.h#4 integrate .. //depot/projects/tty/sys/dev/vx/if_vx.c#12 integrate .. //depot/projects/tty/sys/dev/vx/if_vxvar.h#5 integrate .. //depot/projects/tty/sys/dev/wi/if_wi.c#14 integrate .. //depot/projects/tty/sys/dev/wi/if_wivar.h#6 integrate .. //depot/projects/tty/sys/dev/wl/if_wl.c#10 integrate .. //depot/projects/tty/sys/dev/xe/if_xe.c#11 integrate .. //depot/projects/tty/sys/dev/xe/if_xe_pccard.c#9 integrate .. //depot/projects/tty/sys/dev/xe/if_xevar.h#4 integrate .. //depot/projects/tty/sys/i386/isa/if_el.c#8 integrate .. //depot/projects/tty/sys/i386/isa/pcvt/pcvt_hdr.h#6 integrate .. //depot/projects/tty/sys/i4b/driver/i4b_ipr.c#8 integrate .. //depot/projects/tty/sys/i4b/driver/i4b_isppp.c#7 integrate .. //depot/projects/tty/sys/isa/atkbd_isa.c#5 delete .. //depot/projects/tty/sys/isa/atkbdc_isa.c#7 delete .. //depot/projects/tty/sys/isa/psm.c#10 delete .. //depot/projects/tty/sys/kern/kern_ktr.c#10 integrate .. //depot/projects/tty/sys/kern/kern_malloc.c#15 integrate .. //depot/projects/tty/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/tty/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/tty/sys/modules/netgraph/Makefile#9 integrate .. //depot/projects/tty/sys/modules/netgraph/tcpmss/Makefile#1 branch .. //depot/projects/tty/sys/net/bpf.c#14 integrate .. //depot/projects/tty/sys/net/bridge.c#13 integrate .. //depot/projects/tty/sys/net/bridge.h#3 integrate .. //depot/projects/tty/sys/net/bridgestp.c#2 integrate .. //depot/projects/tty/sys/net/firewire.h#2 integrate .. //depot/projects/tty/sys/net/if.c#17 integrate .. //depot/projects/tty/sys/net/if_arc.h#4 integrate .. //depot/projects/tty/sys/net/if_arcsubr.c#11 integrate .. //depot/projects/tty/sys/net/if_arp.h#6 integrate .. //depot/projects/tty/sys/net/if_atm.h#8 integrate .. //depot/projects/tty/sys/net/if_atmsubr.c#11 integrate .. //depot/projects/tty/sys/net/if_bridge.c#4 integrate .. //depot/projects/tty/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/tty/sys/net/if_disc.c#10 integrate .. //depot/projects/tty/sys/net/if_ef.c#10 integrate .. //depot/projects/tty/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/tty/sys/net/if_faith.c#12 integrate .. //depot/projects/tty/sys/net/if_fddisubr.c#11 integrate .. //depot/projects/tty/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/tty/sys/net/if_gif.c#8 integrate .. //depot/projects/tty/sys/net/if_gif.h#4 integrate .. //depot/projects/tty/sys/net/if_gre.c#9 integrate .. //depot/projects/tty/sys/net/if_gre.h#4 integrate .. //depot/projects/tty/sys/net/if_iso88025subr.c#10 integrate .. //depot/projects/tty/sys/net/if_loop.c#14 integrate .. //depot/projects/tty/sys/net/if_ppp.c#11 integrate .. //depot/projects/tty/sys/net/if_pppvar.h#3 integrate .. //depot/projects/tty/sys/net/if_sl.c#8 integrate .. //depot/projects/tty/sys/net/if_slvar.h#3 integrate .. //depot/projects/tty/sys/net/if_sppp.h#3 integrate .. //depot/projects/tty/sys/net/if_spppfr.c#2 integrate .. //depot/projects/tty/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/tty/sys/net/if_stf.c#10 integrate .. //depot/projects/tty/sys/net/if_tap.c#12 integrate .. //depot/projects/tty/sys/net/if_tapvar.h#5 integrate .. //depot/projects/tty/sys/net/if_tun.c#12 integrate .. //depot/projects/tty/sys/net/if_types.h#8 integrate .. //depot/projects/tty/sys/net/if_var.h#10 integrate .. //depot/projects/tty/sys/net/if_vlan.c#10 integrate .. //depot/projects/tty/sys/net/ppp_tty.c#6 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_none.c#3 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/tty/sys/net80211/ieee80211_crypto_wep.c#3 integrate .. //depot/projects/tty/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/tty/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/tty/sys/netatalk/aarp.c#12 integrate .. //depot/projects/tty/sys/netatm/atm_if.c#6 integrate .. //depot/projects/tty/sys/netatm/atm_if.h#5 integrate .. //depot/projects/tty/sys/netatm/atm_socket.c#8 integrate .. //depot/projects/tty/sys/netatm/atm_usrreq.c#6 integrate .. //depot/projects/tty/sys/netatm/ipatm/ipatm_input.c#5 integrate .. //depot/projects/tty/sys/netatm/ipatm/ipatm_load.c#5 integrate .. //depot/projects/tty/sys/netatm/ipatm/ipatm_output.c#4 integrate .. //depot/projects/tty/sys/netatm/ipatm/ipatm_usrreq.c#6 integrate .. //depot/projects/tty/sys/netatm/ipatm/ipatm_vcm.c#6 integrate .. //depot/projects/tty/sys/netatm/spans/spans_arp.c#6 integrate .. //depot/projects/tty/sys/netatm/uni/uniarp.c#6 integrate .. //depot/projects/tty/sys/netatm/uni/uniarp_cache.c#5 integrate .. //depot/projects/tty/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#4 integrate .. //depot/projects/tty/sys/netgraph/atm/ng_atm.c#7 integrate .. //depot/projects/tty/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/tty/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/tty/sys/netgraph/ng_fec.c#9 integrate .. //depot/projects/tty/sys/netgraph/ng_gif.c#8 integrate .. //depot/projects/tty/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/tty/sys/netgraph/ng_sppp.c#5 integrate .. //depot/projects/tty/sys/netgraph/ng_tcpmss.c#1 branch .. //depot/projects/tty/sys/netgraph/ng_tcpmss.h#1 branch .. //depot/projects/tty/sys/netinet/in_gif.c#8 integrate .. //depot/projects/tty/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/tty/sys/netinet/ip_gre.c#6 integrate .. //depot/projects/tty/sys/netinet/ip_output.c#14 integrate .. //depot/projects/tty/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/tty/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/tty/sys/netipx/ipx_ip.c#7 integrate .. //depot/projects/tty/sys/netipx/ipx_ip.h#3 integrate .. //depot/projects/tty/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/tty/sys/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/tty/sys/nfsclient/nfsargs.h#5 integrate .. //depot/projects/tty/sys/nfsclient/nfsmount.h#6 integrate .. //depot/projects/tty/sys/pci/if_dc.c#16 integrate .. //depot/projects/tty/sys/pci/if_dcreg.h#10 integrate .. //depot/projects/tty/sys/pci/if_de.c#11 integrate .. //depot/projects/tty/sys/pci/if_devar.h#6 integrate .. //depot/projects/tty/sys/pci/if_mn.c#8 integrate .. //depot/projects/tty/sys/pci/if_pcn.c#14 integrate .. //depot/projects/tty/sys/pci/if_pcnreg.h#4 integrate .. //depot/projects/tty/sys/pci/if_rl.c#14 integrate .. //depot/projects/tty/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/tty/sys/pci/if_sf.c#13 integrate .. //depot/projects/tty/sys/pci/if_sfreg.h#4 integrate .. //depot/projects/tty/sys/pci/if_sis.c#15 integrate .. //depot/projects/tty/sys/pci/if_sisreg.h#7 integrate .. //depot/projects/tty/sys/pci/if_sk.c#15 integrate .. //depot/projects/tty/sys/pci/if_skreg.h#9 integrate .. //depot/projects/tty/sys/pci/if_ste.c#13 integrate .. //depot/projects/tty/sys/pci/if_stereg.h#5 integrate .. //depot/projects/tty/sys/pci/if_ti.c#15 integrate .. //depot/projects/tty/sys/pci/if_tireg.h#6 integrate .. //depot/projects/tty/sys/pci/if_tl.c#12 integrate .. //depot/projects/tty/sys/pci/if_tlreg.h#4 integrate .. //depot/projects/tty/sys/pci/if_vr.c#13 integrate .. //depot/projects/tty/sys/pci/if_vrreg.h#7 integrate .. //depot/projects/tty/sys/pci/if_wb.c#12 integrate .. //depot/projects/tty/sys/pci/if_wbreg.h#4 integrate .. //depot/projects/tty/sys/pci/if_xl.c#15 integrate .. //depot/projects/tty/sys/pci/if_xlreg.h#10 integrate .. //depot/projects/tty/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/tty/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/tty/sys/sys/buf.h#13 integrate .. //depot/projects/tty/sys/sys/bufobj.h#4 integrate .. //depot/projects/tty/sys/sys/ktr.h#6 integrate .. //depot/projects/tty/sys/sys/param.h#21 integrate .. //depot/projects/tty/sys/sys/tree.h#4 integrate .. //depot/projects/tty/sys/vm/device_pager.c#9 integrate .. //depot/projects/tty/sys/vm/vm_contig.c#8 integrate .. //depot/projects/tty/usr.bin/sockstat/sockstat.c#6 integrate .. //depot/projects/tty/usr.bin/telnet/Makefile#5 integrate .. //depot/projects/tty/usr.bin/vacation/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/cron/Makefile.inc#2 integrate .. //depot/projects/tty/usr.sbin/editmap/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/inetd/inetd.8#5 integrate .. //depot/projects/tty/usr.sbin/lpr/Makefile.inc#3 integrate .. //depot/projects/tty/usr.sbin/mailstats/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/makemap/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/mrouted/Makefile.inc#4 integrate .. //depot/projects/tty/usr.sbin/ntp/Makefile.inc#5 integrate .. //depot/projects/tty/usr.sbin/pkg_install/Makefile.inc#5 integrate .. //depot/projects/tty/usr.sbin/praliases/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/rmt/rmt.8#5 integrate .. //depot/projects/tty/usr.sbin/sendmail/Makefile#9 integrate .. //depot/projects/tty/usr.sbin/slstat/slstat.c#3 integrate Differences ... ==== //depot/projects/tty/UPDATING#22 (text+ko) ==== @@ -21,11 +21,20 @@ developers choose to disable these features on build machines to maximize performance. +20050610: + Major changes to network interface API. All drivers must be + recompiled. Drivers not in the base system will need to be + updated to the new APIs. + 20050609: Changes were made to kinfo_proc in sys/user.h. Please recompile userland, or commands like `fstat', `pkill', `ps', `top' and `w' will not behave correctly. + The API and ABI for hwpmc(4) have changed with the addition + of sampling support. Please recompile lib/libpmc(3) and + usr.sbin/{pmcstat,pmccontrol}. + 20050606: The OpenBSD dhclient was imported in place of the ISC dhclient and the network interface configuration scripts were updated @@ -373,4 +382,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.412 2005/06/09 19:09:38 gad Exp $ +$FreeBSD: src/UPDATING,v 1.414 2005/06/10 19:59:26 jkoshy Exp $ ==== //depot/projects/tty/bin/rmail/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.21 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.22 2005/06/10 06:12:49 des Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail @@ -14,12 +14,8 @@ WARNS?= 0 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a +LIBSMDIR= ${.OBJDIR}/../../lib/libsm +LIBSM= ${LIBSMDIR}/libsm.a DPADD= ${LIBSM} LDADD= ${LIBSM} ==== //depot/projects/tty/etc/etc.sparc64/ttys#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.10 2005/03/09 03:57:08 obrien Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.11 2005/06/10 23:06:14 marius Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -31,26 +31,27 @@ # If console is marked "insecure", then init will ask for the root password # when going to single-user mode. console none unknown off secure -# -screen "/usr/libexec/getty Pc" vt100 on secure +# ofw_console(4) +screen "/usr/libexec/getty Pc" vt100 off secure ttya "/usr/libexec/getty 3wire.9600" vt100 off secure ttyb "/usr/libexec/getty 3wire.9600" vt100 off secure +# sab(4) ttyz0 "/usr/libexec/getty 3wire.9600" vt100 off secure ttyz1 "/usr/libexec/getty 3wire.9600" vt100 off secure -# -#ttyv0 "/usr/libexec/getty Pc" cons25 on secure +# syscons(4) +ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals -#ttyv1 "/usr/libexec/getty Pc" cons25 on secure -#ttyv2 "/usr/libexec/getty Pc" cons25 on secure -#ttyv3 "/usr/libexec/getty Pc" cons25 on secure -#ttyv4 "/usr/libexec/getty Pc" cons25 on secure -#ttyv5 "/usr/libexec/getty Pc" cons25 on secure -#ttyv6 "/usr/libexec/getty Pc" cons25 on secure -#ttyv7 "/usr/libexec/getty Pc" cons25 on secure -#ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure +ttyv1 "/usr/libexec/getty Pc" cons25 on secure +ttyv2 "/usr/libexec/getty Pc" cons25 on secure +ttyv3 "/usr/libexec/getty Pc" cons25 on secure +ttyv4 "/usr/libexec/getty Pc" cons25 on secure +ttyv5 "/usr/libexec/getty Pc" cons25 on secure +ttyv6 "/usr/libexec/getty Pc" cons25 on secure +ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -# Requires device 'uart' be enabled. +# uart(4) ttyu0 "/usr/libexec/getty std.9600" vt100 on secure ttyu1 "/usr/libexec/getty std.9600" vt100 on secure ttyu2 "/usr/libexec/getty std.9600" vt100 off secure ==== //depot/projects/tty/etc/inetd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.69 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.70 2005/06/10 20:52:35 nectar Exp $ # # Internet server configuration database # @@ -18,7 +18,6 @@ #login stream tcp6 nowait root /usr/libexec/rlogind rlogind #finger stream tcp nowait/3/10 nobody /usr/libexec/fingerd fingerd -s #finger stream tcp6 nowait/3/10 nobody /usr/libexec/fingerd fingerd -s -#exec stream tcp nowait root /usr/libexec/rexecd rexecd # # run comsat as root to be able to print partial mailbox contents w/ biff, # or use the safer tty:tty to just print that new mail has been received. ==== //depot/projects/tty/etc/mtree/BSD.local.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.115 2005/05/13 04:06:04 marcus Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.117 2005/06/10 20:14:38 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # ==== //depot/projects/tty/etc/pam.d/Makefile#6 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/etc/pam.d/Makefile,v 1.12 2004/12/21 08:46:50 ru Exp $ +# $FreeBSD: src/etc/pam.d/Makefile,v 1.13 2005/06/10 20:52:36 nectar Exp $ NO_OBJ= FILES= README ftpd gdm imap kde login other passwd pop3 \ - rexecd rsh sshd su system telnetd xdm + rsh sshd su system telnetd xdm FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 ==== //depot/projects/tty/games/fortune/datfiles/fortunes#16 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.178 2005/06/06 15:41:16 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.179 2005/06/10 08:58:44 phk Exp $ % ======================================================================= @@ -36069,6 +36069,9 @@ No one regards what is before his feet; we all gaze at the stars. -- Quintus Ennius % +No one should have to wait until after ten o'clock for his english muffin! + -- Snoopy +% No one so thoroughly appreciates the value of constructive criticism as the one who's giving it. -- Hal Chadwick @@ -60947,4 +60950,3 @@ finder, be careful not to put your fingers or fingernails in your eye. -- found in the users manual of the Nikon D2x camera, a camera for professional photographers -% ==== //depot/projects/tty/gnu/usr.bin/cvs/Makefile.inc#2 (text+ko) ==== @@ -1,21 +1,13 @@ +# $FreeBSD: src/gnu/usr.bin/cvs/Makefile.inc,v 1.6 2005/06/10 06:12:50 des Exp $ + .if !defined(CVSDIR) CVSDIR= $(.CURDIR)/../../../../contrib/cvs -.if exists(${.OBJDIR}/../lib) LIBCVSDIR= ${.OBJDIR}/../lib -.else -LIBCVSDIR= ${.CURDIR}/../lib -.endif - LIBCVS= ${LIBCVSDIR}/libcvs.a -.if exists(${.OBJDIR}/../libdiff) LIBDIFFDIR= ${.OBJDIR}/../libdiff -.else -LIBDIFFDIR= ${.CURDIR}/../libdiff -.endif - LIBDIFF= ${LIBDIFFDIR}/libdiff.a .if exists(${.CURDIR}/../../Makefile.inc) ==== //depot/projects/tty/gnu/usr.bin/groff/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.9 2003/08/04 21:31:52 ache Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.11 2005/06/10 07:06:07 ru Exp $ BINDIR?= /usr/bin SHELL= /bin/sh @@ -65,16 +65,9 @@ ######################################################################## # Libraries -# Bad assumption, if one exists they all exist -.if exists(${.OBJDIR}/${TOPREL}/src/libs/libgroff) LIBGROFF= ${.OBJDIR}/${TOPREL}/src/libs/libgroff/libgroff.a LIBDRIVER= ${.OBJDIR}/${TOPREL}/src/libs/libdriver/libdriver.a LIBBIB= ${.OBJDIR}/${TOPREL}/src/libs/libbib/libbib.a -.else -LIBGROFF= ${.CURDIR}/${TOPREL}/src/libs/libgroff/libgroff.a -LIBDRIVER= ${.CURDIR}/${TOPREL}/src/libs/libdriver/libdriver.a -LIBBIB= ${.CURDIR}/${TOPREL}/src/libs/libbib/libbib.a -.endif CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include ==== //depot/projects/tty/gnu/usr.bin/man/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/man/Makefile.inc,v 1.21 2002/10/18 09:14:13 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/man/Makefile.inc,v 1.22 2005/06/10 06:12:50 des Exp $ # # Set a bunch of things to hardcoded paths so that we don't accidently # pick up a user's own version of some utility and hose ourselves. @@ -25,12 +25,7 @@ compress= /usr/bin/gzip -c compext= .gz -.if exists(${.OBJDIR}/../lib) LIBDESTDIR= ${.OBJDIR}/../lib -.else -LIBDESTDIR= ${.CURDIR}/../lib -.endif - -LIBMAN= ${LIBDESTDIR}/libman.a +LIBMAN= ${LIBDESTDIR}/libman.a .include "../Makefile.inc" ==== //depot/projects/tty/gnu/usr.bin/rcs/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,3 @@ -# Location of librcs +# $FreeBSD: src/gnu/usr.bin/rcs/Makefile.inc,v 1.4 2005/06/10 06:12:50 des Exp $ -.if exists(${.OBJDIR}/../lib) LIBRCS= ${.OBJDIR}/../lib/librcs.a -.else -LIBRCS= ${.CURDIR}/../lib/librcs.a -.endif ==== //depot/projects/tty/gnu/usr.bin/texinfo/Makefile.inc#2 (text+ko) ==== @@ -1,12 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.11 2000/01/17 10:59:13 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.12 2005/06/10 06:12:51 des Exp $ TXIDIR= ${.CURDIR}/../../../../contrib/texinfo - -.if exists(${.OBJDIR}/../libtxi) LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a -.else -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a -.endif CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" \ -I${TXIDIR} -I${TXIDIR}/lib ==== //depot/projects/tty/kerberos5/Makefile.inc#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.25 2005/04/18 22:03:21 imp Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.26 2005/06/10 06:12:51 des Exp $ NO_LINT= @@ -15,17 +15,8 @@ LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib .endif -.if exists(${.OBJDIR}/../../lib/libvers) LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a -.else -LIBVERS= ${.CURDIR}/../../lib/libvers/libvers.a -.endif - -.if exists(${.OBJDIR}/../../lib/libsl) LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a -.else -LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a -.endif .if defined(SRCS) ==== //depot/projects/tty/lib/libc/net/rcmd.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)rcmd.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.23 2002/12/18 12:45:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.24 2005/06/10 20:52:35 nectar Exp $ .\" .Dd March 3, 2000 .Dt RCMD 3 @@ -264,8 +264,6 @@ .Xr rlogin 1 , .Xr rsh 1 , .Xr intro 2 , -.Xr rexec 3 , -.Xr rexecd 8 , .Xr rlogind 8 , .Xr rshd 8 .Pp ==== //depot/projects/tty/lib/libc/sys/extattr_get_file.2#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.16 2005/02/24 00:04:45 csjp Exp $ +.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.17 2005/06/10 16:54:17 rodrigc Exp $ .\" .Dd February 23, 2005 .Dt EXTATTR 2 @@ -97,8 +97,10 @@ system call deletes the extended attribute specified. The .Fn extattr_list_file -returns a list of attributes present in the requested namespace, separated -by ASCII 0 (nul) characters. +returns a list of attributes present in the requested namespace. +Each list entry consists of a single byte containing the length +of the attribute name, followed by the attribute name. +The attribute name is not terminated by ASCII 0 (nul). The .Fn extattr_get_file , and ==== //depot/projects/tty/lib/libpam/modules/pam_deny/pam_deny.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_deny/pam_deny.c,v 1.9 2002/04/12 22:27:19 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_deny/pam_deny.c,v 1.10 2005/06/10 06:16:13 des Exp $"); #include @@ -55,7 +55,7 @@ int argc __unused, const char *argv[] __unused) { - return (PAM_AUTH_ERR); + return (PAM_CRED_ERR); } PAM_EXTERN int @@ -71,7 +71,7 @@ int argc __unused, const char *argv[] __unused) { - return (PAM_AUTH_ERR); + return (PAM_AUTHTOK_ERR); } PAM_EXTERN int @@ -79,7 +79,7 @@ int argc __unused, const char *argv[] __unused) { - return (PAM_AUTH_ERR); + return (PAM_SESSION_ERR); } PAM_EXTERN int @@ -87,7 +87,7 @@ int argc __unused, const char *argv[] __unused) { - return (PAM_AUTH_ERR); + return (PAM_SESSION_ERR); } PAM_MODULE_ENTRY("pam_deny"); ==== //depot/projects/tty/libexec/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.74 2005/05/16 17:12:23 obrien Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.75 2005/06/10 20:52:35 nectar Exp $ SUBDIR= atrun \ bootpd \ @@ -16,7 +16,6 @@ pt_chown \ rbootd \ revnetgroup \ - ${_rexecd} \ ${_rlogind} \ rpc.rquotad \ rpc.rstatd \ @@ -47,7 +46,6 @@ .endif .if !defined(NO_RCMDS) -_rexecd= rexecd _rlogind= rlogind _rshd= rshd .endif ==== //depot/projects/tty/libexec/mail.local/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/libexec/mail.local/Makefile,v 1.20 2003/07/07 03:54:03 gshapiro Exp $ +# $FreeBSD: src/libexec/mail.local/Makefile,v 1.21 2005/06/10 06:12:51 des Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/mail.local @@ -10,12 +10,8 @@ CFLAGS+=-I${SENDMAIL_DIR}/include -I. WFORMAT=0 -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a +LIBSMDIR= ${.OBJDIR}/../../lib/libsm +LIBSM= ${LIBSMDIR}/libsm.a DPADD= ${LIBSM} LDADD= ${LIBSM} ==== //depot/projects/tty/libexec/smrsh/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/2/95 -# $FreeBSD: src/libexec/smrsh/Makefile,v 1.9 2003/07/07 03:54:03 gshapiro Exp $ +# $FreeBSD: src/libexec/smrsh/Makefile,v 1.10 2005/06/10 06:12:51 des Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/smrsh @@ -9,12 +9,8 @@ MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a +LIBSMDIR= ${.OBJDIR}/../../lib/libsm +LIBSM= ${LIBSMDIR}/libsm.a DPADD= ${LIBSM} LDADD= ${LIBSM} ==== //depot/projects/tty/libexec/telnetd/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/telnetd/Makefile,v 1.25 2004/12/21 10:16:01 ru Exp $ +# $FreeBSD: src/libexec/telnetd/Makefile,v 1.26 2005/06/10 06:12:51 des Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -19,11 +19,7 @@ WARNS?= 2 WFORMAT?= 0 -.if exists(${.OBJDIR}/../../lib/libtelnet) LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -.else -LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a -.endif DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} ==== //depot/projects/tty/sbin/mount/mntopts.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.25 2005/06/01 09:39:34 delphij Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.26 2005/06/10 09:51:40 delphij Exp $ */ struct mntopt { @@ -65,8 +65,8 @@ /* This is parsed by mount(8), but is ignored by specific mount_*(8)s. */ #define MOPT_AUTO { "auto", 0, 0, 0 } -/* A handy macro as terminator of MNT_ array */ -#define MOPT_NULL { NULL, 0, 0, 0 } +/* A handy macro as terminator of MNT_ array. */ +#define MOPT_END { NULL, 0, 0, 0 } #define MOPT_FSTAB_COMPAT \ MOPT_RO, \ ==== //depot/projects/tty/sbin/mount/mount_ufs.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount_ufs.c,v 1.25 2005/06/01 09:39:34 delphij Exp $"; + "$FreeBSD: src/sbin/mount/mount_ufs.c,v 1.26 2005/06/10 09:51:40 delphij Exp $"; #endif /* not lint */ #include @@ -64,7 +64,7 @@ MOPT_SYNC, MOPT_UPDATE, MOPT_SNAPSHOT, - MOPT_NULL + MOPT_END }; int ==== //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.c#7 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95"; */ static const char rcsid[] = - "$FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.29 2005/06/01 09:39:34 delphij Exp $"; + "$FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.30 2005/06/10 09:51:41 delphij Exp $"; #endif /* not lint */ #include @@ -77,7 +77,7 @@ { "rrip", 1, ISOFSMNT_NORRIP, 1 }, { "joliet", 1, ISOFSMNT_NOJOLIET, 1 }, { "strictjoliet", 1, ISOFSMNT_BROKENJOLIET, 1 }, - MOPT_NULL + MOPT_END }; int get_ssector(const char *dev); ==== //depot/projects/tty/sbin/mount_ext2fs/mount_ext2fs.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount_lfs.c 8.3 (Berkeley) 3/27/94"; */ static const char rcsid[] = - "$FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.19 2005/06/01 09:39:34 delphij Exp $"; + "$FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.20 2005/06/10 09:51:41 delphij Exp $"; #endif /* not lint */ #include @@ -60,7 +60,7 @@ MOPT_FORCE, MOPT_SYNC, MOPT_UPDATE, - MOPT_NULL + MOPT_END }; static void usage(void) __dead2; ==== //depot/projects/tty/sbin/mount_hpfs/mount_hpfs.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF >>> TRUNCATED FOR MAIL (1000 lines) <<<