From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 02:42:31 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0850106566C; Sun, 2 Oct 2011 02:42:31 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 96E0F8FC08; Sun, 2 Oct 2011 02:42:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p922gVYo044003; Sun, 2 Oct 2011 02:42:31 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p922gV3S043999; Sun, 2 Oct 2011 02:42:31 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110020242.p922gV3S043999@svn.freebsd.org> From: Adrian Chadd Date: Sun, 2 Oct 2011 02:42:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225913 - head/sys/net80211 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 02:42:31 -0000 Author: adrian Date: Sun Oct 2 02:42:31 2011 New Revision: 225913 URL: http://svn.freebsd.org/changeset/base/225913 Log: Fix a panic in the wifi stack when a software beacon miss occurs in the wrong state. The ieee80211_swbmiss() callout is not called with the ic lock held, so it's quite possible the scheduler will run the callout during a state change. This patch: * changes the swbmiss callout to be locked by the ic lock * enforces the ic lock being held across the beacon vap functions by grabbing it inside beacon_miss() and beacon_swmiss(). This ensures that the ic lock is held (and thus the VAP state stays constant) during beacon miss and software miss processing. Since the callout is removed whilst the ic lock is held, it also ensures that the ic lock can't be called during a state change or exhibit any race conditions seen above. Both Edgar and Joel report that this patch fixes the crash and doesn't introduce new issues. Reported by: Edgar Martinez Reported by: Joel Dahl Reported by: emaste Modified: head/sys/net80211/ieee80211_proto.c head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_tdma.c Modified: head/sys/net80211/ieee80211_proto.c ============================================================================== --- head/sys/net80211/ieee80211_proto.c Sat Oct 1 23:47:37 2011 (r225912) +++ head/sys/net80211/ieee80211_proto.c Sun Oct 2 02:42:31 2011 (r225913) @@ -193,7 +193,7 @@ ieee80211_proto_vattach(struct ieee80211 vap->iv_rtsthreshold = IEEE80211_RTS_DEFAULT; vap->iv_fragthreshold = IEEE80211_FRAG_DEFAULT; vap->iv_bmiss_max = IEEE80211_BMISS_MAX; - callout_init(&vap->iv_swbmiss, CALLOUT_MPSAFE); + callout_init_mtx(&vap->iv_swbmiss, IEEE80211_LOCK_OBJ(ic), 0); callout_init(&vap->iv_mgtsend, CALLOUT_MPSAFE); TASK_INIT(&vap->iv_nstate_task, 0, ieee80211_newstate_cb, vap); TASK_INIT(&vap->iv_swbmiss_task, 0, beacon_swmiss, vap); @@ -1403,7 +1403,7 @@ beacon_miss(void *arg, int npending) struct ieee80211com *ic = arg; struct ieee80211vap *vap; - /* XXX locking */ + IEEE80211_LOCK(ic); TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { /* * We only pass events through for sta vap's in RUN state; @@ -1415,18 +1415,21 @@ beacon_miss(void *arg, int npending) vap->iv_bmiss != NULL) vap->iv_bmiss(vap); } + IEEE80211_UNLOCK(ic); } static void beacon_swmiss(void *arg, int npending) { struct ieee80211vap *vap = arg; + struct ieee80211com *ic = vap->iv_ic; - if (vap->iv_state != IEEE80211_S_RUN) - return; - - /* XXX Call multiple times if npending > zero? */ - vap->iv_bmiss(vap); + IEEE80211_LOCK(ic); + if (vap->iv_state == IEEE80211_S_RUN) { + /* XXX Call multiple times if npending > zero? */ + vap->iv_bmiss(vap); + } + IEEE80211_UNLOCK(ic); } /* @@ -1440,6 +1443,8 @@ ieee80211_swbmiss(void *arg) struct ieee80211vap *vap = arg; struct ieee80211com *ic = vap->iv_ic; + IEEE80211_LOCK_ASSERT(ic); + /* XXX sleep state? */ KASSERT(vap->iv_state == IEEE80211_S_RUN, ("wrong state %d", vap->iv_state)); Modified: head/sys/net80211/ieee80211_sta.c ============================================================================== --- head/sys/net80211/ieee80211_sta.c Sat Oct 1 23:47:37 2011 (r225912) +++ head/sys/net80211/ieee80211_sta.c Sun Oct 2 02:42:31 2011 (r225913) @@ -109,6 +109,8 @@ sta_beacon_miss(struct ieee80211vap *vap { struct ieee80211com *ic = vap->iv_ic; + IEEE80211_LOCK_ASSERT(ic); + KASSERT((ic->ic_flags & IEEE80211_F_SCAN) == 0, ("scanning")); KASSERT(vap->iv_state >= IEEE80211_S_RUN, ("wrong state %s", ieee80211_state_name[vap->iv_state])); Modified: head/sys/net80211/ieee80211_tdma.c ============================================================================== --- head/sys/net80211/ieee80211_tdma.c Sat Oct 1 23:47:37 2011 (r225912) +++ head/sys/net80211/ieee80211_tdma.c Sun Oct 2 02:42:31 2011 (r225913) @@ -285,6 +285,9 @@ static void tdma_beacon_miss(struct ieee80211vap *vap) { struct ieee80211_tdma_state *ts = vap->iv_tdma; + struct ieee80211com *ic = vap->iv_ic; + + IEEE80211_LOCK_ASSERT(ic); KASSERT((vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0, ("scanning")); KASSERT(vap->iv_state == IEEE80211_S_RUN, From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 09:44:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B721E106564A; Sun, 2 Oct 2011 09:44:28 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A59888FC08; Sun, 2 Oct 2011 09:44:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p929iSfw056837; Sun, 2 Oct 2011 09:44:28 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p929iS6W056835; Sun, 2 Oct 2011 09:44:28 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201110020944.p929iS6W056835@svn.freebsd.org> From: Xin LI Date: Sun, 2 Oct 2011 09:44:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225916 - stable/8/sys/dev/coretemp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 09:44:28 -0000 Author: delphij Date: Sun Oct 2 09:44:28 2011 New Revision: 225916 URL: http://svn.freebsd.org/changeset/base/225916 Log: MFC r225339: Expose more variables from coretemp(4) via sysctl: - tjmax - Tj(max) value from the CPU - delta - current delta reading - resolution - sensor resolution in Celsius - throttle_log - whether a #PROCHOT was asserted since last reset Submitted by: Mark Johnston (mostly) Modified: stable/8/sys/dev/coretemp/coretemp.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/coretemp/coretemp.c ============================================================================== --- stable/8/sys/dev/coretemp/coretemp.c Sun Oct 2 08:48:47 2011 (r225915) +++ stable/8/sys/dev/coretemp/coretemp.c Sun Oct 2 09:44:28 2011 (r225916) @@ -48,12 +48,21 @@ __FBSDID("$FreeBSD$"); #include #include -#define TZ_ZEROC 2732 +#define TZ_ZEROC 2732 + +#define THERM_STATUS_LOG 0x02 +#define THERM_STATUS 0x01 +#define THERM_STATUS_TEMP_SHIFT 16 +#define THERM_STATUS_TEMP_MASK 0x7f +#define THERM_STATUS_RES_SHIFT 27 +#define THERM_STATUS_RES_MASK 0x0f +#define THERM_STATUS_VALID_SHIFT 31 +#define THERM_STATUS_VALID_MASK 0x01 struct coretemp_softc { device_t sc_dev; int sc_tjmax; - struct sysctl_oid *sc_oid; + unsigned int sc_throttle_log; }; /* @@ -64,8 +73,10 @@ static int coretemp_probe(device_t dev); static int coretemp_attach(device_t dev); static int coretemp_detach(device_t dev); -static int coretemp_get_temp(device_t dev); -static int coretemp_get_temp_sysctl(SYSCTL_HANDLER_ARGS); +static uint64_t coretemp_get_thermal_msr(int cpu); +static void coretemp_clear_thermal_msr(int cpu); +static int coretemp_get_val_sysctl(SYSCTL_HANDLER_ARGS); +static int coretemp_throttle_log_sysctl(SYSCTL_HANDLER_ARGS); static device_method_t coretemp_methods[] = { /* Device interface */ @@ -83,8 +94,16 @@ static driver_t coretemp_driver = { sizeof(struct coretemp_softc), }; +enum therm_info { + CORETEMP_TEMP, + CORETEMP_DELTA, + CORETEMP_RESOLUTION, + CORETEMP_TJMAX, +}; + static devclass_t coretemp_devclass; -DRIVER_MODULE(coretemp, cpu, coretemp_driver, coretemp_devclass, NULL, NULL); +DRIVER_MODULE(coretemp, cpu, coretemp_driver, coretemp_devclass, NULL, + NULL); static void coretemp_identify(driver_t *driver, device_t parent) @@ -135,6 +154,8 @@ coretemp_attach(device_t dev) uint64_t msr; int cpu_model, cpu_stepping; int ret, tjtarget; + struct sysctl_oid *oid; + struct sysctl_ctx_list *ctx; sc->sc_dev = dev; pdev = device_get_parent(dev); @@ -149,7 +170,7 @@ coretemp_attach(device_t dev) */ if (cpu_model < 0xe) return (ENXIO); - + #if 0 /* * XXXrpaulo: I have this CPU model and when it returns from C3 * coretemp continues to function properly. @@ -216,7 +237,7 @@ coretemp_attach(device_t dev) ret = rdmsr_safe(MSR_IA32_TEMPERATURE_TARGET, &msr); if (ret == 0) { tjtarget = (msr >> 16) & 0xff; - + /* * On earlier generation of processors, the value * obtained from IA32_TEMPERATURE_TARGET register is @@ -243,15 +264,35 @@ coretemp_attach(device_t dev) if (bootverbose) device_printf(dev, "Setting TjMax=%d\n", sc->sc_tjmax); + ctx = device_get_sysctl_ctx(dev); + + oid = SYSCTL_ADD_NODE(ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), OID_AUTO, + "coretemp", CTLFLAG_RD, NULL, "Per-CPU thermal information"); + /* - * Add the "temperature" MIB to dev.cpu.N. + * Add the MIBs to dev.cpu.N and dev.cpu.N.coretemp. */ - sc->sc_oid = SYSCTL_ADD_PROC(device_get_sysctl_ctx(pdev), - SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), - OID_AUTO, "temperature", - CTLTYPE_INT | CTLFLAG_RD, - dev, 0, coretemp_get_temp_sysctl, "IK", + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), + OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, dev, + CORETEMP_TEMP, coretemp_get_val_sysctl, "IK", "Current temperature"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "delta", + CTLTYPE_INT | CTLFLAG_RD, dev, CORETEMP_DELTA, + coretemp_get_val_sysctl, "I", + "Delta between TCC activation and current temperature"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "resolution", + CTLTYPE_INT | CTLFLAG_RD, dev, CORETEMP_RESOLUTION, + coretemp_get_val_sysctl, "I", + "Resolution of CPU thermal sensor"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "tjmax", + CTLTYPE_INT | CTLFLAG_RD, dev, CORETEMP_TJMAX, + coretemp_get_val_sysctl, "IK", + "TCC activation temperature"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "throttle_log", CTLTYPE_INT | CTLFLAG_RW, dev, 0, + coretemp_throttle_log_sysctl, "I", + "Set to 1 if the thermal sensor has tripped"); return (0); } @@ -259,22 +300,13 @@ coretemp_attach(device_t dev) static int coretemp_detach(device_t dev) { - struct coretemp_softc *sc = device_get_softc(dev); - - sysctl_remove_oid(sc->sc_oid, 1, 0); - return (0); } - -static int -coretemp_get_temp(device_t dev) +static uint64_t +coretemp_get_thermal_msr(int cpu) { uint64_t msr; - int temp; - int cpu = device_get_unit(dev); - struct coretemp_softc *sc = device_get_softc(dev); - char stemp[16]; thread_lock(curthread); sched_bind(curthread, cpu); @@ -296,51 +328,116 @@ coretemp_get_temp(device_t dev) sched_unbind(curthread); thread_unlock(curthread); - /* - * Check for Thermal Status and Thermal Status Log. - */ - if ((msr & 0x3) == 0x3) - device_printf(dev, "PROCHOT asserted\n"); + return (msr); +} + +static void +coretemp_clear_thermal_msr(int cpu) +{ + thread_lock(curthread); + sched_bind(curthread, cpu); + thread_unlock(curthread); + + wrmsr(MSR_THERM_STATUS, 0); + + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); +} + +static int +coretemp_get_val_sysctl(SYSCTL_HANDLER_ARGS) +{ + device_t dev; + uint64_t msr; + int val, tmp; + struct coretemp_softc *sc; + enum therm_info type; + char stemp[16]; + + dev = (device_t) arg1; + msr = coretemp_get_thermal_msr(device_get_unit(dev)); + sc = device_get_softc(dev); + type = arg2; + + if (((msr >> THERM_STATUS_VALID_SHIFT) & THERM_STATUS_VALID_MASK) != 1) { + val = -1; + } else { + switch (type) { + case CORETEMP_TEMP: + tmp = (msr >> THERM_STATUS_TEMP_SHIFT) & + THERM_STATUS_TEMP_MASK; + val = (sc->sc_tjmax - tmp) * 10 + TZ_ZEROC; + break; + case CORETEMP_DELTA: + val = (msr >> THERM_STATUS_TEMP_SHIFT) & + THERM_STATUS_TEMP_MASK; + break; + case CORETEMP_RESOLUTION: + val = (msr >> THERM_STATUS_RES_SHIFT) & + THERM_STATUS_RES_MASK; + break; + case CORETEMP_TJMAX: + val = sc->sc_tjmax * 10 + TZ_ZEROC; + break; + } + } + + if (msr & THERM_STATUS_LOG) { + sc->sc_throttle_log = 1; - /* - * Bit 31 contains "Reading valid" - */ - if (((msr >> 31) & 0x1) == 1) { /* - * Starting on bit 16 and ending on bit 22. + * Check for Critical Temperature Status and Critical + * Temperature Log. It doesn't really matter if the + * current temperature is invalid because the "Critical + * Temperature Log" bit will tell us if the Critical + * Temperature has * been reached in past. It's not + * directly related to the current temperature. + * + * If we reach a critical level, allow devctl(4) + * to catch this and shutdown the system. */ - temp = sc->sc_tjmax - ((msr >> 16) & 0x7f); - } else - temp = -1; - - /* - * Check for Critical Temperature Status and Critical - * Temperature Log. - * It doesn't really matter if the current temperature is - * invalid because the "Critical Temperature Log" bit will - * tell us if the Critical Temperature has been reached in - * past. It's not directly related to the current temperature. - * - * If we reach a critical level, allow devctl(4) to catch this - * and shutdown the system. - */ - if (((msr >> 4) & 0x3) == 0x3) { - device_printf(dev, "critical temperature detected, " - "suggest system shutdown\n"); - snprintf(stemp, sizeof(stemp), "%d", temp); - devctl_notify("coretemp", "Thermal", stemp, "notify=0xcc"); + if (msr & THERM_STATUS) { + tmp = (msr >> THERM_STATUS_TEMP_SHIFT) & + THERM_STATUS_TEMP_MASK; + tmp = (sc->sc_tjmax - tmp) * 10 + TZ_ZEROC; + device_printf(dev, "critical temperature detected, " + "suggest system shutdown\n"); + snprintf(stemp, sizeof(stemp), "%d", tmp); + devctl_notify("coretemp", "Thermal", stemp, + "notify=0xcc"); + } } - return (temp); + return (sysctl_handle_int(oidp, &val, 0, req)); } static int -coretemp_get_temp_sysctl(SYSCTL_HANDLER_ARGS) +coretemp_throttle_log_sysctl(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; - int temp; + device_t dev; + uint64_t msr; + int error, val; + struct coretemp_softc *sc; + + dev = (device_t) arg1; + msr = coretemp_get_thermal_msr(device_get_unit(dev)); + sc = device_get_softc(dev); + + if (msr & THERM_STATUS_LOG) + sc->sc_throttle_log = 1; + + val = sc->sc_throttle_log; - temp = coretemp_get_temp(dev) * 10 + TZ_ZEROC; + error = sysctl_handle_int(oidp, &val, 0, req); - return (sysctl_handle_int(oidp, &temp, 0, req)); + if (error || !req->newptr) + return (error); + else if (val != 0) + return (EINVAL); + + coretemp_clear_thermal_msr(device_get_unit(dev)); + sc->sc_throttle_log = 0; + + return (0); } From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 11:13:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6E75106566B; Sun, 2 Oct 2011 11:13:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BCE5F8FC08; Sun, 2 Oct 2011 11:13:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92BDSQA061329; Sun, 2 Oct 2011 11:13:28 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92BDS7C061327; Sun, 2 Oct 2011 11:13:28 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201110021113.p92BDS7C061327@svn.freebsd.org> From: Alexander Motin Date: Sun, 2 Oct 2011 11:13:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225917 - stable/9/sys/powerpc/powerpc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 11:13:29 -0000 Author: mav Date: Sun Oct 2 11:13:28 2011 New Revision: 225917 URL: http://svn.freebsd.org/changeset/base/225917 Log: MFC r225875, r225877: Handle the race in cpu_idle() when due to the critical section CPU could get into sleep after receiving interrupt, delaying interrupt thread execution indefinitely until the next interrupt arrive. Reviewed by: nwhitehorn Approved by: re (kib) Modified: stable/9/sys/powerpc/powerpc/cpu.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/powerpc/powerpc/cpu.c ============================================================================== --- stable/9/sys/powerpc/powerpc/cpu.c Sun Oct 2 09:44:28 2011 (r225916) +++ stable/9/sys/powerpc/powerpc/cpu.c Sun Oct 2 11:13:28 2011 (r225917) @@ -65,6 +65,7 @@ #include #include #include +#include #include #include @@ -553,6 +554,11 @@ cpu_idle_60x(void) vers = mfpvr() >> 16; #ifdef AIM + mtmsr(msr & ~PSL_EE); + if (sched_runnable()) { + mtmsr(msr); + return; + } switch (vers) { case IBM970: case IBM970FX: @@ -583,6 +589,11 @@ cpu_idle_e500(void) msr = mfmsr(); #ifdef E500 + mtmsr(msr & ~PSL_EE); + if (sched_runnable()) { + mtmsr(msr); + return; + } /* Freescale E500 core RM section 6.4.1. */ __asm __volatile("msync; mtmsr %0; isync" :: "r" (msr | PSL_WE)); From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 12:15:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 726641065672; Sun, 2 Oct 2011 12:15:15 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 612978FC18; Sun, 2 Oct 2011 12:15:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92CFF39063147; Sun, 2 Oct 2011 12:15:15 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92CFFw4063144; Sun, 2 Oct 2011 12:15:15 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201110021215.p92CFFw4063144@svn.freebsd.org> From: Alexander Motin Date: Sun, 2 Oct 2011 12:15:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225918 - stable/9/sys/dev/mfi X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 12:15:15 -0000 Author: mav Date: Sun Oct 2 12:15:15 2011 New Revision: 225918 URL: http://svn.freebsd.org/changeset/base/225918 Log: MFC r225869: - Add special support for the MFI_CMD ioctl with MFI_CMD_STP command, used by present MegaCLI version. It has some special meaning for the first s/g list entry, while the main s/g list begins from the the second entry, and those lists should remain separate after loading to the busdma map. - Fix bug in 32bit ioctl compatibility shims when s/g list consists of more then on element. Approved by: re (kib) Modified: stable/9/sys/dev/mfi/mfi.c stable/9/sys/dev/mfi/mfivar.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/mfi/mfi.c ============================================================================== --- stable/9/sys/dev/mfi/mfi.c Sun Oct 2 11:13:28 2011 (r225917) +++ stable/9/sys/dev/mfi/mfi.c Sun Oct 2 12:15:15 2011 (r225918) @@ -1488,7 +1488,7 @@ mfi_data_cb(void *arg, bus_dma_segment_t struct mfi_command *cm; union mfi_sgl *sgl; struct mfi_softc *sc; - int i, dir; + int i, j, first, dir; cm = (struct mfi_command *)arg; sc = cm->cm_sc; @@ -1502,19 +1502,33 @@ mfi_data_cb(void *arg, bus_dma_segment_t return; } + j = 0; + if (cm->cm_frame->header.cmd == MFI_CMD_STP) { + first = cm->cm_stp_len; + if ((sc->mfi_flags & MFI_FLAGS_SG64) == 0) { + sgl->sg32[j].addr = segs[0].ds_addr; + sgl->sg32[j++].len = first; + } else { + sgl->sg64[j].addr = segs[0].ds_addr; + sgl->sg64[j++].len = first; + } + } else + first = 0; if ((sc->mfi_flags & MFI_FLAGS_SG64) == 0) { for (i = 0; i < nsegs; i++) { - sgl->sg32[i].addr = segs[i].ds_addr; - sgl->sg32[i].len = segs[i].ds_len; + sgl->sg32[j].addr = segs[i].ds_addr + first; + sgl->sg32[j++].len = segs[i].ds_len - first; + first = 0; } } else { for (i = 0; i < nsegs; i++) { - sgl->sg64[i].addr = segs[i].ds_addr; - sgl->sg64[i].len = segs[i].ds_len; + sgl->sg64[j].addr = segs[i].ds_addr + first; + sgl->sg64[j++].len = segs[i].ds_len - first; + first = 0; } hdr->flags |= MFI_FRAME_SGL64; } - hdr->sg_count = nsegs; + hdr->sg_count = j; dir = 0; if (cm->cm_flags & MFI_CMD_DATAIN) { @@ -1525,6 +1539,8 @@ mfi_data_cb(void *arg, bus_dma_segment_t dir |= BUS_DMASYNC_PREWRITE; hdr->flags |= MFI_FRAME_DIR_WRITE; } + if (cm->cm_frame->header.cmd == MFI_CMD_STP) + dir |= BUS_DMASYNC_PREWRITE; bus_dmamap_sync(sc->mfi_buffer_dmat, cm->cm_dmamap, dir); cm->cm_flags |= MFI_CMD_MAPPED; @@ -1602,7 +1618,8 @@ mfi_complete(struct mfi_softc *sc, struc if ((cm->cm_flags & MFI_CMD_MAPPED) != 0) { dir = 0; - if (cm->cm_flags & MFI_CMD_DATAIN) + if ((cm->cm_flags & MFI_CMD_DATAIN) || + (cm->cm_frame->header.cmd == MFI_CMD_STP)) dir |= BUS_DMASYNC_POSTREAD; if (cm->cm_flags & MFI_CMD_DATAOUT) dir |= BUS_DMASYNC_POSTWRITE; @@ -1927,7 +1944,8 @@ mfi_ioctl(struct cdev *dev, u_long cmd, struct mfi_command *cm = NULL; uint32_t context; union mfi_sense_ptr sense_ptr; - uint8_t *data = NULL, *temp; + uint8_t *data = NULL, *temp, *addr; + size_t len; int i; struct mfi_ioc_passthru *iop = (struct mfi_ioc_passthru *)arg; #ifdef __amd64__ @@ -2024,6 +2042,21 @@ mfi_ioctl(struct cdev *dev, u_long cmd, if (cm->cm_flags == 0) cm->cm_flags |= MFI_CMD_DATAIN | MFI_CMD_DATAOUT; cm->cm_len = cm->cm_frame->header.data_len; + if (cm->cm_frame->header.cmd == MFI_CMD_STP) { +#ifdef __amd64__ + if (cmd == MFI_CMD) { +#endif + /* Native */ + cm->cm_stp_len = ioc->mfi_sgl[0].iov_len; +#ifdef __amd64__ + } else { + /* 32bit on 64bit */ + ioc32 = (struct mfi_ioc_packet32 *)ioc; + cm->cm_stp_len = ioc32->mfi_sgl[0].iov_len; + } +#endif + cm->cm_len += cm->cm_stp_len; + } if (cm->cm_len && (cm->cm_flags & (MFI_CMD_DATAIN | MFI_CMD_DATAOUT))) { cm->cm_data = data = malloc(cm->cm_len, M_MFIBUF, @@ -2040,35 +2073,30 @@ mfi_ioctl(struct cdev *dev, u_long cmd, cm->cm_frame->header.context = context; temp = data; - if (cm->cm_flags & MFI_CMD_DATAOUT) { + if ((cm->cm_flags & MFI_CMD_DATAOUT) || + (cm->cm_frame->header.cmd == MFI_CMD_STP)) { for (i = 0; i < ioc->mfi_sge_count; i++) { #ifdef __amd64__ if (cmd == MFI_CMD) { +#endif /* Native */ - error = copyin(ioc->mfi_sgl[i].iov_base, - temp, - ioc->mfi_sgl[i].iov_len); + addr = ioc->mfi_sgl[i].iov_base; + len = ioc->mfi_sgl[i].iov_len; +#ifdef __amd64__ } else { - void *temp_convert; - /* 32bit */ + /* 32bit on 64bit */ ioc32 = (struct mfi_ioc_packet32 *)ioc; - temp_convert = - PTRIN(ioc32->mfi_sgl[i].iov_base); - error = copyin(temp_convert, - temp, - ioc32->mfi_sgl[i].iov_len); + addr = PTRIN(ioc32->mfi_sgl[i].iov_base); + len = ioc32->mfi_sgl[i].iov_len; } -#else - error = copyin(ioc->mfi_sgl[i].iov_base, - temp, - ioc->mfi_sgl[i].iov_len); #endif + error = copyin(addr, temp, len); if (error != 0) { device_printf(sc->mfi_dev, "Copy in failed\n"); goto out; } - temp = &temp[ioc->mfi_sgl[i].iov_len]; + temp = &temp[len]; } } @@ -2098,35 +2126,30 @@ mfi_ioctl(struct cdev *dev, u_long cmd, mtx_unlock(&sc->mfi_io_lock); temp = data; - if (cm->cm_flags & MFI_CMD_DATAIN) { + if ((cm->cm_flags & MFI_CMD_DATAIN) || + (cm->cm_frame->header.cmd == MFI_CMD_STP)) { for (i = 0; i < ioc->mfi_sge_count; i++) { #ifdef __amd64__ if (cmd == MFI_CMD) { +#endif /* Native */ - error = copyout(temp, - ioc->mfi_sgl[i].iov_base, - ioc->mfi_sgl[i].iov_len); + addr = ioc->mfi_sgl[i].iov_base; + len = ioc->mfi_sgl[i].iov_len; +#ifdef __amd64__ } else { - void *temp_convert; - /* 32bit */ + /* 32bit on 64bit */ ioc32 = (struct mfi_ioc_packet32 *)ioc; - temp_convert = - PTRIN(ioc32->mfi_sgl[i].iov_base); - error = copyout(temp, - temp_convert, - ioc32->mfi_sgl[i].iov_len); + addr = PTRIN(ioc32->mfi_sgl[i].iov_base); + len = ioc32->mfi_sgl[i].iov_len; } -#else - error = copyout(temp, - ioc->mfi_sgl[i].iov_base, - ioc->mfi_sgl[i].iov_len); #endif + error = copyout(temp, addr, len); if (error != 0) { device_printf(sc->mfi_dev, "Copy out failed\n"); goto out; } - temp = &temp[ioc->mfi_sgl[i].iov_len]; + temp = &temp[len]; } } Modified: stable/9/sys/dev/mfi/mfivar.h ============================================================================== --- stable/9/sys/dev/mfi/mfivar.h Sun Oct 2 11:13:28 2011 (r225917) +++ stable/9/sys/dev/mfi/mfivar.h Sun Oct 2 12:15:15 2011 (r225918) @@ -87,6 +87,7 @@ struct mfi_command { union mfi_sgl *cm_sg; void *cm_data; int cm_len; + int cm_stp_len; int cm_total_frame_size; int cm_extra_frames; int cm_flags; From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 12:18:06 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71A131065673; Sun, 2 Oct 2011 12:18:06 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 608EC8FC08; Sun, 2 Oct 2011 12:18:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92CI6Ne063293; Sun, 2 Oct 2011 12:18:06 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92CI6vk063290; Sun, 2 Oct 2011 12:18:06 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201110021218.p92CI6vk063290@svn.freebsd.org> From: Alexander Motin Date: Sun, 2 Oct 2011 12:18:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225919 - stable/8/sys/dev/mfi X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 12:18:06 -0000 Author: mav Date: Sun Oct 2 12:18:06 2011 New Revision: 225919 URL: http://svn.freebsd.org/changeset/base/225919 Log: MFC r225869: - Add special support for the MFI_CMD ioctl with MFI_CMD_STP command, used by present MegaCLI version. It has some special meaning for the first s/g list entry, while the main s/g list begins from the the second entry, and those lists should remain separate after loading to the busdma map. - Fix bug in 32bit ioctl compatibility shims when s/g list consists of more then on element. Modified: stable/8/sys/dev/mfi/mfi.c stable/8/sys/dev/mfi/mfivar.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/mfi/mfi.c ============================================================================== --- stable/8/sys/dev/mfi/mfi.c Sun Oct 2 12:15:15 2011 (r225918) +++ stable/8/sys/dev/mfi/mfi.c Sun Oct 2 12:18:06 2011 (r225919) @@ -1488,7 +1488,7 @@ mfi_data_cb(void *arg, bus_dma_segment_t struct mfi_command *cm; union mfi_sgl *sgl; struct mfi_softc *sc; - int i, dir; + int i, j, first, dir; cm = (struct mfi_command *)arg; sc = cm->cm_sc; @@ -1502,19 +1502,33 @@ mfi_data_cb(void *arg, bus_dma_segment_t return; } + j = 0; + if (cm->cm_frame->header.cmd == MFI_CMD_STP) { + first = cm->cm_stp_len; + if ((sc->mfi_flags & MFI_FLAGS_SG64) == 0) { + sgl->sg32[j].addr = segs[0].ds_addr; + sgl->sg32[j++].len = first; + } else { + sgl->sg64[j].addr = segs[0].ds_addr; + sgl->sg64[j++].len = first; + } + } else + first = 0; if ((sc->mfi_flags & MFI_FLAGS_SG64) == 0) { for (i = 0; i < nsegs; i++) { - sgl->sg32[i].addr = segs[i].ds_addr; - sgl->sg32[i].len = segs[i].ds_len; + sgl->sg32[j].addr = segs[i].ds_addr + first; + sgl->sg32[j++].len = segs[i].ds_len - first; + first = 0; } } else { for (i = 0; i < nsegs; i++) { - sgl->sg64[i].addr = segs[i].ds_addr; - sgl->sg64[i].len = segs[i].ds_len; + sgl->sg64[j].addr = segs[i].ds_addr + first; + sgl->sg64[j++].len = segs[i].ds_len - first; + first = 0; } hdr->flags |= MFI_FRAME_SGL64; } - hdr->sg_count = nsegs; + hdr->sg_count = j; dir = 0; if (cm->cm_flags & MFI_CMD_DATAIN) { @@ -1525,6 +1539,8 @@ mfi_data_cb(void *arg, bus_dma_segment_t dir |= BUS_DMASYNC_PREWRITE; hdr->flags |= MFI_FRAME_DIR_WRITE; } + if (cm->cm_frame->header.cmd == MFI_CMD_STP) + dir |= BUS_DMASYNC_PREWRITE; bus_dmamap_sync(sc->mfi_buffer_dmat, cm->cm_dmamap, dir); cm->cm_flags |= MFI_CMD_MAPPED; @@ -1602,7 +1618,8 @@ mfi_complete(struct mfi_softc *sc, struc if ((cm->cm_flags & MFI_CMD_MAPPED) != 0) { dir = 0; - if (cm->cm_flags & MFI_CMD_DATAIN) + if ((cm->cm_flags & MFI_CMD_DATAIN) || + (cm->cm_frame->header.cmd == MFI_CMD_STP)) dir |= BUS_DMASYNC_POSTREAD; if (cm->cm_flags & MFI_CMD_DATAOUT) dir |= BUS_DMASYNC_POSTWRITE; @@ -1927,7 +1944,8 @@ mfi_ioctl(struct cdev *dev, u_long cmd, struct mfi_command *cm = NULL; uint32_t context; union mfi_sense_ptr sense_ptr; - uint8_t *data = NULL, *temp; + uint8_t *data = NULL, *temp, *addr; + size_t len; int i; struct mfi_ioc_passthru *iop = (struct mfi_ioc_passthru *)arg; #ifdef __amd64__ @@ -2024,6 +2042,21 @@ mfi_ioctl(struct cdev *dev, u_long cmd, if (cm->cm_flags == 0) cm->cm_flags |= MFI_CMD_DATAIN | MFI_CMD_DATAOUT; cm->cm_len = cm->cm_frame->header.data_len; + if (cm->cm_frame->header.cmd == MFI_CMD_STP) { +#ifdef __amd64__ + if (cmd == MFI_CMD) { +#endif + /* Native */ + cm->cm_stp_len = ioc->mfi_sgl[0].iov_len; +#ifdef __amd64__ + } else { + /* 32bit on 64bit */ + ioc32 = (struct mfi_ioc_packet32 *)ioc; + cm->cm_stp_len = ioc32->mfi_sgl[0].iov_len; + } +#endif + cm->cm_len += cm->cm_stp_len; + } if (cm->cm_len && (cm->cm_flags & (MFI_CMD_DATAIN | MFI_CMD_DATAOUT))) { cm->cm_data = data = malloc(cm->cm_len, M_MFIBUF, @@ -2040,35 +2073,30 @@ mfi_ioctl(struct cdev *dev, u_long cmd, cm->cm_frame->header.context = context; temp = data; - if (cm->cm_flags & MFI_CMD_DATAOUT) { + if ((cm->cm_flags & MFI_CMD_DATAOUT) || + (cm->cm_frame->header.cmd == MFI_CMD_STP)) { for (i = 0; i < ioc->mfi_sge_count; i++) { #ifdef __amd64__ if (cmd == MFI_CMD) { +#endif /* Native */ - error = copyin(ioc->mfi_sgl[i].iov_base, - temp, - ioc->mfi_sgl[i].iov_len); + addr = ioc->mfi_sgl[i].iov_base; + len = ioc->mfi_sgl[i].iov_len; +#ifdef __amd64__ } else { - void *temp_convert; - /* 32bit */ + /* 32bit on 64bit */ ioc32 = (struct mfi_ioc_packet32 *)ioc; - temp_convert = - PTRIN(ioc32->mfi_sgl[i].iov_base); - error = copyin(temp_convert, - temp, - ioc32->mfi_sgl[i].iov_len); + addr = PTRIN(ioc32->mfi_sgl[i].iov_base); + len = ioc32->mfi_sgl[i].iov_len; } -#else - error = copyin(ioc->mfi_sgl[i].iov_base, - temp, - ioc->mfi_sgl[i].iov_len); #endif + error = copyin(addr, temp, len); if (error != 0) { device_printf(sc->mfi_dev, "Copy in failed\n"); goto out; } - temp = &temp[ioc->mfi_sgl[i].iov_len]; + temp = &temp[len]; } } @@ -2098,35 +2126,30 @@ mfi_ioctl(struct cdev *dev, u_long cmd, mtx_unlock(&sc->mfi_io_lock); temp = data; - if (cm->cm_flags & MFI_CMD_DATAIN) { + if ((cm->cm_flags & MFI_CMD_DATAIN) || + (cm->cm_frame->header.cmd == MFI_CMD_STP)) { for (i = 0; i < ioc->mfi_sge_count; i++) { #ifdef __amd64__ if (cmd == MFI_CMD) { +#endif /* Native */ - error = copyout(temp, - ioc->mfi_sgl[i].iov_base, - ioc->mfi_sgl[i].iov_len); + addr = ioc->mfi_sgl[i].iov_base; + len = ioc->mfi_sgl[i].iov_len; +#ifdef __amd64__ } else { - void *temp_convert; - /* 32bit */ + /* 32bit on 64bit */ ioc32 = (struct mfi_ioc_packet32 *)ioc; - temp_convert = - PTRIN(ioc32->mfi_sgl[i].iov_base); - error = copyout(temp, - temp_convert, - ioc32->mfi_sgl[i].iov_len); + addr = PTRIN(ioc32->mfi_sgl[i].iov_base); + len = ioc32->mfi_sgl[i].iov_len; } -#else - error = copyout(temp, - ioc->mfi_sgl[i].iov_base, - ioc->mfi_sgl[i].iov_len); #endif + error = copyout(temp, addr, len); if (error != 0) { device_printf(sc->mfi_dev, "Copy out failed\n"); goto out; } - temp = &temp[ioc->mfi_sgl[i].iov_len]; + temp = &temp[len]; } } Modified: stable/8/sys/dev/mfi/mfivar.h ============================================================================== --- stable/8/sys/dev/mfi/mfivar.h Sun Oct 2 12:15:15 2011 (r225918) +++ stable/8/sys/dev/mfi/mfivar.h Sun Oct 2 12:18:06 2011 (r225919) @@ -87,6 +87,7 @@ struct mfi_command { union mfi_sgl *cm_sg; void *cm_data; int cm_len; + int cm_stp_len; int cm_total_frame_size; int cm_extra_frames; int cm_flags; From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 13:43:07 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A6591065670; Sun, 2 Oct 2011 13:43:07 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 10D3D8FC0A; Sun, 2 Oct 2011 13:43:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92Dh6g1065824; Sun, 2 Oct 2011 13:43:06 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92Dh61L065821; Sun, 2 Oct 2011 13:43:06 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110021343.p92Dh61L065821@svn.freebsd.org> From: Adrian Chadd Date: Sun, 2 Oct 2011 13:43:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225921 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 13:43:07 -0000 Author: adrian Date: Sun Oct 2 13:43:06 2011 New Revision: 225921 URL: http://svn.freebsd.org/changeset/base/225921 Log: Disable TX interrupt mitigation just for the time being. There are some timing concerns which I've yet to fully map out. In any case, there's an existing software driven mitigation method for TX interrupts and when TX'ing 11n frames, the whole frame itself generates an interrupt rather then the subframes. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c Sun Oct 2 13:29:29 2011 (r225920) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c Sun Oct 2 13:43:06 2011 (r225921) @@ -142,8 +142,6 @@ ar5416GetPendingInterrupts(struct ath_ha #ifdef AH_AR5416_INTERRUPT_MITIGATION if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM)) *masked |= HAL_INT_RX; - if (isr & (AR_ISR_TXMINTR | AR_ISR_TXINTM)) - *masked |= HAL_INT_TX; #endif *masked |= mask2; } @@ -216,18 +214,12 @@ ar5416SetInterrupts(struct ath_hal *ah, * Overwrite default mask if Interrupt mitigation * is specified for AR5416 */ - mask = ints & HAL_INT_COMMON; - if (ints & HAL_INT_TX) - mask |= AR_IMR_TXMINTR | AR_IMR_TXINTM; if (ints & HAL_INT_RX) mask |= AR_IMR_RXERR | AR_IMR_RXMINTR | AR_IMR_RXINTM; - if (ints & HAL_INT_TX) { - if (ahp->ah_txErrInterruptMask) - mask |= AR_IMR_TXERR; - if (ahp->ah_txEolInterruptMask) - mask |= AR_IMR_TXEOL; - } #else + if (ints & HAL_INT_RX) + mask |= AR_IMR_RXOK | AR_IMR_RXERR | AR_IMR_RXDESC; +#endif if (ints & HAL_INT_TX) { if (ahp->ah_txOkInterruptMask) mask |= AR_IMR_TXOK; @@ -238,9 +230,6 @@ ar5416SetInterrupts(struct ath_hal *ah, if (ahp->ah_txEolInterruptMask) mask |= AR_IMR_TXEOL; } - if (ints & HAL_INT_RX) - mask |= AR_IMR_RXOK | AR_IMR_RXERR | AR_IMR_RXDESC; -#endif if (ints & (HAL_INT_BMISC)) { mask |= AR_IMR_BCNMISC; if (ints & HAL_INT_TIM) Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Sun Oct 2 13:29:29 2011 (r225920) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Sun Oct 2 13:43:06 2011 (r225921) @@ -360,10 +360,8 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO #ifdef AH_AR5416_INTERRUPT_MITIGATION OS_REG_WRITE(ah, AR_MIRT, 0); - OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500); - OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 2000); - OS_REG_RMW_FIELD(ah, AR_TIMT, AR_TIMT_LAST, 300); - OS_REG_RMW_FIELD(ah, AR_TIMT, AR_TIMT_FIRST, 750); + OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 250); + OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 700); #endif ar5416InitBB(ah, chan); From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 13:47:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0EB0106567C; Sun, 2 Oct 2011 13:47:03 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6C7468FC24; Sun, 2 Oct 2011 13:47:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92Dl3Er065992; Sun, 2 Oct 2011 13:47:03 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92Dl3KI065990; Sun, 2 Oct 2011 13:47:03 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110021347.p92Dl3KI065990@svn.freebsd.org> From: Adrian Chadd Date: Sun, 2 Oct 2011 13:47:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225922 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 13:47:03 -0000 Author: adrian Date: Sun Oct 2 13:47:03 2011 New Revision: 225922 URL: http://svn.freebsd.org/changeset/base/225922 Log: For now (ie: until autosleep support is fully fleshed out), always clear all of the RX status fields when initialising a new RX descriptor. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c Sun Oct 2 13:43:06 2011 (r225921) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c Sun Oct 2 13:47:03 2011 (r225922) @@ -119,8 +119,7 @@ ar5416SetupRxDesc(struct ath_hal *ah, st ads->ds_rxstatus8 &= ~AR_RxDone; /* clear the rest of the status fields */ - if (! pCap->halAutoSleepSupport) - OS_MEMZERO(&(ads->u), sizeof(ads->u)); + OS_MEMZERO(&(ads->u), sizeof(ads->u)); return AH_TRUE; } From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 13:48:16 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FD011065676; Sun, 2 Oct 2011 13:48:16 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0E2318FC16; Sun, 2 Oct 2011 13:48:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92DmFS2066063; Sun, 2 Oct 2011 13:48:15 GMT (envelope-from mr@svn.freebsd.org) Received: (from mr@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92DmF7K066061; Sun, 2 Oct 2011 13:48:15 GMT (envelope-from mr@svn.freebsd.org) Message-Id: <201110021348.p92DmF7K066061@svn.freebsd.org> From: Michael Reifenberger Date: Sun, 2 Oct 2011 13:48:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225923 - stable/8/tools/tools/nanobsd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 13:48:16 -0000 Author: mr Date: Sun Oct 2 13:48:15 2011 New Revision: 225923 URL: http://svn.freebsd.org/changeset/base/225923 Log: Bring nanobsd.sh up to date. MFC: r212938: Support new variable NANO_LABEL. r212990: Make the labels match the device name that's mounted, not just the slice they are on. r214955: - Set -x flag when executing customisation scripts to aid in debugging them. - Use KERNCONFDIR with KERNCONF instead of copying the kernel config into the source tree so included kernel configs work. - Put more stuff in the _.bk/_.ik log file, not just make statements. - Add the kernel config name to the pprint during kernel installation. - Add NANO_MODULES providing a list of modules to build and install. r215069: Document NANO_CFGDIR and NANO_DATADIR r215070: Build make.conf when the world is not selected to build, but the kernel is. r215081: Insulate the nanobsd build from the current system by opting out of the SRCCONF processing. r216144: _WITHOUT_SRCCONF has too much baggage. Instead, use the simpler SRCCONF=/dev/null. r216145: - Mount the device async when we're doing the copy. - Create a sparse file instead of a fully zerod one. This trades the possibiltiy of running out of space during the build for the speed gain not having do write all those zeros... r216928: Put in the other half of the SRCCONF patch. r216929: Bump the media size from approx 600MB to approx 750MB. The great hob-nailed tennis shoe of progress demands it! r220091: Use ${NANO_WORLDDIR}/var/empty as copy source since it has no schg flag set. r221850: Copy symbolic links as files rather than recreating the links. r221851: Implement -f to inhibit copying s1 partition out for speed. r221852: Add ${} around variable dereference... r221856: If there's no package directory, don't try to install packages from it. Instead, report that 0 packages are reported. r221877: Restore BOOT2CFG, accidentally removed in r212938. r222535: Don't need (and can't use) -L to copy links here. Parts of the MFC's requested by: jpaetzel@ Modified: stable/8/tools/tools/nanobsd/nanobsd.sh Directory Properties: stable/8/tools/tools/nanobsd/ (props changed) Modified: stable/8/tools/tools/nanobsd/nanobsd.sh ============================================================================== --- stable/8/tools/tools/nanobsd/nanobsd.sh Sun Oct 2 13:47:03 2011 (r225922) +++ stable/8/tools/tools/nanobsd/nanobsd.sh Sun Oct 2 13:48:15 2011 (r225923) @@ -75,6 +75,9 @@ CONF_WORLD=' ' # Kernel config file to use NANO_KERNEL=GENERIC +# Kernel modules to build; default is none +NANO_MODULES= + # Customize commands. NANO_CUSTOMIZE="" @@ -88,7 +91,7 @@ NANO_NEWFS="-b 4096 -f 512 -i 8192 -O1 - NANO_DRIVE=ad0 # Target media size in 512 bytes sectors -NANO_MEDIASIZE=1200000 +NANO_MEDIASIZE=1500000 # Number of code images on media (1 or 2) NANO_IMAGES=2 @@ -135,14 +138,27 @@ NANO_MD_BACKING="file" # Progress Print level PPLEVEL=3 +# Set NANO_LABEL to non-blank to form the basis for using /dev/ufs/label +# in preference to /dev/${NANO_DRIVE} +# Root partition will be ${NANO_LABEL}s{1,2} +# /cfg partition will be ${NANO_LABEL}s3 +# /data partition will be ${NANO_LABEL}s4 +NANO_LABEL="" + ####################################################################### # Architecture to build. Corresponds to TARGET_ARCH in a buildworld. -# Unfortunately, there's no way to set TARGET at this time, and it +# Unfortunately, there's no way to set TARGET at this time, and it # conflates the two, so architectures where TARGET != TARGET_ARCH do # not work. This defaults to the arch of the current machine. NANO_ARCH=`uname -p` +# Directory to populate /cfg from +NANO_CFGDIR="" + +# Directory to populate /data from +NANO_DATADIR="" + ####################################################################### # # The functions which do the real work. @@ -166,6 +182,7 @@ make_conf_build ( ) ( echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_BUILD} echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF_BUILD} + echo "SRCCONF=/dev/null" >> ${NANO_MAKE_CONF_BUILD} ) build_world ( ) ( @@ -182,19 +199,26 @@ build_kernel ( ) ( pprint 2 "build kernel ($NANO_KERNEL)" pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.bk" + ( if [ -f ${NANO_KERNEL} ] ; then - cp ${NANO_KERNEL} ${NANO_SRC}/sys/${NANO_ARCH}/conf + kernconfdir=$(realpath $(dirname ${NANO_KERNEL})) + kernconf=$(basename ${NANO_KERNEL}) + else + kernconf=${NANO_KERNEL} fi - (cd ${NANO_SRC}; + cd ${NANO_SRC}; # unset these just in case to avoid compiler complaints # when cross-building unset TARGET_CPUTYPE unset TARGET_BIG_ENDIAN + # Note: We intentionally build all modules, not only the ones in + # NANO_MODULES so the built world can be reused by multiple images. env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \ - __MAKE_CONF=${NANO_MAKE_CONF_BUILD} KERNCONF=`basename ${NANO_KERNEL}` \ - > ${MAKEOBJDIRPREFIX}/_.bk 2>&1 - ) + __MAKE_CONF=${NANO_MAKE_CONF_BUILD} \ + ${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \ + KERNCONF=${kernconf} + ) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1 ) clean_world ( ) ( @@ -221,6 +245,7 @@ make_conf_install ( ) ( echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_INSTALL} echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF_INSTALL} + echo "SRCCONF=/dev/null" >> ${NANO_MAKE_CONF_INSTALL} ) install_world ( ) ( @@ -251,14 +276,25 @@ install_etc ( ) ( ) install_kernel ( ) ( - pprint 2 "install kernel" + pprint 2 "install kernel ($NANO_KERNEL)" pprint 3 "log: ${NANO_OBJ}/_.ik" + ( + if [ -f ${NANO_KERNEL} ] ; then + kernconfdir=$(realpath $(dirname ${NANO_KERNEL})) + kernconf=$(basename ${NANO_KERNEL}) + else + kernconf=${NANO_KERNEL} + fi + cd ${NANO_SRC} env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \ DESTDIR=${NANO_WORLDDIR} \ - __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} KERNCONF=`basename ${NANO_KERNEL}` \ - > ${NANO_OBJ}/_.ik 2>&1 + __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \ + ${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \ + KERNCONF=${kernconf} \ + MODULES_OVERRIDE="${NANO_MODULES}" + ) > ${NANO_OBJ}/_.ik 2>&1 ) run_customize() ( @@ -269,7 +305,7 @@ run_customize() ( pprint 2 "customize \"$c\"" pprint 3 "log: ${NANO_OBJ}/_.cust.$c" pprint 4 "`type $c`" - ( $c ) > ${NANO_OBJ}/_.cust.$c 2>&1 + ( set -x ; $c ) > ${NANO_OBJ}/_.cust.$c 2>&1 done ) @@ -281,7 +317,7 @@ run_late_customize() ( pprint 2 "late customize \"$c\"" pprint 3 "log: ${NANO_OBJ}/_.late_cust.$c" pprint 4 "`type $c`" - ( $c ) > ${NANO_OBJ}/_.late_cust.$c 2>&1 + ( set -x ; $c ) > ${NANO_OBJ}/_.late_cust.$c 2>&1 done ) @@ -361,16 +397,26 @@ prune_usr() ( done ) +newfs_part ( ) ( + local dev mnt lbl + dev=$1 + mnt=$2 + lbl=$3 + echo newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev} + newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev} + mount -o async ${dev} ${mnt} +) + populate_slice ( ) ( - local dev dir mnt + local dev dir mnt lbl dev=$1 dir=$2 mnt=$3 - test -z $2 && dir=/var/empty - test -d $d || dir=/var/empty + lbl=$4 + test -z $2 && dir=${NANO_WORLDDIR}/var/empty + test -d $dir || dir=${NANO_WORLDDIR}/var/empty echo "Creating ${dev} with ${dir} (mounting on ${mnt})" - newfs ${NANO_NEWFS} ${dev} - mount ${dev} ${mnt} + newfs_part $dev $mnt $lbl cd ${dir} find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt} df -i ${mnt} @@ -378,11 +424,11 @@ populate_slice ( ) ( ) populate_cfg_slice ( ) ( - populate_slice "$1" "$2" "$3" + populate_slice "$1" "$2" "$3" "$4" ) populate_data_slice ( ) ( - populate_slice "$1" "$2" "$3" + populate_slice "$1" "$2" "$3" "$4" ) create_i386_diskimage ( ) ( @@ -467,8 +513,8 @@ create_i386_diskimage ( ) ( -y ${NANO_HEADS}` else echo "Creating md backing file..." - dd if=/dev/zero of=${IMG} bs=${NANO_SECTS}b \ - count=`expr ${NANO_MEDIASIZE} / ${NANO_SECTS}` + rm -f ${IMG} + dd if=/dev/zero of=${IMG} seek=${NANO_MEDIASIZE} count=0 MD=`mdconfig -a -t vnode -f ${IMG} -x ${NANO_SECTS} \ -y ${NANO_HEADS}` fi @@ -484,13 +530,8 @@ create_i386_diskimage ( ) ( bsdlabel ${MD}s1 # Create first image - # XXX: should use populate_slice for easier override - newfs ${NANO_NEWFS} /dev/${MD}s1a + populate_slice /dev/${MD}s1a ${NANO_WORLDDIR} ${MNT} "s1a" mount /dev/${MD}s1a ${MNT} - df -i ${MNT} - echo "Copying worlddir..." - ( cd ${NANO_WORLDDIR} && find . -print | cpio -dump ${MNT} ) - df -i ${MNT} echo "Generating mtree..." ( cd ${MNT} && mtree -c ) > ${NANO_OBJ}/_.mtree ( cd ${MNT} && du -k ) > ${NANO_OBJ}/_.du @@ -506,14 +547,19 @@ create_i386_diskimage ( ) ( sed -i "" "s=${NANO_DRIVE}s1=${NANO_DRIVE}s2=g" $f done umount ${MNT} + # Override the label from the first partition so we + # don't confuse glabel with duplicates. + if [ ! -z ${NANO_LABEL} ]; then + tunefs -L ${NANO_LABEL}"s2a" /dev/${MD}s2a + fi fi # Create Config slice - populate_cfg_slice /dev/${MD}s3 "${NANO_CFGDIR}" ${MNT} + populate_cfg_slice /dev/${MD}s3 "${NANO_CFGDIR}" ${MNT} "s3" # Create Data slice, if any. if [ $NANO_DATASIZE -ne 0 ] ; then - populate_data_slice /dev/${MD}s4 "${NANO_DATADIR}" ${MNT} + populate_data_slice /dev/${MD}s4 "${NANO_DATADIR}" ${MNT} "s4" fi if [ "${NANO_MD_BACKING}" = "swap" ] ; then @@ -521,8 +567,10 @@ create_i386_diskimage ( ) ( dd if=/dev/${MD} of=${IMG} bs=64k fi - echo "Writing out _.disk.image..." - dd if=/dev/${MD}s1 of=${NANO_DISKIMGDIR}/_.disk.image bs=64k + if ${do_copyout_partition} ; then + echo "Writing out _.disk.image..." + dd if=/dev/${MD}s1 of=${NANO_DISKIMGDIR}/_.disk.image bs=64k + fi mdconfig -d -u $MD trap - 1 2 15 EXIT @@ -628,7 +676,7 @@ cust_allow_ssh_root () ( cust_install_files () ( cd ${NANO_TOOLS}/Files - find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${NANO_WORLDDIR} + find . -print | grep -Ev '/(CVS|\.svn)' | cpio -Ldumpv ${NANO_WORLDDIR} ) ####################################################################### @@ -636,12 +684,18 @@ cust_install_files () ( cust_pkg () ( + # If the package directory doesn't exist, we're done. + if [ ! -d ${NANO_PACKAGE_DIR} ]; then + echo "DONE 0 packages" + return 0 + fi + # Copy packages into chroot mkdir -p ${NANO_WORLDDIR}/Pkg ( cd ${NANO_PACKAGE_DIR} find ${NANO_PACKAGE_LIST} -print | - cpio -dumpv ${NANO_WORLDDIR}/Pkg + cpio -Ldumpv ${NANO_WORLDDIR}/Pkg ) # Count & report how many we have to install @@ -712,8 +766,9 @@ pprint() { usage () { ( - echo "Usage: $0 [-biknqvw] [-c config_file]" + echo "Usage: $0 [-bfiknqvw] [-c config_file]" echo " -b suppress builds (both kernel and world)" + echo " -f suppress code slice extraction" echo " -i suppress disk image build" echo " -k suppress buildkernel" echo " -n add -DNO_CLEAN to buildworld, buildkernel, etc" @@ -732,9 +787,10 @@ do_clean=true do_kernel=true do_world=true do_image=true +do_copyout_partition=true set +e -args=`getopt bc:hiknqvw $*` +args=`getopt bc:fhiknqvw $*` if [ $? -ne 0 ] ; then usage exit 2 @@ -760,6 +816,10 @@ do shift shift ;; + -f) + do_copyout_partition=false + shift + ;; -h) usage ;; @@ -820,6 +880,11 @@ else NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN" fi +# Override user's NANO_DRIVE if they specified a NANO_LABEL +if [ ! -z "${NANO_LABEL}" ]; then + NANO_DRIVE=ufs/${NANO_LABEL} +fi + export MAKEOBJDIRPREFIX export NANO_ARCH @@ -844,6 +909,7 @@ export NANO_TOOLS export NANO_WORLDDIR export NANO_BOOT0CFG export NANO_BOOTLOADER +export NANO_LABEL ####################################################################### # And then it is as simple as that... @@ -867,6 +933,9 @@ else fi if $do_kernel ; then + if ! $do_world ; then + make_conf_build + fi build_kernel else pprint 2 "Skipping buildkernel (as instructed)" From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 13:51:26 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE2361065673; Sun, 2 Oct 2011 13:51:26 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE3AB8FC14; Sun, 2 Oct 2011 13:51:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92DpQK9066188; Sun, 2 Oct 2011 13:51:26 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92DpQTP066186; Sun, 2 Oct 2011 13:51:26 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110021351.p92DpQTP066186@svn.freebsd.org> From: Adrian Chadd Date: Sun, 2 Oct 2011 13:51:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225924 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 13:51:27 -0000 Author: adrian Date: Sun Oct 2 13:51:26 2011 New Revision: 225924 URL: http://svn.freebsd.org/changeset/base/225924 Log: Document exactly what the RX interrupt mitigation timers do. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Sun Oct 2 13:48:15 2011 (r225923) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Sun Oct 2 13:51:26 2011 (r225924) @@ -358,8 +358,30 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO OS_REG_WRITE(ah, AR_OBS, 8); #ifdef AH_AR5416_INTERRUPT_MITIGATION + /* + * Disable the "general" TX/RX mitigation timers. + */ OS_REG_WRITE(ah, AR_MIRT, 0); + /* + * This initialises the RX interrupt mitigation timers. + * + * The mitigation timers begin at idle and are triggered + * upon the RXOK of a single frame (or sub-frame, for A-MPDU.) + * Then, the RX mitigation interrupt will fire: + * + * + 250uS after the last RX'ed frame, or + * + 700uS after the first RX'ed frame + * + * Thus, the LAST field dictates the extra latency + * induced by the RX mitigation method and the FIRST + * field dictates how long to delay before firing an + * RX mitigation interrupt. + * + * Please note this only seems to be for RXOK frames; + * not CRC or PHY error frames. + * + */ OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 250); OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 700); #endif From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 14:08:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06024106566B; Sun, 2 Oct 2011 14:08:57 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E94CA8FC13; Sun, 2 Oct 2011 14:08:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92E8uUS066722; Sun, 2 Oct 2011 14:08:56 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92E8uQE066719; Sun, 2 Oct 2011 14:08:56 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110021408.p92E8uQE066719@svn.freebsd.org> From: Adrian Chadd Date: Sun, 2 Oct 2011 14:08:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225925 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 14:08:57 -0000 Author: adrian Date: Sun Oct 2 14:08:56 2011 New Revision: 225925 URL: http://svn.freebsd.org/changeset/base/225925 Log: Various interrupt handling and RX interrupt mitigation fixes. * The AR_ISR_RAC interrupt processing method has a subtle bug in all the MAC revisions (including pre-11n NICs) until AR9300v2. If you're unlucky, the clear phase clears an update to one of the secondary registers, which includes TX status. This shows up as a "watchdog timeout" if you're doing very low levels of TX traffic. If you're doing a lot of non-11n TX traffic, you'll end up receiving a TX interrupt from some later traffic anyway. But when TX'ing 11n aggregation session traffic (which -HEAD isn't yet doing), you may find that you're only able to TX one frame (due to BAW restrictions) and this may end up hitting this race condition. The only solution is to not use RAC and instead use AR_ISR and the AR_ISR_Sx registers. The bit in AR_ISR which represents the secondary registers are not cleared; only the AR_ISR_Sx bits are. This way any updates which occur between the read and subsequent write will stay asserted and (correctly) trigger a subsequent interrupt. I've tested this on the AR5416, AR9160, AR9280. I will soon test the AR9285 and AR9287. * The AR_ISR TX and RX bits (and all others!) are set regardless of whether the contents of the AR_IMR register. So if RX mitigation is enabled, RXOK is going to be set in AR_ISR and it would normally set HAL_INT_RX. Fix the code to not set HAL_INT_RX when RXOK is set and RX mitigation is compiled in. That way the RX path isn't prematurely called. I would see: * An interrupt would come in (eg a beacon, or TX completion) where RXOK was set but RXINTM/RXMINT wasn't; * ath_rx_proc() be called - completing RX frames; * RXINTM/RXMINT would then fire; * ath_rx_proc() would then be called again but find no frames in the queue. This fixes the RX mitigation behaviour to not overly call ath_rx_proc(). * Start to flesh out more correct timer interrupt handling - it isn't kite/merlin specific. It's actually based on whether autosleep support is enabled or not. This is sourced from my 11n TX branch and has been tested for a few weeks. Finally, the interrupt handling change should likely be implemented for AR5210, AR5211 and AR5212. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c Sun Oct 2 13:51:26 2011 (r225924) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c Sun Oct 2 14:08:56 2011 (r225925) @@ -68,6 +68,7 @@ HAL_BOOL ar5416GetPendingInterrupts(struct ath_hal *ah, HAL_INT *masked) { uint32_t isr, isr0, isr1, sync_cause = 0; + HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps; /* * Verify there's a mac interrupt and the RTC is on. @@ -110,42 +111,95 @@ ar5416GetPendingInterrupts(struct ath_ha mask2 |= HAL_INT_CST; if (isr2 & AR_ISR_S2_TSFOOR) mask2 |= HAL_INT_TSFOOR; + + /* + * Don't mask out AR_BCNMISC; instead mask + * out what causes it. + */ + OS_REG_WRITE(ah, AR_ISR_S2, isr2); + isr &= ~AR_ISR_BCNMISC; } - isr = OS_REG_READ(ah, AR_ISR_RAC); if (isr == 0xffffffff) { *masked = 0; return AH_FALSE; } *masked = isr & HAL_INT_COMMON; + + if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM)) + *masked |= HAL_INT_RX; + if (isr & (AR_ISR_TXMINTR | AR_ISR_TXINTM)) + *masked |= HAL_INT_TX; + + /* + * When doing RX interrupt mitigation, the RXOK bit is set + * in AR_ISR even if the relevant bit in AR_IMR is clear. + * Since this interrupt may be due to another source, don't + * just automatically set HAL_INT_RX if it's set, otherwise + * we could prematurely service the RX queue. + * + * In some cases, the driver can even handle all the RX + * frames just before the mitigation interrupt fires. + * The subsequent RX processing trip will then end up + * processing 0 frames. + */ +#ifdef AH_AR5416_INTERRUPT_MITIGATION + if (isr & AR_ISR_RXERR) + *masked |= HAL_INT_RX; +#else if (isr & (AR_ISR_RXOK | AR_ISR_RXERR)) *masked |= HAL_INT_RX; - if (isr & (AR_ISR_TXOK | AR_ISR_TXDESC | AR_ISR_TXERR | AR_ISR_TXEOL)) { +#endif + + if (isr & (AR_ISR_TXOK | AR_ISR_TXDESC | AR_ISR_TXERR | + AR_ISR_TXEOL)) { *masked |= HAL_INT_TX; - isr0 = OS_REG_READ(ah, AR_ISR_S0_S); + + isr0 = OS_REG_READ(ah, AR_ISR_S0); + OS_REG_WRITE(ah, AR_ISR_S0, isr0); + isr1 = OS_REG_READ(ah, AR_ISR_S1); + OS_REG_WRITE(ah, AR_ISR_S1, isr1); + + /* + * Don't clear the primary ISR TX bits, clear + * what causes them (S0/S1.) + */ + isr &= ~(AR_ISR_TXOK | AR_ISR_TXDESC | + AR_ISR_TXERR | AR_ISR_TXEOL); + ahp->ah_intrTxqs |= MS(isr0, AR_ISR_S0_QCU_TXOK); ahp->ah_intrTxqs |= MS(isr0, AR_ISR_S0_QCU_TXDESC); - isr1 = OS_REG_READ(ah, AR_ISR_S1_S); ahp->ah_intrTxqs |= MS(isr1, AR_ISR_S1_QCU_TXERR); ahp->ah_intrTxqs |= MS(isr1, AR_ISR_S1_QCU_TXEOL); } - if (AR_SREV_MERLIN(ah) || AR_SREV_KITE(ah)) { + if ((isr & AR_ISR_GENTMR) || (! pCap->halAutoSleepSupport)) { uint32_t isr5; - isr5 = OS_REG_READ(ah, AR_ISR_S5_S); - if (isr5 & AR_ISR_S5_TIM_TIMER) - *masked |= HAL_INT_TIM_TIMER; + isr5 = OS_REG_READ(ah, AR_ISR_S5); + OS_REG_WRITE(ah, AR_ISR_S5, isr5); + isr &= ~AR_ISR_GENTMR; + + if (! pCap->halAutoSleepSupport) + if (isr5 & AR_ISR_S5_TIM_TIMER) + *masked |= HAL_INT_TIM_TIMER; } - - /* Interrupt Mitigation on AR5416 */ -#ifdef AH_AR5416_INTERRUPT_MITIGATION - if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM)) - *masked |= HAL_INT_RX; -#endif *masked |= mask2; } + /* + * Since we're not using AR_ISR_RAC, clear the status bits + * for handled interrupts here. For bits whose interrupt + * source is a secondary register, those bits should've been + * masked out - instead of those bits being written back, + * their source (ie, the secondary status registers) should + * be cleared. That way there are no race conditions with + * new triggers coming in whilst they've been read/cleared. + */ + OS_REG_WRITE(ah, AR_ISR, isr); + /* Flush previous write */ + OS_REG_READ(ah, AR_ISR); + if (AR_SREV_HOWL(ah)) return AH_TRUE; Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Sun Oct 2 13:51:26 2011 (r225924) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Sun Oct 2 14:08:56 2011 (r225925) @@ -250,6 +250,7 @@ /* Interrupts */ #define AR_ISR_TXMINTR 0x00080000 /* Maximum interrupt tx rate */ #define AR_ISR_RXMINTR 0x01000000 /* Maximum interrupt rx rate */ +#define AR_ISR_GENTMR 0x10000000 /* OR of generic timer bits in S5 */ #define AR_ISR_TXINTM 0x40000000 /* Tx int after mitigation */ #define AR_ISR_RXINTM 0x80000000 /* Rx int after mitigation */ From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 14:10:25 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B0801065672; Sun, 2 Oct 2011 14:10:25 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6B0B48FC13; Sun, 2 Oct 2011 14:10:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92EAPdS066801; Sun, 2 Oct 2011 14:10:25 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92EAPOJ066799; Sun, 2 Oct 2011 14:10:25 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110021410.p92EAPOJ066799@svn.freebsd.org> From: Adrian Chadd Date: Sun, 2 Oct 2011 14:10:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225926 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 14:10:25 -0000 Author: adrian Date: Sun Oct 2 14:10:25 2011 New Revision: 225926 URL: http://svn.freebsd.org/changeset/base/225926 Log: Remove an unused variable. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c Sun Oct 2 14:08:56 2011 (r225925) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c Sun Oct 2 14:10:25 2011 (r225926) @@ -107,7 +107,6 @@ ar5416SetupRxDesc(struct ath_hal *ah, st uint32_t size, u_int flags) { struct ar5416_desc *ads = AR5416DESC(ds); - HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps; HALASSERT((size &~ AR_BufLen) == 0); From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 16:05:20 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A56F1065670; Sun, 2 Oct 2011 16:05:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4943B8FC13; Sun, 2 Oct 2011 16:05:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92G5Jfk070259; Sun, 2 Oct 2011 16:05:19 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92G5JXb070257; Sun, 2 Oct 2011 16:05:19 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201110021605.p92G5JXb070257@svn.freebsd.org> From: Glen Barber Date: Sun, 2 Oct 2011 16:05:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225927 - head/bin/ps X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 16:05:20 -0000 Author: gjb (doc committer) Date: Sun Oct 2 16:05:19 2011 New Revision: 225927 URL: http://svn.freebsd.org/changeset/base/225927 Log: Correct a typo that was introduced in 225912 Submitted by: Valentin Nechayev (netch % netch!kiev!ua), arundel MFC after: 1 week With-MFC: 225908 Modified: head/bin/ps/ps.1 Modified: head/bin/ps/ps.1 ============================================================================== --- head/bin/ps/ps.1 Sun Oct 2 14:10:25 2011 (r225926) +++ head/bin/ps/ps.1 Sun Oct 2 16:05:19 2011 (r225927) @@ -431,7 +431,7 @@ The process is being traced or debugged. An abbreviation for the pathname of the controlling terminal, if any. The abbreviation consists of the three letters following .Pa /dev/tty , -or, for psuedo-terminals, the corresponding entry in +or, for pseudo-terminals, the corresponding entry in .Pa /dev/pts . This is followed by a .Ql - From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 23:22:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D46621065670; Sun, 2 Oct 2011 23:22:38 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AB3638FC08; Sun, 2 Oct 2011 23:22:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92NMcrg083527; Sun, 2 Oct 2011 23:22:38 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92NMcRD083512; Sun, 2 Oct 2011 23:22:38 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110022322.p92NMcRD083512@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 Oct 2011 23:22:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225931 - in head/sys: dev/fb dev/le sparc64/central sparc64/conf sparc64/ebus sparc64/fhc sparc64/include sparc64/pci sparc64/sbus sparc64/sparc64 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 23:22:38 -0000 Author: marius Date: Sun Oct 2 23:22:38 2011 New Revision: 225931 URL: http://svn.freebsd.org/changeset/base/225931 Log: Make sparc64 compatible with NEW_PCIB and enable it: - Implement bus_adjust_resource() methods as far as necessary and in non-PCI bridge drivers as far as feasible without rototilling them. - As NEW_PCIB does a layering violation by activating resources at layers above pci(4) without previously bubbling up their allocation there, move the assignment of bus tags and handles from the bus_alloc_resource() to the bus_activate_resource() methods like at least the other NEW_PCIB enabled architectures do. This is somewhat unfortunate as previously sparc64 (ab)used resource activation to indicate whether SYS_RES_MEMORY resources should be mapped into KVA, which is only necessary if their going to be accessed via the pointer returned from rman_get_virtual() but not for bus_space(9) as the later always uses physical access on sparc64. Besides wasting KVA if we always map in SYS_RES_MEMORY resources, a driver also may deliberately not map them in if the firmware already has done so, possibly in a special way. So in order to still allow a driver to decide whether a SYS_RES_MEMORY resource should be mapped into KVA we let it indicate that by calling bus_space_map(9) with BUS_SPACE_MAP_LINEAR as actually documented in the bus_space(9) page. This is implemented by allocating a separate bus tag per SYS_RES_MEMORY resource and passing the resource via the previously unused bus tag cookie so we later on can call rman_set_virtual() in sparc64_bus_mem_map(). As a side effect this now also allows to actually indicate that a SYS_RES_MEMORY resource should be mapped in as cacheable and/or read-only via BUS_SPACE_MAP_CACHEABLE and BUS_SPACE_MAP_READONLY respectively. - Do some minor cleanup like taking advantage of rman_init_from_resource(), factor out the common part of bus tag allocation into a newly added sparc64_alloc_bus_tag(), hook up some missing newbus methods and replace some homegrown versions with the generic counterparts etc. - While at it, let apb_attach() (which can't use the generic NEW_PCIB code as APB bridges just don't have the base and limit registers implemented) regarding the config space registers cached in pcib_softc and the SYSCTL reporting nodes set up. Modified: head/sys/dev/fb/machfb.c head/sys/dev/le/lebuffer_sbus.c head/sys/sparc64/central/central.c head/sys/sparc64/conf/DEFAULTS head/sys/sparc64/ebus/ebus.c head/sys/sparc64/fhc/fhc.c head/sys/sparc64/include/bus.h head/sys/sparc64/include/bus_private.h head/sys/sparc64/pci/apb.c head/sys/sparc64/pci/fire.c head/sys/sparc64/pci/firevar.h head/sys/sparc64/pci/ofw_pcib_subr.c head/sys/sparc64/pci/psycho.c head/sys/sparc64/pci/psychovar.h head/sys/sparc64/pci/sbbc.c head/sys/sparc64/pci/schizo.c head/sys/sparc64/pci/schizovar.h head/sys/sparc64/sbus/dma_sbus.c head/sys/sparc64/sbus/sbus.c head/sys/sparc64/sparc64/bus_machdep.c head/sys/sparc64/sparc64/nexus.c head/sys/sparc64/sparc64/upa.c Modified: head/sys/dev/fb/machfb.c ============================================================================== --- head/sys/dev/fb/machfb.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/dev/fb/machfb.c Sun Oct 2 23:22:38 2011 (r225931) @@ -87,7 +87,9 @@ struct machfb_softc { struct resource *sc_vmemres; bus_space_tag_t sc_memt; bus_space_tag_t sc_regt; + bus_space_tag_t sc_vmemt; bus_space_handle_t sc_memh; + bus_space_handle_t sc_vmemh; bus_space_handle_t sc_regh; u_long sc_mem; u_long sc_vmem; @@ -1175,68 +1177,52 @@ machfb_pci_attach(device_t dev) adp = &sc->sc_va; vi = &adp->va_info; - /* - * Allocate resources regardless of whether we are the console - * and already obtained the bus tag and handle for the framebuffer - * in machfb_configure() or not so the resources are marked as - * taken in the respective RMAN. - */ - - /* Enable memory and IO access. */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) | PCIM_CMD_PORTEN | - PCIM_CMD_MEMEN, 2); - - /* - * NB: we need to take care that the framebuffer isn't mapped - * in twice as besides wasting resources this isn't possible with - * all MMUs. - */ rid = PCIR_BAR(0); - if ((sc->sc_memres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &rid, 0)) == NULL) { + if ((sc->sc_memres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate memory resources\n"); return (ENXIO); } + sc->sc_memt = rman_get_bustag(sc->sc_memres); + sc->sc_memh = rman_get_bushandle(sc->sc_memres); + sc->sc_mem = rman_get_start(sc->sc_memres); + vi->vi_buffer = sc->sc_memh; + vi->vi_buffer_size = rman_get_size(sc->sc_memres); if (OF_getprop(sc->sc_node, "address", &u32, sizeof(u32)) > 0 && - vtophys(u32) == rman_get_bushandle(sc->sc_memres)) + vtophys(u32) == sc->sc_memh) adp->va_mem_base = u32; else { - bus_release_resource(dev, SYS_RES_MEMORY, - rman_get_rid(sc->sc_memres), sc->sc_memres); - rid = PCIR_BAR(0); - if ((sc->sc_memres = bus_alloc_resource_any(dev, - SYS_RES_MEMORY, &rid, RF_ACTIVE)) == NULL) { - device_printf(dev, - "cannot allocate memory resources\n"); - return (ENXIO); + if (bus_space_map(sc->sc_memt, vi->vi_buffer, + vi->vi_buffer_size, BUS_SPACE_MAP_LINEAR, + &sc->sc_memh) != 0) { + device_printf(dev, "cannot map memory resources\n"); + error = ENXIO; + goto fail_memres; } adp->va_mem_base = (vm_offset_t)rman_get_virtual(sc->sc_memres); } - sc->sc_memt = rman_get_bustag(sc->sc_memres); - sc->sc_memh = rman_get_bushandle(sc->sc_memres); - sc->sc_regt = sc->sc_memt; - bus_space_subregion(sc->sc_regt, sc->sc_memh, MACH64_REG_OFF, - MACH64_REG_SIZE, &sc->sc_regh); - adp->va_mem_size = rman_get_size(sc->sc_memres); + adp->va_mem_size = vi->vi_buffer_size; adp->va_buffer = adp->va_mem_base; adp->va_buffer_size = adp->va_mem_size; - sc->sc_mem = rman_get_start(sc->sc_memres); - vi->vi_buffer = sc->sc_memh; - vi->vi_buffer_size = adp->va_buffer_size; + sc->sc_regt = sc->sc_memt; + if (bus_space_subregion(sc->sc_regt, sc->sc_memh, MACH64_REG_OFF, + MACH64_REG_SIZE, &sc->sc_regh) != 0) { + device_printf(dev, "cannot allocate register resources\n"); + error = ENXIO; + goto fail_memmap; + } /* * Depending on the firmware version the VGA I/O and/or memory - * resources of the Mach64 chips come up disabled. We generally - * enable them above (pci(4) actually already did this unless - * pci_enable_io_modes is not set) but this doesn't necessarily - * mean that we get valid ones. Invalid resources seem to have - * in common that they start at address 0. We don't allocate - * them in this case in order to avoid warnings in apb(4) and - * crashes when using these invalid resources. X.Org is aware - * of this and doesn't use the VGA resources in this case (but - * demands them if they are valid). + * resources of the Mach64 chips come up disabled. These will be + * enabled by pci(4) when activating the resource in question but + * this doesn't necessarily mean that the resource is valid. + * Invalid resources seem to have in common that they start at + * address 0. We don't allocate the VGA memory in this case in + * order to avoid warnings in apb(4) and crashes when using this + * invalid resources. X.Org is aware of this and doesn't use the + * VGA memory resource in this case (but demands it if it's valid). */ rid = PCIR_BAR(2); if (bus_get_resource_start(dev, SYS_RES_MEMORY, rid) != 0) { @@ -1245,21 +1231,31 @@ machfb_pci_attach(device_t dev) device_printf(dev, "cannot allocate VGA memory resources\n"); error = ENXIO; - goto fail_memres; + goto fail_memmap; + } + sc->sc_vmemt = rman_get_bustag(sc->sc_vmemres); + sc->sc_vmemh = rman_get_bushandle(sc->sc_vmemres); + sc->sc_vmem = rman_get_start(sc->sc_vmemres); + vi->vi_registers = sc->sc_vmemh; + vi->vi_registers_size = rman_get_size(sc->sc_vmemres); + if (bus_space_map(sc->sc_vmemt, vi->vi_registers, + vi->vi_registers_size, BUS_SPACE_MAP_LINEAR, + &sc->sc_vmemh) != 0) { + device_printf(dev, + "cannot map VGA memory resources\n"); + error = ENXIO; + goto fail_vmemres; } adp->va_registers = (vm_offset_t)rman_get_virtual(sc->sc_vmemres); - adp->va_registers_size = rman_get_size(sc->sc_vmemres); - sc->sc_vmem = rman_get_start(sc->sc_vmemres); - vi->vi_registers = rman_get_bushandle(sc->sc_vmemres); - vi->vi_registers_size = adp->va_registers_size; + adp->va_registers_size = vi->vi_registers_size; } if (!(sc->sc_flags & MACHFB_CONSOLE)) { if ((sw = vid_get_switch(MACHFB_DRIVER_NAME)) == NULL) { device_printf(dev, "cannot get video switch\n"); error = ENODEV; - goto fail_vmemres; + goto fail_vmemmap; } /* * During device configuration we don't necessarily probe @@ -1275,7 +1271,7 @@ machfb_pci_attach(device_t dev) break; if ((error = sw->init(i, adp, 0)) != 0) { device_printf(dev, "cannot initialize adapter\n"); - goto fail_vmemres; + goto fail_vmemmap; } } @@ -1283,8 +1279,8 @@ machfb_pci_attach(device_t dev) * Test whether the aperture is byte swapped or not, set * va_window and va_window_size as appropriate. Note that * the aperture could be mapped either big or little endian - * on independently of the endianess of the host so this - * has to be a runtime test. + * independently of the endianess of the host so this has + * to be a runtime test. */ p32 = (uint32_t *)adp->va_buffer; u32 = *p32; @@ -1346,10 +1342,16 @@ machfb_pci_attach(device_t dev) return (0); + fail_vmemmap: + if (adp->va_registers != 0) + bus_space_unmap(sc->sc_vmemt, sc->sc_vmemh, + vi->vi_registers_size); fail_vmemres: if (sc->sc_vmemres != NULL) bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->sc_vmemres), sc->sc_vmemres); + fail_memmap: + bus_space_unmap(sc->sc_memt, sc->sc_memh, vi->vi_buffer_size); fail_memres: bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->sc_memres), sc->sc_memres); Modified: head/sys/dev/le/lebuffer_sbus.c ============================================================================== --- head/sys/dev/le/lebuffer_sbus.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/dev/le/lebuffer_sbus.c Sun Oct 2 23:22:38 2011 (r225931) @@ -81,6 +81,7 @@ static device_method_t lebuffer_methods[ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), Modified: head/sys/sparc64/central/central.c ============================================================================== --- head/sys/sparc64/central/central.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/central/central.c Sun Oct 2 23:22:38 2011 (r225931) @@ -60,6 +60,7 @@ static device_attach_t central_attach; static bus_print_child_t central_print_child; static bus_probe_nomatch_t central_probe_nomatch; static bus_alloc_resource_t central_alloc_resource; +static bus_adjust_resource_t central_adjust_resource; static bus_get_resource_list_t central_get_resource_list; static ofw_bus_get_devinfo_t central_get_devinfo; @@ -79,6 +80,7 @@ static device_method_t central_methods[] DEVMETHOD(bus_alloc_resource, central_alloc_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, central_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -180,6 +182,15 @@ central_attach(device_t dev) } static int +central_adjust_resource(device_t bus __unused, device_t child __unused, + int type __unused, struct resource *r __unused, u_long start __unused, + u_long end __unused) +{ + + return (ENXIO); +} + +static int central_print_child(device_t dev, device_t child) { int rv; Modified: head/sys/sparc64/conf/DEFAULTS ============================================================================== --- head/sys/sparc64/conf/DEFAULTS Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/conf/DEFAULTS Sun Oct 2 23:22:38 2011 (r225931) @@ -19,3 +19,5 @@ options GEOM_PART_VTOC8 # Let sunkbd emulate an AT keyboard by default. options SUNKBD_EMULATE_ATKBD + +#options NEW_PCIB Modified: head/sys/sparc64/ebus/ebus.c ============================================================================== --- head/sys/sparc64/ebus/ebus.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/ebus/ebus.c Sun Oct 2 23:22:38 2011 (r225931) @@ -136,6 +136,8 @@ static device_attach_t ebus_pci_attach; static bus_print_child_t ebus_print_child; static bus_probe_nomatch_t ebus_probe_nomatch; static bus_alloc_resource_t ebus_alloc_resource; +static bus_activate_resource_t ebus_activate_resource; +static bus_adjust_resource_t ebus_adjust_resource; static bus_release_resource_t ebus_release_resource; static bus_setup_intr_t ebus_setup_intr; static bus_get_resource_list_t ebus_get_resource_list; @@ -161,8 +163,9 @@ static device_method_t ebus_nexus_method DEVMETHOD(bus_print_child, ebus_print_child), DEVMETHOD(bus_probe_nomatch, ebus_probe_nomatch), DEVMETHOD(bus_alloc_resource, ebus_alloc_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_activate_resource, ebus_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, ebus_adjust_resource), DEVMETHOD(bus_release_resource, ebus_release_resource), DEVMETHOD(bus_setup_intr, ebus_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -342,16 +345,10 @@ ebus_pci_attach(device_t dev) eri->eri_res = res; eri->eri_rman.rm_type = RMAN_ARRAY; eri->eri_rman.rm_descr = "EBus range"; - if (rman_init(&eri->eri_rman) != 0) { + if (rman_init_from_resource(&eri->eri_rman, res) != 0) { printf("%s: failed to initialize rman!", __func__); goto fail; } - if (rman_manage_region(&eri->eri_rman, rman_get_start(res), - rman_get_end(res)) != 0) { - printf("%s: failed to register region!", __func__); - rman_fini(&eri->eri_rman); - goto fail; - } } return (ebus_attach(dev, sc, node)); @@ -423,12 +420,10 @@ ebus_alloc_resource(device_t bus, device struct resource_list *rl; struct resource_list_entry *rle = NULL; struct resource *res; - struct ebus_rinfo *ri; + struct ebus_rinfo *eri; struct ebus_nexus_ranges *enr; - bus_space_tag_t bt; - bus_space_handle_t bh; uint64_t cend, cstart, offset; - int i, isdefault, passthrough, ridx, rv; + int i, isdefault, passthrough, ridx; isdefault = (start == 0UL && end == ~0UL); passthrough = (device_get_parent(child) != bus); @@ -459,23 +454,17 @@ ebus_alloc_resource(device_t bus, device */ (void)ofw_isa_range_map(sc->sc_range, sc->sc_nrange, &start, &end, &ridx); - ri = &sc->sc_rinfo[ridx]; - res = rman_reserve_resource(&ri->eri_rman, start, end, - count, flags, child); + eri = &sc->sc_rinfo[ridx]; + res = rman_reserve_resource(&eri->eri_rman, start, + end, count, flags & ~RF_ACTIVE, child); if (res == NULL) return (NULL); rman_set_rid(res, *rid); - bt = rman_get_bustag(ri->eri_res); - rman_set_bustag(res, bt); - rv = bus_space_subregion(bt, - rman_get_bushandle(ri->eri_res), - rman_get_start(res) - rman_get_start(ri->eri_res), - count, &bh); - if (rv != 0) { + if ((flags & RF_ACTIVE) != 0 && bus_activate_resource( + child, type, *rid, res) != 0) { rman_release_resource(res); return (NULL); } - rman_set_bushandle(res, bh); } else { /* Map EBus ranges to nexus ranges. */ for (i = 0; i < sc->sc_nrange; i++) { @@ -496,7 +485,6 @@ ebus_alloc_resource(device_t bus, device break; } } - } if (!passthrough) rle->res = res; @@ -509,6 +497,48 @@ ebus_alloc_resource(device_t bus, device } static int +ebus_activate_resource(device_t bus, device_t child, int type, int rid, + struct resource *res) +{ + struct ebus_softc *sc; + struct ebus_rinfo *eri; + bus_space_tag_t bt; + bus_space_handle_t bh; + int i, rv; + + sc = device_get_softc(bus); + if ((sc->sc_flags & EBUS_PCI) != 0 && type == SYS_RES_MEMORY) { + for (i = 0; i < sc->sc_nrange; i++) { + eri = &sc->sc_rinfo[i]; + if (rman_is_region_manager(res, &eri->eri_rman) != 0) { + bt = rman_get_bustag(eri->eri_res); + rv = bus_space_subregion(bt, + rman_get_bushandle(eri->eri_res), + rman_get_start(res) - + rman_get_start(eri->eri_res), + rman_get_size(res), &bh); + if (rv != 0) + return (rv); + rman_set_bustag(res, bt); + rman_set_bushandle(res, bh); + return (rman_activate_resource(res)); + } + } + return (EINVAL); + } + return (bus_generic_activate_resource(bus, child, type, rid, res)); +} + +static int +ebus_adjust_resource(device_t bus __unused, device_t child __unused, + int type __unused, struct resource *res __unused, u_long start __unused, + u_long end __unused) +{ + + return (ENXIO); +} + +static int ebus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { @@ -519,13 +549,15 @@ ebus_release_resource(device_t bus, devi passthrough = (device_get_parent(child) != bus); rl = BUS_GET_RESOURCE_LIST(bus, child); - switch (type) { - case SYS_RES_MEMORY: - sc = device_get_softc(bus); - if ((sc->sc_flags & EBUS_PCI) == 0) - return (resource_list_release(rl, bus, child, type, - rid, res)); - if ((rv = rman_release_resource(res)) != 0) + sc = device_get_softc(bus); + if ((sc->sc_flags & EBUS_PCI) != 0 && type == SYS_RES_MEMORY) { + if ((rman_get_flags(res) & RF_ACTIVE) != 0 ){ + rv = bus_deactivate_resource(child, type, rid, res); + if (rv != 0) + return (rv); + } + rv = rman_release_resource(res); + if (rv != 0) return (rv); if (!passthrough) { rle = resource_list_find(rl, type, rid); @@ -535,13 +567,9 @@ ebus_release_resource(device_t bus, devi ("%s: resource entry is not busy", __func__)); rle->res = NULL; } - break; - case SYS_RES_IRQ: - return (resource_list_release(rl, bus, child, type, rid, res)); - default: - panic("%s: unsupported resource type %d", __func__, type); + return (0); } - return (0); + return (resource_list_release(rl, bus, child, type, rid, res)); } static int Modified: head/sys/sparc64/fhc/fhc.c ============================================================================== --- head/sys/sparc64/fhc/fhc.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/fhc/fhc.c Sun Oct 2 23:22:38 2011 (r225931) @@ -69,6 +69,7 @@ static bus_print_child_t fhc_print_child static bus_probe_nomatch_t fhc_probe_nomatch; static bus_setup_intr_t fhc_setup_intr; static bus_alloc_resource_t fhc_alloc_resource; +static bus_adjust_resource_t fhc_adjust_resource; static bus_get_resource_list_t fhc_get_resource_list; static ofw_bus_get_devinfo_t fhc_get_devinfo; @@ -93,6 +94,7 @@ static device_method_t fhc_methods[] = { DEVMETHOD(bus_alloc_resource, fhc_alloc_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, fhc_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), DEVMETHOD(bus_setup_intr, fhc_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -475,6 +477,15 @@ fhc_alloc_resource(device_t bus, device_ return (res); } +static int +fhc_adjust_resource(device_t bus __unused, device_t child __unused, + int type __unused, struct resource *r __unused, u_long start __unused, + u_long end __unused) +{ + + return (ENXIO); +} + static struct resource_list * fhc_get_resource_list(device_t bus, device_t child) { Modified: head/sys/sparc64/include/bus.h ============================================================================== --- head/sys/sparc64/include/bus.h Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/include/bus.h Sun Oct 2 23:22:38 2011 (r225931) @@ -122,32 +122,15 @@ static int bus_space_subregion(bus_space /* * Map a region of device bus space into CPU virtual address space. */ - -static __inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr, - bus_size_t size, int flags, bus_space_handle_t *bshp); - -static __inline int -bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr, - bus_size_t size __unused, int flags __unused, bus_space_handle_t *bshp) -{ - - *bshp = addr; - return (0); -} +int bus_space_map(bus_space_tag_t tag, bus_addr_t address, bus_size_t size, + int flags, bus_space_handle_t *handlep); /* * Unmap a region of device bus space. */ -static __inline void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, +void bus_space_unmap(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t size); -static __inline void -bus_space_unmap(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, - bus_size_t size __unused) -{ - -} - /* This macro finds the first "upstream" implementation of method `f' */ #define _BS_CALL(t,f) \ while (t->f == NULL) \ Modified: head/sys/sparc64/include/bus_private.h ============================================================================== --- head/sys/sparc64/include/bus_private.h Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/include/bus_private.h Sun Oct 2 23:22:38 2011 (r225931) @@ -36,10 +36,14 @@ /* * Helpers */ -int sparc64_bus_mem_map(bus_space_tag_t, bus_space_handle_t, bus_size_t, - int, vm_offset_t, void **); -int sparc64_bus_mem_unmap(void *, bus_size_t); -bus_space_handle_t sparc64_fake_bustag(int, bus_addr_t, struct bus_space_tag *); +int sparc64_bus_mem_map(bus_space_tag_t tag, bus_addr_t addr, bus_size_t size, + int flags, vm_offset_t vaddr, bus_space_handle_t *hp); +int sparc64_bus_mem_unmap(bus_space_tag_t tag, bus_space_handle_t handle, + bus_size_t size); +bus_space_tag_t sparc64_alloc_bus_tag(void *cookie, + struct bus_space_tag *ptag, int type, void *barrier); +bus_space_handle_t sparc64_fake_bustag(int space, bus_addr_t addr, + struct bus_space_tag *ptag); struct bus_dmamap_res { struct resource *dr_res; Modified: head/sys/sparc64/pci/apb.c ============================================================================== --- head/sys/sparc64/pci/apb.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/pci/apb.c Sun Oct 2 23:22:38 2011 (r225931) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -77,6 +78,7 @@ struct apb_softc { static device_probe_t apb_probe; static device_attach_t apb_attach; static bus_alloc_resource_t apb_alloc_resource; +static bus_adjust_resource_t apb_adjust_resource; static device_method_t apb_methods[] = { /* Device interface */ @@ -85,6 +87,8 @@ static device_method_t apb_methods[] = { /* Bus interface */ DEVMETHOD(bus_alloc_resource, apb_alloc_resource), + DEVMETHOD(bus_adjust_resource, apb_adjust_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), /* pcib interface */ DEVMETHOD(pcib_route_interrupt, ofw_pcib_gen_route_interrupt), @@ -158,6 +162,8 @@ static int apb_attach(device_t dev) { struct apb_softc *sc; + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; sc = device_get_softc(dev); @@ -165,12 +171,41 @@ apb_attach(device_t dev) * Get current bridge configuration. */ sc->sc_bsc.ops_pcib_sc.domain = pci_get_domain(dev); + sc->sc_bsc.ops_pcib_sc.secstat = + pci_read_config(dev, PCIR_SECSTAT_1, 2); + sc->sc_bsc.ops_pcib_sc.command = + pci_read_config(dev, PCIR_COMMAND, 2); + sc->sc_bsc.ops_pcib_sc.pribus = + pci_read_config(dev, PCIR_PRIBUS_1, 1); sc->sc_bsc.ops_pcib_sc.secbus = pci_read_config(dev, PCIR_SECBUS_1, 1); sc->sc_bsc.ops_pcib_sc.subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1); + sc->sc_bsc.ops_pcib_sc.bridgectl = + pci_read_config(dev, PCIR_BRIDGECTL_1, 2); + sc->sc_bsc.ops_pcib_sc.seclat = + pci_read_config(dev, PCIR_SECLAT_1, 1); sc->sc_iomap = pci_read_config(dev, APBR_IOMAP, 1); sc->sc_memmap = pci_read_config(dev, APBR_MEMMAP, 1); + + /* + * Setup SYSCTL reporting nodes. + */ + sctx = device_get_sysctl_ctx(dev); + soid = device_get_sysctl_tree(dev); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "domain", + CTLFLAG_RD, &sc->sc_bsc.ops_pcib_sc.domain, 0, + "Domain number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "pribus", + CTLFLAG_RD, &sc->sc_bsc.ops_pcib_sc.pribus, 0, + "Primary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "secbus", + CTLFLAG_RD, &sc->sc_bsc.ops_pcib_sc.secbus, 0, + "Secondary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "subbus", + CTLFLAG_RD, &sc->sc_bsc.ops_pcib_sc.subbus, 0, + "Subordinate bus number"); + ofw_pcib_gen_setup(dev); if (bootverbose) { @@ -233,9 +268,9 @@ apb_alloc_resource(device_t dev, device_ "%s requested decoded I/O range 0x%lx-0x%lx\n", device_get_nameunit(child), start, end); break; - case SYS_RES_MEMORY: - if (!apb_checkrange(sc->sc_memmap, APB_MEM_SCALE, start, end)) { + if (!apb_checkrange(sc->sc_memmap, APB_MEM_SCALE, start, + end)) { device_printf(dev, "device %s requested unsupported " "memory range 0x%lx-0x%lx\n", device_get_nameunit(child), start, end); @@ -246,9 +281,6 @@ apb_alloc_resource(device_t dev, device_ "%s requested decoded memory range 0x%lx-0x%lx\n", device_get_nameunit(child), start, end); break; - - default: - break; } passup: @@ -258,3 +290,23 @@ apb_alloc_resource(device_t dev, device_ return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); } + +static int +apb_adjust_resource(device_t dev, device_t child, int type, + struct resource *r, u_long start, u_long end) +{ + struct apb_softc *sc; + + sc = device_get_softc(dev); + switch (type) { + case SYS_RES_IOPORT: + if (!apb_checkrange(sc->sc_iomap, APB_IO_SCALE, start, end)) + return (ENXIO); + break; + case SYS_RES_MEMORY: + if (!apb_checkrange(sc->sc_memmap, APB_MEM_SCALE, start, end)) + return (ENXIO); + break; + } + return (bus_generic_adjust_resource(dev, child, type, r, start, end)); +} Modified: head/sys/sparc64/pci/fire.c ============================================================================== --- head/sys/sparc64/pci/fire.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/pci/fire.c Sun Oct 2 23:22:38 2011 (r225931) @@ -85,7 +85,6 @@ __FBSDID("$FreeBSD$"); struct fire_msiqarg; -static bus_space_tag_t fire_alloc_bus_tag(struct fire_softc *sc, int type); static const struct fire_desc *fire_get_desc(device_t dev); static void fire_dmamap_sync(bus_dma_tag_t dt __unused, bus_dmamap_t map, bus_dmasync_op_t op); @@ -113,11 +112,11 @@ static driver_filter_t fire_xcb; * Methods */ static bus_activate_resource_t fire_activate_resource; +static bus_adjust_resource_t fire_adjust_resource; static pcib_alloc_msi_t fire_alloc_msi; static pcib_alloc_msix_t fire_alloc_msix; static bus_alloc_resource_t fire_alloc_resource; static device_attach_t fire_attach; -static bus_deactivate_resource_t fire_deactivate_resource; static bus_get_dma_tag_t fire_get_dma_tag; static ofw_bus_get_node_t fire_get_node; static pcib_map_msi_t fire_map_msi; @@ -127,7 +126,6 @@ static pcib_read_config_t fire_read_conf static bus_read_ivar_t fire_read_ivar; static pcib_release_msi_t fire_release_msi; static pcib_release_msix_t fire_release_msix; -static bus_release_resource_t fire_release_resource; static pcib_route_interrupt_t fire_route_interrupt; static bus_setup_intr_t fire_setup_intr; static bus_teardown_intr_t fire_teardown_intr; @@ -147,9 +145,10 @@ static device_method_t fire_methods[] = DEVMETHOD(bus_setup_intr, fire_setup_intr), DEVMETHOD(bus_teardown_intr, fire_teardown_intr), DEVMETHOD(bus_alloc_resource, fire_alloc_resource), - DEVMETHOD(bus_activate_resource, fire_activate_resource), - DEVMETHOD(bus_deactivate_resource, fire_deactivate_resource), - DEVMETHOD(bus_release_resource, fire_release_resource), + DEVMETHOD(bus_activate_resource, fire_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, fire_adjust_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_get_dma_tag, fire_get_dma_tag), /* pcib interface */ @@ -757,13 +756,19 @@ fire_attach(device_t dev) free(range, M_OFWPROP); /* Allocate our tags. */ - sc->sc_pci_memt = fire_alloc_bus_tag(sc, PCI_MEMORY_BUS_SPACE); - sc->sc_pci_iot = fire_alloc_bus_tag(sc, PCI_IO_BUS_SPACE); - sc->sc_pci_cfgt = fire_alloc_bus_tag(sc, PCI_CONFIG_BUS_SPACE); + sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, rman_get_bustag( + sc->sc_mem_res[FIRE_PCI]), PCI_IO_BUS_SPACE, NULL); + if (sc->sc_pci_iot == NULL) + panic("%s: could not allocate PCI I/O tag", __func__); + sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, rman_get_bustag( + sc->sc_mem_res[FIRE_PCI]), PCI_CONFIG_BUS_SPACE, NULL); + if (sc->sc_pci_cfgt == NULL) + panic("%s: could not allocate PCI configuration space tag", + __func__); if (bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, sc->sc_is.is_pmaxaddr, ~0, NULL, NULL, sc->sc_is.is_pmaxaddr, 0xff, 0xffffffff, 0, NULL, NULL, &sc->sc_pci_dmat) != 0) - panic("%s: bus_dma_tag_create failed", __func__); + panic("%s: could not create PCI DMA tag", __func__); /* Customize the tag. */ sc->sc_pci_dmat->dt_cookie = &sc->sc_is; sc->sc_pci_dmat->dt_mt = &sc->sc_dma_methods; @@ -2015,14 +2020,10 @@ fire_alloc_resource(device_t bus, device struct fire_softc *sc; struct resource *rv; struct rman *rm; - bus_space_tag_t bt; - bus_space_handle_t bh; - int needactivate = flags & RF_ACTIVE; - - flags &= ~RF_ACTIVE; sc = device_get_softc(bus); - if (type == SYS_RES_IRQ) { + switch (type) { + case SYS_RES_IRQ: /* * XXX: Don't accept blank ranges for now, only single * interrupts. The other case should not happen with @@ -2034,38 +2035,28 @@ fire_alloc_resource(device_t bus, device panic("%s: XXX: interrupt range", __func__); if (*rid == 0) start = end = INTMAP_VEC(sc->sc_ign, end); - return (BUS_ALLOC_RESOURCE(device_get_parent(bus), child, - type, rid, start, end, count, flags)); - } - switch (type) { + return (bus_generic_alloc_resource(bus, child, type, rid, + start, end, count, flags)); case SYS_RES_MEMORY: rm = &sc->sc_pci_mem_rman; - bt = sc->sc_pci_memt; - bh = sc->sc_pci_bh[OFW_PCI_CS_MEM32]; break; case SYS_RES_IOPORT: rm = &sc->sc_pci_io_rman; - bt = sc->sc_pci_iot; - bh = sc->sc_pci_bh[OFW_PCI_CS_IO]; break; default: return (NULL); - /* NOTREACHED */ } - rv = rman_reserve_resource(rm, start, end, count, flags, child); + rv = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, + child); if (rv == NULL) return (NULL); rman_set_rid(rv, *rid); - bh += rman_get_start(rv); - rman_set_bustag(rv, bt); - rman_set_bushandle(rv, bh); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv)) { - rman_release_resource(rv); - return (NULL); - } + + if ((flags & RF_ACTIVE) != 0 && bus_activate_resource(child, type, + *rid, rv) != 0) { + rman_release_resource(rv); + return (NULL); } return (rv); } @@ -2074,56 +2065,56 @@ static int fire_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { - void *p; - int error; + struct fire_softc *sc; + struct bus_space_tag *tag; - if (type == SYS_RES_IRQ) - return (BUS_ACTIVATE_RESOURCE(device_get_parent(bus), child, - type, rid, r)); - if (type == SYS_RES_MEMORY) { - /* - * Need to memory-map the device space, as some drivers - * depend on the virtual address being set and usable. - */ - error = sparc64_bus_mem_map(rman_get_bustag(r), - rman_get_bushandle(r), rman_get_size(r), 0, 0, &p); - if (error != 0) - return (error); - rman_set_virtual(r, p); + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_IRQ: + return (bus_generic_activate_resource(bus, child, type, rid, + r)); + case SYS_RES_MEMORY: + tag = sparc64_alloc_bus_tag(r, rman_get_bustag( + sc->sc_mem_res[FIRE_PCI]), PCI_MEMORY_BUS_SPACE, NULL); + if (tag == NULL) + return (ENOMEM); + rman_set_bustag(r, tag); + rman_set_bushandle(r, sc->sc_pci_bh[OFW_PCI_CS_MEM32] + + rman_get_start(r)); + break; + case SYS_RES_IOPORT: + rman_set_bustag(r, sc->sc_pci_iot); + rman_set_bushandle(r, sc->sc_pci_bh[OFW_PCI_CS_IO] + + rman_get_start(r)); + break; } return (rman_activate_resource(r)); } static int -fire_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) +fire_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, u_long start, u_long end) { + struct fire_softc *sc; + struct rman *rm; - if (type == SYS_RES_IRQ) - return (BUS_DEACTIVATE_RESOURCE(device_get_parent(bus), child, - type, rid, r)); - if (type == SYS_RES_MEMORY) { - sparc64_bus_mem_unmap(rman_get_virtual(r), rman_get_size(r)); - rman_set_virtual(r, NULL); - } - return (rman_deactivate_resource(r)); -} - -static int -fire_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - int error; - - if (type == SYS_RES_IRQ) - return (BUS_RELEASE_RESOURCE(device_get_parent(bus), child, - type, rid, r)); - if (rman_get_flags(r) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, r); - if (error) - return (error); + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_IRQ: + return (bus_generic_adjust_resource(bus, child, type, r, + start, end)); + case SYS_RES_MEMORY: + rm = &sc->sc_pci_mem_rman; + break; + case SYS_RES_IOPORT: + rm = &sc->sc_pci_io_rman; + break; + default: + return (EINVAL); } - return (rman_release_resource(r)); + if (rman_is_region_manager(r, rm) == 0) + return (EINVAL); + return (rman_adjust_resource(r, start, end)); } static bus_dma_tag_t @@ -2145,22 +2136,6 @@ fire_get_node(device_t bus, device_t chi return (sc->sc_node); } -static bus_space_tag_t -fire_alloc_bus_tag(struct fire_softc *sc, int type) -{ - bus_space_tag_t bt; - - bt = malloc(sizeof(struct bus_space_tag), M_DEVBUF, - M_NOWAIT | M_ZERO); - if (bt == NULL) - panic("%s: out of memory", __func__); - - bt->bst_cookie = sc; - bt->bst_parent = rman_get_bustag(sc->sc_mem_res[FIRE_PCI]); - bt->bst_type = type; - return (bt); -} - static u_int fire_get_timecount(struct timecounter *tc) { Modified: head/sys/sparc64/pci/firevar.h ============================================================================== --- head/sys/sparc64/pci/firevar.h Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/pci/firevar.h Sun Oct 2 23:22:38 2011 (r225931) @@ -47,7 +47,6 @@ struct fire_softc { bus_space_handle_t sc_pci_bh[FIRE_NRANGE]; bus_space_tag_t sc_pci_cfgt; bus_space_tag_t sc_pci_iot; - bus_space_tag_t sc_pci_memt; bus_dma_tag_t sc_pci_dmat; device_t sc_dev; Modified: head/sys/sparc64/pci/ofw_pcib_subr.c ============================================================================== --- head/sys/sparc64/pci/ofw_pcib_subr.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/pci/ofw_pcib_subr.c Sun Oct 2 23:22:38 2011 (r225931) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: head/sys/sparc64/pci/psycho.c ============================================================================== --- head/sys/sparc64/pci/psycho.c Sun Oct 2 20:52:28 2011 (r225930) +++ head/sys/sparc64/pci/psycho.c Sun Oct 2 23:22:38 2011 (r225931) @@ -89,7 +89,6 @@ static void psycho_intr_enable(void *); static void psycho_intr_disable(void *); static void psycho_intr_assign(void *); static void psycho_intr_clear(void *); -static bus_space_tag_t psycho_alloc_bus_tag(struct psycho_softc *, int); /* Interrupt handlers */ static driver_filter_t psycho_ue; @@ -113,8 +112,7 @@ static bus_read_ivar_t psycho_read_ivar; static bus_setup_intr_t psycho_setup_intr; static bus_alloc_resource_t psycho_alloc_resource; static bus_activate_resource_t psycho_activate_resource; -static bus_deactivate_resource_t psycho_deactivate_resource; -static bus_release_resource_t psycho_release_resource; +static bus_adjust_resource_t psycho_adjust_resource; static bus_get_dma_tag_t psycho_get_dma_tag; static pcib_maxslots_t psycho_maxslots; static pcib_read_config_t psycho_read_config; @@ -137,9 +135,10 @@ static device_method_t psycho_methods[] DEVMETHOD(bus_setup_intr, psycho_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, psycho_alloc_resource), - DEVMETHOD(bus_activate_resource, psycho_activate_resource), - DEVMETHOD(bus_deactivate_resource, psycho_deactivate_resource), - DEVMETHOD(bus_release_resource, psycho_release_resource), + DEVMETHOD(bus_activate_resource, psycho_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, psycho_adjust_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_describe_intr, bus_generic_describe_intr), DEVMETHOD(bus_get_dma_tag, psycho_get_dma_tag), @@ -567,13 +566,19 @@ psycho_attach(device_t dev) } /* Allocate our tags. */ - sc->sc_pci_memt = psycho_alloc_bus_tag(sc, PCI_MEMORY_BUS_SPACE); - sc->sc_pci_iot = psycho_alloc_bus_tag(sc, PCI_IO_BUS_SPACE); - sc->sc_pci_cfgt = psycho_alloc_bus_tag(sc, PCI_CONFIG_BUS_SPACE); + sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, rman_get_bustag( + sc->sc_mem_res), PCI_IO_BUS_SPACE, NULL); + if (sc->sc_pci_iot == NULL) + panic("%s: could not allocate PCI I/O tag", __func__); + sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, rman_get_bustag( + sc->sc_mem_res), PCI_CONFIG_BUS_SPACE, NULL); + if (sc->sc_pci_cfgt == NULL) + panic("%s: could not allocate PCI configuration space tag", + __func__); if (bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, sc->sc_is->is_pmaxaddr, ~0, NULL, NULL, sc->sc_is->is_pmaxaddr, 0xff, 0xffffffff, 0, NULL, NULL, &sc->sc_pci_dmat) != 0) - panic("%s: bus_dma_tag_create failed", __func__); + panic("%s: could not create PCI DMA tag", __func__); /* Customize the tag. */ sc->sc_pci_dmat->dt_cookie = sc->sc_is; sc->sc_pci_dmat->dt_mt = sc->sc_dma_methods; @@ -1165,14 +1170,10 @@ psycho_alloc_resource(device_t bus, devi struct psycho_softc *sc; struct resource *rv; struct rman *rm; - bus_space_tag_t bt; - bus_space_handle_t bh; - int needactivate = flags & RF_ACTIVE; - - flags &= ~RF_ACTIVE; sc = device_get_softc(bus); - if (type == SYS_RES_IRQ) { + switch (type) { + case SYS_RES_IRQ: /* * XXX: Don't accept blank ranges for now, only single * interrupts. The other case should not happen with @@ -1183,38 +1184,28 @@ psycho_alloc_resource(device_t bus, devi if (start != end) panic("%s: XXX: interrupt range", __func__); start = end = INTMAP_VEC(sc->sc_ign, end); - return (BUS_ALLOC_RESOURCE(device_get_parent(bus), child, - type, rid, start, end, count, flags)); - } - switch (type) { + return (bus_generic_alloc_resource(bus, child, type, rid, + start, end, count, flags)); case SYS_RES_MEMORY: rm = &sc->sc_pci_mem_rman; - bt = sc->sc_pci_memt; - bh = sc->sc_pci_bh[OFW_PCI_CS_MEM32]; break; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Sun Oct 2 23:31:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32B1C106566B; Sun, 2 Oct 2011 23:31:15 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 228308FC14; Sun, 2 Oct 2011 23:31:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p92NVFAr083808; Sun, 2 Oct 2011 23:31:15 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p92NVFmd083806; Sun, 2 Oct 2011 23:31:15 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110022331.p92NVFmd083806@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 Oct 2011 23:31:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225932 - head/sys/sparc64/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 23:31:15 -0000 Author: marius Date: Sun Oct 2 23:31:14 2011 New Revision: 225932 URL: http://svn.freebsd.org/changeset/base/225932 Log: Actually enable NEW_PCIB by default, missed in r225931. Modified: head/sys/sparc64/conf/DEFAULTS Modified: head/sys/sparc64/conf/DEFAULTS ============================================================================== --- head/sys/sparc64/conf/DEFAULTS Sun Oct 2 23:22:38 2011 (r225931) +++ head/sys/sparc64/conf/DEFAULTS Sun Oct 2 23:31:14 2011 (r225932) @@ -20,4 +20,4 @@ options GEOM_PART_VTOC8 # Let sunkbd emulate an AT keyboard by default. options SUNKBD_EMULATE_ATKBD -#options NEW_PCIB +options NEW_PCIB From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 10:23:29 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FB70106566B; Mon, 3 Oct 2011 10:23:29 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F32DF8FC12; Mon, 3 Oct 2011 10:23:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93ANSZx004028; Mon, 3 Oct 2011 10:23:28 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93ANS5r004026; Mon, 3 Oct 2011 10:23:28 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201110031023.p93ANS5r004026@svn.freebsd.org> From: Attilio Rao Date: Mon, 3 Oct 2011 10:23:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225933 - stable/8/sys/dev/coretemp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 10:23:29 -0000 Author: attilio Date: Mon Oct 3 10:23:28 2011 New Revision: 225933 URL: http://svn.freebsd.org/changeset/base/225933 Log: MFC r225662: Cleanup #PROCHOT sticky assertion. Sponsored by: Sandvine Incorporated Modified: stable/8/sys/dev/coretemp/coretemp.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/coretemp/coretemp.c ============================================================================== --- stable/8/sys/dev/coretemp/coretemp.c Sun Oct 2 23:31:14 2011 (r225932) +++ stable/8/sys/dev/coretemp/coretemp.c Mon Oct 3 10:23:28 2011 (r225933) @@ -384,6 +384,7 @@ coretemp_get_val_sysctl(SYSCTL_HANDLER_A } if (msr & THERM_STATUS_LOG) { + coretemp_clear_thermal_msr(device_get_unit(dev)); sc->sc_throttle_log = 1; /* @@ -424,8 +425,10 @@ coretemp_throttle_log_sysctl(SYSCTL_HAND msr = coretemp_get_thermal_msr(device_get_unit(dev)); sc = device_get_softc(dev); - if (msr & THERM_STATUS_LOG) + if (msr & THERM_STATUS_LOG) { + coretemp_clear_thermal_msr(device_get_unit(dev)); sc->sc_throttle_log = 1; + } val = sc->sc_throttle_log; From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 12:12:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E62D1065673; Mon, 3 Oct 2011 12:12:04 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4DD948FC13; Mon, 3 Oct 2011 12:12:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93CC4WE009885; Mon, 3 Oct 2011 12:12:04 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93CC4MQ009883; Mon, 3 Oct 2011 12:12:04 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110031212.p93CC4MQ009883@svn.freebsd.org> From: Adrian Chadd Date: Mon, 3 Oct 2011 12:12:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225934 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 12:12:04 -0000 Author: adrian Date: Mon Oct 3 12:12:03 2011 New Revision: 225934 URL: http://svn.freebsd.org/changeset/base/225934 Log: Port over the radar pulse decoding code common to the AR5416 and later chipsets. Obtained from: Atheros Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Mon Oct 3 10:23:28 2011 (r225933) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Mon Oct 3 12:12:03 2011 (r225934) @@ -21,9 +21,7 @@ #include "ah.h" #include "ah_internal.h" #include "ah_devid.h" -#ifdef AH_DEBUG #include "ah_desc.h" /* NB: for HAL_PHYERR* */ -#endif #include "ar5416/ar5416.h" #include "ar5416/ar5416reg.h" @@ -757,14 +755,200 @@ ar5416EnableDfs(struct ath_hal *ah, HAL_ * Returns AH_TRUE if the phy error was actually a phy error, * AH_FALSE if the phy error wasn't a phy error. */ + +/* Flags for pulse_bw_info */ +#define PRI_CH_RADAR_FOUND 0x01 +#define EXT_CH_RADAR_FOUND 0x02 +#define EXT_CH_RADAR_EARLY_FOUND 0x04 + HAL_BOOL ar5416ProcessRadarEvent(struct ath_hal *ah, struct ath_rx_status *rxs, uint64_t fulltsf, const char *buf, HAL_DFS_EVENT *event) { + HAL_BOOL doDfsExtCh; + HAL_BOOL doDfsEnhanced; + HAL_BOOL doDfsCombinedRssi; + + uint8_t rssi = 0, ext_rssi = 0; + uint8_t pulse_bw_info = 0, pulse_length_ext = 0, pulse_length_pri = 0; + uint32_t dur = 0; + int pri_found = 1, ext_found = 0; + int early_ext = 0; + int is_dc = 0; + uint16_t datalen; /* length from the RX status field */ + + /* Check whether the given phy error is a radar event */ + if ((rxs->rs_phyerr != HAL_PHYERR_RADAR) && + (rxs->rs_phyerr != HAL_PHYERR_FALSE_RADAR_EXT)) { + return AH_FALSE; + } + + /* Grab copies of the capabilities; just to make the code clearer */ + doDfsExtCh = AH_PRIVATE(ah)->ah_caps.halExtChanDfsSupport; + doDfsEnhanced = AH_PRIVATE(ah)->ah_caps.halEnhancedDfsSupport; + doDfsCombinedRssi = AH_PRIVATE(ah)->ah_caps.halUseCombinedRadarRssi; + + datalen = rxs->rs_datalen; + + /* If hardware supports it, use combined RSSI, else use chain 0 RSSI */ + if (doDfsCombinedRssi) + rssi = (uint8_t) rxs->rs_rssi; + else + rssi = (uint8_t) rxs->rs_rssi_ctl[0]; + + /* Set this; but only use it if doDfsExtCh is set */ + ext_rssi = (uint8_t) rxs->rs_rssi_ext[0]; + + /* Cap it at 0 if the RSSI is a negative number */ + if (rssi & 0x80) + rssi = 0; + + if (ext_rssi & 0x80) + ext_rssi = 0; + + /* + * Fetch the relevant data from the frame + */ + if (doDfsExtCh) { + if (datalen < 3) + return AH_FALSE; + + /* Last three bytes of the frame are of interest */ + pulse_length_pri = *(buf + datalen - 3); + pulse_length_ext = *(buf + datalen - 2); + pulse_bw_info = *(buf + datalen - 1); + HALDEBUG(ah, HAL_DEBUG_DFS, "%s: rssi=%d, ext_rssi=%d, pulse_length_pri=%d," + " pulse_length_ext=%d, pulse_bw_info=%x\n", + __func__, rssi, ext_rssi, pulse_length_pri, pulse_length_ext, + pulse_bw_info); + } else { + /* The pulse width is byte 0 of the data */ + if (datalen >= 1) + dur = ((uint8_t) buf[0]) & 0xff; + else + dur = 0; + + if (dur == 0 && rssi == 0) { + HALDEBUG(ah, HAL_DEBUG_DFS, "%s: dur and rssi are 0\n", __func__); + return AH_FALSE; + } + + HALDEBUG(ah, HAL_DEBUG_DFS, "%s: rssi=%d, dur=%d\n", __func__, rssi, dur); + + /* Single-channel only */ + pri_found = 1; + ext_found = 0; + } + + /* + * If doing extended channel data, pulse_bw_info must + * have one of the flags set. + */ + if (doDfsExtCh && pulse_bw_info == 0x0) + return AH_FALSE; + /* - * For now, this isn't implemented. + * If the extended channel data is available, calculate + * which to pay attention to. */ - return AH_FALSE; + if (doDfsExtCh) { + /* If pulse is on DC, take the larger duration of the two */ + if ((pulse_bw_info & EXT_CH_RADAR_FOUND) && + (pulse_bw_info & PRI_CH_RADAR_FOUND)) { + is_dc = 1; + if (pulse_length_ext > pulse_length_pri) { + dur = pulse_length_ext; + pri_found = 0; + ext_found = 1; + } else { + dur = pulse_length_pri; + pri_found = 1; + ext_found = 0; + } + } else if (pulse_bw_info & EXT_CH_RADAR_EARLY_FOUND) { + dur = pulse_length_ext; + pri_found = 0; + ext_found = 1; + early_ext = 1; + } else if (pulse_bw_info & PRI_CH_RADAR_FOUND) { + dur = pulse_length_pri; + pri_found = 1; + ext_found = 0; + } else if (pulse_bw_info & EXT_CH_RADAR_FOUND) { + dur = pulse_length_ext; + pri_found = 0; + ext_found = 1; + } + + } + + /* + * For enhanced DFS (Merlin and later), pulse_bw_info has + * implications for selecting the correct RSSI value. + */ + if (doDfsEnhanced) { + switch (pulse_bw_info & 0x03) { + case 0: + /* No radar? */ + rssi = 0; + break; + case PRI_CH_RADAR_FOUND: + /* Radar in primary channel */ + /* Cannot use ctrl channel RSSI if ext channel is stronger */ + if (ext_rssi >= (rssi + 3)) { + rssi = 0; + }; + break; + case EXT_CH_RADAR_FOUND: + /* Radar in extended channel */ + /* Cannot use ext channel RSSI if ctrl channel is stronger */ + if (rssi >= (ext_rssi + 12)) { + rssi = 0; + } else { + rssi = ext_rssi; + } + break; + case (PRI_CH_RADAR_FOUND | EXT_CH_RADAR_FOUND): + /* When both are present, use stronger one */ + if (rssi < ext_rssi) + rssi = ext_rssi; + break; + } + } + + /* + * If not doing enhanced DFS, choose the ext channel if + * it is stronger than the main channel + */ + if (doDfsExtCh && !doDfsEnhanced) { + if ((ext_rssi > rssi) && (ext_rssi < 128)) + rssi = ext_rssi; + } + + /* + * XXX what happens if the above code decides the RSSI + * XXX wasn't valid, an sets it to 0? + */ + + /* + * Fill out dfs_event structure. + */ + event->re_full_ts = fulltsf; + event->re_ts = rxs->rs_tstamp; + event->re_rssi = rssi; + event->re_dur = dur; + + event->re_flags = 0; + if (pri_found) + event->re_flags |= HAL_DFS_EVENT_PRICH; + if (ext_found) + event->re_flags |= HAL_DFS_EVENT_EXTCH; + if (early_ext) + event->re_flags |= HAL_DFS_EVENT_EXTEARLY; + if (is_dc) + event->re_flags |= HAL_DFS_EVENT_ISDC; + + return AH_TRUE; } /* From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 14:23:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D05151065742; Mon, 3 Oct 2011 14:23:00 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BF5FF8FC14; Mon, 3 Oct 2011 14:23:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93EN04w013952; Mon, 3 Oct 2011 14:23:00 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93EN01t013948; Mon, 3 Oct 2011 14:23:00 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201110031423.p93EN01t013948@svn.freebsd.org> From: Attilio Rao Date: Mon, 3 Oct 2011 14:23:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225936 - in head/sys: amd64/amd64 i386/i386 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 14:23:00 -0000 Author: attilio Date: Mon Oct 3 14:23:00 2011 New Revision: 225936 URL: http://svn.freebsd.org/changeset/base/225936 Log: Add some improvements in the idle table callbacks: - Replace instances of manual assembly instruction "hlt" call with halt() function calling. - In cpu_idle_mwait() avoid races in check to sched_runnable() using the same pattern used in cpu_idle_hlt() with the 'hlt' instruction. - Add comments explaining the logic behind the pattern used in cpu_idle_hlt() and other idle callbacks. In collabouration with: jhb, mav Reviewed by: adri, kib MFC after: 3 weeks Modified: head/sys/amd64/amd64/machdep.c head/sys/i386/i386/machdep.c Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Mon Oct 3 14:11:54 2011 (r225935) +++ head/sys/amd64/amd64/machdep.c Mon Oct 3 14:23:00 2011 (r225936) @@ -609,7 +609,7 @@ void cpu_halt(void) { for (;;) - __asm__ ("hlt"); + halt(); } void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ @@ -630,6 +630,8 @@ cpu_idle_acpi(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_SLEEPING; + + /* See comments in cpu_idle_hlt(). */ disable_intr(); if (sched_runnable()) enable_intr(); @@ -647,9 +649,22 @@ cpu_idle_hlt(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_SLEEPING; + /* - * We must absolutely guarentee that hlt is the next instruction - * after sti or we introduce a timing window. + * Since we may be in a critical section from cpu_idle(), if + * an interrupt fires during that critical section we may have + * a pending preemption. If the CPU halts, then that thread + * may not execute until a later interrupt awakens the CPU. + * To handle this race, check for a runnable thread after + * disabling interrupts and immediately return if one is + * found. Also, we must absolutely guarentee that hlt is + * the next instruction after sti. This ensures that any + * interrupt that fires after the call to disable_intr() will + * immediately awaken the CPU from hlt. Finally, please note + * that on x86 this works fine because of interrupts enabled only + * after the instruction following sti takes place, while IF is set + * to 1 immediately, allowing hlt instruction to acknowledge the + * interrupt. */ disable_intr(); if (sched_runnable()) @@ -675,11 +690,19 @@ cpu_idle_mwait(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_MWAIT; - if (!sched_runnable()) { - cpu_monitor(state, 0, 0); - if (*state == STATE_MWAIT) - cpu_mwait(0, MWAIT_C1); + + /* See comments in cpu_idle_hlt(). */ + disable_intr(); + if (sched_runnable()) { + enable_intr(); + *state = STATE_RUNNING; + return; } + cpu_monitor(state, 0, 0); + if (*state == STATE_MWAIT) + __asm __volatile("sti; mwait" : : "a" (MWAIT_C1), "c" (0)); + else + enable_intr(); *state = STATE_RUNNING; } @@ -691,6 +714,12 @@ cpu_idle_spin(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_RUNNING; + + /* + * The sched_runnable() call is racy but as long as there is + * a loop missing it one time will have just a little impact if any + * (and it is much better than missing the check at all). + */ for (i = 0; i < 1000; i++) { if (sched_runnable()) return; Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Mon Oct 3 14:11:54 2011 (r225935) +++ head/sys/i386/i386/machdep.c Mon Oct 3 14:23:00 2011 (r225936) @@ -1222,7 +1222,7 @@ void cpu_halt(void) { for (;;) - __asm__ ("hlt"); + halt(); } #endif @@ -1245,6 +1245,8 @@ cpu_idle_acpi(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_SLEEPING; + + /* See comments in cpu_idle_hlt(). */ disable_intr(); if (sched_runnable()) enable_intr(); @@ -1263,9 +1265,22 @@ cpu_idle_hlt(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_SLEEPING; + /* - * We must absolutely guarentee that hlt is the next instruction - * after sti or we introduce a timing window. + * Since we may be in a critical section from cpu_idle(), if + * an interrupt fires during that critical section we may have + * a pending preemption. If the CPU halts, then that thread + * may not execute until a later interrupt awakens the CPU. + * To handle this race, check for a runnable thread after + * disabling interrupts and immediately return if one is + * found. Also, we must absolutely guarentee that hlt is + * the next instruction after sti. This ensures that any + * interrupt that fires after the call to disable_intr() will + * immediately awaken the CPU from hlt. Finally, please note + * that on x86 this works fine because of interrupts enabled only + * after the instruction following sti takes place, while IF is set + * to 1 immediately, allowing hlt instruction to acknowledge the + * interrupt. */ disable_intr(); if (sched_runnable()) @@ -1292,11 +1307,19 @@ cpu_idle_mwait(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_MWAIT; - if (!sched_runnable()) { - cpu_monitor(state, 0, 0); - if (*state == STATE_MWAIT) - cpu_mwait(0, MWAIT_C1); + + /* See comments in cpu_idle_hlt(). */ + disable_intr(); + if (sched_runnable()) { + enable_intr(); + *state = STATE_RUNNING; + return; } + cpu_monitor(state, 0, 0); + if (*state == STATE_MWAIT) + __asm __volatile("sti; mwait" : : "a" (MWAIT_C1), "c" (0)); + else + enable_intr(); *state = STATE_RUNNING; } @@ -1308,6 +1331,12 @@ cpu_idle_spin(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_RUNNING; + + /* + * The sched_runnable() call is racy but as long as there is + * a loop missing it one time will have just a little impact if any + * (and it is much better than missing the check at all). + */ for (i = 0; i < 1000; i++) { if (sched_runnable()) return; From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 15:13:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD23A106566C; Mon, 3 Oct 2011 15:13:09 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A9FC48FC14; Mon, 3 Oct 2011 15:13:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93FD9sT015599; Mon, 3 Oct 2011 15:13:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93FD9ev015593; Mon, 3 Oct 2011 15:13:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110031513.p93FD9ev015593@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 3 Oct 2011 15:13:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 15:13:09 -0000 Author: nwhitehorn Date: Mon Oct 3 15:13:09 2011 New Revision: 225937 URL: http://svn.freebsd.org/changeset/base/225937 Log: Farewall, sysinstall! You served us well for many years, but 10.0 is one digit beyond your time. Various sysinstall dependencies (e.g. libftpio, libdisk, libodialog, etc.) will be cleaned up in coming days. Some will take longer than others due to a few other consumers (tzsetup and sade). Deleted: head/release/Makefile.inc.docports head/release/Makefile.sysinstall head/release/amd64/boot_crunch.conf head/release/fixit.profile head/release/fixit.services head/release/i386/boot_crunch.conf head/release/i386/fixit_crunch.conf head/release/ia64/boot_crunch.conf head/release/pc98/boot_crunch.conf head/release/pc98/fixit-small_crunch.conf head/release/pc98/fixit_crunch.conf head/release/powerpc/boot_crunch.conf head/release/scripts/base-install.sh head/release/scripts/catpages-install.sh head/release/scripts/catpages-make.sh head/release/scripts/checkindex.pl head/release/scripts/chkINDEX head/release/scripts/commerce-install.sh head/release/scripts/dict-install.sh head/release/scripts/dict-make.sh head/release/scripts/doFS.sh head/release/scripts/doc-install.sh head/release/scripts/doc-make.sh head/release/scripts/games-install.sh head/release/scripts/info-install.sh head/release/scripts/info-make.sh head/release/scripts/info.sh head/release/scripts/kernels-install.sh head/release/scripts/lib32-install.sh head/release/scripts/manpages-install.sh head/release/scripts/manpages-make.sh head/release/scripts/mkpkghier head/release/scripts/mkpkgindex.sh head/release/scripts/package-split.py head/release/scripts/package-trees.sh head/release/scripts/ports-install.sh head/release/scripts/proflibs-install.sh head/release/scripts/proflibs-make.sh head/release/scripts/split-file.sh head/release/scripts/src-install.sh head/release/scripts/tar.sh head/release/scripts/xperimnt-install.sh head/release/sparc64/boot_crunch.conf head/usr.sbin/sysinstall/ Modified: head/MAINTAINERS head/Makefile.inc1 head/ObsoleteFiles.inc head/UPDATING head/usr.sbin/Makefile Modified: head/MAINTAINERS ============================================================================== --- head/MAINTAINERS Mon Oct 3 14:23:00 2011 (r225936) +++ head/MAINTAINERS Mon Oct 3 15:13:09 2011 (r225937) @@ -123,8 +123,6 @@ usr.sbin/zic edwin Heads-up appreciat maintained by a third party source. lib/libc/stdtime edwin Heads-up appreciated, since parts of this code is maintained by a third party source. -sysinstall randi Please contact about any major changes so that - they can be co-ordinated. sbin/routed bms Pre-commit review; notify vendor at rhyolite.com Following are the entries from the Makefiles, and a few other sources. Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Oct 3 14:23:00 2011 (r225936) +++ head/Makefile.inc1 Mon Oct 3 15:13:09 2011 (r225937) @@ -1106,7 +1106,6 @@ build-tools: ${_aicasm} \ usr.bin/awk \ lib/libmagic \ - usr.sbin/sysinstall \ usr.bin/mkesdb_static \ usr.bin/mkcsmapper_static ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Oct 3 14:23:00 2011 (r225936) +++ head/ObsoleteFiles.inc Mon Oct 3 15:13:09 2011 (r225937) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20110930: sysinstall removed +OLD_FILES+=usr/sbin/sysinstall usr/share/man/man8/sysinstall.8.gz # 20110915: rename congestion control manpages OLD_FILES+=usr/share/man/man4/cc.4.gz OLD_FILES+=usr/share/man/man9/cc.9.gz Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Oct 3 14:23:00 2011 (r225936) +++ head/UPDATING Mon Oct 3 15:13:09 2011 (r225937) @@ -22,6 +22,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20110930: + sysinstall has been removed + 20110923: The stable/9 branch created in subversion. This corresponds to the RELENG_9 branch in CVS. Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Mon Oct 3 14:23:00 2011 (r225936) +++ head/usr.sbin/Makefile Mon Oct 3 15:13:09 2011 (r225937) @@ -290,8 +290,6 @@ SUBDIR+= praliases SUBDIR+= sendmail .endif -SUBDIR+= sysinstall - .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 15:28:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id D94EF1065672; Mon, 3 Oct 2011 15:28:28 +0000 (UTC) Date: Mon, 3 Oct 2011 15:28:28 +0000 From: Alexander Best To: Glen Barber Message-ID: <20111003152828.GA75007@freebsd.org> References: <201110021605.p92G5JXb070257@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline In-Reply-To: <201110021605.p92G5JXb070257@svn.freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225927 - head/bin/ps X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 15:28:28 -0000 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun Oct 2 11, Glen Barber wrote: > Author: gjb (doc committer) > Date: Sun Oct 2 16:05:19 2011 > New Revision: 225927 > URL: http://svn.freebsd.org/changeset/base/225927 > > Log: > Correct a typo that was introduced in 225912 > > Submitted by: Valentin Nechayev (netch % netch!kiev!ua), arundel > MFC after: 1 week > With-MFC: 225908 > > Modified: > head/bin/ps/ps.1 i've been reviewing the ps(1) man page some more and found several other issues. in addition to those, i think some of the recent changes could be improved, too. it would be nice to hear what people think regarding these changes. cheers. alex > > Modified: head/bin/ps/ps.1 > ============================================================================== > --- head/bin/ps/ps.1 Sun Oct 2 14:10:25 2011 (r225926) > +++ head/bin/ps/ps.1 Sun Oct 2 16:05:19 2011 (r225927) > @@ -431,7 +431,7 @@ The process is being traced or debugged. > An abbreviation for the pathname of the controlling terminal, if any. > The abbreviation consists of the three letters following > .Pa /dev/tty , > -or, for psuedo-terminals, the corresponding entry in > +or, for pseudo-terminals, the corresponding entry in > .Pa /dev/pts . > This is followed by a > .Ql - --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ps.1.diff" diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 2c04c21..965abcb 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd October 1, 2011 +.Dd October 3, 2011 .Dt PS 1 .Os .Sh NAME @@ -98,6 +98,16 @@ The default output format includes, for each process, the process' ID, controlling terminal, state, CPU time (including both user and system time) and associated command. .Pp +The +.Fl G , O , o , p , t +and +.Fl U +options accept, in addition to a single argument, a list of arguments +which must be space or comma seperated. +Also these options can be used more than once in a single +.Nm +command. +.Pp The process file system (see .Xr procfs 5 ) should be mounted when @@ -184,11 +194,15 @@ Add the information associated with the space or comma separated list of keywords specified, after the process ID, in the default information display. -Keywords may be appended with an equals +The last keyword in the list may be appended with an equals .Pq Ql = -sign and a string. +sign and a string that spans the rest of the argument, and can contain +space and comma characters. This causes the printed header to use the specified string instead of the standard header. +To specify header texts for multiple keywords, more than one +.Fl O +option must be used. .It Fl o Display information associated with the space or comma separated list of keywords specified. @@ -198,10 +212,9 @@ sign and a string that spans the rest of the argument, and can contain space and comma characters. This causes the printed header to use the specified string instead of the standard header. -Multiple keywords may also be given in the form of more than one +To specify header texts for multiple keywords, more than one .Fl o -option. -So the header texts for multiple keywords can be changed. +option must be used. If all keywords have empty header texts, no header line is written. .It Fl p Display information about processes which match the specified process IDs. @@ -217,7 +230,9 @@ with the standard input. .It Fl t Display information about processes attached to the specified terminal devices. -Full pathnames, as well as abbreviations (see explanation of the +Full pathnames, relative pathnames to +.Pa /dev , +as well as abbreviations (see explanation of the .Cm tt keyword) can be specified. .It Fl U @@ -428,16 +443,16 @@ The process is swapped out. The process is being traced or debugged. .El .It Cm tt -An abbreviation for the pathname of the controlling terminal, if any. -The abbreviation consists of the three letters following +An abbreviation for the device name of the controlling terminal, if any. +The abbreviation consists of the two letters following .Pa /dev/tty , -or, for pseudo-terminals, the corresponding entry in +or, for pseudo-terminals, the corresponding device number in .Pa /dev/pts . This is followed by a .Ql - if the process can no longer reach that controlling terminal (i.e., it has been revoked). -The full pathname of the controlling terminal is available via the +The full device name of the controlling terminal is available via the .Cm tty keyword. .It Cm wchan @@ -636,9 +651,12 @@ control terminal session ID .It Cm tsiz text size (in Kbytes) .It Cm tt -control terminal name (two letter abbreviation) +abbreviated two letter control terminal name or +device number for pseudo-terminals .It Cm tty -full name of control terminal +full name of control terminal or +.Pa pts/ Ns Ao Ar tt Ac +for pseudo-terminals .It Cm ucomm name to be used for accounting .It Cm uid --EVF5PPMfhYS0aIcm-- From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 15:32:16 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EC76106564A; Mon, 3 Oct 2011 15:32:16 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F29B58FC13; Mon, 3 Oct 2011 15:32:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93FWF0U016242; Mon, 3 Oct 2011 15:32:15 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93FWF5C016240; Mon, 3 Oct 2011 15:32:15 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201110031532.p93FWF5C016240@svn.freebsd.org> From: Edward Tomasz Napierala Date: Mon, 3 Oct 2011 15:32:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225938 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 15:32:16 -0000 Author: trasz Date: Mon Oct 3 15:32:15 2011 New Revision: 225938 URL: http://svn.freebsd.org/changeset/base/225938 Log: Fix bug introduced in r225641, which would cause panic if racct_proc_fork() returned error -- the racct_destroy_locked() would get called twice. MFC after: 3 days Modified: head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Mon Oct 3 15:13:09 2011 (r225937) +++ head/sys/kern/kern_racct.c Mon Oct 3 15:32:15 2011 (r225938) @@ -569,32 +569,15 @@ racct_proc_fork(struct proc *parent, str error = racct_set_locked(child, i, parent->p_racct->r_resources[i]); - if (error != 0) { - /* - * XXX: The only purpose of these two lines is - * to prevent from tripping checks in racct_destroy(). - */ - for (i = 0; i <= RACCT_MAX; i++) - racct_set_locked(child, i, 0); + if (error != 0) goto out; - } } #ifdef RCTL error = rctl_proc_fork(parent, child); - if (error != 0) { - /* - * XXX: The only purpose of these two lines is to prevent from - * tripping checks in racct_destroy(). - */ - for (i = 0; i <= RACCT_MAX; i++) - racct_set_locked(child, i, 0); - } #endif out: - if (error != 0) - racct_destroy_locked(&child->p_racct); mtx_unlock(&racct_lock); PROC_UNLOCK(child); PROC_UNLOCK(parent); From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 16:23:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E60D106566B; Mon, 3 Oct 2011 16:23:21 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D4B68FC13; Mon, 3 Oct 2011 16:23:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93GNKSr018397; Mon, 3 Oct 2011 16:23:20 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93GNKja018392; Mon, 3 Oct 2011 16:23:20 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201110031623.p93GNKja018392@svn.freebsd.org> From: Edward Tomasz Napierala Date: Mon, 3 Oct 2011 16:23:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225940 - in head/sys: kern sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 16:23:21 -0000 Author: trasz Date: Mon Oct 3 16:23:20 2011 New Revision: 225940 URL: http://svn.freebsd.org/changeset/base/225940 Log: Fix another bug introduced in r225641, which caused rctl to access certain fields in 'struct proc' before they got initialized in do_fork(). MFC after: 3 days Modified: head/sys/kern/kern_fork.c head/sys/kern/kern_racct.c head/sys/kern/kern_rctl.c head/sys/sys/racct.h Modified: head/sys/kern/kern_fork.c ============================================================================== --- head/sys/kern/kern_fork.c Mon Oct 3 16:02:55 2011 (r225939) +++ head/sys/kern/kern_fork.c Mon Oct 3 16:23:20 2011 (r225940) @@ -939,6 +939,7 @@ fork1(struct thread *td, int flags, int if (flags & RFPROCDESC) procdesc_finit(newproc->p_procdesc, fp_procdesc); #endif + racct_proc_fork_done(newproc); return (0); } Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Mon Oct 3 16:02:55 2011 (r225939) +++ head/sys/kern/kern_racct.c Mon Oct 3 16:23:20 2011 (r225940) @@ -585,6 +585,24 @@ out: return (error); } +/* + * Called at the end of fork1(), to handle rules that require the process + * to be fully initialized. + */ +void +racct_proc_fork_done(struct proc *child) +{ + +#ifdef RCTL + PROC_LOCK(child); + mtx_lock(&racct_lock); + rctl_enforce(child, RACCT_NPROC, 0); + rctl_enforce(child, RACCT_NTHR, 0); + mtx_unlock(&racct_lock); + PROC_UNLOCK(child); +#endif +} + void racct_proc_exit(struct proc *p) { @@ -810,6 +828,11 @@ racct_proc_fork(struct proc *parent, str } void +racct_proc_fork_done(struct proc *child) +{ +} + +void racct_proc_exit(struct proc *p) { } Modified: head/sys/kern/kern_rctl.c ============================================================================== --- head/sys/kern/kern_rctl.c Mon Oct 3 16:02:55 2011 (r225939) +++ head/sys/kern/kern_rctl.c Mon Oct 3 16:23:20 2011 (r225940) @@ -312,6 +312,16 @@ rctl_enforce(struct proc *p, int resourc if (link->rrl_exceeded != 0) continue; + /* + * If the process state is not fully initialized yet, + * we can't access most of the required fields, e.g. + * p->p_comm. This happens when called from fork1(). + * Ignore this rule for now; it will be processed just + * after fork, when called from racct_proc_fork_done(). + */ + if (p->p_state != PRS_NORMAL) + continue; + if (!ppsratecheck(&lasttime, &curtime, 10)) continue; @@ -335,6 +345,9 @@ rctl_enforce(struct proc *p, int resourc if (link->rrl_exceeded != 0) continue; + if (p->p_state != PRS_NORMAL) + continue; + buf = malloc(RCTL_LOG_BUFSIZE, M_RCTL, M_NOWAIT); if (buf == NULL) { printf("rctl_enforce: out of memory\n"); @@ -357,23 +370,15 @@ rctl_enforce(struct proc *p, int resourc if (link->rrl_exceeded != 0) continue; + if (p->p_state != PRS_NORMAL) + continue; + KASSERT(rule->rr_action > 0 && rule->rr_action <= RCTL_ACTION_SIGNAL_MAX, ("rctl_enforce: unknown action %d", rule->rr_action)); /* - * We're supposed to send a signal, but the process - * is not fully initialized yet, probably because we - * got called from fork1(). For now just deny the - * allocation instead. - */ - if (p->p_state != PRS_NORMAL) { - should_deny = 1; - continue; - } - - /* * We're using the fact that RCTL_ACTION_SIG* values * are equal to their counterparts from sys/signal.h. */ Modified: head/sys/sys/racct.h ============================================================================== --- head/sys/sys/racct.h Mon Oct 3 16:02:55 2011 (r225939) +++ head/sys/sys/racct.h Mon Oct 3 16:23:20 2011 (r225940) @@ -137,6 +137,7 @@ void racct_create(struct racct **racctp) void racct_destroy(struct racct **racctp); int racct_proc_fork(struct proc *parent, struct proc *child); +void racct_proc_fork_done(struct proc *child); void racct_proc_exit(struct proc *p); void racct_proc_ucred_changed(struct proc *p, struct ucred *oldcred, From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 16:30:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 165E61065670; Mon, 3 Oct 2011 16:30:19 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D73038FC0A; Mon, 3 Oct 2011 16:30:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93GUIPi018790; Mon, 3 Oct 2011 16:30:18 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93GUIMb018788; Mon, 3 Oct 2011 16:30:18 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110031630.p93GUIMb018788@svn.freebsd.org> From: Adrian Chadd Date: Mon, 3 Oct 2011 16:30:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225941 - head/sys/dev/bwi X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 16:30:19 -0000 Author: adrian Date: Mon Oct 3 16:30:18 2011 New Revision: 225941 URL: http://svn.freebsd.org/changeset/base/225941 Log: Fix an unaligned access issue; tidy up OFDM/DS rate decoding from the PLCP. This fixes a panic on PPC. Submitted by: novel Obtained from: OpenBSD, sys/dev/ic/bwi.c r1.89 Modified: head/sys/dev/bwi/if_bwi.c Modified: head/sys/dev/bwi/if_bwi.c ============================================================================== --- head/sys/dev/bwi/if_bwi.c Mon Oct 3 16:23:20 2011 (r225940) +++ head/sys/dev/bwi/if_bwi.c Mon Oct 3 16:30:18 2011 (r225941) @@ -118,8 +118,7 @@ static void bwi_calibrate(void *); static int bwi_calc_rssi(struct bwi_softc *, const struct bwi_rxbuf_hdr *); static int bwi_calc_noise(struct bwi_softc *); -static __inline uint8_t bwi_ofdm_plcp2rate(const uint32_t *); -static __inline uint8_t bwi_ds_plcp2rate(const struct ieee80211_ds_plcp_hdr *); +static __inline uint8_t bwi_plcp2rate(uint32_t, enum ieee80211_phymode); static void bwi_rx_radiotap(struct bwi_softc *, struct mbuf *, struct bwi_rxbuf_hdr *, const void *, int, int, int); @@ -2629,7 +2628,7 @@ bwi_rxeof(struct bwi_softc *sc, int end_ struct ieee80211_frame_min *wh; struct ieee80211_node *ni; struct mbuf *m; - const void *plcp; + uint32_t plcp; uint16_t flags2; int buflen, wh_ofs, hdr_extra, rssi, noise, type, rate; @@ -2659,7 +2658,7 @@ bwi_rxeof(struct bwi_softc *sc, int end_ goto next; } - plcp = ((const uint8_t *)(hdr + 1) + hdr_extra); + bcopy((uint8_t *)(hdr + 1) + hdr_extra, &plcp, sizeof(plcp)); rssi = bwi_calc_rssi(sc, hdr); noise = bwi_calc_noise(sc); @@ -2668,13 +2667,13 @@ bwi_rxeof(struct bwi_softc *sc, int end_ m_adj(m, sizeof(*hdr) + wh_ofs); if (htole16(hdr->rxh_flags1) & BWI_RXH_F1_OFDM) - rate = bwi_ofdm_plcp2rate(plcp); + rate = bwi_plcp2rate(plcp, IEEE80211_MODE_11G); else - rate = bwi_ds_plcp2rate(plcp); + rate = bwi_plcp2rate(plcp, IEEE80211_MODE_11B); /* RX radio tap */ if (ieee80211_radiotap_active(ic)) - bwi_rx_radiotap(sc, m, hdr, plcp, rate, rssi, noise); + bwi_rx_radiotap(sc, m, hdr, &plcp, rate, rssi, noise); m_adj(m, -IEEE80211_CRC_LEN); @@ -3802,20 +3801,10 @@ bwi_calc_noise(struct bwi_softc *sc) } static __inline uint8_t -bwi_ofdm_plcp2rate(const uint32_t *plcp0) +bwi_plcp2rate(const uint32_t plcp0, enum ieee80211_phymode phymode) { - uint32_t plcp; - uint8_t plcp_rate; - - plcp = le32toh(*plcp0); - plcp_rate = __SHIFTOUT(plcp, IEEE80211_OFDM_PLCP_RATE_MASK); - return ieee80211_plcp2rate(plcp_rate, IEEE80211_T_OFDM); -} - -static __inline uint8_t -bwi_ds_plcp2rate(const struct ieee80211_ds_plcp_hdr *hdr) -{ - return ieee80211_plcp2rate(hdr->i_signal, IEEE80211_T_DS); + uint32_t plcp = le32toh(plcp0) & IEEE80211_OFDM_PLCP_RATE_MASK; + return (ieee80211_plcp2rate(plcp, phymode)); } static void From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 16:58:58 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3DBF1065670; Mon, 3 Oct 2011 16:58:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C3B928FC17; Mon, 3 Oct 2011 16:58:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93Gwwro019676; Mon, 3 Oct 2011 16:58:58 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93GwwQ5019674; Mon, 3 Oct 2011 16:58:58 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110031658.p93GwwQ5019674@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 3 Oct 2011 16:58:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225942 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 16:58:58 -0000 Author: kib Date: Mon Oct 3 16:58:58 2011 New Revision: 225942 URL: http://svn.freebsd.org/changeset/base/225942 Log: Assert that exiting process does not return to usermode. Reviewed by: avg, jhb MFC after: 1 week Modified: head/sys/kern/subr_trap.c Modified: head/sys/kern/subr_trap.c ============================================================================== --- head/sys/kern/subr_trap.c Mon Oct 3 16:30:18 2011 (r225941) +++ head/sys/kern/subr_trap.c Mon Oct 3 16:58:58 2011 (r225942) @@ -99,6 +99,8 @@ userret(struct thread *td, struct trapfr CTR3(KTR_SYSC, "userret: thread %p (pid %d, %s)", td, p->p_pid, td->td_name); + KASSERT((p->p_flag & P_WEXIT) == 0, + ("Exiting process returns to usermode")); #if 0 #ifdef DIAGNOSTIC /* Check that we called signotify() enough. */ From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 17:01:32 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 319731065677; Mon, 3 Oct 2011 17:01:32 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 20EB78FC13; Mon, 3 Oct 2011 17:01:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93H1Wui019829; Mon, 3 Oct 2011 17:01:32 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93H1VXn019826; Mon, 3 Oct 2011 17:01:32 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110031701.p93H1VXn019826@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 3 Oct 2011 17:01:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225943 - in head/sys: amd64/amd64 i386/i386 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 17:01:32 -0000 Author: kib Date: Mon Oct 3 17:01:31 2011 New Revision: 225943 URL: http://svn.freebsd.org/changeset/base/225943 Log: Do not allow the kernel to access usermode pages without installed fault handler. Panic immediately in such situation, on i386 and amd64. Reviewed by: avg, jhb MFC after: 1 week Modified: head/sys/amd64/amd64/trap.c head/sys/i386/i386/trap.c Modified: head/sys/amd64/amd64/trap.c ============================================================================== --- head/sys/amd64/amd64/trap.c Mon Oct 3 16:58:58 2011 (r225942) +++ head/sys/amd64/amd64/trap.c Mon Oct 3 17:01:31 2011 (r225943) @@ -674,6 +674,19 @@ trap_pfault(frame, usermode) goto nogo; map = &vm->vm_map; + + /* + * When accessing a usermode address, kernel must be + * ready to accept the page fault, and provide a + * handling routine. Since accessing the address + * without the handler is a bug, do not try to handle + * it normally, and panic immediately. + */ + if (!usermode && (td->td_intr_nesting_level != 0 || + PCPU_GET(curpcb)->pcb_onfault == NULL)) { + trap_fatal(frame, eva); + return (-1); + } } /* Modified: head/sys/i386/i386/trap.c ============================================================================== --- head/sys/i386/i386/trap.c Mon Oct 3 16:58:58 2011 (r225942) +++ head/sys/i386/i386/trap.c Mon Oct 3 17:01:31 2011 (r225943) @@ -831,6 +831,11 @@ trap_pfault(frame, usermode, eva) goto nogo; map = &vm->vm_map; + if (!usermode && (td->td_intr_nesting_level != 0 || + PCPU_GET(curpcb)->pcb_onfault == NULL)) { + trap_fatal(frame, eva); + return (-1); + } } /* From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 17:40:55 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2C1E106566B; Mon, 3 Oct 2011 17:40:55 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A89938FC08; Mon, 3 Oct 2011 17:40:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93HetUj021113; Mon, 3 Oct 2011 17:40:55 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93Hetcd021110; Mon, 3 Oct 2011 17:40:55 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201110031740.p93Hetcd021110@svn.freebsd.org> From: Edward Tomasz Napierala Date: Mon, 3 Oct 2011 17:40:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225944 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 17:40:55 -0000 Author: trasz Date: Mon Oct 3 17:40:55 2011 New Revision: 225944 URL: http://svn.freebsd.org/changeset/base/225944 Log: Move some code inside the racct_proc_fork(); it spares a few lock operations and it's more logical this way. MFC after: 3 days Modified: head/sys/kern/kern_fork.c head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_fork.c ============================================================================== --- head/sys/kern/kern_fork.c Mon Oct 3 17:01:31 2011 (r225943) +++ head/sys/kern/kern_fork.c Mon Oct 3 17:40:55 2011 (r225944) @@ -879,17 +879,6 @@ fork1(struct thread *td, int flags, int goto fail1; } -#ifdef RACCT - PROC_LOCK(newproc); - error = racct_add(newproc, RACCT_NPROC, 1); - error += racct_add(newproc, RACCT_NTHR, 1); - PROC_UNLOCK(newproc); - if (error != 0) { - error = EAGAIN; - goto fail1; - } -#endif - #ifdef MAC mac_proc_init(newproc); #endif Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Mon Oct 3 17:01:31 2011 (r225943) +++ head/sys/kern/kern_racct.c Mon Oct 3 17:40:55 2011 (r225944) @@ -261,12 +261,8 @@ racct_alloc_resource(struct racct *racct } } -/* - * Increase allocation of 'resource' by 'amount' for process 'p'. - * Return 0 if it's below limits, or errno, if it's not. - */ -int -racct_add(struct proc *p, int resource, uint64_t amount) +static int +racct_add_locked(struct proc *p, int resource, uint64_t amount) { #ifdef RCTL int error; @@ -282,23 +278,35 @@ racct_add(struct proc *p, int resource, */ PROC_LOCK_ASSERT(p, MA_OWNED); - mtx_lock(&racct_lock); #ifdef RCTL error = rctl_enforce(p, resource, amount); if (error && RACCT_IS_DENIABLE(resource)) { SDT_PROBE(racct, kernel, rusage, add_failure, p, resource, amount, 0, 0); - mtx_unlock(&racct_lock); return (error); } #endif racct_alloc_resource(p->p_racct, resource, amount); racct_add_cred_locked(p->p_ucred, resource, amount); - mtx_unlock(&racct_lock); return (0); } +/* + * Increase allocation of 'resource' by 'amount' for process 'p'. + * Return 0 if it's below limits, or errno, if it's not. + */ +int +racct_add(struct proc *p, int resource, uint64_t amount) +{ + int error; + + mtx_lock(&racct_lock); + error = racct_add_locked(p, resource, amount); + mtx_unlock(&racct_lock); + return (error); +} + static void racct_add_cred_locked(struct ucred *cred, int resource, uint64_t amount) { @@ -575,8 +583,13 @@ racct_proc_fork(struct proc *parent, str #ifdef RCTL error = rctl_proc_fork(parent, child); + if (error != 0) + goto out; #endif + error = racct_add_locked(child, RACCT_NPROC, 1); + error += racct_add_locked(child, RACCT_NTHR, 1); + out: mtx_unlock(&racct_lock); PROC_UNLOCK(child); From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 18:05:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A582B1065672; Mon, 3 Oct 2011 18:05:51 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 956FD8FC16; Mon, 3 Oct 2011 18:05:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93I5p5q021983; Mon, 3 Oct 2011 18:05:51 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93I5pab021981; Mon, 3 Oct 2011 18:05:51 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110031805.p93I5pab021981@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 3 Oct 2011 18:05:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225945 - head/lib X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 18:05:51 -0000 Author: jkim Date: Mon Oct 3 18:05:51 2011 New Revision: 225945 URL: http://svn.freebsd.org/changeset/base/225945 Log: Remove a redundant check for libncp. Submitted by: Alexander Sack (asack at niksun dot com) Modified: head/lib/Makefile Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Mon Oct 3 17:40:55 2011 (r225944) +++ head/lib/Makefile Mon Oct 3 18:05:51 2011 (r225945) @@ -192,12 +192,6 @@ _libefi= libefi _libsmb= libsmb .endif -.if ${MACHINE_CPUARCH} == "amd64" -.if ${MK_NCP} != "no" -_libncp= libncp -.endif -.endif - .if ${MACHINE_CPUARCH} == "powerpc" _libsmb= libsmb .endif From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 19:06:56 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66B53106564A; Mon, 3 Oct 2011 19:06:56 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D5258FC14; Mon, 3 Oct 2011 19:06:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93J6uxr023836; Mon, 3 Oct 2011 19:06:56 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93J6ugV023834; Mon, 3 Oct 2011 19:06:56 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <201110031906.p93J6ugV023834@svn.freebsd.org> From: Qing Li Date: Mon, 3 Oct 2011 19:06:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225946 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 19:06:56 -0000 Author: qingli Date: Mon Oct 3 19:06:55 2011 New Revision: 225946 URL: http://svn.freebsd.org/changeset/base/225946 Log: This patch allows ARP to work properly in the presence of self-referencing routes. This patch is a rework of r223862. Reviewed by: bz, zec MFC after: 5 days Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Mon Oct 3 18:05:51 2011 (r225945) +++ head/sys/netinet/in.c Mon Oct 3 19:06:55 2011 (r225946) @@ -1411,6 +1411,8 @@ static int in_lltable_rtcheck(struct ifnet *ifp, u_int flags, const struct sockaddr *l3addr) { struct rtentry *rt; + struct ifnet *xifp; + int error = 0; KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); @@ -1418,30 +1420,35 @@ in_lltable_rtcheck(struct ifnet *ifp, u_ /* XXX rtalloc1 should take a const param */ rt = rtalloc1(__DECONST(struct sockaddr *, l3addr), 0, 0); + if (rt == NULL) + return (EINVAL); + /* * If the gateway for an existing host route matches the target L3 - * address, allow for ARP to proceed. + * address, which is a special route inserted by some implementation + * such as MANET, and the interface is of the correct type, then + * allow for ARP to proceed. */ - if (rt != NULL && (rt->rt_flags & (RTF_HOST|RTF_GATEWAY)) && - rt->rt_gateway->sa_family == AF_INET && - memcmp(rt->rt_gateway->sa_data, l3addr->sa_data, 4) == 0) { - RTFREE_LOCKED(rt); - return (0); - } - - if (rt == NULL || (!(flags & LLE_PUB) && - ((rt->rt_flags & RTF_GATEWAY) || - (rt->rt_ifp != ifp)))) { + if (rt->rt_flags & (RTF_GATEWAY | RTF_HOST)) { + xifp = rt->rt_ifp; + + if (xifp && (xifp->if_type != IFT_ETHER || + (xifp->if_flags & (IFF_NOARP | IFF_STATICARP)) != 0)) + error = EINVAL; + + if (memcmp(rt->rt_gateway->sa_data, l3addr->sa_data, + sizeof(in_addr_t)) != 0) + error = EINVAL; + } else if (!(flags & LLE_PUB) && ((rt->rt_flags & RTF_GATEWAY) || + (rt->rt_ifp != ifp))) { #ifdef DIAGNOSTIC log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", inet_ntoa(((const struct sockaddr_in *)l3addr)->sin_addr)); #endif - if (rt != NULL) - RTFREE_LOCKED(rt); - return (EINVAL); + error = EINVAL; } RTFREE_LOCKED(rt); - return 0; + return (error); } /* From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 19:11:23 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FDBD1065670; Mon, 3 Oct 2011 19:11:23 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail02.syd.optusnet.com.au (mail02.syd.optusnet.com.au [211.29.132.183]) by mx1.freebsd.org (Postfix) with ESMTP id 80CFA8FC18; Mon, 3 Oct 2011 19:11:22 +0000 (UTC) Received: from c122-106-165-191.carlnfd1.nsw.optusnet.com.au (c122-106-165-191.carlnfd1.nsw.optusnet.com.au [122.106.165.191]) by mail02.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p93JBIWQ013506 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 4 Oct 2011 06:11:19 +1100 Date: Tue, 4 Oct 2011 06:11:18 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Attilio Rao In-Reply-To: Message-ID: <20111004043232.K11186@besplex.bde.org> References: <201109041307.p84D72GY092462@svn.freebsd.org> <20110905023251.C832@besplex.bde.org> MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-919531809-1317669078=:11186" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Bruce Evans Subject: Re: svn commit: r225372 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 19:11:23 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-919531809-1317669078=:11186 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE On Mon, 26 Sep 2011, Attilio Rao wrote: > 2011/9/4 Bruce Evans : >> On Sun, 4 Sep 2011, Attilio Rao wrote: >> >>> Also please notice that intr enable/disable happens in the wrong way >>> as it is done via the MD (x86 specific likely) interface. This is >>> wrong for 2 reasons: >> >> No, intr_disable() is MI. =C2=A0It is also used by witness. =C2=A0disabl= e_intr() >> is the corresponding x86 interface that you may be thinking of. =C2=A0Th= e MI >> interface intr_disable() was introduced to avoid the MD'ness of >> intr_disable(). > > I was a bit surprised to verify that you are right but > spinlock_enter() has the big difference besides disable_intr() of also > explicitly disabling preemption via critical_enter() which some > codepath can trigger without even noticing it. > This means it is more safer in presence of PREEMPTION option on and > thus should be preferred to the normal intr_disable(), in particular > for convoluted codepaths. I think this is another implementation detail which shouldn't be depended on. Spinlocks may or may not need either interrupts disabled or a critical section to work. Now I'm a little surprised to remember that they use a critical section. This is to prevent context switching. It is useful behaviour, but not strictly necessary. Since disabling interrupts also prevents context switching (excep by buggy trap handlers including NMI), it is safe to use hard interrupt disabling instead of critical_enter() to prevent context switching. This is safe because code that has interrupts disabled cannot wander off into other code that doesn't understand this and does context switching! (unless it is broken). But for preventing context switching, critical_enter() is better now that it doesn't hard-disable interrupts internally. >>> 1) There may be some codepaths leading to explicit preemption >>> 2) It should =C2=A0really use an MI interface >>> >>> The right way to do this should be via spinlock_enter(). >> >> spinlock_enter() is MI, but has wrong semantics. =C2=A0In my version of = i386, >> spinlocks don't disable any h/w interrupt, as is needed for fast interru= pt >> handlers to actually work. =C2=A0I believe sparc64 is similar, except it= s >> spinlock_enter() disables most h/w interrupts and this includes fast >> interrupt handlers. =C2=A0I don't understand sparc64, but it looks like = its >> spinlock_enter() disables all interrupts visible in C code, but not >> all interrupts: > > Can you please explain more about the 'h/w interrupts not disabled' in X8= 6? > Are you speaking about NMIs? For those the only way to effectively > mask them would be to reprogram the LAPIC entry, but I don't really > think we may want that. This is in my version of x86. mtx_lock_spin() is entirely in software (and deconvoluted -- no macros -- for at least the non-LOCK_DEBUG case): % void % mtx_lock_spin(struct mtx *mp) % { % =09struct thread *td; %=20 % =09td =3D curthread; % =09td->td_critnest++; The previous line is the entire critical_enter() manually inlined (except the full critical_enter() has lots of instrumentation cruft). -current has spinlock_enter() here. -current used to have critical_enter() here (actually in the macro correspoding to this) instead. This depended on critical_enter() being pessimal and always doing a hard interrupt disable. The hard interrupt disable is needed as an implementation detail for -current in the !SMP case, but for most other uses it is not needed. The pessimization was rediced in -current by moving this hard interrupt disable from critical_enter() to the spinlock_enter() cases that need it (currently all?). This optimized critical_enter() to just an increment of td_critnest, exactly the same as in my version except for instrumentation (mine has lots of messy timing stuff but -current has a single CTR4()). My version also optimizes away the hard interrupt disable. The resulting critical_enter() really should be an inline. I only did this in the manual inlining above. This handles most cases of interest. By un-inlining (un-macroizing) mtx_lock_spin(), but inlining critical_enter(), I get the same number of function calls but much smaller code since it is the tiny critical_enter() function and not the big mtx_lock_spin() one that is inlined. % =09if (!_obtain_lock(mp, td)) { % =09=09if (mp->mtx_lock =3D=3D (uintptr_t)td) % =09=09=09(mp)->mtx_recurse++; % =09=09else % =09=09=09_mtx_lock_spin(mp, 0, NULL, 0); % =09} Essentially the same as in -current. % } The complications are mainly in critical_exit(): - in my version, when td_critnest is decremented to 0, a MD function is called to "unpend" any pending interrupts that have accumulated while in the critical region. Since mtx_lock_spin() doesn't hard-disable interrupts, they may occur when a spinlock is held. Fast interrupts proceed. Others are blocked until critical_exit() unpends them. This includes software interrupts. The only really complicated part is letting fast interrupts proceed. Fast interrupt handlers cannot use or be blocked by any normal locking, since they don't respect normal spinlocks. So for example, hardclock() cannot be a fast interrup= t handler. - in -current, when td_critnest is incremented to 0, it calls mi_switch() to implement delayed preemption if a seting of td_owepreempt has accumulated while in the critical region. It is much simpler because it only has this one type of delayed "interrupt" to handle. >> from cpufunc.h: >> % static __inline register_t >> % intr_disable(void) >> % { >> % =C2=A0 =C2=A0 =C2=A0 register_t s; >> % % =C2=A0 =C2=A0 s =3D rdpr(pstate); >> % =C2=A0 =C2=A0 =C2=A0 wrpr(pstate, s & ~PSTATE_IE, 0); >> % =C2=A0 =C2=A0 =C2=A0 return (s); >> % } >> >> This seems to mask all interrupts, as required. >> >> =C2=A0 =C2=A0(The interface here is slightly broken (non-MI). =C2=A0It r= eturns register_t. >> =C2=A0 =C2=A0This assumes that the interrupt state can be represented in= a single >> =C2=A0 =C2=A0register. =C2=A0The type critical_t exists to avoid the sam= e bug in an >> =C2=A0 =C2=A0old version of critical_enter(). =C2=A0Now this type is jus= t bogus. >> =C2=A0 =C2=A0critical_enter() no longer returns it. =C2=A0Instead, spinl= ock_enter() uses >> =C2=A0 =C2=A0a non-reentrant interface which stores what used to be the = return value >> =C2=A0 =C2=A0of critical_enter() in a per-thread MD data structure (md_s= aved_pil >> =C2=A0 =C2=A0in the above). =C2=A0Most or all arches use register_t for = this. =C2=A0This >> =C2=A0 =C2=A0leaves critical_t as pure garbage -- the only remaining ref= erences to >> =C2=A0 =C2=A0it are for its definition.) > > I mostly agree, I think we should have an MD specified type to replace > register_t for this (it could alias it, if it is suitable, but this > interface smells a lot like x86-centric). Really vax-centric. spl "levels" are from vax or earlier CPUs. x86 doesn't really have levels (the AT PIC has masks and precedences. The precedences correspond to levels are but rarely depended on or programmed specifically). alpha and sparc seem to have levels much closer to vax. With only levels, even an 8-bit interface for the level is enough (255 levels should be enough for anyone). With masks, even a 64-bit interface for the mask might not be enough. When masks were mapped to levels for FreeBSD on i386, the largish set of possible mask values was mapped into < 8 standard levels (tty, net, bio, etc). Related encoding of MD details as cookies would probably work well enough in general. Bruce --0-919531809-1317669078=:11186-- From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 19:51:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52E2D106566C; Mon, 3 Oct 2011 19:51:19 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 297DD8FC12; Mon, 3 Oct 2011 19:51:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93JpJsP025251; Mon, 3 Oct 2011 19:51:19 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93JpJLA025249; Mon, 3 Oct 2011 19:51:19 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <201110031951.p93JpJLA025249@svn.freebsd.org> From: Qing Li Date: Mon, 3 Oct 2011 19:51:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225947 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 19:51:19 -0000 Author: qingli Date: Mon Oct 3 19:51:18 2011 New Revision: 225947 URL: http://svn.freebsd.org/changeset/base/225947 Log: A system may have multiple physical interfaces, all of which are on the same prefix. Since a single route entry is installed for the prefix (without RADIX_MPATH), incoming packets on the interfaces that are not associated with the prefix route may trigger an error message about unable to allocation LLE entry, and fails L2. This patch makes sure a valid route is present in the system, and allow the aforementioned condition to exist and treats as valid. Reviewed by: bz MFC after: 5 days Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Mon Oct 3 19:06:55 2011 (r225946) +++ head/sys/netinet/in.c Mon Oct 3 19:51:18 2011 (r225947) @@ -1439,14 +1439,43 @@ in_lltable_rtcheck(struct ifnet *ifp, u_ if (memcmp(rt->rt_gateway->sa_data, l3addr->sa_data, sizeof(in_addr_t)) != 0) error = EINVAL; - } else if (!(flags & LLE_PUB) && ((rt->rt_flags & RTF_GATEWAY) || - (rt->rt_ifp != ifp))) { + } + + if (rt->rt_flags & RTF_GATEWAY) { + RTFREE_LOCKED(rt); + return (EINVAL); + } + + /* + * Make sure that at least the destination address is covered + * by the route. This is for handling the case where 2 or more + * interfaces have the same prefix. An incoming packet arrives + * on one interface and the corresponding outgoing packet leaves + * another interface. + * + */ + if (rt->rt_ifp != ifp) { + char *sa, *mask, *addr, *lim; + int len; + + sa = (char *)rt_key(rt); + mask = (char *)rt_mask(rt); + addr = (char *)__DECONST(struct sockaddr *, l3addr); + len = ((struct sockaddr_in *)__DECONST(struct sockaddr *, l3addr))->sin_len; + lim = addr + len; + + for ( ; addr < lim; sa++, mask++, addr++) { + if ((*sa ^ *addr) & *mask) { + error = EINVAL; #ifdef DIAGNOSTIC - log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", - inet_ntoa(((const struct sockaddr_in *)l3addr)->sin_addr)); + log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", + inet_ntoa(((const struct sockaddr_in *)l3addr)->sin_addr)); #endif - error = EINVAL; + break; + } + } } + RTFREE_LOCKED(rt); return (error); } From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 20:05:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A12861065673; Mon, 3 Oct 2011 20:05:21 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9070E8FC0A; Mon, 3 Oct 2011 20:05:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93K5LCN025757; Mon, 3 Oct 2011 20:05:21 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93K5LWi025755; Mon, 3 Oct 2011 20:05:21 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110032005.p93K5LWi025755@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 3 Oct 2011 20:05:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225948 - stable/8/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 20:05:21 -0000 Author: kib Date: Mon Oct 3 20:05:21 2011 New Revision: 225948 URL: http://svn.freebsd.org/changeset/base/225948 Log: Restore the td_syscalls counter, that was erronously removed in the r225855. Note that this is a direct commit to stable/8, td_syscalls was removed in head by r210138. Submitted by: jhb Modified: stable/8/sys/kern/subr_syscall.c Modified: stable/8/sys/kern/subr_syscall.c ============================================================================== --- stable/8/sys/kern/subr_syscall.c Mon Oct 3 19:51:18 2011 (r225947) +++ stable/8/sys/kern/subr_syscall.c Mon Oct 3 20:05:21 2011 (r225948) @@ -58,6 +58,7 @@ syscallenter(struct thread *td, struct s PCPU_INC(cnt.v_syscall); p = td->td_proc; + td->td_syscalls++; td->td_pticks = 0; if (td->td_ucred != p->p_ucred) From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 20:27:52 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63DD4106566B; Mon, 3 Oct 2011 20:27:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4FF568FC12; Mon, 3 Oct 2011 20:27:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93KRqfs026472; Mon, 3 Oct 2011 20:27:52 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93KRqf7026466; Mon, 3 Oct 2011 20:27:52 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201110032027.p93KRqf7026466@svn.freebsd.org> From: Dimitry Andric Date: Mon, 3 Oct 2011 20:27:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225949 - in stable/9: contrib/llvm contrib/llvm/lib/Support contrib/llvm/tools/clang etc/mtree share/doc share/doc/llvm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 20:27:52 -0000 Author: dim Date: Mon Oct 3 20:27:51 2011 New Revision: 225949 URL: http://svn.freebsd.org/changeset/base/225949 Log: MFC r225880: Revive the LLVM and Clang license files, which were removed in my too-thorough cleanup of unused files, in r213695. Also make sure these get installed under /usr/share/doc. Submitted by: rwatson, brooks Pointy hat to: dim Approved by: re (kib) Added: stable/9/contrib/llvm/LICENSE.TXT - copied unchanged from r225880, head/contrib/llvm/LICENSE.TXT stable/9/contrib/llvm/lib/Support/COPYRIGHT.regex - copied unchanged from r225880, head/contrib/llvm/lib/Support/COPYRIGHT.regex stable/9/contrib/llvm/tools/clang/LICENSE.TXT - copied unchanged from r225880, head/contrib/llvm/tools/clang/LICENSE.TXT stable/9/share/doc/llvm/ - copied from r225880, head/share/doc/llvm/ Modified: stable/9/etc/mtree/BSD.usr.dist stable/9/share/doc/Makefile Directory Properties: stable/9/contrib/llvm/ (props changed) stable/9/contrib/llvm/tools/clang/ (props changed) stable/9/etc/ (props changed) stable/9/share/doc/ (props changed) Copied: stable/9/contrib/llvm/LICENSE.TXT (from r225880, head/contrib/llvm/LICENSE.TXT) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/llvm/LICENSE.TXT Mon Oct 3 20:27:51 2011 (r225949, copy of r225880, head/contrib/llvm/LICENSE.TXT) @@ -0,0 +1,69 @@ +============================================================================== +LLVM Release License +============================================================================== +University of Illinois/NCSA +Open Source License + +Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign. +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + +============================================================================== +Copyrights and Licenses for Third Party Software Distributed with LLVM: +============================================================================== +The LLVM software contains code written by third parties. Such software will +have its own individual LICENSE.TXT file in the directory in which it appears. +This file will describe the copyrights, license, and restrictions which apply +to that code. + +The disclaimer of warranty in the University of Illinois Open Source License +applies to all code in the LLVM Distribution, and nothing in any of the +other licenses gives permission to use the names of the LLVM Team or the +University of Illinois to endorse or promote products derived from this +Software. + +The following pieces of software have additional or alternate copyrights, +licenses, and/or restrictions: + +Program Directory +------- --------- +Autoconf llvm/autoconf + llvm/projects/ModuleMaker/autoconf + llvm/projects/sample/autoconf +CellSPU backend llvm/lib/Target/CellSPU/README.txt +Google Test llvm/utils/unittest/googletest +OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex} Copied: stable/9/contrib/llvm/lib/Support/COPYRIGHT.regex (from r225880, head/contrib/llvm/lib/Support/COPYRIGHT.regex) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/llvm/lib/Support/COPYRIGHT.regex Mon Oct 3 20:27:51 2011 (r225949, copy of r225880, head/contrib/llvm/lib/Support/COPYRIGHT.regex) @@ -0,0 +1,54 @@ +$OpenBSD: COPYRIGHT,v 1.3 2003/06/02 20:18:36 millert Exp $ + +Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved. +This software is not subject to any license of the American Telephone +and Telegraph Company or of the Regents of the University of California. + +Permission is granted to anyone to use this software for any purpose on +any computer system, and to alter it and redistribute it, subject +to the following restrictions: + +1. The author is not responsible for the consequences of use of this + software, no matter how awful, even if they arise from flaws in it. + +2. The origin of this software must not be misrepresented, either by + explicit claim or by omission. Since few users ever read sources, + credits must appear in the documentation. + +3. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original software. Since few users + ever read sources, credits must appear in the documentation. + +4. This notice may not be removed or altered. + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +/*- + * Copyright (c) 1994 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)COPYRIGHT 8.1 (Berkeley) 3/16/94 + */ Copied: stable/9/contrib/llvm/tools/clang/LICENSE.TXT (from r225880, head/contrib/llvm/tools/clang/LICENSE.TXT) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/llvm/tools/clang/LICENSE.TXT Mon Oct 3 20:27:51 2011 (r225949, copy of r225880, head/contrib/llvm/tools/clang/LICENSE.TXT) @@ -0,0 +1,63 @@ +============================================================================== +LLVM Release License +============================================================================== +University of Illinois/NCSA +Open Source License + +Copyright (c) 2007-2011 University of Illinois at Urbana-Champaign. +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + +============================================================================== +The LLVM software contains code written by third parties. Such software will +have its own individual LICENSE.TXT file in the directory in which it appears. +This file will describe the copyrights, license, and restrictions which apply +to that code. + +The disclaimer of warranty in the University of Illinois Open Source License +applies to all code in the LLVM Distribution, and nothing in any of the +other licenses gives permission to use the names of the LLVM Team or the +University of Illinois to endorse or promote products derived from this +Software. + +The following pieces of software have additional or alternate copyrights, +licenses, and/or restrictions: + +Program Directory +------- --------- + + Modified: stable/9/etc/mtree/BSD.usr.dist ============================================================================== --- stable/9/etc/mtree/BSD.usr.dist Mon Oct 3 20:05:21 2011 (r225948) +++ stable/9/etc/mtree/BSD.usr.dist Mon Oct 3 20:27:51 2011 (r225949) @@ -93,6 +93,10 @@ intel_wpi .. .. + llvm + clang + .. + .. ncurses .. ntp Modified: stable/9/share/doc/Makefile ============================================================================== --- stable/9/share/doc/Makefile Mon Oct 3 20:05:21 2011 (r225948) +++ stable/9/share/doc/Makefile Mon Oct 3 20:27:51 2011 (r225949) @@ -3,12 +3,16 @@ .include -SUBDIR= ${_bind9} IPv6 legal ${_roffdocs} +SUBDIR= ${_bind9} IPv6 legal ${_llvm} ${_roffdocs} .if ${MK_BIND} != "no" _bind9= bind9 .endif +.if ${MK_CLANG} != "no" +_llvm= llvm +.endif + # FIXME this is not a real solution ... .if ${MK_GROFF} != "no" _roffdocs= papers psd smm usd From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 20:32:56 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 659D3106566B; Mon, 3 Oct 2011 20:32:56 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 511BE8FC0A; Mon, 3 Oct 2011 20:32:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93KWutA026720; Mon, 3 Oct 2011 20:32:56 GMT (envelope-from ken@svn.freebsd.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93KWufB026711; Mon, 3 Oct 2011 20:32:56 GMT (envelope-from ken@svn.freebsd.org) Message-Id: <201110032032.p93KWufB026711@svn.freebsd.org> From: "Kenneth D. Merry" Date: Mon, 3 Oct 2011 20:32:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225950 - in head: sbin/camcontrol share/examples/scsi_target share/misc sys/cam sys/cam/scsi sys/dev/ciss sys/dev/firewire sys/dev/iir sys/dev/iscsi/initiator sys/dev/isp sys/dev/mly s... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 20:32:56 -0000 Author: ken Date: Mon Oct 3 20:32:55 2011 New Revision: 225950 URL: http://svn.freebsd.org/changeset/base/225950 Log: Add descriptor sense support to CAM, and honor sense residuals properly in CAM. Desriptor sense is a new sense data format that originated in SPC-3. Among other things, it allows for an 8-byte info field, which is necessary to pass back block numbers larger than 4 bytes. This change adds a number of new functions to scsi_all.c (and therefore libcam) that abstract out most access to sense data. This includes a bump of CAM_VERSION, because the CCB ABI has changed. Userland programs that use the CAM pass(4) driver will need to be recompiled. camcontrol.c: Change uses of scsi_extract_sense() to use scsi_extract_sense_len(). Use scsi_get_sks() instead of accessing sense key specific data directly. scsi_modes: Update the control mode page to the latest version (SPC-4). scsi_cmds.c, scsi_target.c: Change references to struct scsi_sense_data to struct scsi_sense_data_fixed. This should be changed to allow the user to specify fixed or descriptor sense, and then use scsi_set_sense_data() to build the sense data. ps3cdrom.c: Use scsi_set_sense_data() instead of setting sense data manually. cam_periph.c: Use scsi_extract_sense_len() instead of using scsi_extract_sense() or accessing sense data directly. cam_ccb.h: Bump the CAM_VERSION from 0x15 to 0x16. The change of struct scsi_sense_data from 32 to 252 bytes changes the size of struct ccb_scsiio, but not the size of union ccb. So the version must be bumped to prevent structure mis-matches. scsi_all.h: Lots of updated SCSI sense data and other structures. Add function prototypes for the new sense data functions. Take out the inline implementation of scsi_extract_sense(). It is now too large to put in a header file. Add macros to calculate whether fields are present and filled in fixed and descriptor sense data scsi_all.c: In scsi_op_desc(), allow the user to pass in NULL inquiry data, and we'll assume a direct access device in that case. Changed the SCSI RESERVED sense key name and description to COMPLETED, as it is now defined in the spec. Change the error recovery action for a number of read errors to prevent lots of retries when the drive has said that the block isn't accessible. This speeds up reconstruction of the block by any RAID software running on top of the drive (e.g. ZFS). In scsi_sense_desc(), allow for invalid sense key numbers. This allows calling this routine without checking the input values first. Change scsi_error_action() to use scsi_extract_sense_len(), and handle things when invalid asc/ascq values are encountered. Add a new routine, scsi_desc_iterate(), that will call the supplied function for every descriptor in descriptor format sense data. Add scsi_set_sense_data(), and scsi_set_sense_data_va(), which build descriptor and fixed format sense data. They currently default to fixed format sense data. Add a number of scsi_get_*() functions, which get different types of sense data fields from either fixed or descriptor format sense data, if the data is present. Add a number of scsi_*_sbuf() functions, which print formatted versions of various sense data fields. These functions work for either fixed or descriptor sense. Add a number of scsi_sense_*_sbuf() functions, which have a standard calling interface and print the indicated field. These functions take descriptors only. Add scsi_sense_desc_sbuf(), which will print a formatted version of the given sense descriptor. Pull out a majority of the scsi_sense_sbuf() function and put it into scsi_sense_only_sbuf(). This allows callers that don't use struct ccb_scsiio to easily utilize the printing routines. Revamp that function to handle descriptor sense and use the new sense fetching and printing routines. Move scsi_extract_sense() into scsi_all.c, and implement it in terms of the new function, scsi_extract_sense_len(). The _len() version takes a length (which should be the sense length - residual) and can indicate which fields are present and valid in the sense data. Add a couple of new scsi_get_*() routines to get the sense key, asc, and ascq only. mly.c: Rename struct scsi_sense_data to struct scsi_sense_data_fixed. sbp_targ.c: Use the new sense fetching routines to get sense data instead of accessing it directly. sbp.c: Change the firewire/SCSI sense data transformation code to use struct scsi_sense_data_fixed instead of struct scsi_sense_data. This should be changed later to use scsi_set_sense_data(). ciss.c: Calculate the sense residual properly. Use scsi_get_sense_key() to fetch the sense key. mps_sas.c, mpt_cam.c: Set the sense residual properly. iir.c: Use scsi_set_sense_data() instead of building sense data by hand. iscsi_subr.c: Use scsi_extract_sense_len() instead of grabbing sense data directly. umass.c: Use scsi_set_sense_data() to build sense data. Grab the sense key using scsi_get_sense_key(). Calculate the sense residual properly. isp_freebsd.h: Use scsi_get_*() routines to grab asc, ascq, and sense key values. Calculate and set the sense residual. MFC after: 3 days Sponsored by: Spectra Logic Corporation Modified: head/sbin/camcontrol/camcontrol.c head/share/examples/scsi_target/scsi_cmds.c head/share/examples/scsi_target/scsi_target.c head/share/misc/scsi_modes head/sys/cam/cam_ccb.h head/sys/cam/cam_periph.c head/sys/cam/scsi/scsi_all.c head/sys/cam/scsi/scsi_all.h head/sys/cam/scsi/scsi_cd.c head/sys/cam/scsi/scsi_da.c head/sys/cam/scsi/scsi_low.c head/sys/cam/scsi/scsi_sa.c head/sys/cam/scsi/scsi_targ_bh.c head/sys/dev/ciss/ciss.c head/sys/dev/firewire/sbp.c head/sys/dev/firewire/sbp_targ.c head/sys/dev/iir/iir.c head/sys/dev/iscsi/initiator/iscsi_subr.c head/sys/dev/isp/isp_freebsd.h head/sys/dev/mly/mly.c head/sys/dev/mps/mps_sas.c head/sys/dev/mpt/mpt_cam.c head/sys/dev/usb/storage/umass.c head/sys/powerpc/ps3/ps3cdrom.c Modified: head/sbin/camcontrol/camcontrol.c ============================================================================== --- head/sbin/camcontrol/camcontrol.c Mon Oct 3 20:27:51 2011 (r225949) +++ head/sbin/camcontrol/camcontrol.c Mon Oct 3 20:32:55 2011 (r225950) @@ -1907,7 +1907,9 @@ readdefects(struct cam_device *device, i int error_code, sense_key, asc, ascq; sense = &ccb->csio.sense_data; - scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); + scsi_extract_sense_len(sense, ccb->csio.sense_len - + ccb->csio.sense_resid, &error_code, &sense_key, &asc, + &ascq, /*show_errors*/ 1); /* * According to the SCSI spec, if the disk doesn't support @@ -3798,8 +3800,9 @@ doreport: int error_code, sense_key, asc, ascq; sense = &ccb->csio.sense_data; - scsi_extract_sense(sense, &error_code, &sense_key, - &asc, &ascq); + scsi_extract_sense_len(sense, ccb->csio.sense_len - + ccb->csio.sense_resid, &error_code, &sense_key, + &asc, &ascq, /*show_errors*/ 1); /* * According to the SCSI-2 and SCSI-3 specs, a @@ -3810,15 +3813,15 @@ doreport: */ if ((sense_key == SSD_KEY_NOT_READY) && (asc == 0x04) && (ascq == 0x04)) { - if ((sense->extra_len >= 10) - && ((sense->sense_key_spec[0] & - SSD_SCS_VALID) != 0) + uint8_t sks[3]; + + if ((scsi_get_sks(sense, ccb->csio.sense_len - + ccb->csio.sense_resid, sks) == 0) && (quiet == 0)) { int val; u_int64_t percentage; - val = scsi_2btoul( - &sense->sense_key_spec[1]); + val = scsi_2btoul(&sks[1]); percentage = 10000 * val; fprintf(stdout, Modified: head/share/examples/scsi_target/scsi_cmds.c ============================================================================== --- head/share/examples/scsi_target/scsi_cmds.c Mon Oct 3 20:27:51 2011 (r225949) +++ head/share/examples/scsi_target/scsi_cmds.c Mon Oct 3 20:32:55 2011 (r225950) @@ -242,22 +242,22 @@ tcmd_sense(u_int init_id, struct ccb_scs u_int8_t asc, u_int8_t ascq) { struct initiator_state *istate; - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; /* Set our initiator's istate */ istate = tcmd_get_istate(init_id); if (istate == NULL) return; istate->pending_ca |= CA_CMD_SENSE; /* XXX set instead of or? */ - sense = &istate->sense_data; + sense = (struct scsi_sense_data_fixed *)&istate->sense_data; bzero(sense, sizeof(*sense)); sense->error_code = SSD_CURRENT_ERROR; sense->flags = flags; sense->add_sense_code = asc; sense->add_sense_code_qual = ascq; sense->extra_len = - offsetof(struct scsi_sense_data, sense_key_spec[2]) - - offsetof(struct scsi_sense_data, extra_len); + offsetof(struct scsi_sense_data_fixed, sense_key_spec[2]) - + offsetof(struct scsi_sense_data_fixed, extra_len); /* Fill out the supplied CTIO */ if (ctio != NULL) { @@ -298,7 +298,7 @@ tcmd_inquiry(struct ccb_accept_tio *atio struct scsi_inquiry *inq; struct atio_descr *a_descr; struct initiator_state *istate; - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; a_descr = (struct atio_descr *)atio->ccb_h.targ_descr; inq = (struct scsi_inquiry *)a_descr->cdb; @@ -310,7 +310,7 @@ tcmd_inquiry(struct ccb_accept_tio *atio * complain if EVPD or CMDDT is set. */ istate = tcmd_get_istate(ctio->init_id); - sense = &istate->sense_data; + sense = (struct scsi_sense_data_fixed *)&istate->sense_data; if ((inq->byte2 & SI_EVPD) != 0) { tcmd_illegal_req(atio, ctio); sense->sense_key_spec[0] = SSD_SCS_VALID | SSD_FIELDPTR_CMD | @@ -376,7 +376,7 @@ static int tcmd_req_sense(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio) { struct scsi_request_sense *rsense; - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; struct initiator_state *istate; size_t dlen; struct atio_descr *a_descr; @@ -385,7 +385,7 @@ tcmd_req_sense(struct ccb_accept_tio *at rsense = (struct scsi_request_sense *)a_descr->cdb; istate = tcmd_get_istate(ctio->init_id); - sense = &istate->sense_data; + sense = (struct scsi_sense_data_fixed *)&istate->sense_data; if (debug) { cdb_debug(a_descr->cdb, "REQ SENSE from %u: ", atio->init_id); @@ -400,7 +400,7 @@ tcmd_req_sense(struct ccb_accept_tio *at } bcopy(sense, ctio->data_ptr, sizeof(struct scsi_sense_data)); - dlen = offsetof(struct scsi_sense_data, extra_len) + + dlen = offsetof(struct scsi_sense_data_fixed, extra_len) + sense->extra_len + 1; ctio->dxfer_len = min(dlen, SCSI_CDB6_LEN(rsense->length)); ctio->ccb_h.flags |= CAM_DIR_IN | CAM_SEND_STATUS; @@ -482,7 +482,7 @@ tcmd_rdwr(struct ccb_accept_tio *atio, s c_descr = (struct ctio_descr *)ctio->ccb_h.targ_descr; /* Command needs to be decoded */ - if ((a_descr->flags & CAM_DIR_MASK) == CAM_DIR_RESV) { + if ((a_descr->flags & CAM_DIR_MASK) == CAM_DIR_BOTH) { if (debug) warnx("Calling rdwr_decode"); ret = tcmd_rdwr_decode(atio, ctio); Modified: head/share/examples/scsi_target/scsi_target.c ============================================================================== --- head/share/examples/scsi_target/scsi_target.c Mon Oct 3 20:27:51 2011 (r225949) +++ head/share/examples/scsi_target/scsi_target.c Mon Oct 3 20:32:55 2011 (r225950) @@ -651,7 +651,7 @@ work_atio(struct ccb_accept_tio *atio) * receiving this ATIO. */ if (atio->sense_len != 0) { - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; if (debug) { warnx("ATIO with %u bytes sense received", @@ -825,9 +825,9 @@ work_inot(struct ccb_immed_notify *inot) /* If there is sense data, use it */ if (sense != 0) { - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; - sense = &inot->sense_data; + sense = (struct scsi_sense_data_fixed *)&inot->sense_data; tcmd_sense(inot->initiator_id, NULL, sense->flags, sense->add_sense_code, sense->add_sense_code_qual); if (debug) Modified: head/share/misc/scsi_modes ============================================================================== --- head/share/misc/scsi_modes Mon Oct 3 20:27:51 2011 (r225949) +++ head/share/misc/scsi_modes Mon Oct 3 20:32:55 2011 (r225950) @@ -50,19 +50,32 @@ # ALL DEVICE TYPES 0x0a "Control Mode Page" { - {Reserved} *t7 + {TST} t3 + {TMF_ONLY} t1 + {DPICZ} t1 + {D_SENSE} t1 + {GLTSD} t1 {RLEC} t1 {Queue Algorithm Modifier} t4 - {Reserved} *t2 - {QErr} t1 + {NUAR} t1 + {QErr} t2 {DQue} t1 {EECA} t1 - {Reserved} *t4 + {RAC} t1 + {UA_INTLCK_CTRL} t2 + {SWP} t1 {RAENP} t1 {UAAENP} t1 {EAENP} t1 - {Reserved} *i1 + {ATO} t1 + {TAS} t1 + {ATMPE} t1 + {RWWP} t1 + {Reserved} *t1 + {Autoload Mode} t3 {Ready AEN Holdoff Period} i2 + {Busy Timeout Period} i2 + {Extended Self-Test Completion Time} i2 } 0x02 "Disconnect-Reconnect Page" { Modified: head/sys/cam/cam_ccb.h ============================================================================== --- head/sys/cam/cam_ccb.h Mon Oct 3 20:27:51 2011 (r225949) +++ head/sys/cam/cam_ccb.h Mon Oct 3 20:32:55 2011 (r225950) @@ -539,7 +539,7 @@ struct ccb_dev_match { /* * Definitions for the path inquiry CCB fields. */ -#define CAM_VERSION 0x15 /* Hex value for current version */ +#define CAM_VERSION 0x16 /* Hex value for current version */ typedef enum { PI_MDP_ABLE = 0x80, /* Supports MDP message */ Modified: head/sys/cam/cam_periph.c ============================================================================== --- head/sys/cam/cam_periph.c Mon Oct 3 20:27:51 2011 (r225949) +++ head/sys/cam/cam_periph.c Mon Oct 3 20:32:55 2011 (r225950) @@ -1085,7 +1085,6 @@ camperiphsensedone(struct cam_periph *pe union ccb *saved_ccb = (union ccb *)done_ccb->ccb_h.saved_ccb_ptr; cam_status status; int frozen = 0; - u_int sense_key; int depth = done_ccb->ccb_h.recovery_depth; status = done_ccb->ccb_h.status; @@ -1101,22 +1100,25 @@ camperiphsensedone(struct cam_periph *pe switch (status) { case CAM_REQ_CMP: { + int error_code, sense_key, asc, ascq; + + scsi_extract_sense_len(&saved_ccb->csio.sense_data, + saved_ccb->csio.sense_len - + saved_ccb->csio.sense_resid, + &error_code, &sense_key, &asc, &ascq, + /*show_errors*/ 1); /* * If we manually retrieved sense into a CCB and got * something other than "NO SENSE" send the updated CCB * back to the client via xpt_done() to be processed via * the error recovery code again. */ - sense_key = saved_ccb->csio.sense_data.flags; - sense_key &= SSD_KEY; - if (sense_key != SSD_KEY_NO_SENSE) { - saved_ccb->ccb_h.status |= - CAM_AUTOSNS_VALID; + if ((sense_key != -1) + && (sense_key != SSD_KEY_NO_SENSE)) { + saved_ccb->ccb_h.status |= CAM_AUTOSNS_VALID; } else { - saved_ccb->ccb_h.status &= - ~CAM_STATUS_MASK; - saved_ccb->ccb_h.status |= - CAM_AUTOSENSE_FAIL; + saved_ccb->ccb_h.status &= ~CAM_STATUS_MASK; + saved_ccb->ccb_h.status |= CAM_AUTOSENSE_FAIL; } saved_ccb->csio.sense_resid = done_ccb->csio.resid; bcopy(saved_ccb, done_ccb, sizeof(union ccb)); @@ -1198,12 +1200,15 @@ camperiphdone(struct cam_periph *periph, if (status & CAM_AUTOSNS_VALID) { struct ccb_getdev cgd; struct scsi_sense_data *sense; - int error_code, sense_key, asc, ascq; + int error_code, sense_key, asc, ascq, sense_len; scsi_sense_action err_action; sense = &done_ccb->csio.sense_data; - scsi_extract_sense(sense, &error_code, - &sense_key, &asc, &ascq); + sense_len = done_ccb->csio.sense_len - + done_ccb->csio.sense_resid; + scsi_extract_sense_len(sense, sense_len, &error_code, + &sense_key, &asc, &ascq, + /*show_errors*/ 1); /* * Grab the inquiry data for this device. */ Modified: head/sys/cam/scsi/scsi_all.c ============================================================================== --- head/sys/cam/scsi/scsi_all.c Mon Oct 3 20:27:51 2011 (r225949) +++ head/sys/cam/scsi/scsi_all.c Mon Oct 3 20:32:55 2011 (r225950) @@ -31,6 +31,8 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #ifdef _KERNEL #include @@ -54,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #ifndef _KERNEL #include +#include #ifndef FALSE #define FALSE 0 @@ -608,14 +611,24 @@ scsi_op_desc(u_int16_t opcode, struct sc struct op_table_entry *table[2]; int num_tables; - pd_type = SID_TYPE(inq_data); + /* + * If we've got inquiry data, use it to determine what type of + * device we're dealing with here. Otherwise, assume direct + * access. + */ + if (inq_data == NULL) { + pd_type = T_DIRECT; + match = NULL; + } else { + pd_type = SID_TYPE(inq_data); - match = cam_quirkmatch((caddr_t)inq_data, - (caddr_t)scsi_op_quirk_table, - sizeof(scsi_op_quirk_table)/ - sizeof(*scsi_op_quirk_table), - sizeof(*scsi_op_quirk_table), - scsi_inquiry_match); + match = cam_quirkmatch((caddr_t)inq_data, + (caddr_t)scsi_op_quirk_table, + sizeof(scsi_op_quirk_table)/ + sizeof(*scsi_op_quirk_table), + sizeof(*scsi_op_quirk_table), + scsi_inquiry_match); + } if (match != NULL) { table[0] = ((struct scsi_op_quirk_entry *)match)->op_table; @@ -699,7 +712,7 @@ const struct sense_key_table_entry sense { SSD_KEY_EQUAL, SS_NOP, "EQUAL" }, { SSD_KEY_VOLUME_OVERFLOW, SS_FATAL|EIO, "VOLUME OVERFLOW" }, { SSD_KEY_MISCOMPARE, SS_NOP, "MISCOMPARE" }, - { SSD_KEY_RESERVED, SS_FATAL|EIO, "RESERVED" } + { SSD_KEY_COMPLETED, SS_NOP, "COMPLETED" } }; const int sense_key_table_size = @@ -1062,25 +1075,25 @@ static struct asc_table_entry asc_table[ { SST(0x10, 0x03, SS_RDEF, /* XXX TBD */ "Logical block reference tag check failed") }, /* DT WRO BK */ - { SST(0x11, 0x00, SS_RDEF, + { SST(0x11, 0x00, SS_FATAL|EIO, "Unrecovered read error") }, /* DT WRO BK */ - { SST(0x11, 0x01, SS_RDEF, + { SST(0x11, 0x01, SS_FATAL|EIO, "Read retries exhausted") }, /* DT WRO BK */ - { SST(0x11, 0x02, SS_RDEF, + { SST(0x11, 0x02, SS_FATAL|EIO, "Error too long to correct") }, /* DT W O BK */ - { SST(0x11, 0x03, SS_RDEF, + { SST(0x11, 0x03, SS_FATAL|EIO, "Multiple read errors") }, /* D W O BK */ - { SST(0x11, 0x04, SS_RDEF, + { SST(0x11, 0x04, SS_FATAL|EIO, "Unrecovered read error - auto reallocate failed") }, /* WRO B */ - { SST(0x11, 0x05, SS_RDEF, + { SST(0x11, 0x05, SS_FATAL|EIO, "L-EC uncorrectable error") }, /* WRO B */ - { SST(0x11, 0x06, SS_RDEF, + { SST(0x11, 0x06, SS_FATAL|EIO, "CIRC unrecovered error") }, /* W O B */ { SST(0x11, 0x07, SS_RDEF, @@ -1095,10 +1108,10 @@ static struct asc_table_entry asc_table[ { SST(0x11, 0x0A, SS_RDEF, "Miscorrected error") }, /* D W O BK */ - { SST(0x11, 0x0B, SS_RDEF, + { SST(0x11, 0x0B, SS_FATAL|EIO, "Unrecovered read error - recommend reassignment") }, /* D W O BK */ - { SST(0x11, 0x0C, SS_RDEF, + { SST(0x11, 0x0C, SS_FATAL|EIO, "Unrecovered read error - recommend rewrite the data") }, /* DT WRO B */ { SST(0x11, 0x0D, SS_RDEF, @@ -2790,7 +2803,10 @@ scsi_sense_desc(int sense_key, int asc, &sense_entry, &asc_entry); - *sense_key_desc = sense_entry->desc; + if (sense_entry != NULL) + *sense_key_desc = sense_entry->desc; + else + *sense_key_desc = "Invalid Sense Key"; if (asc_entry != NULL) *asc_desc = asc_entry->desc; @@ -2816,10 +2832,12 @@ scsi_error_action(struct ccb_scsiio *csi int error_code, sense_key, asc, ascq; scsi_sense_action action; - scsi_extract_sense(&csio->sense_data, &error_code, - &sense_key, &asc, &ascq); + scsi_extract_sense_len(&csio->sense_data, csio->sense_len - + csio->sense_resid, &error_code, + &sense_key, &asc, &ascq, /*show_errors*/ 1); - if (error_code == SSD_DEFERRED_ERROR) { + if ((error_code == SSD_DEFERRED_ERROR) + || (error_code == SSD_DESC_DEFERRED_ERROR)) { /* * XXX dufault@FreeBSD.org * This error doesn't relate to the command associated @@ -2857,8 +2875,10 @@ scsi_error_action(struct ccb_scsiio *csi if (asc_entry != NULL && (asc != 0 || ascq != 0)) action = asc_entry->action; - else + else if (sense_entry != NULL) action = sense_entry->action; + else + action = SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE; if (sense_key == SSD_KEY_RECOVERED_ERROR) { /* @@ -3040,308 +3060,1530 @@ scsi_command_string(struct cam_device *d return(0); } - /* - * scsi_sense_sbuf() returns 0 for success and -1 for failure. + * Iterate over sense descriptors. Each descriptor is passed into iter_func(). + * If iter_func() returns 0, list traversal continues. If iter_func() + * returns non-zero, list traversal is stopped. */ -#ifdef _KERNEL -int -scsi_sense_sbuf(struct ccb_scsiio *csio, struct sbuf *sb, - scsi_sense_string_flags flags) -#else /* !_KERNEL */ -int -scsi_sense_sbuf(struct cam_device *device, struct ccb_scsiio *csio, - struct sbuf *sb, scsi_sense_string_flags flags) -#endif /* _KERNEL/!_KERNEL */ +void +scsi_desc_iterate(struct scsi_sense_data_desc *sense, u_int sense_len, + int (*iter_func)(struct scsi_sense_data_desc *sense, + u_int, struct scsi_sense_desc_header *, + void *), void *arg) { - struct scsi_sense_data *sense; - struct scsi_inquiry_data *inq_data; -#ifdef _KERNEL - struct ccb_getdev *cgd; -#endif /* _KERNEL */ - u_int32_t info; - int error_code; - int sense_key; - int asc, ascq; - char path_str[64]; - -#ifndef _KERNEL - if (device == NULL) - return(-1); -#endif /* !_KERNEL */ - if ((csio == NULL) || (sb == NULL)) - return(-1); + int cur_pos; + int desc_len; /* - * If the CDB is a physical address, we can't deal with it.. + * First make sure the extra length field is present. */ - if ((csio->ccb_h.flags & CAM_CDB_PHYS) != 0) - flags &= ~SSS_FLAG_PRINT_COMMAND; + if (SSD_DESC_IS_PRESENT(sense, sense_len, extra_len) == 0) + return; -#ifdef _KERNEL - xpt_path_string(csio->ccb_h.path, path_str, sizeof(path_str)); -#else /* !_KERNEL */ - cam_path_string(device, path_str, sizeof(path_str)); -#endif /* _KERNEL/!_KERNEL */ + /* + * The length of data actually returned may be different than the + * extra_len recorded in the sturcture. + */ + desc_len = sense_len -offsetof(struct scsi_sense_data_desc, sense_desc); -#ifdef _KERNEL - if ((cgd = (struct ccb_getdev*)xpt_alloc_ccb_nowait()) == NULL) - return(-1); /* - * Get the device information. + * Limit this further by the extra length reported, and the maximum + * allowed extra length. */ - xpt_setup_ccb(&cgd->ccb_h, - csio->ccb_h.path, - CAM_PRIORITY_NORMAL); - cgd->ccb_h.func_code = XPT_GDEV_TYPE; - xpt_action((union ccb *)cgd); + desc_len = MIN(desc_len, MIN(sense->extra_len, SSD_EXTRA_MAX)); /* - * If the device is unconfigured, just pretend that it is a hard - * drive. scsi_op_desc() needs this. + * Subtract the size of the header from the descriptor length. + * This is to ensure that we have at least the header left, so we + * don't have to check that inside the loop. This can wind up + * being a negative value. */ - if (cgd->ccb_h.status == CAM_DEV_NOT_THERE) - cgd->inq_data.device = T_DIRECT; + desc_len -= sizeof(struct scsi_sense_desc_header); - inq_data = &cgd->inq_data; + for (cur_pos = 0; cur_pos < desc_len;) { + struct scsi_sense_desc_header *header; -#else /* !_KERNEL */ + header = (struct scsi_sense_desc_header *) + &sense->sense_desc[cur_pos]; - inq_data = &device->inq_data; + /* + * Check to make sure we have the entire descriptor. We + * don't call iter_func() unless we do. + * + * Note that although cur_pos is at the beginning of the + * descriptor, desc_len already has the header length + * subtracted. So the comparison of the length in the + * header (which does not include the header itself) to + * desc_len - cur_pos is correct. + */ + if (header->length > (desc_len - cur_pos)) + break; -#endif /* _KERNEL/!_KERNEL */ + if (iter_func(sense, sense_len, header, arg) != 0) + break; - sense = NULL; + cur_pos += sizeof(*header) + header->length; + } +} - if (flags & SSS_FLAG_PRINT_COMMAND) { +struct scsi_find_desc_info { + uint8_t desc_type; + struct scsi_sense_desc_header *header; +}; - sbuf_cat(sb, path_str); +static int +scsi_find_desc_func(struct scsi_sense_data_desc *sense, u_int sense_len, + struct scsi_sense_desc_header *header, void *arg) +{ + struct scsi_find_desc_info *desc_info; -#ifdef _KERNEL - scsi_command_string(csio, sb); -#else /* !_KERNEL */ - scsi_command_string(device, csio, sb); -#endif /* _KERNEL/!_KERNEL */ - sbuf_printf(sb, "\n"); - } + desc_info = (struct scsi_find_desc_info *)arg; + + if (header->desc_type == desc_info->desc_type) { + desc_info->header = header; + + /* We found the descriptor, tell the iterator to stop. */ + return (1); + } else + return (0); +} + +/* + * Given a descriptor type, return a pointer to it if it is in the sense + * data and not truncated. Avoiding truncating sense data will simplify + * things significantly for the caller. + */ +uint8_t * +scsi_find_desc(struct scsi_sense_data_desc *sense, u_int sense_len, + uint8_t desc_type) +{ + struct scsi_find_desc_info desc_info; + + desc_info.desc_type = desc_type; + desc_info.header = NULL; + + scsi_desc_iterate(sense, sense_len, scsi_find_desc_func, &desc_info); + + return ((uint8_t *)desc_info.header); +} + +/* + * Fill in SCSI sense data with the specified parameters. This routine can + * fill in either fixed or descriptor type sense data. + */ +void +scsi_set_sense_data_va(struct scsi_sense_data *sense_data, + scsi_sense_data_type sense_format, int current_error, + int sense_key, int asc, int ascq, va_list ap) +{ + int descriptor_sense; + scsi_sense_elem_type elem_type; /* - * If the sense data is a physical pointer, forget it. + * Determine whether to return fixed or descriptor format sense + * data. If the user specifies SSD_TYPE_NONE for some reason, + * they'll just get fixed sense data. */ - if (csio->ccb_h.flags & CAM_SENSE_PTR) { - if (csio->ccb_h.flags & CAM_SENSE_PHYS) { -#ifdef _KERNEL - xpt_free_ccb((union ccb*)cgd); -#endif /* _KERNEL/!_KERNEL */ - return(-1); - } else { - /* - * bcopy the pointer to avoid unaligned access - * errors on finicky architectures. We don't - * ensure that the sense data is pointer aligned. - */ - bcopy(&csio->sense_data, &sense, - sizeof(struct scsi_sense_data *)); - } - } else { + if (sense_format == SSD_TYPE_DESC) + descriptor_sense = 1; + else + descriptor_sense = 0; + + /* + * Zero the sense data, so that we don't pass back any garbage data + * to the user. + */ + memset(sense_data, 0, sizeof(*sense_data)); + + if (descriptor_sense != 0) { + struct scsi_sense_data_desc *sense; + + sense = (struct scsi_sense_data_desc *)sense_data; /* - * If the physical sense flag is set, but the sense pointer - * is not also set, we assume that the user is an idiot and - * return. (Well, okay, it could be that somehow, the - * entire csio is physical, but we would have probably core - * dumped on one of the bogus pointer deferences above - * already.) + * The descriptor sense format eliminates the use of the + * valid bit. */ - if (csio->ccb_h.flags & CAM_SENSE_PHYS) { -#ifdef _KERNEL - xpt_free_ccb((union ccb*)cgd); -#endif /* _KERNEL/!_KERNEL */ - return(-1); - } else - sense = &csio->sense_data; - } - + if (current_error != 0) + sense->error_code = SSD_DESC_CURRENT_ERROR; + else + sense->error_code = SSD_DESC_DEFERRED_ERROR; + sense->sense_key = sense_key; + sense->add_sense_code = asc; + sense->add_sense_code_qual = ascq; + /* + * Start off with no extra length, since the above data + * fits in the standard descriptor sense information. + */ + sense->extra_len = 0; + while ((elem_type = (scsi_sense_elem_type)va_arg(ap, + scsi_sense_elem_type)) != SSD_ELEM_NONE) { + int sense_len, len_to_copy; + uint8_t *data; + + if (elem_type >= SSD_ELEM_MAX) { + printf("%s: invalid sense type %d\n", __func__, + elem_type); + break; + } - sbuf_cat(sb, path_str); + sense_len = (int)va_arg(ap, int); + len_to_copy = MIN(sense_len, SSD_EXTRA_MAX - + sense->extra_len); + data = (uint8_t *)va_arg(ap, uint8_t *); - error_code = sense->error_code & SSD_ERRCODE; - sense_key = sense->flags & SSD_KEY; + /* + * We've already consumed the arguments for this one. + */ + if (elem_type == SSD_ELEM_SKIP) + continue; - sbuf_printf(sb, "SCSI sense: "); - switch (error_code) { - case SSD_DEFERRED_ERROR: - sbuf_printf(sb, "Deferred error: "); + switch (elem_type) { + case SSD_ELEM_DESC: { - /* FALLTHROUGH */ - case SSD_CURRENT_ERROR: - { - const char *sense_key_desc; - const char *asc_desc; + /* + * This is a straight descriptor. All we + * need to do is copy the data in. + */ + bcopy(data, &sense->sense_desc[ + sense->extra_len], len_to_copy); + sense->extra_len += len_to_copy; + break; + } + case SSD_ELEM_SKS: { + struct scsi_sense_sks sks; - asc = (sense->extra_len >= 5) ? sense->add_sense_code : 0; - ascq = (sense->extra_len >= 6) ? sense->add_sense_code_qual : 0; - scsi_sense_desc(sense_key, asc, ascq, inq_data, - &sense_key_desc, &asc_desc); - sbuf_cat(sb, sense_key_desc); + bzero(&sks, sizeof(sks)); - info = scsi_4btoul(sense->info); - - if (sense->error_code & SSD_ERRCODE_VALID) { + /* + * This is already-formatted sense key + * specific data. We just need to fill out + * the header and copy everything in. + */ + bcopy(data, &sks.sense_key_spec, + MIN(len_to_copy, + sizeof(sks.sense_key_spec))); + + sks.desc_type = SSD_DESC_SKS; + sks.length = sizeof(sks) - + offsetof(struct scsi_sense_sks, reserved1); + bcopy(&sks,&sense->sense_desc[sense->extra_len], + sizeof(sks)); + sense->extra_len += sizeof(sks); + break; + } + case SSD_ELEM_INFO: + case SSD_ELEM_COMMAND: { + struct scsi_sense_command cmd; + struct scsi_sense_info info; + uint8_t *data_dest; + uint8_t *descriptor; + int descriptor_size, i, copy_len; + + bzero(&cmd, sizeof(cmd)); + bzero(&info, sizeof(info)); + + /* + * Command or information data. The + * operate in pretty much the same way. + */ + if (elem_type == SSD_ELEM_COMMAND) { + len_to_copy = MIN(len_to_copy, + sizeof(cmd.command_info)); + descriptor = (uint8_t *)&cmd; + descriptor_size = sizeof(cmd); + data_dest =(uint8_t *)&cmd.command_info; + cmd.desc_type = SSD_DESC_COMMAND; + cmd.length = sizeof(cmd) - + offsetof(struct scsi_sense_command, + reserved); + } else { + len_to_copy = MIN(len_to_copy, + sizeof(info.info)); + descriptor = (uint8_t *)&info; + descriptor_size = sizeof(cmd); + data_dest = (uint8_t *)&info.info; + info.desc_type = SSD_DESC_INFO; + info.byte2 = SSD_INFO_VALID; + info.length = sizeof(info) - + offsetof(struct scsi_sense_info, + byte2); + } - switch (sense_key) { - case SSD_KEY_NOT_READY: - case SSD_KEY_ILLEGAL_REQUEST: - case SSD_KEY_UNIT_ATTENTION: - case SSD_KEY_DATA_PROTECT: + /* + * Copy this in reverse because the spec + * (SPC-4) says that when 4 byte quantities + * are stored in this 8 byte field, the + * first four bytes shall be 0. + * + * So we fill the bytes in from the end, and + * if we have less than 8 bytes to copy, + * the initial, most significant bytes will + * be 0. + */ + for (i = sense_len - 1; i >= 0 && + len_to_copy > 0; i--, len_to_copy--) + data_dest[len_to_copy - 1] = data[i]; + + /* + * This calculation looks much like the + * initial len_to_copy calculation, but + * we have to do it again here, because + * we're looking at a larger amount that + * may or may not fit. It's not only the + * data the user passed in, but also the + * rest of the descriptor. + */ + copy_len = MIN(descriptor_size, + SSD_EXTRA_MAX - sense->extra_len); + bcopy(descriptor, &sense->sense_desc[ + sense->extra_len], copy_len); + sense->extra_len += copy_len; + break; + } + case SSD_ELEM_FRU: { + struct scsi_sense_fru fru; + int copy_len; + + bzero(&fru, sizeof(fru)); + + fru.desc_type = SSD_DESC_FRU; + fru.length = sizeof(fru) - + offsetof(struct scsi_sense_fru, reserved); + fru.fru = *data; + + copy_len = MIN(sizeof(fru), SSD_EXTRA_MAX - + sense->extra_len); + bcopy(&fru, &sense->sense_desc[ + sense->extra_len], copy_len); + sense->extra_len += copy_len; break; - case SSD_KEY_BLANK_CHECK: - sbuf_printf(sb, " req sz: %d (decimal)", info); + } + case SSD_ELEM_STREAM: { + struct scsi_sense_stream stream_sense; + int copy_len; + + bzero(&stream_sense, sizeof(stream_sense)); + stream_sense.desc_type = SSD_DESC_STREAM; + stream_sense.length = sizeof(stream_sense) - + offsetof(struct scsi_sense_stream, reserved); + stream_sense.byte3 = *data; + + copy_len = MIN(sizeof(stream_sense), + SSD_EXTRA_MAX - sense->extra_len); + bcopy(&stream_sense, &sense->sense_desc[ + sense->extra_len], copy_len); + sense->extra_len += copy_len; break; + } default: - if (info) { - if (sense->flags & SSD_ILI) { - sbuf_printf(sb, " ILI (length " - "mismatch): %d", info); - - } else { - sbuf_printf(sb, " info:%x", - info); - } - } + /* + * We shouldn't get here, but if we do, do + * nothing. We've already consumed the + * arguments above. + */ + break; } - } else if (info) { - sbuf_printf(sb, " info?:%x", info); } + } else { + struct scsi_sense_data_fixed *sense; - if (sense->extra_len >= 4) { - if (bcmp(sense->cmd_spec_info, "\0\0\0\0", 4)) { - sbuf_printf(sb, " csi:%x,%x,%x,%x", - sense->cmd_spec_info[0], - sense->cmd_spec_info[1], - sense->cmd_spec_info[2], - sense->cmd_spec_info[3]); - } - } + sense = (struct scsi_sense_data_fixed *)sense_data; - sbuf_printf(sb, " asc:%x,%x (%s)", asc, ascq, asc_desc); + if (current_error != 0) + sense->error_code = SSD_CURRENT_ERROR; + else + sense->error_code = SSD_DEFERRED_ERROR; - if (sense->extra_len >= 7 && sense->fru) { - sbuf_printf(sb, " field replaceable unit: %x", - sense->fru); - } + sense->flags = sense_key; + sense->add_sense_code = asc; + sense->add_sense_code_qual = ascq; + /* + * We've set the ASC and ASCQ, so we have 6 more bytes of + * valid data. If we wind up setting any of the other + * fields, we'll bump this to 10 extra bytes. + */ + sense->extra_len = 6; - if ((sense->extra_len >= 10) - && (sense->sense_key_spec[0] & SSD_SCS_VALID) != 0) { - switch(sense_key) { - case SSD_KEY_ILLEGAL_REQUEST: { - int bad_command; - char tmpstr2[40]; - - if (sense->sense_key_spec[0] & 0x40) - bad_command = 1; - else - bad_command = 0; - - tmpstr2[0] = '\0'; - - /* Bit pointer is valid */ - if (sense->sense_key_spec[0] & 0x08) - snprintf(tmpstr2, sizeof(tmpstr2), - "bit %d ", - sense->sense_key_spec[0] & 0x7); - sbuf_printf(sb, ": %s byte %d %sis invalid", - bad_command ? "Command" : "Data", - scsi_2btoul( - &sense->sense_key_spec[1]), - tmpstr2); + while ((elem_type = (scsi_sense_elem_type)va_arg(ap, + scsi_sense_elem_type)) != SSD_ELEM_NONE) { + int sense_len, len_to_copy; + uint8_t *data; + + if (elem_type >= SSD_ELEM_MAX) { + printf("%s: invalid sense type %d\n", __func__, + elem_type); break; } - case SSD_KEY_RECOVERED_ERROR: - case SSD_KEY_HARDWARE_ERROR: - case SSD_KEY_MEDIUM_ERROR: - sbuf_printf(sb, " actual retry count: %d", - scsi_2btoul( - &sense->sense_key_spec[1])); + /* + * If we get in here, just bump the extra length to + * 10 bytes. That will encompass anything we're + * going to set here. + */ + sense->extra_len = 10; + sense_len = (int)va_arg(ap, int); + len_to_copy = MIN(sense_len, SSD_EXTRA_MAX - + sense->extra_len); + data = (uint8_t *)va_arg(ap, uint8_t *); + + switch (elem_type) { + case SSD_ELEM_SKS: + /* + * The user passed in pre-formatted sense + * key specific data. + */ + bcopy(data, &sense->sense_key_spec[0], + MIN(sizeof(sense->sense_key_spec), + sense_len)); break; - default: - sbuf_printf(sb, " sks:%#x,%#x", - sense->sense_key_spec[0], - scsi_2btoul( - &sense->sense_key_spec[1])); + case SSD_ELEM_INFO: + case SSD_ELEM_COMMAND: { + uint8_t *data_dest; + int i; + + if (elem_type == SSD_ELEM_COMMAND) + data_dest = &sense->cmd_spec_info[0]; + else { + data_dest = &sense->info[0]; + /* + * We're setting the info field, so + * set the valid bit. + */ + sense->error_code |= SSD_ERRCODE_VALID; + } + + /* + * Copy this in reverse so that if we have + * less than 4 bytes to fill, the least + * significant bytes will be at the end. + * If we have more than 4 bytes, only the + * least significant bytes will be included. + */ + for (i = sense_len - 1; i >= 0 && + len_to_copy > 0; i--, len_to_copy--) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 20:46:36 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5BE2106564A; Mon, 3 Oct 2011 20:46:36 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C4B08FC08; Mon, 3 Oct 2011 20:46:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93KkaeP027162; Mon, 3 Oct 2011 20:46:36 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93Kkah0027160; Mon, 3 Oct 2011 20:46:36 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110032046.p93Kkah0027160@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 3 Oct 2011 20:46:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225951 - head X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 20:46:36 -0000 Author: nwhitehorn Date: Mon Oct 3 20:46:36 2011 New Revision: 225951 URL: http://svn.freebsd.org/changeset/base/225951 Log: Fix a number of platform problems in this file (mostly assuming that only amd64 has lib32). Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Oct 3 20:32:55 2011 (r225950) +++ head/ObsoleteFiles.inc Mon Oct 3 20:46:36 2011 (r225951) @@ -56,7 +56,7 @@ OLD_LIBS+=usr/lib/libdwarf.so.2 OLD_LIBS+=usr/lib/libopie.so.6 OLD_LIBS+=usr/lib/librtld_db.so.1 OLD_LIBS+=usr/lib/libtacplus.so.4 -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libcam.so.5 OLD_LIBS+=usr/lib32/libpcap.so.7 OLD_LIBS+=usr/lib32/libufs.so.5 @@ -94,7 +94,7 @@ OLD_FILES+=usr/lib/libpkg.a OLD_FILES+=usr/lib/libpkg.so OLD_LIBS+=usr/lib/libpkg.so.0 OLD_FILES+=usr/lib/libpkg_p.a -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libpkg.a OLD_FILES+=usr/lib32/libpkg.so OLD_LIBS+=usr/lib32/libpkg.so.0 @@ -102,7 +102,7 @@ OLD_FILES+=usr/lib32/libpkg_p.a .endif # 20110517: libsbuf version bump OLD_LIBS+=lib/libsbuf.so.5 -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libsbuf.so.5 .endif # 20110502: new clang import which bumps version from 2.9 to 3.0 @@ -133,7 +133,7 @@ OLD_FILES+=usr/lib/libobjc_p.a OLD_FILES+=usr/libexec/cc1obj OLD_LIBS+=usr/lib/libobjc.so.4 OLD_DIRS+=usr/include/objc -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libobjc.a OLD_FILES+=usr/lib32/libobjc.so OLD_FILES+=usr/lib32/libobjc_p.a @@ -260,7 +260,7 @@ OLD_FILES+=usr/include/machine/intr.h .endif # 20100514: library version bump for versioned symbols for liblzma OLD_LIBS+=usr/lib/liblzma.so.0 -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/liblzma.so.0 .endif # 20100511: move GCC-specific headers to /usr/include/gcc @@ -2582,7 +2582,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs -.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" +.if ${TARGET_ARCH} != "amd64" && ${TARGET} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET} != "powerpc" OLD_FILES+=usr/bin/gdbserver .endif OLD_FILES+=usr/bin/ssh-keysign From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 20:49:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B267106564A; Mon, 3 Oct 2011 20:49:03 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2AB378FC16; Mon, 3 Oct 2011 20:49:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93Kn323027281; Mon, 3 Oct 2011 20:49:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93Kn3jj027278; Mon, 3 Oct 2011 20:49:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110032049.p93Kn3jj027278@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 3 Oct 2011 20:49:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225952 - in head: . lib lib/libftpio X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 20:49:03 -0000 Author: nwhitehorn Date: Mon Oct 3 20:49:02 2011 New Revision: 225952 URL: http://svn.freebsd.org/changeset/base/225952 Log: Now that its only consumer is gone (sysinstall), remove libftpio as well. Deleted: head/lib/libftpio/ Modified: head/ObsoleteFiles.inc head/lib/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Oct 3 20:46:36 2011 (r225951) +++ head/ObsoleteFiles.inc Mon Oct 3 20:49:02 2011 (r225952) @@ -39,7 +39,18 @@ # done # 20110930: sysinstall removed -OLD_FILES+=usr/sbin/sysinstall usr/share/man/man8/sysinstall.8.gz +OLD_FILES+=usr/sbin/sysinstall +OLD_FILES+=usr/share/man/man8/sysinstall.8.gz +OLD_FILES+=usr/lib/libftpio.a +OLD_FILES+=usr/lib/libftpio.so +OLD_LIBS+=usr/lib/libftpio.so.8 +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/libftpio.a +OLD_FILES+=usr/lib32/libftpio.so +OLD_LIBS+=usr/lib32/libftpio.so.8 +.endif +OLD_FILES+=usr/include/ftpio.h +OLD_FILES+=usr/share/man/man3/ftpio.3.gz # 20110915: rename congestion control manpages OLD_FILES+=usr/share/man/man4/cc.4.gz OLD_FILES+=usr/share/man/man9/cc.9.gz Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Mon Oct 3 20:46:36 2011 (r225951) +++ head/lib/Makefile Mon Oct 3 20:49:02 2011 (r225952) @@ -70,7 +70,6 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libefi} \ libexpat \ libfetch \ - libftpio \ libgeom \ ${_libgpib} \ ${_libgssapi} \ From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 20:52:47 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id BD1D7106564A; Mon, 3 Oct 2011 20:52:47 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id F242514E4D0; Mon, 3 Oct 2011 20:52:46 +0000 (UTC) Message-ID: <4E8A209E.8010407@FreeBSD.org> Date: Mon, 03 Oct 2011 13:52:46 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1 MIME-Version: 1.0 To: Nathan Whitehorn References: <201110031513.p93FD9ev015593@svn.freebsd.org> In-Reply-To: <201110031513.p93FD9ev015593@svn.freebsd.org> X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 20:52:47 -0000 On 10/03/2011 08:13, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Mon Oct 3 15:13:09 2011 > New Revision: 225937 > URL: http://svn.freebsd.org/changeset/base/225937 > > Log: > Farewall, sysinstall! You served us well for many years, but 10.0 is one > digit beyond your time. sysinstall had (at least) 2 primary purposes, installation, and post-install system configuration. The new installer is a good step towards the first goal, but we currently have nothing to fulfill the second role. For that reason I think this step is premature. One could also make the case that this is exactly the kind of disruptive change that the release engineer asked us not to do until the release is done, but I'll leave that to them to deal with. :) Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 20:54:52 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B12E9106566B; Mon, 3 Oct 2011 20:54:52 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-pz0-f44.google.com (mail-pz0-f44.google.com [209.85.210.44]) by mx1.freebsd.org (Postfix) with ESMTP id 6A0508FC0A; Mon, 3 Oct 2011 20:54:52 +0000 (UTC) Received: by pzk32 with SMTP id 32so26971457pzk.3 for ; Mon, 03 Oct 2011 13:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer; bh=euaZqpPNE7TDdFN2f3h4Hq/7LKH5GQC3IiIO+DybEIE=; b=nYkpZUEkqCZ3oOdOitcoQUar/aQuzMnoPcrJKOMJW9KdxXHgezwhbo1cyIeB1Fxdbe lfaVeRxjjV4XBUsoOaD2k+D3zJGlnHtDtKoi/tZZ9TqKgsyWZ5UMPj4pqZGxVysV9YGk Mq/LsqZj2VhVIPToVIurktdt5+wznJsY12zko= Received: by 10.68.35.231 with SMTP id l7mr109046pbj.41.1317675291807; Mon, 03 Oct 2011 13:54:51 -0700 (PDT) Received: from kruse-180.4.ixsystems.com (drawbridge.ixsystems.com. [206.40.55.65]) by mx.google.com with ESMTPS id h5sm57233151pbf.4.2011.10.03.13.54.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Oct 2011 13:54:50 -0700 (PDT) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Garrett Cooper In-Reply-To: <4E8A209E.8010407@FreeBSD.org> Date: Mon, 3 Oct 2011 13:54:47 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201110031513.p93FD9ev015593@svn.freebsd.org> <4E8A209E.8010407@FreeBSD.org> To: Doug Barton X-Mailer: Apple Mail (2.1084) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Nathan Whitehorn Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 20:54:52 -0000 On Oct 3, 2011, at 1:52 PM, Doug Barton wrote: > On 10/03/2011 08:13, Nathan Whitehorn wrote: >> Author: nwhitehorn >> Date: Mon Oct 3 15:13:09 2011 >> New Revision: 225937 >> URL: http://svn.freebsd.org/changeset/base/225937 >>=20 >> Log: >> Farewall, sysinstall! You served us well for many years, but 10.0 is = one >> digit beyond your time. >=20 > sysinstall had (at least) 2 primary purposes, installation, and > post-install system configuration. The new installer is a good step > towards the first goal, but we currently have nothing to fulfill the > second role. For that reason I think this step is premature. >=20 > One could also make the case that this is exactly the kind of = disruptive > change that the release engineer asked us not to do until the release = is > done, but I'll leave that to them to deal with. :) FWIW, I thought timeline between deprecation and deletion was at least 2 = releases too.. -Garrett= From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 21:19:16 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FCD6106566B; Mon, 3 Oct 2011 21:19:16 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2FC608FC08; Mon, 3 Oct 2011 21:19:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93LJGBV028238; Mon, 3 Oct 2011 21:19:16 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93LJG7W028236; Mon, 3 Oct 2011 21:19:16 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201110032119.p93LJG7W028236@svn.freebsd.org> From: Alexander Motin Date: Mon, 3 Oct 2011 21:19:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225953 - head/sys/powerpc/powerpc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 21:19:16 -0000 Author: mav Date: Mon Oct 3 21:19:15 2011 New Revision: 225953 URL: http://svn.freebsd.org/changeset/base/225953 Log: Revert r225875, r225877: It is reported that on some chips (e.g. the 970MP) behavior of POW bit set simultaneously with modifying other bits is undefined and may cause hangs. The race should be handled in some other way, but for now just get back. Reported by: nwitehorn Modified: head/sys/powerpc/powerpc/cpu.c Modified: head/sys/powerpc/powerpc/cpu.c ============================================================================== --- head/sys/powerpc/powerpc/cpu.c Mon Oct 3 20:49:02 2011 (r225952) +++ head/sys/powerpc/powerpc/cpu.c Mon Oct 3 21:19:15 2011 (r225953) @@ -65,7 +65,6 @@ #include #include #include -#include #include #include @@ -554,11 +553,6 @@ cpu_idle_60x(void) vers = mfpvr() >> 16; #ifdef AIM - mtmsr(msr & ~PSL_EE); - if (sched_runnable()) { - mtmsr(msr); - return; - } switch (vers) { case IBM970: case IBM970FX: @@ -589,11 +583,6 @@ cpu_idle_e500(void) msr = mfmsr(); #ifdef E500 - mtmsr(msr & ~PSL_EE); - if (sched_runnable()) { - mtmsr(msr); - return; - } /* Freescale E500 core RM section 6.4.1. */ __asm __volatile("msync; mtmsr %0; isync" :: "r" (msr | PSL_WE)); From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 21:48:11 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 407EB106564A; Mon, 3 Oct 2011 21:48:11 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 30A128FC12; Mon, 3 Oct 2011 21:48:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p93LmB5j029164; Mon, 3 Oct 2011 21:48:11 GMT (envelope-from ivoras@svn.freebsd.org) Received: (from ivoras@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p93LmBnp029162; Mon, 3 Oct 2011 21:48:11 GMT (envelope-from ivoras@svn.freebsd.org) Message-Id: <201110032148.p93LmBnp029162@svn.freebsd.org> From: Ivan Voras Date: Mon, 3 Oct 2011 21:48:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225954 - head/bin/mv X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 21:48:11 -0000 Author: ivoras Date: Mon Oct 3 21:48:10 2011 New Revision: 225954 URL: http://svn.freebsd.org/changeset/base/225954 Log: Don't chop IO into small pieces, follow cp(1) and just use MAXPHYS. Modified: head/bin/mv/mv.c Modified: head/bin/mv/mv.c ============================================================================== --- head/bin/mv/mv.c Mon Oct 3 21:19:15 2011 (r225953) +++ head/bin/mv/mv.c Mon Oct 3 21:48:10 2011 (r225954) @@ -260,40 +260,34 @@ static int fastcopy(const char *from, const char *to, struct stat *sbp) { struct timeval tval[2]; - static u_int blen; - static char *bp; + static u_int blen = MAXPHYS; + static char *bp = NULL; mode_t oldmode; int nread, from_fd, to_fd; if ((from_fd = open(from, O_RDONLY, 0)) < 0) { - warn("%s", from); + warn("fastcopy: open() failed (from): %s", from); return (1); } - if (blen < sbp->st_blksize) { - if (bp != NULL) - free(bp); - if ((bp = malloc((size_t)sbp->st_blksize)) == NULL) { - blen = 0; - warnx("malloc failed"); - return (1); - } - blen = sbp->st_blksize; + if (bp == NULL && (bp = malloc((size_t)blen)) == NULL) { + warnx("malloc(%u) failed", blen); + return (1); } while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0) { if (errno == EEXIST && unlink(to) == 0) continue; - warn("%s", to); + warn("fastcopy: open() failed (to): %s", to); (void)close(from_fd); return (1); } while ((nread = read(from_fd, bp, (size_t)blen)) > 0) if (write(to_fd, bp, (size_t)nread) != nread) { - warn("%s", to); + warn("fastcopy: write() failed: %s", to); goto err; } if (nread < 0) { - warn("%s", from); + warn("fastcopy: read() failed: %s", from); err: if (unlink(to)) warn("%s: remove", to); (void)close(from_fd); From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 22:11:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 850C71065677; Mon, 3 Oct 2011 22:11:38 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 7827C8FC0A; Mon, 3 Oct 2011 22:11:37 +0000 (UTC) Received: by bkbzs8 with SMTP id zs8so6996370bkb.13 for ; Mon, 03 Oct 2011 15:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=p3NWlRyLo1EuD4v4eCQICA2gJo9otBQLNw4Nnfayl5o=; b=qGPUOwAR9s3ZDuS2WIPek0hcP5G/BkjEw6hfwhrru7xQxihm0Z48z+M4NfhGXaWCpz jRhTjMRpGGYKV520vWWl66jD4QB29qSIvZ5/w65maRvRTKZ5Tfu9y3O0/epNLHmWnQjp RPFyX1BDyDfvGm5ZE4nmKCC39YUMFl20ZR0Xc= MIME-Version: 1.0 Received: by 10.204.129.4 with SMTP id m4mr237446bks.251.1317679896185; Mon, 03 Oct 2011 15:11:36 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.204.132.140 with HTTP; Mon, 3 Oct 2011 15:11:36 -0700 (PDT) In-Reply-To: <201110031513.p93FD9ev015593@svn.freebsd.org> References: <201110031513.p93FD9ev015593@svn.freebsd.org> Date: Mon, 3 Oct 2011 15:11:36 -0700 X-Google-Sender-Auth: 4Qfn8qfRudW8HQDu8gvbu8rapLY Message-ID: From: Craig Rodrigues To: Nathan Whitehorn Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 22:11:38 -0000 On Mon, Oct 3, 2011 at 8:13 AM, Nathan Whitehorn w= rote: > Author: nwhitehorn > Date: Mon Oct =A03 15:13:09 2011 > New Revision: 225937 > URL: http://svn.freebsd.org/changeset/base/225937 > > Log: > =A0Farewall, sysinstall! You served us well for many years, but 10.0 is o= ne > =A0digit beyond your time. Hi, Wow, finally someone brave enough to put the stake through the heart of sysinstall. :) In the sysinstall man page, the "SCRIPT SYNTAX" documents how to create a script file which can be passed as an argument to sysinstall so that instead of running in an interactive menu system, installation/configuration commands are run in batch mode. I have seen some places write customized FreeBSD installers use this feature for doing unattended customized installs of FreeBSD. Can bsdinstall be used as a drop-in replacement for sysinstall when run with the "SCRIPT SYNTAX" batch mode? If not, how much code would need to be added to bsdinstall? Or, is there some other utility, such as something from the PC-BSD suite of scripts, that can be used as a drop-in replacement for sysinstall in "SCRIPT SYNTAX" mode? Thanks. --=20 Craig Rodrigues rodrigc@crodrigues.org From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 22:17:49 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E246106564A; Mon, 3 Oct 2011 22:17:49 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id A7D088FC14; Mon, 3 Oct 2011 22:17:48 +0000 (UTC) Received: by qadz30 with SMTP id z30so2612368qad.13 for ; Mon, 03 Oct 2011 15:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=EDtbfcvdN0DID3jBaylcMF23ZqPoLzEcM6rMIglXgj0=; b=upAC1P4Q/9EeiTLNVEJDfFooG9e/X0mKoune0vARjNoqVGcHCymI5jOLFctAVDw3y5 gyMnpJnw3/p2197l/MIwooQTEx4WuWH+b6OkXWgiVq7ZLLqEd8JY09HYEfPzm1VUGZku HpJMnOoVE0aHQGS9+F851aYXUJvDwnJR3U2Gs= MIME-Version: 1.0 Received: by 10.224.175.82 with SMTP id w18mr396112qaz.374.1317680266284; Mon, 03 Oct 2011 15:17:46 -0700 (PDT) Received: by 10.224.74.82 with HTTP; Mon, 3 Oct 2011 15:17:46 -0700 (PDT) In-Reply-To: References: <201110031513.p93FD9ev015593@svn.freebsd.org> Date: Mon, 3 Oct 2011 15:17:46 -0700 Message-ID: From: Garrett Cooper To: Craig Rodrigues Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Nathan Whitehorn Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 22:17:49 -0000 On Mon, Oct 3, 2011 at 3:11 PM, Craig Rodrigues wr= ote: > On Mon, Oct 3, 2011 at 8:13 AM, Nathan Whitehorn = wrote: >> Author: nwhitehorn >> Date: Mon Oct =A03 15:13:09 2011 >> New Revision: 225937 >> URL: http://svn.freebsd.org/changeset/base/225937 >> >> Log: >> =A0Farewall, sysinstall! You served us well for many years, but 10.0 is = one >> =A0digit beyond your time. > > > Hi, > > Wow, finally someone brave enough to put =A0the stake through the heart > of sysinstall. :) > > In the sysinstall man page, the "SCRIPT SYNTAX" documents how > to create a script file which can be passed as an argument to sysinstall > so that instead of running in an interactive menu system, > installation/configuration commands are run in batch mode. > > I have seen some places write customized FreeBSD installers > use this feature for doing unattended customized installs of FreeBSD. > > Can bsdinstall be used as a drop-in replacement for > sysinstall when run with the "SCRIPT SYNTAX" batch mode? > If not, how much code would need to be added to bsdinstall? =A0Or, is the= re > some other utility, such as something from the PC-BSD suite of scripts, > that can be used as a drop-in replacement for sysinstall in "SCRIPT > SYNTAX" mode? bsdinstall AFAIK isn't designed to do this. pc-sysinstall is a much better method to accomplish this task. That being said, pc-sysinstall integration is probably coming sometime in the next 1-2 years.. -Garrett From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 22:11:58 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD2AA106564A; Mon, 3 Oct 2011 22:11:58 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from argol.doit.wisc.edu (argol.doit.wisc.edu [144.92.197.212]) by mx1.freebsd.org (Postfix) with ESMTP id AA0B38FC0C; Mon, 3 Oct 2011 22:11:58 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII; format=flowed Received: from avs-daemon.smtpauth3.wiscmail.wisc.edu by smtpauth3.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) id <0LSI00706DJXWV00@smtpauth3.wiscmail.wisc.edu>; Mon, 03 Oct 2011 16:11:57 -0500 (CDT) Received: from wanderer.tachypleus.net (i3-user-nat.icecube.wisc.edu [128.104.255.12]) by smtpauth3.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) with ESMTPSA id <0LSI002R7DJVG320@smtpauth3.wiscmail.wisc.edu>; Mon, 03 Oct 2011 16:11:56 -0500 (CDT) Date: Mon, 03 Oct 2011 16:11:55 -0500 From: Nathan Whitehorn In-reply-to: To: Garrett Cooper Message-id: <4E8A251B.3000300@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=128.104.255.12 X-Spam-PmxInfo: Server=avs-9, Version=5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.10.3.210314, SenderIP=128.104.255.12 References: <201110031513.p93FD9ev015593@svn.freebsd.org> <4E8A209E.8010407@FreeBSD.org> User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0) Gecko/20110928 Thunderbird/7.0 X-Mailman-Approved-At: Mon, 03 Oct 2011 23:20:15 +0000 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Doug Barton , src-committers@freebsd.org Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 22:11:59 -0000 On 10/03/11 15:54, Garrett Cooper wrote: > On Oct 3, 2011, at 1:52 PM, Doug Barton wrote: > >> On 10/03/2011 08:13, Nathan Whitehorn wrote: >>> Author: nwhitehorn >>> Date: Mon Oct 3 15:13:09 2011 >>> New Revision: 225937 >>> URL: http://svn.freebsd.org/changeset/base/225937 >>> >>> Log: >>> Farewall, sysinstall! You served us well for many years, but 10.0 is one >>> digit beyond your time. >> >> sysinstall had (at least) 2 primary purposes, installation, and >> post-install system configuration. The new installer is a good step >> towards the first goal, but we currently have nothing to fulfill the >> second role. For that reason I think this step is premature. >> >> One could also make the case that this is exactly the kind of disruptive >> change that the release engineer asked us not to do until the release is >> done, but I'll leave that to them to deal with. :) > > FWIW, I thought timeline between deprecation and deletion was at least 2 releases too.. > -Garrett I had thought the intention was to let it remain in 9.0 indefinitely and then to remove it from 10 (which gives sysinstall a more than 20-year run). I brought this up early last week on the freebsd-sysinstall list, to no objections and some encouragement. It can be reverted, of course, if people would prefer that. -Nathan From owner-svn-src-all@FreeBSD.ORG Mon Oct 3 23:32:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F4D21065673; Mon, 3 Oct 2011 23:32:09 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 71B5A8FC15; Mon, 3 Oct 2011 23:32:08 +0000 (UTC) Received: by bkbzs8 with SMTP id zs8so7077315bkb.13 for ; Mon, 03 Oct 2011 16:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=Z3qLJyefFxvnT7QaLFVZTAOZBBhgLBCB91dp9CFEh88=; b=jCdNL1g06tbbmSAgPwVIxszqinRnPp/JevI7SyEw1ddNuEO141x6sXCyV6PrWYFudS GzPC14k7KulJYhljUKCKaFiCuEhVYTSO4B3lLFhf8kVTrGDr1bcyfsbyCXGdZh9Zc7mB Y76+MOFf4OANFzY5Jo4tcN2EgB1H1sTYnStVw= MIME-Version: 1.0 Received: by 10.204.152.201 with SMTP id h9mr257572bkw.147.1317684727246; Mon, 03 Oct 2011 16:32:07 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.204.132.140 with HTTP; Mon, 3 Oct 2011 16:32:07 -0700 (PDT) In-Reply-To: References: <201110031513.p93FD9ev015593@svn.freebsd.org> Date: Mon, 3 Oct 2011 16:32:07 -0700 X-Google-Sender-Auth: utSkH2e3fEONqjarBtxiKEJ0eCI Message-ID: From: Craig Rodrigues To: Garrett Cooper Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Nathan Whitehorn Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 23:32:09 -0000 Hi, If pc-sysinstall can be a drop-in replacement for sysinstall in "SCRIPT SYNTAX" mode, even better. sysinstall needs to go... while people do use it, it has a lot of problems that aren't getting fixed, and it is clear that bsdinstall is the future for FreeBSD installation. Nathan is doing a good thing by forcing the issue by removing it....there is too much brokenness in sysinstall that is not getting fixed, and the sooner we can move to bsdinstall/pc-sysinstall, the better. Since the sysinstall removal is happening only in HEAD/10.0, we have some time to fix the issues before 10.0 is released. -- Craig Rodrigues rodrigc@crodrigues.org On Mon, Oct 3, 2011 at 3:17 PM, Garrett Cooper wrote: > On Mon, Oct 3, 2011 at 3:11 PM, Craig Rodrigues = wrote: >> On Mon, Oct 3, 2011 at 8:13 AM, Nathan Whitehorn wrote: >>> Author: nwhitehorn >>> Date: Mon Oct =A03 15:13:09 2011 >>> New Revision: 225937 >>> URL: http://svn.freebsd.org/changeset/base/225937 >>> >>> Log: >>> =A0Farewall, sysinstall! You served us well for many years, but 10.0 is= one >>> =A0digit beyond your time. >> >> >> Hi, >> >> Wow, finally someone brave enough to put =A0the stake through the heart >> of sysinstall. :) >> >> In the sysinstall man page, the "SCRIPT SYNTAX" documents how >> to create a script file which can be passed as an argument to sysinstall >> so that instead of running in an interactive menu system, >> installation/configuration commands are run in batch mode. >> >> I have seen some places write customized FreeBSD installers >> use this feature for doing unattended customized installs of FreeBSD. >> >> Can bsdinstall be used as a drop-in replacement for >> sysinstall when run with the "SCRIPT SYNTAX" batch mode? >> If not, how much code would need to be added to bsdinstall? =A0Or, is th= ere >> some other utility, such as something from the PC-BSD suite of scripts, >> that can be used as a drop-in replacement for sysinstall in "SCRIPT >> SYNTAX" mode? > > bsdinstall AFAIK isn't designed to do this. pc-sysinstall is a much > better method to accomplish this task. > > That being said, pc-sysinstall integration is probably coming sometime > in the next 1-2 years.. > > -Garrett > --=20 Craig Rodrigues rodrigc@crodrigues.org From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 00:15:40 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9221E106566B; Tue, 4 Oct 2011 00:15:40 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 821CB8FC0A; Tue, 4 Oct 2011 00:15:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p940FeTf033803; Tue, 4 Oct 2011 00:15:40 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p940Fe6L033801; Tue, 4 Oct 2011 00:15:40 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <201110040015.p940Fe6L033801@svn.freebsd.org> From: Andrew Thompson Date: Tue, 4 Oct 2011 00:15:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225955 - head/sys/boot/arm/ixp425/boot2 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 00:15:40 -0000 Author: thompsa Date: Tue Oct 4 00:15:40 2011 New Revision: 225955 URL: http://svn.freebsd.org/changeset/base/225955 Log: Allow ixp425 boot2 to compile after r219452 Modified: head/sys/boot/arm/ixp425/boot2/boot2.c Modified: head/sys/boot/arm/ixp425/boot2/boot2.c ============================================================================== --- head/sys/boot/arm/ixp425/boot2/boot2.c Mon Oct 3 21:48:10 2011 (r225954) +++ head/sys/boot/arm/ixp425/boot2/boot2.c Tue Oct 4 00:15:40 2011 (r225955) @@ -86,7 +86,7 @@ static unsigned dsk_start; static char cmd[512]; static char kname[1024]; static uint32_t opts; -static int dsk_meta; +static uint8_t dsk_meta; static int bootslice; static int bootpart; static int disk_layout; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 00:29:10 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8ABCB106564A; Tue, 4 Oct 2011 00:29:10 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 713218FC16; Tue, 4 Oct 2011 00:29:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p940TAmK034311; Tue, 4 Oct 2011 00:29:10 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p940TAE2034309; Tue, 4 Oct 2011 00:29:10 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201110040029.p940TAE2034309@svn.freebsd.org> From: Ed Maste Date: Tue, 4 Oct 2011 00:29:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225956 - stable/8/usr.sbin/mfiutil X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 00:29:10 -0000 Author: emaste Date: Tue Oct 4 00:29:10 2011 New Revision: 225956 URL: http://svn.freebsd.org/changeset/base/225956 Log: MFC r225798: Improve battery capacity reporting When a status pointer is passed in mfi_dcmd_command does not return an errno (if the ioctl is successful), so move the test for NO_HW_PRESENT outside of the error case. This should fix incorrect reporting for systems with a dead or no battery. Additionally, handle error codes other than NO_HW_PRESENT by omitting the battery capacity display. LSI's supercap-based parts (CV series) report their data using the same interface as battery-based parts, except that they do not include the capacity stats (state of charge, cumulative charge cycles, etc.) PR: bin/160581 Modified: stable/8/usr.sbin/mfiutil/mfi_show.c Directory Properties: stable/8/usr.sbin/mfiutil/ (props changed) Modified: stable/8/usr.sbin/mfiutil/mfi_show.c ============================================================================== --- stable/8/usr.sbin/mfiutil/mfi_show.c Tue Oct 4 00:15:40 2011 (r225955) +++ stable/8/usr.sbin/mfiutil/mfi_show.c Tue Oct 4 00:29:10 2011 (r225956) @@ -141,7 +141,7 @@ show_battery(int ac, char **av) struct mfi_bbu_design_info design; struct mfi_bbu_status stat; uint8_t status; - int comma, error, fd; + int comma, error, fd, show_capacity; if (ac != 1) { warnx("show battery: extra arguments"); @@ -157,16 +157,17 @@ show_battery(int ac, char **av) if (mfi_dcmd_command(fd, MFI_DCMD_BBU_GET_CAPACITY_INFO, &cap, sizeof(cap), NULL, 0, &status) < 0) { - if (status == MFI_STAT_NO_HW_PRESENT) { - printf("mfi%d: No battery present\n", mfi_unit); - close(fd); - return (0); - } error = errno; warn("Failed to get capacity info"); close(fd); return (error); } + if (status == MFI_STAT_NO_HW_PRESENT) { + printf("mfi%d: No battery present\n", mfi_unit); + close(fd); + return (0); + } + show_capacity = (status == MFI_STAT_OK); if (mfi_dcmd_command(fd, MFI_DCMD_BBU_GET_DESIGN_INFO, &design, sizeof(design), NULL, 0, NULL) < 0) { @@ -192,10 +193,14 @@ show_battery(int ac, char **av) printf(" Model: %s\n", design.device_name); printf(" Chemistry: %s\n", design.device_chemistry); printf(" Design Capacity: %d mAh\n", design.design_capacity); - printf(" Full Charge Capacity: %d mAh\n", cap.full_charge_capacity); - printf(" Current Capacity: %d mAh\n", cap.remaining_capacity); - printf(" Charge Cycles: %d\n", cap.cycle_count); - printf(" Current Charge: %d%%\n", cap.relative_charge); + if (show_capacity) { + printf(" Full Charge Capacity: %d mAh\n", + cap.full_charge_capacity); + printf(" Current Capacity: %d mAh\n", + cap.remaining_capacity); + printf(" Charge Cycles: %d\n", cap.cycle_count); + printf(" Current Charge: %d%%\n", cap.relative_charge); + } printf(" Design Voltage: %d mV\n", design.design_voltage); printf(" Current Voltage: %d mV\n", stat.voltage); printf(" Temperature: %d C\n", stat.temperature); From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 00:32:11 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F9E3106564A; Tue, 4 Oct 2011 00:32:11 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 25F698FC13; Tue, 4 Oct 2011 00:32:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p940WBae034444; Tue, 4 Oct 2011 00:32:11 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p940WBY1034440; Tue, 4 Oct 2011 00:32:11 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110040032.p940WBY1034440@svn.freebsd.org> From: Adrian Chadd Date: Tue, 4 Oct 2011 00:32:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225957 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 00:32:11 -0000 Author: adrian Date: Tue Oct 4 00:32:10 2011 New Revision: 225957 URL: http://svn.freebsd.org/changeset/base/225957 Log: Add an AR5416 aware version of the "current RSSI" function. Pre-11n devices and AR5416 use AR_PHY(263) for current RX RSSI. AR9130 and later have a fourth calibration register (for doing ADC calibration) and thus the register has moved to AR_PHY(271). This isn't currently used by any of the active code; I'm committing this for completeness and in case any third party code attempts to use it for legacy reasons. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416.h head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416.h Tue Oct 4 00:29:10 2011 (r225956) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416.h Tue Oct 4 00:32:10 2011 (r225957) @@ -190,6 +190,7 @@ extern void ar5416SetLedState(struct ath extern uint64_t ar5416GetTsf64(struct ath_hal *ah); extern void ar5416SetTsf64(struct ath_hal *ah, uint64_t tsf64); extern void ar5416ResetTsf(struct ath_hal *ah); +extern uint32_t ar5416GetCurRssi(struct ath_hal *ah); extern HAL_BOOL ar5416SetAntennaSwitch(struct ath_hal *, HAL_ANT_SETTING); extern HAL_BOOL ar5416SetDecompMask(struct ath_hal *, uint16_t, int); extern void ar5416SetCoverageClass(struct ath_hal *, uint8_t, int); Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Tue Oct 4 00:29:10 2011 (r225956) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Tue Oct 4 00:32:10 2011 (r225957) @@ -143,6 +143,14 @@ ar5416ResetTsf(struct ath_hal *ah) OS_REG_WRITE(ah, AR_RESET_TSF, AR_RESET_TSF_ONCE); } +uint32_t +ar5416GetCurRssi(struct ath_hal *ah) +{ + if (AR_SREV_OWL(ah)) + return (OS_REG_READ(ah, AR_PHY_CURRENT_RSSI) & 0xff); + return (OS_REG_READ(ah, AR9130_PHY_CURRENT_RSSI) & 0xff); +} + HAL_BOOL ar5416SetAntennaSwitch(struct ath_hal *ah, HAL_ANT_SETTING settings) { Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h Tue Oct 4 00:29:10 2011 (r225956) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h Tue Oct 4 00:32:10 2011 (r225957) @@ -156,8 +156,14 @@ #define AR_PHY_CAL_MEAS_0(_i) (0x9c10 + ((_i) << 12)) #define AR_PHY_CAL_MEAS_1(_i) (0x9c14 + ((_i) << 12)) #define AR_PHY_CAL_MEAS_2(_i) (0x9c18 + ((_i) << 12)) +/* This is AR9130 and later */ #define AR_PHY_CAL_MEAS_3(_i) (0x9c1c + ((_i) << 12)) +/* + * AR5416 still uses AR_PHY(263) for current RSSI; + * AR9130 and later uses AR_PHY(271). + */ +#define AR9130_PHY_CURRENT_RSSI 0x9c3c /* rssi of current frame rx'd */ #define AR_PHY_CCA 0x9864 #define AR_PHY_MINCCA_PWR 0x0FF80000 From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 02:01:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 730011065670; Tue, 4 Oct 2011 02:01:04 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.freebsd.org (Postfix) with ESMTP id DD2AE8FC0A; Tue, 4 Oct 2011 02:01:03 +0000 (UTC) Received: from ur.gsoft.com.au (Ur.gsoft.com.au [203.31.81.44]) (authenticated bits=0) by cain.gsoft.com.au (8.14.4/8.14.3) with ESMTP id p941Zsx6081250 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 4 Oct 2011 12:05:59 +1030 (CST) (envelope-from doconnor@gsoft.com.au) Mime-Version: 1.0 (Apple Message framework v1244.3) Content-Type: text/plain; charset=windows-1252 From: "Daniel O'Connor" In-Reply-To: Date: Tue, 4 Oct 2011 12:05:54 +1030 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201110031513.p93FD9ev015593@svn.freebsd.org> To: Craig Rodrigues X-Mailer: Apple Mail (2.1244.3) X-Spam-Score: -4.391 () ALL_TRUSTED,BAYES_00,RP_MATCHES_RCVD X-Scanned-By: MIMEDefang 2.67 on 203.31.81.10 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Nathan Whitehorn Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 02:01:04 -0000 On 04/10/2011, at 8:41, Craig Rodrigues wrote: > Can bsdinstall be used as a drop-in replacement for > sysinstall when run with the "SCRIPT SYNTAX" batch mode? > If not, how much code would need to be added to bsdinstall? Or, is = there > some other utility, such as something from the PC-BSD suite of = scripts, > that can be used as a drop-in replacement for sysinstall in "SCRIPT > SYNTAX" mode? No it can't, but speaking as someone who used this feature in = sysinstall=85 Good riddance :) I wrote a shell script which does an install itself (i.e. no bsdinstall = - which is just [mostly] a shell script). It is 200 lines, a fair chunk of which is pre-canned stuff to go into = rc.conf, loader.conf, etc.. http://www.gsoft.com.au/~doconnor/install-os.sh I also modified the rc.local script the installer uses to add an option = to call my script. > Thanks. > --=20 > Craig Rodrigues > rodrigc@crodrigues.org > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" >=20 -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 06:39:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3178106564A; Tue, 4 Oct 2011 06:39:37 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id DCE7D8FC17; Tue, 4 Oct 2011 06:39:36 +0000 (UTC) Received: by bkbzs8 with SMTP id zs8so330459bkb.13 for ; Mon, 03 Oct 2011 23:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=abLRvur4GYIrkrB1IhiGpvFLYRC5IBjbP+9xx7piFzY=; b=pIkwXDbH8rOstkaQvYCkvXiEHyt9RhvyiESRDTtNSZWj0B+Payy1LSxV4tEI5xhnhW EKsZAmKUvb5nuZaBW3eQM5i6GPP6fG3ItV/W2i+iOJ/de9VBYA/DJDZonoAsFUC/lbMJ NWUZcOHFRzrEH9UbME+S24atZ+6rrXy70ON6Y= MIME-Version: 1.0 Received: by 10.204.129.4 with SMTP id m4mr430378bks.251.1317710375655; Mon, 03 Oct 2011 23:39:35 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.204.132.140 with HTTP; Mon, 3 Oct 2011 23:39:35 -0700 (PDT) In-Reply-To: References: <201110031513.p93FD9ev015593@svn.freebsd.org> Date: Mon, 3 Oct 2011 23:39:35 -0700 X-Google-Sender-Auth: QI1yheuMS033CnFUJxARIMcpKO4 Message-ID: From: Craig Rodrigues To: "Daniel O'Connor" Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Nathan Whitehorn Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 06:39:38 -0000 On Mon, Oct 3, 2011 at 6:35 PM, Daniel O'Connor wro= te: > > No it can't, but speaking as someone who used this feature in sysinstall= =85 Good riddance :) > > I wrote a shell script which does an install itself (i.e. no bsdinstall -= which is just [mostly] a shell script). > > It is 200 lines, a fair chunk of which is pre-canned stuff to go into rc.= conf, loader.conf, etc.. > > http://www.gsoft.com.au/~doconnor/install-os.sh > > I also modified the rc.local script the installer uses to add an option t= o call my script. Hi, Indeed, I have written my own Bourne shell based installers for FreeBSD in two different companies I have worked for. The path you went down to do this is not uncommon.....many people walk down the same path to write in their own installer in shell scripts, and the results are often better than sysinstall. However, I have seen at least two places which have written Jumpstart/Kicks= tart based installers based on sysinstall. This use case is not uncommon. For example, using an install.cfg was documented here, and people have followed it: http://www.freebsd.org/doc/en/articles/pxe/article.html If in the 10.0 timeframe, if we can provide something (bsdinstall, pc-sysinstall, whatever) that has some compatibility with the old sysinstall scripted syntax, that would be nice for users who have built installers based on this stuff. --=20 Craig Rodrigues rodrigc@crodrigues.org From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 07:00:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB14B106564A; Tue, 4 Oct 2011 07:00:07 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.freebsd.org (Postfix) with ESMTP id 351EE8FC12; Tue, 4 Oct 2011 07:00:06 +0000 (UTC) Received: from ur.gsoft.com.au (Ur.gsoft.com.au [203.31.81.44]) (authenticated bits=0) by cain.gsoft.com.au (8.14.4/8.14.3) with ESMTP id p946xoGk009562 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 4 Oct 2011 17:29:56 +1030 (CST) (envelope-from doconnor@gsoft.com.au) Mime-Version: 1.0 (Apple Message framework v1244.3) Content-Type: text/plain; charset=windows-1252 From: "Daniel O'Connor" In-Reply-To: Date: Tue, 4 Oct 2011 17:29:49 +1030 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201110031513.p93FD9ev015593@svn.freebsd.org> To: Craig Rodrigues X-Mailer: Apple Mail (2.1244.3) X-Spam-Score: -4.391 () ALL_TRUSTED,BAYES_00,RP_MATCHES_RCVD X-Scanned-By: MIMEDefang 2.67 on 203.31.81.10 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Nathan Whitehorn Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 07:00:09 -0000 On 04/10/2011, at 17:09, Craig Rodrigues wrote: > However, I have seen at least two places which have written = Jumpstart/Kickstart > based installers based on sysinstall. This use case is not uncommon. > For example, using an install.cfg was documented here, and people > have followed it: > http://www.freebsd.org/doc/en/articles/pxe/article.html >=20 >=20 > If in the 10.0 timeframe, if we can provide something (bsdinstall, > pc-sysinstall, whatever) that has some compatibility with the old > sysinstall scripted syntax, that would be nice for users who have > built installers based on this stuff. >=20 I suspect this would be problematic because bsdinstall is architected = differently to sysinstall and the later's scripting is based on calling = various C functions :( Also things like dist names are different.. Don't let me stop you writing it though ;) -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 09:55:16 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D26C1065673; Tue, 4 Oct 2011 09:55:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2C93E8FC1B; Tue, 4 Oct 2011 09:55:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p949tG9P052022; Tue, 4 Oct 2011 09:55:16 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p949tGO2052020; Tue, 4 Oct 2011 09:55:16 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110040955.p949tGO2052020@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 4 Oct 2011 09:55:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225961 - stable/8/libexec/rtld-elf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 09:55:16 -0000 Author: kib Date: Tue Oct 4 09:55:15 2011 New Revision: 225961 URL: http://svn.freebsd.org/changeset/base/225961 Log: MFC r225699: Restore the writing of the .bss sections of the dsos. Revert the optimization of using mprotect(2) to establish .bss, overlap the section with mmap(2). Modified: stable/8/libexec/rtld-elf/map_object.c Directory Properties: stable/8/libexec/rtld-elf/ (props changed) Modified: stable/8/libexec/rtld-elf/map_object.c ============================================================================== --- stable/8/libexec/rtld-elf/map_object.c Tue Oct 4 06:46:12 2011 (r225960) +++ stable/8/libexec/rtld-elf/map_object.c Tue Oct 4 09:55:15 2011 (r225961) @@ -209,8 +209,9 @@ map_object(int fd, const char *path, con bss_vlimit = round_page(segs[i]->p_vaddr + segs[i]->p_memsz); bss_addr = mapbase + (bss_vaddr - base_vaddr); if (bss_vlimit > bss_vaddr) { /* There is something to do */ - if (mprotect(bss_addr, bss_vlimit - bss_vaddr, data_prot) == -1) { - _rtld_error("%s: mprotect of bss failed: %s", path, + if (mmap(bss_addr, bss_vlimit - bss_vaddr, data_prot, + data_flags | MAP_ANON, -1, 0) == (caddr_t)-1) { + _rtld_error("%s: mmap of bss failed: %s", path, strerror(errno)); return NULL; } From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 10:00:29 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7319A1065675; Tue, 4 Oct 2011 10:00:29 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2D39C8FC20; Tue, 4 Oct 2011 10:00:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94A0TSn052272; Tue, 4 Oct 2011 10:00:29 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94A0T75052269; Tue, 4 Oct 2011 10:00:29 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201110041000.p94A0T75052269@svn.freebsd.org> From: Mikolaj Golub Date: Tue, 4 Oct 2011 10:00:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225962 - stable/9/usr.bin/script X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 10:00:29 -0000 Author: trociny Date: Tue Oct 4 10:00:28 2011 New Revision: 225962 URL: http://svn.freebsd.org/changeset/base/225962 Log: MFC r225809: When script(1) reads EOF from input it starts spinning on zero-byte reads eating 100% CPU. Fix this by skipping select on STDIN after reading EOF -- permanently if STDIN is not terminal and for one second if it is. Also after reading EOF from STDIN we have to pass it to the program being scripted. The previous approach was to write zero bytes into the pseudo-terminal. This does not work because zero-byte write does not have any effect on read. Fix this by sending VEOF instead. Submitted by: Ronald Klop Discussed with: kib, Chris Torek Approved by: re (kib) Modified: stable/9/usr.bin/script/script.1 stable/9/usr.bin/script/script.c Directory Properties: stable/9/usr.bin/script/ (props changed) Modified: stable/9/usr.bin/script/script.1 ============================================================================== --- stable/9/usr.bin/script/script.1 Tue Oct 4 09:55:15 2011 (r225961) +++ stable/9/usr.bin/script/script.1 Tue Oct 4 10:00:28 2011 (r225962) @@ -166,3 +166,12 @@ The slave terminal mode is checked for ECHO mode to check when to avoid manual echo logging. This does not work when in a raw mode where the program being run is doing manual echo. +.Pp +If the +.Nm +reads zero bytes from the terminal it switches to a mode when it probes read +only once a second until it gets some data. +This prevents the +.Nm +spinning on zero-byte reads, but might cause a 1-second delay in +processing of the user input. Modified: stable/9/usr.bin/script/script.c ============================================================================== --- stable/9/usr.bin/script/script.c Tue Oct 4 09:55:15 2011 (r225961) +++ stable/9/usr.bin/script/script.c Tue Oct 4 10:00:28 2011 (r225962) @@ -86,6 +86,7 @@ main(int argc, char *argv[]) char ibuf[BUFSIZ]; fd_set rfd; int flushtime = 30; + int readstdin; aflg = kflg = 0; while ((ch = getopt(argc, argv, "aqkt:")) != -1) @@ -155,19 +156,21 @@ main(int argc, char *argv[]) doshell(argv); close(slave); - if (flushtime > 0) - tvp = &tv; - else - tvp = NULL; - - start = time(0); - FD_ZERO(&rfd); + start = tvec = time(0); + readstdin = 1; for (;;) { + FD_ZERO(&rfd); FD_SET(master, &rfd); - FD_SET(STDIN_FILENO, &rfd); - if (flushtime > 0) { - tv.tv_sec = flushtime; + if (readstdin) + FD_SET(STDIN_FILENO, &rfd); + if ((!readstdin && ttyflg) || flushtime > 0) { + tv.tv_sec = !readstdin && ttyflg ? 1 : + flushtime - (tvec - start); tv.tv_usec = 0; + tvp = &tv; + readstdin = 1; + } else { + tvp = NULL; } n = select(master + 1, &rfd, 0, 0, tvp); if (n < 0 && errno != EINTR) @@ -176,8 +179,13 @@ main(int argc, char *argv[]) cc = read(STDIN_FILENO, ibuf, BUFSIZ); if (cc < 0) break; - if (cc == 0) - (void)write(master, ibuf, 0); + if (cc == 0) { + if (tcgetattr(master, &stt) == 0 && + (stt.c_lflag & ICANON) != 0) { + (void)write(master, &stt.c_cc[VEOF], 1); + } + readstdin = 0; + } if (cc > 0) { (void)write(master, ibuf, cc); if (kflg && tcgetattr(master, &stt) >= 0 && From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 10:02:14 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89223106566C; Tue, 4 Oct 2011 10:02:14 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 60A608FC1F; Tue, 4 Oct 2011 10:02:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94A2Ela052386; Tue, 4 Oct 2011 10:02:14 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94A2Elo052384; Tue, 4 Oct 2011 10:02:14 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201110041002.p94A2Elo052384@svn.freebsd.org> From: Alexander Motin Date: Tue, 4 Oct 2011 10:02:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225963 - stable/9/sys/powerpc/powerpc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 10:02:14 -0000 Author: mav Date: Tue Oct 4 10:02:14 2011 New Revision: 225963 URL: http://svn.freebsd.org/changeset/base/225963 Log: MFC 225953: Revert r225875, r225877: It is reported that on some chips (e.g. the 970MP) behavior of POW bit set simultaneously with modifying other bits is undefined and may cause hangs. The race should be handled in some other way, but for now just get back. Reported by: nwitehorn Approved by: re (kib) Modified: stable/9/sys/powerpc/powerpc/cpu.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/powerpc/powerpc/cpu.c ============================================================================== --- stable/9/sys/powerpc/powerpc/cpu.c Tue Oct 4 10:00:28 2011 (r225962) +++ stable/9/sys/powerpc/powerpc/cpu.c Tue Oct 4 10:02:14 2011 (r225963) @@ -65,7 +65,6 @@ #include #include #include -#include #include #include @@ -554,11 +553,6 @@ cpu_idle_60x(void) vers = mfpvr() >> 16; #ifdef AIM - mtmsr(msr & ~PSL_EE); - if (sched_runnable()) { - mtmsr(msr); - return; - } switch (vers) { case IBM970: case IBM970FX: @@ -589,11 +583,6 @@ cpu_idle_e500(void) msr = mfmsr(); #ifdef E500 - mtmsr(msr & ~PSL_EE); - if (sched_runnable()) { - mtmsr(msr); - return; - } /* Freescale E500 core RM section 6.4.1. */ __asm __volatile("msync; mtmsr %0; isync" :: "r" (msr | PSL_WE)); From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 10:08:02 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6432A106564A; Tue, 4 Oct 2011 10:08:02 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 540258FC13; Tue, 4 Oct 2011 10:08:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94A82Jd052715; Tue, 4 Oct 2011 10:08:02 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94A82av052712; Tue, 4 Oct 2011 10:08:02 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110041008.p94A82av052712@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 4 Oct 2011 10:08:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225964 - in stable/8: etc/mtree include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 10:08:02 -0000 Author: kib Date: Tue Oct 4 10:08:02 2011 New Revision: 225964 URL: http://svn.freebsd.org/changeset/base/225964 Log: MFC r225790: Install ciss(4) ioctl header. PR: kern/109813 Modified: stable/8/etc/mtree/BSD.include.dist stable/8/include/Makefile Directory Properties: stable/8/etc/ (props changed) stable/8/include/ (props changed) Modified: stable/8/etc/mtree/BSD.include.dist ============================================================================== --- stable/8/etc/mtree/BSD.include.dist Tue Oct 4 10:02:14 2011 (r225963) +++ stable/8/etc/mtree/BSD.include.dist Tue Oct 4 10:08:02 2011 (r225964) @@ -92,6 +92,8 @@ .. bktr .. + ciss + .. firewire .. hwpmc Modified: stable/8/include/Makefile ============================================================================== --- stable/8/include/Makefile Tue Oct 4 10:02:14 2011 (r225963) +++ stable/8/include/Makefile Tue Oct 4 10:08:02 2011 (r225964) @@ -39,7 +39,7 @@ LDIRS= bsm cam geom net net80211 netatal sys vm LSUBDIRS= cam/ata cam/scsi \ - dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ + dev/acpica dev/an dev/bktr dev/ciss dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:02:49 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57F80106566C; Tue, 4 Oct 2011 11:02:49 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E8798FC08; Tue, 4 Oct 2011 11:02:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94B2nRw054516; Tue, 4 Oct 2011 11:02:49 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94B2neP054513; Tue, 4 Oct 2011 11:02:49 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201110041102.p94B2neP054513@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 4 Oct 2011 11:02:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225965 - in stable/9/sys: modules/ipfw netinet/ipfw X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:02:49 -0000 Author: bz Date: Tue Oct 4 11:02:48 2011 New Revision: 225965 URL: http://svn.freebsd.org/changeset/base/225965 Log: MFC r225793: Unbreak no-ip and no-inet6 module builds with ipfw. For now continue to build the ip_fw_pfil.c hooks and ipfw even in case of no-ip under the assumption that the private L2 hook (which hopefully eventually will be a pfil hook as well) can still be useful. Allow building the module without inet as well. Approved by: re (kib) Modified: stable/9/sys/modules/ipfw/Makefile stable/9/sys/netinet/ipfw/ip_fw_pfil.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/modules/ipfw/Makefile ============================================================================== --- stable/9/sys/modules/ipfw/Makefile Tue Oct 4 10:08:02 2011 (r225964) +++ stable/9/sys/modules/ipfw/Makefile Tue Oct 4 11:02:48 2011 (r225965) @@ -8,7 +8,7 @@ KMOD= ipfw SRCS= ip_fw2.c ip_fw_pfil.c SRCS+= ip_fw_dynamic.c ip_fw_log.c SRCS+= ip_fw_sockopt.c ip_fw_table.c -SRCS+= opt_inet6.h opt_ipfw.h opt_ipsec.h +SRCS+= opt_inet.h opt_inet6.h opt_ipfw.h opt_ipsec.h CFLAGS+= -DIPFIREWALL CFLAGS+= -I${.CURDIR}/../../contrib/pf @@ -22,6 +22,10 @@ CFLAGS+= -I${.CURDIR}/../../contrib/pf # .if !defined(KERNBUILDDIR) +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + echo "#define INET 1" > ${.TARGET} +.endif .if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} Modified: stable/9/sys/netinet/ipfw/ip_fw_pfil.c ============================================================================== --- stable/9/sys/netinet/ipfw/ip_fw_pfil.c Tue Oct 4 10:08:02 2011 (r225964) +++ stable/9/sys/netinet/ipfw/ip_fw_pfil.c Tue Oct 4 11:02:48 2011 (r225965) @@ -31,11 +31,11 @@ __FBSDID("$FreeBSD$"); #if !defined(KLD_MODULE) #include "opt_ipdn.h" #include "opt_inet.h" +#include "opt_inet6.h" #ifndef INET #error IPFIREWALL requires INET. #endif /* INET */ #endif /* KLD_MODULE */ -#include "opt_inet6.h" #include #include @@ -154,7 +154,7 @@ again: /* next_hop may be set by ipfw_chk */ if (args.next_hop == NULL && args.next_hop6 == NULL) break; /* pass */ -#ifndef IPFIREWALL_FORWARD +#if !defined(IPFIREWALL_FORWARD) || (!defined(INET6) && !defined(INET)) ret = EACCES; #else { @@ -205,7 +205,7 @@ again: #endif m_tag_prepend(*m0, fwd_tag); } -#endif +#endif /* IPFIREWALL_FORWARD */ break; case IP_FW_DENY: From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:06:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF920106564A; Tue, 4 Oct 2011 11:06:00 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id E74188FC19; Tue, 4 Oct 2011 11:05:59 +0000 (UTC) Received: by eyg7 with SMTP id 7so476399eyg.13 for ; Tue, 04 Oct 2011 04:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=85G6l7cbX+bnfWj91twVejGLLqSpj4zu17ILLiM7b70=; b=HZ4NW9D7mIz8x8wpVpfwbP6tjPqhQg1nwMBMpafq4oLiDKKn5kxHTD8VEOqXH15qCx /JbH0s9A+CGlfB9OZVNXIHre5+cIla61P53a+ukZGpC5OJUTuzsksLPCPoAay8Xctrww /nDUbnch/8hk6NkgoFFUnXsoUsobJby3mw5tM= MIME-Version: 1.0 Received: by 10.216.134.201 with SMTP id s51mr753440wei.27.1317726358183; Tue, 04 Oct 2011 04:05:58 -0700 (PDT) Sender: asmrookie@gmail.com Received: by 10.216.182.3 with HTTP; Tue, 4 Oct 2011 04:05:58 -0700 (PDT) In-Reply-To: <20111004043232.K11186@besplex.bde.org> References: <201109041307.p84D72GY092462@svn.freebsd.org> <20110905023251.C832@besplex.bde.org> <20111004043232.K11186@besplex.bde.org> Date: Tue, 4 Oct 2011 13:05:58 +0200 X-Google-Sender-Auth: FGn8NYRK9qDQVJIYm0Sgu-_qH7Q Message-ID: From: Attilio Rao To: Bruce Evans Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225372 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:06:00 -0000 2011/10/3 Bruce Evans : > On Mon, 26 Sep 2011, Attilio Rao wrote: > >> 2011/9/4 Bruce Evans : >>> >>> On Sun, 4 Sep 2011, Attilio Rao wrote: >>> >>>> Also please notice that intr enable/disable happens in the wrong way >>>> as it is done via the MD (x86 specific likely) interface. This is >>>> wrong for 2 reasons: >>> >>> No, intr_disable() is MI. =C2=A0It is also used by witness. =C2=A0disab= le_intr() >>> is the corresponding x86 interface that you may be thinking of. =C2=A0T= he MI >>> interface intr_disable() was introduced to avoid the MD'ness of >>> intr_disable(). >> >> I was a bit surprised to verify that you are right but >> spinlock_enter() has the big difference besides disable_intr() of also >> explicitly disabling preemption via critical_enter() which some >> codepath can trigger without even noticing it. >> This means it is more safer in presence of PREEMPTION option on and >> thus should be preferred to the normal intr_disable(), in particular >> for convoluted codepaths. > > I think this is another implementation detail which shouldn't be depended > on. =C2=A0Spinlocks may or may not need either interrupts disabled or a c= ritical > section to work. =C2=A0Now I'm a little surprised to remember that they u= se a > critical section. =C2=A0This is to prevent context switching. =C2=A0It is= useful > behaviour, but not strictly necessary. > > Since disabling interrupts also prevents context switching (excep by bugg= y > trap handlers including NMI), it is safe to use hard interrupt disabling > instead of critical_enter() to prevent context switching. =C2=A0This is s= afe > because code that has interrupts disabled cannot wander off into other > code that doesn't understand this and does context switching! (unless it > is broken). =C2=A0But for preventing context switching, critical_enter() = is > better now that it doesn't hard-disable interrupts internally. This is not entirely correct, infact you may have preemption even with interrupts disabled by calling code that schedule threads. This is why spinlock_enter() disables interrupts _and_ preemption altogether. Look for example at hardclock() and its internal magic (this is what I meant, earlier, with "non convoluted codepaths"). >> Can you please explain more about the 'h/w interrupts not disabled' in >> X86? >> Are you speaking about NMIs? For those the only way to effectively >> mask them would be to reprogram the LAPIC entry, but I don't really >> think we may want that. > > This is in my version of x86. =C2=A0mtx_lock_spin() is entirely in softwa= re > (and deconvoluted -- no macros -- for at least the non-LOCK_DEBUG case): > > % void > % mtx_lock_spin(struct mtx *mp) > % { > % =C2=A0 =C2=A0 =C2=A0 struct thread *td; > % % =C2=A0 =C2=A0 td =3D curthread; > % =C2=A0 =C2=A0 =C2=A0 td->td_critnest++; > > The previous line is the entire critical_enter() manually inlined > (except the full critical_enter() has lots of instrumentation cruft). > -current has spinlock_enter() here. > > -current used to have critical_enter() here (actually in the macro > correspoding to this) instead. =C2=A0This depended on critical_enter() be= ing > pessimal and always doing a hard interrupt disable. =C2=A0The hard interr= upt > disable is needed as an implementation detail for -current in the !SMP > case, but for most other uses it is not needed. =C2=A0The pessimization w= as > rediced in -current by moving this hard interrupt disable from > critical_enter() to the spinlock_enter() cases that need it (currently > all?). =C2=A0This optimized critical_enter() to just an increment of > td_critnest, exactly the same as in my version except for instrumentation > (mine has lots of messy timing stuff but -current has a single CTR4()). > My version also optimizes away the hard interrupt disable. > > The resulting critical_enter() really should be an inline. =C2=A0I only d= id > this in the manual inlining above. =C2=A0This handles most cases of inter= est. > By un-inlining (un-macroizing) mtx_lock_spin(), but inlining > critical_enter(), I get the same number of function calls but much smalle= r > code since it is the tiny critical_enter() function and not the big > mtx_lock_spin() one that is inlined. I'm not entirely sure I follow. In -CURRENT, right now mtx_lock_spin() just yields _mtx_lock_spin_flags() which is not inlined. So the improvement here is just to have inlined critical_enter()? How this can lead to smaller code? > % =C2=A0 =C2=A0 =C2=A0 if (!_obtain_lock(mp, td)) { > % =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (mp->mtx_lock =3D= =3D (uintptr_t)td) > % =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 (mp)->mtx_recurse++; > % =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 else > % =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 _mtx_lock_spin(mp, 0, NULL, 0); > % =C2=A0 =C2=A0 =C2=A0 } > > Essentially the same as in -current. > > % } > > The complications are mainly in critical_exit(): > - in my version, when td_critnest is decremented to 0, a MD function is > =C2=A0called to "unpend" any pending interrupts that have accumulated whi= le > =C2=A0in the critical region. =C2=A0Since mtx_lock_spin() doesn't hard-di= sable > =C2=A0interrupts, they may occur when a spinlock is held. =C2=A0Fast inte= rrupts > =C2=A0proceed. =C2=A0Others are blocked until critical_exit() unpends the= m. > =C2=A0This includes software interrupts. =C2=A0The only really complicate= d part > =C2=A0is letting fast interrupts proceed. =C2=A0Fast interrupt handlers c= annot > =C2=A0use or be blocked by any normal locking, since they don't respect > =C2=A0normal spinlocks. =C2=A0So for example, hardclock() cannot be a fas= t interrupt > =C2=A0handler. I don't think this is a good idea. We hardly rely on interrupts disabling during spinlock helding in order to get them be used by fast handlers and then avoid deadlocks with code running in interrupt/kernel context. >>> =C2=A0 =C2=A0(The interface here is slightly broken (non-MI). =C2=A0It = returns >>> register_t. >>> =C2=A0 =C2=A0This assumes that the interrupt state can be represented i= n a single >>> =C2=A0 =C2=A0register. =C2=A0The type critical_t exists to avoid the sa= me bug in an >>> =C2=A0 =C2=A0old version of critical_enter(). =C2=A0Now this type is ju= st bogus. >>> =C2=A0 =C2=A0critical_enter() no longer returns it. =C2=A0Instead, spin= lock_enter() uses >>> =C2=A0 =C2=A0a non-reentrant interface which stores what used to be the= return >>> value >>> =C2=A0 =C2=A0of critical_enter() in a per-thread MD data structure (md_= saved_pil >>> =C2=A0 =C2=A0in the above). =C2=A0Most or all arches use register_t for= this. =C2=A0This >>> =C2=A0 =C2=A0leaves critical_t as pure garbage -- the only remaining re= ferences to >>> =C2=A0 =C2=A0it are for its definition.) >> >> I mostly agree, I think we should have an MD specified type to replace >> register_t for this (it could alias it, if it is suitable, but this >> interface smells a lot like x86-centric). > > Really vax-centric. =C2=A0spl "levels" are from vax or earlier CPUs. =C2= =A0x86 > doesn't really have levels (the AT PIC has masks and precedences. =C2=A0T= he > precedences correspond to levels are but rarely depended on or programmed > specifically). =C2=A0alpha and sparc seem to have levels much closer to > vax. > > With only levels, even an 8-bit interface for the level is enough (255 > levels should be enough for anyone). =C2=A0With masks, even a 64-bit inte= rface > for the mask might not be enough. =C2=A0When masks were mapped to levels > for FreeBSD on i386, the largish set of possible mask values was mapped > into < 8 standard levels (tty, net, bio, etc). =C2=A0Related encoding of > MD details as cookies would probably work well enough in general. For cookie you just mean a void * ptr? Attilio --=20 Peace can only be achieved by understanding - A. Einstein From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:08:32 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D1D5106566B; Tue, 4 Oct 2011 11:08:32 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 22DE38FC15; Tue, 4 Oct 2011 11:08:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94B8WLR054738; Tue, 4 Oct 2011 11:08:32 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94B8Wuu054735; Tue, 4 Oct 2011 11:08:32 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201110041108.p94B8Wuu054735@svn.freebsd.org> From: Mikolaj Golub Date: Tue, 4 Oct 2011 11:08:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225966 - stable/8/usr.bin/script X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:08:32 -0000 Author: trociny Date: Tue Oct 4 11:08:31 2011 New Revision: 225966 URL: http://svn.freebsd.org/changeset/base/225966 Log: MFC r225809: When script(1) reads EOF from input it starts spinning on zero-byte reads eating 100% CPU. Fix this by skipping select on STDIN after reading EOF -- permanently if STDIN is not terminal and for one second if it is. Also after reading EOF from STDIN we have to pass it to the program being scripted. The previous approach was to write zero bytes into the pseudo-terminal. This does not work because zero-byte write does not have any effect on read. Fix this by sending VEOF instead. Submitted by: Ronald Klop Discussed with: kib, Chris Torek Modified: stable/8/usr.bin/script/script.1 stable/8/usr.bin/script/script.c Directory Properties: stable/8/usr.bin/script/ (props changed) Modified: stable/8/usr.bin/script/script.1 ============================================================================== --- stable/8/usr.bin/script/script.1 Tue Oct 4 11:02:48 2011 (r225965) +++ stable/8/usr.bin/script/script.1 Tue Oct 4 11:08:31 2011 (r225966) @@ -170,3 +170,12 @@ The slave terminal mode is checked for ECHO mode to check when to avoid manual echo logging. This does not work when in a raw mode where the program being run is doing manual echo. +.Pp +If the +.Nm +reads zero bytes from the terminal it switches to a mode when it probes read +only once a second until it gets some data. +This prevents the +.Nm +spinning on zero-byte reads, but might cause a 1-second delay in +processing of the user input. Modified: stable/8/usr.bin/script/script.c ============================================================================== --- stable/8/usr.bin/script/script.c Tue Oct 4 11:02:48 2011 (r225965) +++ stable/8/usr.bin/script/script.c Tue Oct 4 11:08:31 2011 (r225966) @@ -91,6 +91,7 @@ main(int argc, char *argv[]) char ibuf[BUFSIZ]; fd_set rfd; int flushtime = 30; + int readstdin; aflg = kflg = 0; while ((ch = getopt(argc, argv, "aqkt:")) != -1) @@ -160,19 +161,21 @@ main(int argc, char *argv[]) doshell(argv); close(slave); - if (flushtime > 0) - tvp = &tv; - else - tvp = NULL; - - start = time(0); - FD_ZERO(&rfd); + start = tvec = time(0); + readstdin = 1; for (;;) { + FD_ZERO(&rfd); FD_SET(master, &rfd); - FD_SET(STDIN_FILENO, &rfd); - if (flushtime > 0) { - tv.tv_sec = flushtime; + if (readstdin) + FD_SET(STDIN_FILENO, &rfd); + if ((!readstdin && ttyflg) || flushtime > 0) { + tv.tv_sec = !readstdin && ttyflg ? 1 : + flushtime - (tvec - start); tv.tv_usec = 0; + tvp = &tv; + readstdin = 1; + } else { + tvp = NULL; } n = select(master + 1, &rfd, 0, 0, tvp); if (n < 0 && errno != EINTR) @@ -181,8 +184,13 @@ main(int argc, char *argv[]) cc = read(STDIN_FILENO, ibuf, BUFSIZ); if (cc < 0) break; - if (cc == 0) - (void)write(master, ibuf, 0); + if (cc == 0) { + if (tcgetattr(master, &stt) == 0 && + (stt.c_lflag & ICANON) != 0) { + (void)write(master, &stt.c_cc[VEOF], 1); + } + readstdin = 0; + } if (cc > 0) { (void)write(master, ibuf, cc); if (kflg && tcgetattr(master, &stt) >= 0 && From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:08:45 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29A2E106578A; Tue, 4 Oct 2011 11:08:45 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 190738FC12; Tue, 4 Oct 2011 11:08:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94B8iIP054781; Tue, 4 Oct 2011 11:08:44 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94B8iuH054778; Tue, 4 Oct 2011 11:08:44 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110041108.p94B8iuH054778@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 4 Oct 2011 11:08:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225967 - in stable/9: etc/mtree include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:08:45 -0000 Author: kib Date: Tue Oct 4 11:08:44 2011 New Revision: 225967 URL: http://svn.freebsd.org/changeset/base/225967 Log: MFC r225790: Install ciss(4) ioctl header. PR: kern/109813 Approved by: re (bz) Modified: stable/9/etc/mtree/BSD.include.dist stable/9/include/Makefile Directory Properties: stable/9/etc/ (props changed) stable/9/include/ (props changed) Modified: stable/9/etc/mtree/BSD.include.dist ============================================================================== --- stable/9/etc/mtree/BSD.include.dist Tue Oct 4 11:08:31 2011 (r225966) +++ stable/9/etc/mtree/BSD.include.dist Tue Oct 4 11:08:44 2011 (r225967) @@ -96,6 +96,8 @@ .. bktr .. + ciss + .. firewire .. hwpmc Modified: stable/9/include/Makefile ============================================================================== --- stable/9/include/Makefile Tue Oct 4 11:08:31 2011 (r225966) +++ stable/9/include/Makefile Tue Oct 4 11:08:44 2011 (r225967) @@ -39,7 +39,7 @@ LDIRS= bsm cam geom net net80211 netatal sys vm LSUBDIRS= cam/ata cam/scsi \ - dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ + dev/acpica dev/an dev/bktr dev/ciss dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:10:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 554DE106566B; Tue, 4 Oct 2011 11:10:12 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3B33A8FC0A; Tue, 4 Oct 2011 11:10:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94BACgh054871; Tue, 4 Oct 2011 11:10:12 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94BACvW054868; Tue, 4 Oct 2011 11:10:12 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201110041110.p94BACvW054868@svn.freebsd.org> From: Mikolaj Golub Date: Tue, 4 Oct 2011 11:10:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225968 - stable/7/usr.bin/script X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:10:12 -0000 Author: trociny Date: Tue Oct 4 11:10:11 2011 New Revision: 225968 URL: http://svn.freebsd.org/changeset/base/225968 Log: MFC r225809: When script(1) reads EOF from input it starts spinning on zero-byte reads eating 100% CPU. Fix this by skipping select on STDIN after reading EOF -- permanently if STDIN is not terminal and for one second if it is. Also after reading EOF from STDIN we have to pass it to the program being scripted. The previous approach was to write zero bytes into the pseudo-terminal. This does not work because zero-byte write does not have any effect on read. Fix this by sending VEOF instead. Reported by: Ronald Klop Discussed with: kib, Chris Torek Modified: stable/7/usr.bin/script/script.1 stable/7/usr.bin/script/script.c Directory Properties: stable/7/usr.bin/script/ (props changed) Modified: stable/7/usr.bin/script/script.1 ============================================================================== --- stable/7/usr.bin/script/script.1 Tue Oct 4 11:08:44 2011 (r225967) +++ stable/7/usr.bin/script/script.1 Tue Oct 4 11:10:11 2011 (r225968) @@ -170,3 +170,12 @@ The slave terminal mode is checked for ECHO mode to check when to avoid manual echo logging. This does not work when in a raw mode where the program being run is doing manual echo. +.Pp +If the +.Nm +reads zero bytes from the terminal it switches to a mode when it probes read +only once a second until it gets some data. +This prevents the +.Nm +spinning on zero-byte reads, but might cause a 1-second delay in +processing of the user input. Modified: stable/7/usr.bin/script/script.c ============================================================================== --- stable/7/usr.bin/script/script.c Tue Oct 4 11:08:44 2011 (r225967) +++ stable/7/usr.bin/script/script.c Tue Oct 4 11:10:11 2011 (r225968) @@ -91,6 +91,7 @@ main(int argc, char *argv[]) char ibuf[BUFSIZ]; fd_set rfd; int flushtime = 30; + int readstdin; aflg = kflg = 0; while ((ch = getopt(argc, argv, "aqkt:")) != -1) @@ -159,19 +160,21 @@ main(int argc, char *argv[]) if (child == 0) doshell(argv); - if (flushtime > 0) - tvp = &tv; - else - tvp = NULL; - - start = time(0); - FD_ZERO(&rfd); + start = tvec = time(0); + readstdin = 1; for (;;) { + FD_ZERO(&rfd); FD_SET(master, &rfd); - FD_SET(STDIN_FILENO, &rfd); - if (flushtime > 0) { - tv.tv_sec = flushtime; + if (readstdin) + FD_SET(STDIN_FILENO, &rfd); + if ((!readstdin && ttyflg) || flushtime > 0) { + tv.tv_sec = !readstdin && ttyflg ? 1 : + flushtime - (tvec - start); tv.tv_usec = 0; + tvp = &tv; + readstdin = 1; + } else { + tvp = NULL; } n = select(master + 1, &rfd, 0, 0, tvp); if (n < 0 && errno != EINTR) @@ -180,8 +183,13 @@ main(int argc, char *argv[]) cc = read(STDIN_FILENO, ibuf, BUFSIZ); if (cc < 0) break; - if (cc == 0) - (void)write(master, ibuf, 0); + if (cc == 0) { + if (tcgetattr(master, &stt) == 0 && + (stt.c_lflag & ICANON) != 0) { + (void)write(master, &stt.c_cc[VEOF], 1); + } + readstdin = 0; + } if (cc > 0) { (void)write(master, ibuf, cc); if (kflg && tcgetattr(master, &stt) >= 0 && From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:23:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41174106566B; Tue, 4 Oct 2011 11:23:04 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3030E8FC14; Tue, 4 Oct 2011 11:23:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94BN4lB055349; Tue, 4 Oct 2011 11:23:04 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94BN4Pp055347; Tue, 4 Oct 2011 11:23:04 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110041123.p94BN4Pp055347@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 4 Oct 2011 11:23:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225969 - stable/8/lib/libc/stdtime X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:23:04 -0000 Author: kib Date: Tue Oct 4 11:23:03 2011 New Revision: 225969 URL: http://svn.freebsd.org/changeset/base/225969 Log: MFC r225677: Do not overallocate on the stack. Threaded code might use custom stack size. Modified: stable/8/lib/libc/stdtime/localtime.c Directory Properties: stable/8/lib/libc/stdtime/ (props changed) Modified: stable/8/lib/libc/stdtime/localtime.c ============================================================================== --- stable/8/lib/libc/stdtime/localtime.c Tue Oct 4 11:10:11 2011 (r225968) +++ stable/8/lib/libc/stdtime/localtime.c Tue Oct 4 11:23:03 2011 (r225969) @@ -388,12 +388,16 @@ register const int doextend; int fid; int stored; int nread; + int res; union { struct tzhead tzhead; char buf[2 * sizeof(struct tzhead) + 2 * sizeof *sp + 4 * TZ_MAX_TIMES]; - } u; + } *u; + + u = NULL; + res = -1; /* XXX The following is from OpenBSD, and I'm not sure it is correct */ if (name != NULL && issetugid() != 0) @@ -412,16 +416,24 @@ register const int doextend; ** to hold the longest file name string that the implementation ** guarantees can be opened." */ - char fullname[FILENAME_MAX + 1]; + char *fullname; + + fullname = malloc(FILENAME_MAX + 1); + if (fullname == NULL) + goto out; if (name[0] == ':') ++name; doaccess = name[0] == '/'; if (!doaccess) { - if ((p = TZDIR) == NULL) + if ((p = TZDIR) == NULL) { + free(fullname); return -1; - if ((strlen(p) + 1 + strlen(name) + 1) >= sizeof fullname) + } + if (strlen(p) + 1 + strlen(name) >= FILENAME_MAX) { + free(fullname); return -1; + } (void) strcpy(fullname, p); (void) strcat(fullname, "/"); (void) strcat(fullname, name); @@ -432,37 +444,45 @@ register const int doextend; doaccess = TRUE; name = fullname; } - if (doaccess && access(name, R_OK) != 0) + if (doaccess && access(name, R_OK) != 0) { + free(fullname); return -1; - if ((fid = _open(name, OPEN_MODE)) == -1) + } + if ((fid = _open(name, OPEN_MODE)) == -1) { + free(fullname); return -1; + } if ((_fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode)) { + free(fullname); _close(fid); return -1; } } - nread = _read(fid, u.buf, sizeof u.buf); + u = malloc(sizeof(*u)); + if (u == NULL) + goto out; + nread = _read(fid, u->buf, sizeof u->buf); if (_close(fid) < 0 || nread <= 0) - return -1; + goto out; for (stored = 4; stored <= 8; stored *= 2) { int ttisstdcnt; int ttisgmtcnt; - ttisstdcnt = (int) detzcode(u.tzhead.tzh_ttisstdcnt); - ttisgmtcnt = (int) detzcode(u.tzhead.tzh_ttisgmtcnt); - sp->leapcnt = (int) detzcode(u.tzhead.tzh_leapcnt); - sp->timecnt = (int) detzcode(u.tzhead.tzh_timecnt); - sp->typecnt = (int) detzcode(u.tzhead.tzh_typecnt); - sp->charcnt = (int) detzcode(u.tzhead.tzh_charcnt); - p = u.tzhead.tzh_charcnt + sizeof u.tzhead.tzh_charcnt; + ttisstdcnt = (int) detzcode(u->tzhead.tzh_ttisstdcnt); + ttisgmtcnt = (int) detzcode(u->tzhead.tzh_ttisgmtcnt); + sp->leapcnt = (int) detzcode(u->tzhead.tzh_leapcnt); + sp->timecnt = (int) detzcode(u->tzhead.tzh_timecnt); + sp->typecnt = (int) detzcode(u->tzhead.tzh_typecnt); + sp->charcnt = (int) detzcode(u->tzhead.tzh_charcnt); + p = u->tzhead.tzh_charcnt + sizeof u->tzhead.tzh_charcnt; if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS || sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES || sp->timecnt < 0 || sp->timecnt > TZ_MAX_TIMES || sp->charcnt < 0 || sp->charcnt > TZ_MAX_CHARS || (ttisstdcnt != sp->typecnt && ttisstdcnt != 0) || (ttisgmtcnt != sp->typecnt && ttisgmtcnt != 0)) - return -1; - if (nread - (p - u.buf) < + goto out; + if (nread - (p - u->buf) < sp->timecnt * stored + /* ats */ sp->timecnt + /* types */ sp->typecnt * 6 + /* ttinfos */ @@ -470,7 +490,7 @@ register const int doextend; sp->leapcnt * (stored + 4) + /* lsinfos */ ttisstdcnt + /* ttisstds */ ttisgmtcnt) /* ttisgmts */ - return -1; + goto out; for (i = 0; i < sp->timecnt; ++i) { sp->ats[i] = (stored == 4) ? detzcode(p) : detzcode64(p); @@ -479,7 +499,7 @@ register const int doextend; for (i = 0; i < sp->timecnt; ++i) { sp->types[i] = (unsigned char) *p++; if (sp->types[i] >= sp->typecnt) - return -1; + goto out; } for (i = 0; i < sp->typecnt; ++i) { struct ttinfo * ttisp; @@ -489,11 +509,11 @@ register const int doextend; p += 4; ttisp->tt_isdst = (unsigned char) *p++; if (ttisp->tt_isdst != 0 && ttisp->tt_isdst != 1) - return -1; + goto out; ttisp->tt_abbrind = (unsigned char) *p++; if (ttisp->tt_abbrind < 0 || ttisp->tt_abbrind > sp->charcnt) - return -1; + goto out; } for (i = 0; i < sp->charcnt; ++i) sp->chars[i] = *p++; @@ -518,7 +538,7 @@ register const int doextend; ttisp->tt_ttisstd = *p++; if (ttisp->tt_ttisstd != TRUE && ttisp->tt_ttisstd != FALSE) - return -1; + goto out; } } for (i = 0; i < sp->typecnt; ++i) { @@ -531,7 +551,7 @@ register const int doextend; ttisp->tt_ttisgmt = *p++; if (ttisp->tt_ttisgmt != TRUE && ttisp->tt_ttisgmt != FALSE) - return -1; + goto out; } } /* @@ -564,11 +584,11 @@ register const int doextend; /* ** If this is an old file, we're done. */ - if (u.tzhead.tzh_version[0] == '\0') + if (u->tzhead.tzh_version[0] == '\0') break; - nread -= p - u.buf; + nread -= p - u->buf; for (i = 0; i < nread; ++i) - u.buf[i] = p[i]; + u->buf[i] = p[i]; /* ** If this is a narrow integer time_t system, we're done. */ @@ -576,39 +596,43 @@ register const int doextend; break; } if (doextend && nread > 2 && - u.buf[0] == '\n' && u.buf[nread - 1] == '\n' && + u->buf[0] == '\n' && u->buf[nread - 1] == '\n' && sp->typecnt + 2 <= TZ_MAX_TYPES) { - struct state ts; + struct state *ts; register int result; - u.buf[nread - 1] = '\0'; - result = tzparse(&u.buf[1], &ts, FALSE); - if (result == 0 && ts.typecnt == 2 && - sp->charcnt + ts.charcnt <= TZ_MAX_CHARS) { + ts = malloc(sizeof(*ts)); + if (ts == NULL) + goto out; + u->buf[nread - 1] = '\0'; + result = tzparse(&u->buf[1], ts, FALSE); + if (result == 0 && ts->typecnt == 2 && + sp->charcnt + ts->charcnt <= TZ_MAX_CHARS) { for (i = 0; i < 2; ++i) - ts.ttis[i].tt_abbrind += + ts->ttis[i].tt_abbrind += sp->charcnt; - for (i = 0; i < ts.charcnt; ++i) + for (i = 0; i < ts->charcnt; ++i) sp->chars[sp->charcnt++] = - ts.chars[i]; + ts->chars[i]; i = 0; - while (i < ts.timecnt && - ts.ats[i] <= + while (i < ts->timecnt && + ts->ats[i] <= sp->ats[sp->timecnt - 1]) ++i; - while (i < ts.timecnt && + while (i < ts->timecnt && sp->timecnt < TZ_MAX_TIMES) { sp->ats[sp->timecnt] = - ts.ats[i]; + ts->ats[i]; sp->types[sp->timecnt] = sp->typecnt + - ts.types[i]; + ts->types[i]; ++sp->timecnt; ++i; } - sp->ttis[sp->typecnt++] = ts.ttis[0]; - sp->ttis[sp->typecnt++] = ts.ttis[1]; + sp->ttis[sp->typecnt++] = ts->ttis[0]; + sp->ttis[sp->typecnt++] = ts->ttis[1]; } + free(ts); } sp->goback = sp->goahead = FALSE; if (sp->timecnt > 1) { @@ -627,7 +651,10 @@ register const int doextend; break; } } - return 0; + res = 0; +out: + free(u); + return (res); } static int From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:35:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8716106566B; Tue, 4 Oct 2011 11:35:18 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C6F638FC08; Tue, 4 Oct 2011 11:35:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94BZICF055777; Tue, 4 Oct 2011 11:35:18 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94BZIBO055771; Tue, 4 Oct 2011 11:35:18 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201110041135.p94BZIBO055771@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 4 Oct 2011 11:35:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225970 - stable/9/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:35:19 -0000 Author: bz Date: Tue Oct 4 11:35:18 2011 New Revision: 225970 URL: http://svn.freebsd.org/changeset/base/225970 Log: MFC r225837: Pass the fibnum where we need filtering of the message on the rtsock allowing routing daemons to filter routing updates on an rtsock per FIB. Adjust raw_input() and split it into wrapper and a new function taking an optional callback argument even though we only have one consumer [1] to keep the hackish flags local to rtsock.c. Submitted by: multiple (see PR) Suggested by: rwatson [1] Reviewed by: rwatson PR: kern/134931 Approved by: re (kib) Modified: stable/9/sys/net/raw_cb.h stable/9/sys/net/raw_usrreq.c stable/9/sys/net/route.c stable/9/sys/net/route.h stable/9/sys/net/rtsock.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/net/raw_cb.h ============================================================================== --- stable/9/sys/net/raw_cb.h Tue Oct 4 11:23:03 2011 (r225969) +++ stable/9/sys/net/raw_cb.h Tue Oct 4 11:35:18 2011 (r225970) @@ -70,9 +70,14 @@ pr_init_t raw_init; * Library routines for raw socket usrreq functions; will always be wrapped * so that protocol-specific functions can be handled. */ +typedef int (*raw_input_cb_fn)(struct mbuf *, struct sockproto *, + struct sockaddr *, struct rawcb *); + int raw_attach(struct socket *, int); void raw_detach(struct rawcb *); void raw_input(struct mbuf *, struct sockproto *, struct sockaddr *); +void raw_input_ext(struct mbuf *, struct sockproto *, struct sockaddr *, + raw_input_cb_fn); /* * Generic pr_usrreqs entries for raw socket protocols, usually wrapped so Modified: stable/9/sys/net/raw_usrreq.c ============================================================================== --- stable/9/sys/net/raw_usrreq.c Tue Oct 4 11:23:03 2011 (r225969) +++ stable/9/sys/net/raw_usrreq.c Tue Oct 4 11:35:18 2011 (r225970) @@ -71,6 +71,14 @@ raw_init(void) void raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src) { + + return (raw_input_ext(m0, proto, src, NULL)); +} + +void +raw_input_ext(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src, + raw_input_cb_fn cb) +{ struct rawcb *rp; struct mbuf *m = m0; struct socket *last; @@ -83,6 +91,8 @@ raw_input(struct mbuf *m0, struct sockpr if (rp->rcb_proto.sp_protocol && rp->rcb_proto.sp_protocol != proto->sp_protocol) continue; + if (cb != NULL && (*cb)(m, proto, src, rp) != 0) + continue; if (last) { struct mbuf *n; n = m_copy(m, 0, (int)M_COPYALL); Modified: stable/9/sys/net/route.c ============================================================================== --- stable/9/sys/net/route.c Tue Oct 4 11:23:03 2011 (r225969) +++ stable/9/sys/net/route.c Tue Oct 4 11:35:18 2011 (r225970) @@ -384,7 +384,7 @@ miss: */ bzero(&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; - rt_missmsg(msgtype, &info, 0, err); + rt_missmsg_fib(msgtype, &info, 0, err, fibnum); } done: if (newrt) @@ -609,7 +609,7 @@ out: info.rti_info[RTAX_GATEWAY] = gateway; info.rti_info[RTAX_NETMASK] = netmask; info.rti_info[RTAX_AUTHOR] = src; - rt_missmsg(RTM_REDIRECT, &info, flags, error); + rt_missmsg_fib(RTM_REDIRECT, &info, flags, error, fibnum); if (ifa != NULL) ifa_free(ifa); } @@ -1522,7 +1522,7 @@ rtinit1(struct ifaddr *ifa, int cmd, int } RT_ADDREF(rt); RT_UNLOCK(rt); - rt_newaddrmsg(cmd, ifa, error, rt); + rt_newaddrmsg_fib(cmd, ifa, error, rt, fibnum); RT_LOCK(rt); RT_REMREF(rt); if (cmd == RTM_DELETE) { Modified: stable/9/sys/net/route.h ============================================================================== --- stable/9/sys/net/route.h Tue Oct 4 11:23:03 2011 (r225969) +++ stable/9/sys/net/route.h Tue Oct 4 11:35:18 2011 (r225970) @@ -369,7 +369,9 @@ void rt_ieee80211msg(struct ifnet *, in void rt_ifannouncemsg(struct ifnet *, int); void rt_ifmsg(struct ifnet *); void rt_missmsg(int, struct rt_addrinfo *, int, int); +void rt_missmsg_fib(int, struct rt_addrinfo *, int, int, int); void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *); +void rt_newaddrmsg_fib(int, struct ifaddr *, int, struct rtentry *, int); void rt_newmaddrmsg(int, struct ifmultiaddr *); int rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *); void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); Modified: stable/9/sys/net/rtsock.c ============================================================================== --- stable/9/sys/net/rtsock.c Tue Oct 4 11:23:03 2011 (r225969) +++ stable/9/sys/net/rtsock.c Tue Oct 4 11:35:18 2011 (r225970) @@ -122,6 +122,13 @@ MALLOC_DEFINE(M_RTABLE, "routetbl", "rou static struct sockaddr route_src = { 2, PF_ROUTE, }; static struct sockaddr sa_zero = { sizeof(sa_zero), AF_INET, }; +/* + * Used by rtsock/raw_input callback code to decide whether to filter the update + * notification to a socket bound to a particular FIB. + */ +#define RTS_FILTER_FIB M_PROTO8 +#define RTS_ALLFIBS -1 + static struct { int ip_count; /* attached w/ AF_INET */ int ip6_count; /* attached w/ AF_INET6 */ @@ -196,6 +203,31 @@ rts_init(void) } SYSINIT(rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rts_init, 0); +static int +raw_input_rts_cb(struct mbuf *m, struct sockproto *proto, struct sockaddr *src, + struct rawcb *rp) +{ + int fibnum; + + KASSERT(m != NULL, ("%s: m is NULL", __func__)); + KASSERT(proto != NULL, ("%s: proto is NULL", __func__)); + KASSERT(rp != NULL, ("%s: rp is NULL", __func__)); + + /* No filtering requested. */ + if ((m->m_flags & RTS_FILTER_FIB) == 0) + return (0); + + /* Check if it is a rts and the fib matches the one of the socket. */ + fibnum = M_GETFIB(m); + if (proto->sp_family != PF_ROUTE || + rp->rcb_socket == NULL || + rp->rcb_socket->so_fibnum == fibnum) + return (0); + + /* Filtering requested and no match, the socket shall be skipped. */ + return (1); +} + static void rts_input(struct mbuf *m) { @@ -212,7 +244,7 @@ rts_input(struct mbuf *m) } else route_proto.sp_protocol = 0; - raw_input(m, &route_proto, &route_src); + raw_input_ext(m, &route_proto, &route_src, raw_input_rts_cb); } /* @@ -885,6 +917,8 @@ flush: m_adj(m, rtm->rtm_msglen - m->m_pkthdr.len); } if (m) { + M_SETFIB(m, so->so_fibnum); + m->m_flags |= RTS_FILTER_FIB; if (rp) { /* * XXX insure we don't get a copy by @@ -1127,7 +1161,8 @@ again: * destination. */ void -rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) +rt_missmsg_fib(int type, struct rt_addrinfo *rtinfo, int flags, int error, + int fibnum) { struct rt_msghdr *rtm; struct mbuf *m; @@ -1138,6 +1173,14 @@ rt_missmsg(int type, struct rt_addrinfo m = rt_msg1(type, rtinfo); if (m == NULL) return; + + if (fibnum != RTS_ALLFIBS) { + KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: fibnum out " + "of range 0 <= %d < %d", __func__, fibnum, rt_numfibs)); + M_SETFIB(m, fibnum); + m->m_flags |= RTS_FILTER_FIB; + } + rtm = mtod(m, struct rt_msghdr *); rtm->rtm_flags = RTF_DONE | flags; rtm->rtm_errno = error; @@ -1145,6 +1188,13 @@ rt_missmsg(int type, struct rt_addrinfo rt_dispatch(m, sa); } +void +rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) +{ + + rt_missmsg_fib(type, rtinfo, flags, error, RTS_ALLFIBS); +} + /* * This routine is called to generate a message from the routing * socket indicating that the status of a network interface has changed. @@ -1179,7 +1229,8 @@ rt_ifmsg(struct ifnet *ifp) * copies of it. */ void -rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) +rt_newaddrmsg_fib(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt, + int fibnum) { struct rt_addrinfo info; struct sockaddr *sa = NULL; @@ -1237,10 +1288,24 @@ rt_newaddrmsg(int cmd, struct ifaddr *if rtm->rtm_errno = error; rtm->rtm_addrs = info.rti_addrs; } + if (fibnum != RTS_ALLFIBS) { + KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: " + "fibnum out of range 0 <= %d < %d", __func__, + fibnum, rt_numfibs)); + M_SETFIB(m, fibnum); + m->m_flags |= RTS_FILTER_FIB; + } rt_dispatch(m, sa); } } +void +rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) +{ + + rt_newaddrmsg_fib(cmd, ifa, error, rt, RTS_ALLFIBS); +} + /* * This is the analogue to the rt_newaddrmsg which performs the same * function but for multicast group memberhips. This is easier since From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 11:54:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 754AA106566B; Tue, 4 Oct 2011 11:54:57 +0000 (UTC) (envelope-from melifaro@yandex-team.ru) Received: from forward6.mail.yandex.net (forward6.mail.yandex.net [IPv6:2a02:6b8:0:202::1]) by mx1.freebsd.org (Postfix) with ESMTP id D1E978FC0C; Tue, 4 Oct 2011 11:54:53 +0000 (UTC) Received: from smtpcorp2.mail.yandex.net (smtpcorp2.mail.yandex.net [77.88.61.36]) by forward6.mail.yandex.net (Yandex) with ESMTP id F2A3CF82AF7; Tue, 4 Oct 2011 15:54:51 +0400 (MSD) Received: from smtpcorp2.mail.yandex.net (localhost [127.0.0.1]) by smtpcorp2.mail.yandex.net (Yandex) with ESMTP id DF1BD740110; Tue, 4 Oct 2011 15:54:51 +0400 (MSD) Received: from dhcp170-36-red.yandex.net (dhcp170-36-red.yandex.net [95.108.170.36]) by smtpcorp2.mail.yandex.net (nwsmtp/Yandex) with ESMTP id spLCWQo9; Tue, 4 Oct 2011 15:54:51 +0400 Message-ID: <4E8AF3AC.8050001@yandex-team.ru> Date: Tue, 04 Oct 2011 15:53:16 +0400 From: "Alexander V. Chernikov" User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.16) Gecko/20110120 Thunderbird/3.0.11 MIME-Version: 1.0 To: "Bjoern A. Zeeb" References: <201110041135.p94BZIBO055771@svn.freebsd.org> In-Reply-To: <201110041135.p94BZIBO055771@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Tue, 04 Oct 2011 12:24:26 +0000 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r225970 - stable/9/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 11:54:57 -0000 On 04.10.2011 15:35, Bjoern A. Zeeb wrote: > Author: bz > Date: Tue Oct 4 11:35:18 2011 > New Revision: 225970 > URL: http://svn.freebsd.org/changeset/base/225970 > > Log: > MFC r225837: Thanks for merging this very very long-awaited fix! From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 12:45:24 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E402E106566C; Tue, 4 Oct 2011 12:45:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D337F8FC1A; Tue, 4 Oct 2011 12:45:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94CjOdR057980; Tue, 4 Oct 2011 12:45:24 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94CjOZM057978; Tue, 4 Oct 2011 12:45:24 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201110041245.p94CjOZM057978@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 4 Oct 2011 12:45:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225971 - stable/9/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 12:45:25 -0000 Author: bz Date: Tue Oct 4 12:45:24 2011 New Revision: 225971 URL: http://svn.freebsd.org/changeset/base/225971 Log: MFC r225885: Fix an obvious bug from r186196 shadowing a variable, not correctly appending the new mbuf to the chain reference but possibly causing an mbuf nextpkt loop leading to a memory used after handoff (or having been freed) and leaking an mbuf here. Reviewed by: rwatson, brooks Approved by: re (kib) Modified: stable/9/sys/netinet6/nd6.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/netinet6/nd6.c ============================================================================== --- stable/9/sys/netinet6/nd6.c Tue Oct 4 11:35:18 2011 (r225970) +++ stable/9/sys/netinet6/nd6.c Tue Oct 4 12:45:24 2011 (r225971) @@ -2042,14 +2042,15 @@ nd6_output_lle(struct ifnet *ifp, struct if (*chain == NULL) *chain = m; else { - struct mbuf *m = *chain; + struct mbuf *mb; /* * append mbuf to end of deferred chain */ - while (m->m_nextpkt != NULL) - m = m->m_nextpkt; - m->m_nextpkt = m; + mb = *chain; + while (mb->m_nextpkt != NULL) + mb = mb->m_nextpkt; + mb->m_nextpkt = m; } return (error); } From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 13:14:24 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76E9C1065674; Tue, 4 Oct 2011 13:14:24 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 661578FC0A; Tue, 4 Oct 2011 13:14:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94DEOI7059014; Tue, 4 Oct 2011 13:14:24 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94DEOKY059010; Tue, 4 Oct 2011 13:14:24 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110041314.p94DEOKY059010@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 4 Oct 2011 13:14:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225973 - in head/sys/arm: arm include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 13:14:24 -0000 Author: kib Date: Tue Oct 4 13:14:24 2011 New Revision: 225973 URL: http://svn.freebsd.org/changeset/base/225973 Log: Convert ARM to the syscallenter/syscallret system call sequence handlers. Tested by: gber MFC after: 1 month Modified: head/sys/arm/arm/elf_machdep.c head/sys/arm/arm/trap.c head/sys/arm/include/proc.h Modified: head/sys/arm/arm/elf_machdep.c ============================================================================== --- head/sys/arm/arm/elf_machdep.c Tue Oct 4 13:05:07 2011 (r225972) +++ head/sys/arm/arm/elf_machdep.c Tue Oct 4 13:14:24 2011 (r225973) @@ -76,7 +76,7 @@ struct sysentvec elf32_freebsd_sysvec = .sv_maxssiz = NULL, .sv_flags = SV_ABI_FREEBSD | SV_ILP32, .sv_set_syscall_retval = cpu_set_syscall_retval, - .sv_fetch_syscall_args = NULL, /* XXXKIB */ + .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, .sv_schedtail = NULL, }; Modified: head/sys/arm/arm/trap.c ============================================================================== --- head/sys/arm/arm/trap.c Tue Oct 4 13:05:07 2011 (r225972) +++ head/sys/arm/arm/trap.c Tue Oct 4 13:14:24 2011 (r225973) @@ -861,98 +861,68 @@ badaddr_read(void *addr, size_t size, vo return (rv); } -#define MAXARGS 8 +int +cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa) +{ + struct proc *p; + register_t *ap; + int error; + + sa->code = sa->insn & 0x000fffff; + ap = &td->td_frame->tf_r0; + if (sa->code == SYS_syscall) { + sa->code = *ap++; + sa->nap--; + } else if (sa->code == SYS___syscall) { + sa->code = ap[_QUAD_LOWWORD]; + sa->nap -= 2; + ap += 2; + } + p = td->td_proc; + if (p->p_sysent->sv_mask) + sa->code &= p->p_sysent->sv_mask; + if (sa->code >= p->p_sysent->sv_size) + sa->callp = &p->p_sysent->sv_table[0]; + else + sa->callp = &p->p_sysent->sv_table[sa->code]; + sa->narg = sa->callp->sy_narg; + error = 0; + memcpy(sa->args, ap, sa->nap * sizeof(register_t)); + if (sa->narg > sa->nap) { + error = copyin((void *)td->td_frame->tf_usr_sp, sa->args + + sa->nap, (sa->narg - sa->nap) * sizeof(register_t)); + } + if (error == 0) { + td->td_retval[0] = 0; + td->td_retval[1] = 0; + } + return (error); +} + +#include "../../kern/subr_syscall.c" + static void syscall(struct thread *td, trapframe_t *frame, u_int32_t insn) { - struct proc *p = td->td_proc; - int code, error; - u_int nap, nargs; - register_t *ap, *args, copyargs[MAXARGS]; - struct sysent *callp; + struct syscall_args sa; + int error; - PCPU_INC(cnt.v_syscall); - td->td_pticks = 0; - if (td->td_ucred != td->td_proc->p_ucred) - cred_update_thread(td); + td->td_frame = frame; + sa.insn = insn; switch (insn & SWI_OS_MASK) { case 0: /* XXX: we need our own one. */ - nap = 4; + sa.nap = 4; break; default: call_trapsignal(td, SIGILL, 0); userret(td, frame); return; } - code = insn & 0x000fffff; - td->td_pticks = 0; - ap = &frame->tf_r0; - if (code == SYS_syscall) { - code = *ap++; - - nap--; - } else if (code == SYS___syscall) { - code = ap[_QUAD_LOWWORD]; - nap -= 2; - ap += 2; - } - 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]; - nargs = callp->sy_narg; - memcpy(copyargs, ap, nap * sizeof(register_t)); - if (nargs > nap) { - error = copyin((void *)frame->tf_usr_sp, copyargs + nap, - (nargs - nap) * sizeof(register_t)); - if (error) - goto bad; - } - args = copyargs; - error = 0; -#ifdef KTRACE - if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(code, nargs, args); -#endif - - CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, - td->td_proc->p_pid, td->td_name, code); - if (error == 0) { - td->td_retval[0] = 0; - td->td_retval[1] = 0; - STOPEVENT(p, S_SCE, callp->sy_narg); - PTRACESTOP_SC(p, td, S_PT_SCE); - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, args); - AUDIT_SYSCALL_EXIT(error, td); - KASSERT(td->td_ar == NULL, - ("returning from syscall with td_ar set!")); - } -bad: - cpu_set_syscall_retval(td, error); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - KASSERT(td->td_critnest == 0, - ("System call %s returning in a critical section", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); - KASSERT(td->td_locks == 0, - ("System call %s returning with %d locks held", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", - td->td_locks)); - - userret(td, frame); - CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, - td->td_proc->p_pid, td->td_name, code); - - STOPEVENT(p, S_SCX, code); - PTRACESTOP_SC(p, td, S_PT_SCX); -#ifdef KTRACE - if (KTRPOINT(td, KTR_SYSRET)) - ktrsysret(code, error, td->td_retval[0]); -#endif + + error = syscallenter(td, &sa); + KASSERT(error != 0 || td->td_ar == NULL, + ("returning from syscall with td_ar set!")); + syscallret(td, error, &sa); } void Modified: head/sys/arm/include/proc.h ============================================================================== --- head/sys/arm/include/proc.h Tue Oct 4 13:05:07 2011 (r225972) +++ head/sys/arm/include/proc.h Tue Oct 4 13:14:24 2011 (r225973) @@ -62,4 +62,15 @@ struct mdproc { #define KINFO_PROC_SIZE 792 +#define MAXARGS 8 +struct syscall_args { + u_int code; + struct sysent *callp; + register_t args[MAXARGS]; + int narg; + u_int nap; + u_int32_t insn; +}; +#define HAVE_SYSCALL_ARGS_DEF 1 + #endif /* !_MACHINE_PROC_H_ */ From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 13:15:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAC0C1065676; Tue, 4 Oct 2011 13:15:12 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DAC7A8FC1B; Tue, 4 Oct 2011 13:15:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94DFCdK059083; Tue, 4 Oct 2011 13:15:12 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94DFC49059081; Tue, 4 Oct 2011 13:15:12 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110041315.p94DFC49059081@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 4 Oct 2011 13:15:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225974 - head/lib/libc/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 13:15:13 -0000 Author: kib Date: Tue Oct 4 13:15:12 2011 New Revision: 225974 URL: http://svn.freebsd.org/changeset/base/225974 Log: Remove no longer valid statement about ARM. MFC after: 1 month Modified: head/lib/libc/sys/ptrace.2 Modified: head/lib/libc/sys/ptrace.2 ============================================================================== --- head/lib/libc/sys/ptrace.2 Tue Oct 4 13:14:24 2011 (r225973) +++ head/lib/libc/sys/ptrace.2 Tue Oct 4 13:15:12 2011 (r225974) @@ -2,7 +2,7 @@ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. -.Dd January 23, 2011 +.Dd October 3, 2011 .Dt PTRACE 2 .Os .Sh NAME @@ -606,4 +606,4 @@ The .Dv PL_FLAG_SCX and .Dv PL_FLAG_EXEC -are not implemented for MIPS and ARM architectures. +are not implemented for MIPS architecture. From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 13:18:14 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE8781065673; Tue, 4 Oct 2011 13:18:14 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D442D8FC08; Tue, 4 Oct 2011 13:18:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94DIEwD059220; Tue, 4 Oct 2011 13:18:14 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94DIE3o059214; Tue, 4 Oct 2011 13:18:14 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201110041318.p94DIE3o059214@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 4 Oct 2011 13:18:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225975 - stable/8/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 13:18:15 -0000 Author: bz Date: Tue Oct 4 13:18:14 2011 New Revision: 225975 URL: http://svn.freebsd.org/changeset/base/225975 Log: MFC r225837: Pass the fibnum where we need filtering of the message on the rtsock allowing routing daemons to filter routing updates on an rtsock per FIB. Adjust raw_input() and split it into wrapper and a new function taking an optional callback argument even though we only have one consumer [1] to keep the hackish flags local to rtsock.c. PR: kern/134931 Submitted by: multiple (see PR) Suggested by: rwatson [1] Reviewed by: rwatson Modified: stable/8/sys/net/raw_cb.h stable/8/sys/net/raw_usrreq.c stable/8/sys/net/route.c stable/8/sys/net/route.h stable/8/sys/net/rtsock.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/net/raw_cb.h ============================================================================== --- stable/8/sys/net/raw_cb.h Tue Oct 4 13:15:12 2011 (r225974) +++ stable/8/sys/net/raw_cb.h Tue Oct 4 13:18:14 2011 (r225975) @@ -70,9 +70,14 @@ pr_init_t raw_init; * Library routines for raw socket usrreq functions; will always be wrapped * so that protocol-specific functions can be handled. */ +typedef int (*raw_input_cb_fn)(struct mbuf *, struct sockproto *, + struct sockaddr *, struct rawcb *); + int raw_attach(struct socket *, int); void raw_detach(struct rawcb *); void raw_input(struct mbuf *, struct sockproto *, struct sockaddr *); +void raw_input_ext(struct mbuf *, struct sockproto *, struct sockaddr *, + raw_input_cb_fn); /* * Generic pr_usrreqs entries for raw socket protocols, usually wrapped so Modified: stable/8/sys/net/raw_usrreq.c ============================================================================== --- stable/8/sys/net/raw_usrreq.c Tue Oct 4 13:15:12 2011 (r225974) +++ stable/8/sys/net/raw_usrreq.c Tue Oct 4 13:18:14 2011 (r225975) @@ -71,6 +71,14 @@ raw_init(void) void raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src) { + + return (raw_input_ext(m0, proto, src, NULL)); +} + +void +raw_input_ext(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src, + raw_input_cb_fn cb) +{ struct rawcb *rp; struct mbuf *m = m0; struct socket *last; @@ -83,6 +91,8 @@ raw_input(struct mbuf *m0, struct sockpr if (rp->rcb_proto.sp_protocol && rp->rcb_proto.sp_protocol != proto->sp_protocol) continue; + if (cb != NULL && (*cb)(m, proto, src, rp) != 0) + continue; if (last) { struct mbuf *n; n = m_copy(m, 0, (int)M_COPYALL); Modified: stable/8/sys/net/route.c ============================================================================== --- stable/8/sys/net/route.c Tue Oct 4 13:15:12 2011 (r225974) +++ stable/8/sys/net/route.c Tue Oct 4 13:18:14 2011 (r225975) @@ -390,7 +390,7 @@ miss: */ bzero(&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; - rt_missmsg(msgtype, &info, 0, err); + rt_missmsg_fib(msgtype, &info, 0, err, fibnum); } done: if (newrt) @@ -615,7 +615,7 @@ out: info.rti_info[RTAX_GATEWAY] = gateway; info.rti_info[RTAX_NETMASK] = netmask; info.rti_info[RTAX_AUTHOR] = src; - rt_missmsg(RTM_REDIRECT, &info, flags, error); + rt_missmsg_fib(RTM_REDIRECT, &info, flags, error, fibnum); if (ifa != NULL) ifa_free(ifa); } @@ -1527,7 +1527,7 @@ rtinit1(struct ifaddr *ifa, int cmd, int } RT_ADDREF(rt); RT_UNLOCK(rt); - rt_newaddrmsg(cmd, ifa, error, rt); + rt_newaddrmsg_fib(cmd, ifa, error, rt, fibnum); RT_LOCK(rt); RT_REMREF(rt); if (cmd == RTM_DELETE) { Modified: stable/8/sys/net/route.h ============================================================================== --- stable/8/sys/net/route.h Tue Oct 4 13:15:12 2011 (r225974) +++ stable/8/sys/net/route.h Tue Oct 4 13:18:14 2011 (r225975) @@ -367,7 +367,9 @@ void rt_ieee80211msg(struct ifnet *, in void rt_ifannouncemsg(struct ifnet *, int); void rt_ifmsg(struct ifnet *); void rt_missmsg(int, struct rt_addrinfo *, int, int); +void rt_missmsg_fib(int, struct rt_addrinfo *, int, int, int); void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *); +void rt_newaddrmsg_fib(int, struct ifaddr *, int, struct rtentry *, int); void rt_newmaddrmsg(int, struct ifmultiaddr *); int rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *); void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); Modified: stable/8/sys/net/rtsock.c ============================================================================== --- stable/8/sys/net/rtsock.c Tue Oct 4 13:15:12 2011 (r225974) +++ stable/8/sys/net/rtsock.c Tue Oct 4 13:18:14 2011 (r225975) @@ -122,6 +122,13 @@ MALLOC_DEFINE(M_RTABLE, "routetbl", "rou static struct sockaddr route_src = { 2, PF_ROUTE, }; static struct sockaddr sa_zero = { sizeof(sa_zero), AF_INET, }; +/* + * Used by rtsock/raw_input callback code to decide whether to filter the update + * notification to a socket bound to a particular FIB. + */ +#define RTS_FILTER_FIB M_PROTO8 +#define RTS_ALLFIBS -1 + static struct { int ip_count; /* attached w/ AF_INET */ int ip6_count; /* attached w/ AF_INET6 */ @@ -196,6 +203,31 @@ rts_init(void) } SYSINIT(rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rts_init, 0); +static int +raw_input_rts_cb(struct mbuf *m, struct sockproto *proto, struct sockaddr *src, + struct rawcb *rp) +{ + int fibnum; + + KASSERT(m != NULL, ("%s: m is NULL", __func__)); + KASSERT(proto != NULL, ("%s: proto is NULL", __func__)); + KASSERT(rp != NULL, ("%s: rp is NULL", __func__)); + + /* No filtering requested. */ + if ((m->m_flags & RTS_FILTER_FIB) == 0) + return (0); + + /* Check if it is a rts and the fib matches the one of the socket. */ + fibnum = M_GETFIB(m); + if (proto->sp_family != PF_ROUTE || + rp->rcb_socket == NULL || + rp->rcb_socket->so_fibnum == fibnum) + return (0); + + /* Filtering requested and no match, the socket shall be skipped. */ + return (1); +} + static void rts_input(struct mbuf *m) { @@ -212,7 +244,7 @@ rts_input(struct mbuf *m) } else route_proto.sp_protocol = 0; - raw_input(m, &route_proto, &route_src); + raw_input_ext(m, &route_proto, &route_src, raw_input_rts_cb); } /* @@ -886,6 +918,8 @@ flush: Free(rtm); } if (m) { + M_SETFIB(m, so->so_fibnum); + m->m_flags |= RTS_FILTER_FIB; if (rp) { /* * XXX insure we don't get a copy by @@ -1125,7 +1159,8 @@ again: * destination. */ void -rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) +rt_missmsg_fib(int type, struct rt_addrinfo *rtinfo, int flags, int error, + int fibnum) { struct rt_msghdr *rtm; struct mbuf *m; @@ -1136,6 +1171,14 @@ rt_missmsg(int type, struct rt_addrinfo m = rt_msg1(type, rtinfo); if (m == NULL) return; + + if (fibnum != RTS_ALLFIBS) { + KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: fibnum out " + "of range 0 <= %d < %d", __func__, fibnum, rt_numfibs)); + M_SETFIB(m, fibnum); + m->m_flags |= RTS_FILTER_FIB; + } + rtm = mtod(m, struct rt_msghdr *); rtm->rtm_flags = RTF_DONE | flags; rtm->rtm_errno = error; @@ -1143,6 +1186,13 @@ rt_missmsg(int type, struct rt_addrinfo rt_dispatch(m, sa); } +void +rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) +{ + + rt_missmsg_fib(type, rtinfo, flags, error, RTS_ALLFIBS); +} + /* * This routine is called to generate a message from the routing * socket indicating that the status of a network interface has changed. @@ -1177,7 +1227,8 @@ rt_ifmsg(struct ifnet *ifp) * copies of it. */ void -rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) +rt_newaddrmsg_fib(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt, + int fibnum) { struct rt_addrinfo info; struct sockaddr *sa = NULL; @@ -1235,10 +1286,24 @@ rt_newaddrmsg(int cmd, struct ifaddr *if rtm->rtm_errno = error; rtm->rtm_addrs = info.rti_addrs; } + if (fibnum != RTS_ALLFIBS) { + KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: " + "fibnum out of range 0 <= %d < %d", __func__, + fibnum, rt_numfibs)); + M_SETFIB(m, fibnum); + m->m_flags |= RTS_FILTER_FIB; + } rt_dispatch(m, sa); } } +void +rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) +{ + + rt_newaddrmsg_fib(cmd, ifa, error, rt, RTS_ALLFIBS); +} + /* * This is the analogue to the rt_newaddrmsg which performs the same * function but for multicast group memberhips. This is easier since From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 13:19:22 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61B15106564A; Tue, 4 Oct 2011 13:19:22 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F96B8FC12; Tue, 4 Oct 2011 13:19:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94DJMGM059294; Tue, 4 Oct 2011 13:19:22 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94DJMt3059288; Tue, 4 Oct 2011 13:19:22 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201110041319.p94DJMt3059288@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 4 Oct 2011 13:19:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225976 - stable/7/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 13:19:22 -0000 Author: bz Date: Tue Oct 4 13:19:21 2011 New Revision: 225976 URL: http://svn.freebsd.org/changeset/base/225976 Log: MFC r225837: Pass the fibnum where we need filtering of the message on the rtsock allowing routing daemons to filter routing updates on an rtsock per FIB. Adjust raw_input() and split it into wrapper and a new function taking an optional callback argument even though we only have one consumer [1] to keep the hackish flags local to rtsock.c. PR: kern/134931 Submitted by: multiple (see PR) Suggested by: rwatson [1] Reviewed by: rwatson Modified: stable/7/sys/net/raw_cb.h stable/7/sys/net/raw_usrreq.c stable/7/sys/net/route.c stable/7/sys/net/route.h stable/7/sys/net/rtsock.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/net/raw_cb.h ============================================================================== --- stable/7/sys/net/raw_cb.h Tue Oct 4 13:18:14 2011 (r225975) +++ stable/7/sys/net/raw_cb.h Tue Oct 4 13:19:21 2011 (r225976) @@ -68,9 +68,14 @@ pr_init_t raw_init; * Library routines for raw socket usrreq functions; will always be wrapped * so that protocol-specific functions can be handled. */ +typedef int (*raw_input_cb_fn)(struct mbuf *, struct sockproto *, + struct sockaddr *, struct rawcb *); + int raw_attach(struct socket *, int); void raw_detach(struct rawcb *); void raw_input(struct mbuf *, struct sockproto *, struct sockaddr *); +void raw_input_ext(struct mbuf *, struct sockproto *, struct sockaddr *, + raw_input_cb_fn); /* * Generic pr_usrreqs entries for raw socket protocols, usually wrapped so Modified: stable/7/sys/net/raw_usrreq.c ============================================================================== --- stable/7/sys/net/raw_usrreq.c Tue Oct 4 13:18:14 2011 (r225975) +++ stable/7/sys/net/raw_usrreq.c Tue Oct 4 13:19:21 2011 (r225976) @@ -69,6 +69,14 @@ raw_init(void) void raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src) { + + return (raw_input_ext(m0, proto, src, NULL)); +} + +void +raw_input_ext(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src, + raw_input_cb_fn cb) +{ struct rawcb *rp; struct mbuf *m = m0; struct socket *last; @@ -81,6 +89,8 @@ raw_input(struct mbuf *m0, struct sockpr if (rp->rcb_proto.sp_protocol && rp->rcb_proto.sp_protocol != proto->sp_protocol) continue; + if (cb != NULL && (*cb)(m, proto, src, rp) != 0) + continue; if (last) { struct mbuf *n; n = m_copy(m, 0, (int)M_COPYALL); Modified: stable/7/sys/net/route.c ============================================================================== --- stable/7/sys/net/route.c Tue Oct 4 13:18:14 2011 (r225975) +++ stable/7/sys/net/route.c Tue Oct 4 13:19:21 2011 (r225976) @@ -344,7 +344,8 @@ rtalloc1_fib(struct sockaddr *dst, int r newrt->rt_ifp->if_addr->ifa_addr; info.rti_info[RTAX_IFA] = newrt->rt_ifa->ifa_addr; } - rt_missmsg(RTM_ADD, &info, newrt->rt_flags, 0); + rt_missmsg_fib(RTM_ADD, &info, newrt->rt_flags, 0, + fibnum); } else { KASSERT(rt == newrt, ("locking wrong route")); RT_LOCK(newrt); @@ -370,7 +371,7 @@ rtalloc1_fib(struct sockaddr *dst, int r */ bzero(&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; - rt_missmsg(msgtype, &info, 0, err); + rt_missmsg_fib(msgtype, &info, 0, err, fibnum); } } if (newrt) @@ -591,7 +592,7 @@ out: info.rti_info[RTAX_GATEWAY] = gateway; info.rti_info[RTAX_NETMASK] = netmask; info.rti_info[RTAX_AUTHOR] = src; - rt_missmsg(RTM_REDIRECT, &info, flags, error); + rt_missmsg_fib(RTM_REDIRECT, &info, flags, error, fibnum); } int @@ -1482,7 +1483,7 @@ rtinit1(struct ifaddr *ifa, int cmd, int * notify any listening routing agents of the change */ RT_LOCK(rt); - rt_newaddrmsg(cmd, ifa, error, rt); + rt_newaddrmsg_fib(cmd, ifa, error, rt, fibnum); if (cmd == RTM_DELETE) { /* * If we are deleting, and we found an entry, then Modified: stable/7/sys/net/route.h ============================================================================== --- stable/7/sys/net/route.h Tue Oct 4 13:18:14 2011 (r225975) +++ stable/7/sys/net/route.h Tue Oct 4 13:19:21 2011 (r225976) @@ -351,7 +351,9 @@ void rt_ieee80211msg(struct ifnet *, in void rt_ifannouncemsg(struct ifnet *, int); void rt_ifmsg(struct ifnet *); void rt_missmsg(int, struct rt_addrinfo *, int, int); +void rt_missmsg_fib(int, struct rt_addrinfo *, int, int, int); void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *); +void rt_newaddrmsg_fib(int, struct ifaddr *, int, struct rtentry *, int); void rt_newmaddrmsg(int, struct ifmultiaddr *); int rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *); Modified: stable/7/sys/net/rtsock.c ============================================================================== --- stable/7/sys/net/rtsock.c Tue Oct 4 13:18:14 2011 (r225975) +++ stable/7/sys/net/rtsock.c Tue Oct 4 13:19:21 2011 (r225976) @@ -68,6 +68,13 @@ MALLOC_DEFINE(M_RTABLE, "routetbl", "rou static struct sockaddr route_src = { 2, PF_ROUTE, }; static struct sockaddr sa_zero = { sizeof(sa_zero), AF_INET, }; +/* + * Used by rtsock/raw_input callback code to decide whether to filter the update + * notification to a socket bound to a particular FIB. + */ +#define RTS_FILTER_FIB M_PROTO8 +#define RTS_ALLFIBS -1 + static struct { int ip_count; /* attached w/ AF_INET */ int ip6_count; /* attached w/ AF_INET6 */ @@ -124,6 +131,31 @@ rts_init(void) } SYSINIT(rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rts_init, 0); +static int +raw_input_rts_cb(struct mbuf *m, struct sockproto *proto, struct sockaddr *src, + struct rawcb *rp) +{ + int fibnum; + + KASSERT(m != NULL, ("%s: m is NULL", __func__)); + KASSERT(proto != NULL, ("%s: proto is NULL", __func__)); + KASSERT(rp != NULL, ("%s: rp is NULL", __func__)); + + /* No filtering requested. */ + if ((m->m_flags & RTS_FILTER_FIB) == 0) + return (0); + + /* Check if it is a rts and the fib matches the one of the socket. */ + fibnum = M_GETFIB(m); + if (proto->sp_family != PF_ROUTE || + rp->rcb_socket == NULL || + rp->rcb_socket->so_fibnum == fibnum) + return (0); + + /* Filtering requested and no match, the socket shall be skipped. */ + return (1); +} + static void rts_input(struct mbuf *m) { @@ -140,7 +172,7 @@ rts_input(struct mbuf *m) } else route_proto.sp_protocol = 0; - raw_input(m, &route_proto, &route_src); + raw_input_ext(m, &route_proto, &route_src, raw_input_rts_cb); } /* @@ -727,6 +759,8 @@ flush: Free(rtm); } if (m) { + M_SETFIB(m, so->so_fibnum); + m->m_flags |= RTS_FILTER_FIB; if (rp) { /* * XXX insure we don't get a copy by @@ -958,7 +992,8 @@ again: * destination. */ void -rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) +rt_missmsg_fib(int type, struct rt_addrinfo *rtinfo, int flags, int error, + int fibnum) { struct rt_msghdr *rtm; struct mbuf *m; @@ -969,6 +1004,14 @@ rt_missmsg(int type, struct rt_addrinfo m = rt_msg1(type, rtinfo); if (m == NULL) return; + + if (fibnum != RTS_ALLFIBS) { + KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: fibnum out " + "of range 0 <= %d < %d", __func__, fibnum, rt_numfibs)); + M_SETFIB(m, fibnum); + m->m_flags |= RTS_FILTER_FIB; + } + rtm = mtod(m, struct rt_msghdr *); rtm->rtm_flags = RTF_DONE | flags; rtm->rtm_errno = error; @@ -976,6 +1019,13 @@ rt_missmsg(int type, struct rt_addrinfo rt_dispatch(m, sa); } +void +rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) +{ + + rt_missmsg_fib(type, rtinfo, flags, error, RTS_ALLFIBS); +} + /* * This routine is called to generate a message from the routing * socket indicating that the status of a network interface has changed. @@ -1010,7 +1060,8 @@ rt_ifmsg(struct ifnet *ifp) * copies of it. */ void -rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) +rt_newaddrmsg_fib(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt, + int fibnum) { struct rt_addrinfo info; struct sockaddr *sa = NULL; @@ -1066,10 +1117,24 @@ rt_newaddrmsg(int cmd, struct ifaddr *if rtm->rtm_errno = error; rtm->rtm_addrs = info.rti_addrs; } + if (fibnum != RTS_ALLFIBS) { + KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: " + "fibnum out of range 0 <= %d < %d", __func__, + fibnum, rt_numfibs)); + M_SETFIB(m, fibnum); + m->m_flags |= RTS_FILTER_FIB; + } rt_dispatch(m, sa); } } +void +rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) +{ + + rt_newaddrmsg_fib(cmd, ifa, error, rt, RTS_ALLFIBS); +} + /* * This is the analogue to the rt_newaddrmsg which performs the same * function but for multicast group memberhips. This is easier since From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 13:24:22 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 808311065676; Tue, 4 Oct 2011 13:24:22 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 661458FC0C; Tue, 4 Oct 2011 13:24:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94DOM76059508; Tue, 4 Oct 2011 13:24:22 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94DOMW4059506; Tue, 4 Oct 2011 13:24:22 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <201110041324.p94DOMW4059506@svn.freebsd.org> From: Takahashi Yoshihiro Date: Tue, 4 Oct 2011 13:24:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225977 - head/sys/pc98/pc98 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 13:24:22 -0000 Author: nyan Date: Tue Oct 4 13:24:22 2011 New Revision: 225977 URL: http://svn.freebsd.org/changeset/base/225977 Log: MFi386: revision 225936 Add some improvements in the idle table callbacks: - Replace instances of manual assembly instruction "hlt" call with halt() function calling. - In cpu_idle_mwait() avoid races in check to sched_runnable() using the same pattern used in cpu_idle_hlt() with the 'hlt' instruction. - Add comments explaining the logic behind the pattern used in cpu_idle_hlt() and other idle callbacks. Modified: head/sys/pc98/pc98/machdep.c Modified: head/sys/pc98/pc98/machdep.c ============================================================================== --- head/sys/pc98/pc98/machdep.c Tue Oct 4 13:19:21 2011 (r225976) +++ head/sys/pc98/pc98/machdep.c Tue Oct 4 13:24:22 2011 (r225977) @@ -1117,7 +1117,7 @@ void cpu_halt(void) { for (;;) - __asm__ ("hlt"); + halt(); } static int idle_mwait = 1; /* Use MONITOR/MWAIT for short idle. */ @@ -1136,9 +1136,22 @@ cpu_idle_hlt(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_SLEEPING; + /* - * We must absolutely guarentee that hlt is the next instruction - * after sti or we introduce a timing window. + * Since we may be in a critical section from cpu_idle(), if + * an interrupt fires during that critical section we may have + * a pending preemption. If the CPU halts, then that thread + * may not execute until a later interrupt awakens the CPU. + * To handle this race, check for a runnable thread after + * disabling interrupts and immediately return if one is + * found. Also, we must absolutely guarentee that hlt is + * the next instruction after sti. This ensures that any + * interrupt that fires after the call to disable_intr() will + * immediately awaken the CPU from hlt. Finally, please note + * that on x86 this works fine because of interrupts enabled only + * after the instruction following sti takes place, while IF is set + * to 1 immediately, allowing hlt instruction to acknowledge the + * interrupt. */ disable_intr(); if (sched_runnable()) @@ -1164,11 +1177,19 @@ cpu_idle_mwait(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_MWAIT; - if (!sched_runnable()) { - cpu_monitor(state, 0, 0); - if (*state == STATE_MWAIT) - cpu_mwait(0, MWAIT_C1); + + /* See comments in cpu_idle_hlt(). */ + disable_intr(); + if (sched_runnable()) { + enable_intr(); + *state = STATE_RUNNING; + return; } + cpu_monitor(state, 0, 0); + if (*state == STATE_MWAIT) + __asm __volatile("sti; mwait" : : "a" (MWAIT_C1), "c" (0)); + else + enable_intr(); *state = STATE_RUNNING; } @@ -1180,6 +1201,12 @@ cpu_idle_spin(int busy) state = (int *)PCPU_PTR(monitorbuf); *state = STATE_RUNNING; + + /* + * The sched_runnable() call is racy but as long as there is + * a loop missing it one time will have just a little impact if any + * (and it is much better than missing the check at all). + */ for (i = 0; i < 1000; i++) { if (sched_runnable()) return; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 13:26:36 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEFA9106566C; Tue, 4 Oct 2011 13:26:36 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from argol.doit.wisc.edu (argol.doit.wisc.edu [144.92.197.212]) by mx1.freebsd.org (Postfix) with ESMTP id 9C78C8FC15; Tue, 4 Oct 2011 13:26:36 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset=windows-1252; format=flowed Received: from avs-daemon.smtpauth3.wiscmail.wisc.edu by smtpauth3.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) id <0LSJ00208MOBTF00@smtpauth3.wiscmail.wisc.edu>; Tue, 04 Oct 2011 08:26:35 -0500 (CDT) Received: from comporellon.tachypleus.net ([unknown] [76.210.72.39]) by smtpauth3.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) with ESMTPSA id <0LSJ001ISMO27Y00@smtpauth3.wiscmail.wisc.edu>; Tue, 04 Oct 2011 08:26:27 -0500 (CDT) Date: Tue, 04 Oct 2011 08:26:26 -0500 From: Nathan Whitehorn In-reply-to: To: Daniel O'Connor Message-id: <4E8B0982.8010508@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=76.210.72.39 X-Spam-PmxInfo: Server=avs-9, Version=5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.10.4.105414, SenderIP=76.210.72.39 References: <201110031513.p93FD9ev015593@svn.freebsd.org> User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0) Gecko/20110928 Thunderbird/7.0 Cc: svn-src-head@freebsd.org, Craig Rodrigues , svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 13:26:36 -0000 On 10/03/11 20:35, Daniel O'Connor wrote: > On 04/10/2011, at 8:41, Craig Rodrigues wrote: >> Can bsdinstall be used as a drop-in replacement for >> sysinstall when run with the "SCRIPT SYNTAX" batch mode? >> If not, how much code would need to be added to bsdinstall? Or, is there >> some other utility, such as something from the PC-BSD suite of scripts, >> that can be used as a drop-in replacement for sysinstall in "SCRIPT >> SYNTAX" mode? > No it can't, but speaking as someone who used this feature in sysinstall… Good riddance :) > > I wrote a shell script which does an install itself (i.e. no bsdinstall - which is just [mostly] a shell script). > > It is 200 lines, a fair chunk of which is pre-canned stuff to go into rc.conf, loader.conf, etc.. > > http://www.gsoft.com.au/~doconnor/install-os.sh > > I also modified the rc.local script the installer uses to add an option to call my script. > Although pc-sysinstall is probably the [much] better choice for scripting, there are facilities in bsdinstall to help writing of custom installers like this, and the regular installer is in fact an example of a scripted install. There's some more information in bsdinstall(8) for the curious. -Nathan From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 13:31:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A94E21065674; Tue, 4 Oct 2011 13:31:57 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 987AE8FC12; Tue, 4 Oct 2011 13:31:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94DVvdG059767; Tue, 4 Oct 2011 13:31:57 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94DVv9F059765; Tue, 4 Oct 2011 13:31:57 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201110041331.p94DVv9F059765@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 4 Oct 2011 13:31:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225978 - stable/8/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 13:31:57 -0000 Author: bz Date: Tue Oct 4 13:31:57 2011 New Revision: 225978 URL: http://svn.freebsd.org/changeset/base/225978 Log: MFC r225885: Fix an obvious bug from r186196 shadowing a variable, not correctly appending the new mbuf to the chain reference but possibly causing an mbuf nextpkt loop leading to a memory used after handoff (or having been freed) and leaking an mbuf here. Reviewed by: rwatson, brooks Modified: stable/8/sys/netinet6/nd6.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/netinet6/nd6.c ============================================================================== --- stable/8/sys/netinet6/nd6.c Tue Oct 4 13:24:22 2011 (r225977) +++ stable/8/sys/netinet6/nd6.c Tue Oct 4 13:31:57 2011 (r225978) @@ -1917,14 +1917,15 @@ nd6_output_lle(struct ifnet *ifp, struct if (*chain == NULL) *chain = m; else { - struct mbuf *m = *chain; + struct mbuf *mb; /* * append mbuf to end of deferred chain */ - while (m->m_nextpkt != NULL) - m = m->m_nextpkt; - m->m_nextpkt = m; + mb = *chain; + while (mb->m_nextpkt != NULL) + mb = mb->m_nextpkt; + mb->m_nextpkt = m; } return (error); } From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 14:25:10 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A97B106566B; Tue, 4 Oct 2011 14:25:10 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A27F8FC12; Tue, 4 Oct 2011 14:25:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94EPAgd061422; Tue, 4 Oct 2011 14:25:10 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94EPAgA061420; Tue, 4 Oct 2011 14:25:10 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110041425.p94EPAgA061420@svn.freebsd.org> From: Adrian Chadd Date: Tue, 4 Oct 2011 14:25:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225979 - head/usr.bin/csup X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 14:25:10 -0000 Author: adrian Date: Tue Oct 4 14:25:10 2011 New Revision: 225979 URL: http://svn.freebsd.org/changeset/base/225979 Log: Update the comment to reflect what is actually going on. Submitted by: mux Modified: head/usr.bin/csup/updater.c Modified: head/usr.bin/csup/updater.c ============================================================================== --- head/usr.bin/csup/updater.c Tue Oct 4 13:31:57 2011 (r225978) +++ head/usr.bin/csup/updater.c Tue Oct 4 14:25:10 2011 (r225979) @@ -238,7 +238,7 @@ updater(void *arg) /* * Make sure to close the fixups even in case of an error, - * so that the lister thread doesn't block indefinitely. + * so that the detailer thread doesn't block indefinitely. */ fixups_close(up->config->fixups); if (!error) From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 14:26:45 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D06C1106564A; Tue, 4 Oct 2011 14:26:45 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C01098FC12; Tue, 4 Oct 2011 14:26:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94EQj99061504; Tue, 4 Oct 2011 14:26:45 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94EQj7t061502; Tue, 4 Oct 2011 14:26:45 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110041426.p94EQj7t061502@svn.freebsd.org> From: Adrian Chadd Date: Tue, 4 Oct 2011 14:26:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225980 - head/usr.bin/csup X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 14:26:45 -0000 Author: adrian Date: Tue Oct 4 14:26:45 2011 New Revision: 225980 URL: http://svn.freebsd.org/changeset/base/225980 Log: Handle the situation where fixups_close() has been called but more fixups are still available on the queue. Without this, the fixups producer/consumer pipeline will artifically terminate before all of the fixups have been processed, leading to incomplete updates and generally quite unhappy users. Submitted by: mux Modified: head/usr.bin/csup/fixups.c Modified: head/usr.bin/csup/fixups.c ============================================================================== --- head/usr.bin/csup/fixups.c Tue Oct 4 14:25:10 2011 (r225979) +++ head/usr.bin/csup/fixups.c Tue Oct 4 14:26:45 2011 (r225980) @@ -141,7 +141,7 @@ fixups_get(struct fixups *f) fixups_lock(f); while (f->size == 0 && !f->closed) pthread_cond_wait(&f->cond, &f->lock); - if (f->closed) { + if (f->closed && f->size == 0) { fixups_unlock(f); return (NULL); } From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 14:56:33 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B487106566B; Tue, 4 Oct 2011 14:56:33 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8AAE48FC0A; Tue, 4 Oct 2011 14:56:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94EuXol062660; Tue, 4 Oct 2011 14:56:33 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94EuXaV062658; Tue, 4 Oct 2011 14:56:33 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201110041456.p94EuXaV062658@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 4 Oct 2011 14:56:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225981 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 14:56:33 -0000 Author: trasz Date: Tue Oct 4 14:56:33 2011 New Revision: 225981 URL: http://svn.freebsd.org/changeset/base/225981 Log: Actually enforce limit for inheritable resources on fork. MFC after: 3 days Modified: head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Tue Oct 4 14:26:45 2011 (r225980) +++ head/sys/kern/kern_racct.c Tue Oct 4 14:56:33 2011 (r225981) @@ -567,6 +567,12 @@ racct_proc_fork(struct proc *parent, str PROC_LOCK(child); mtx_lock(&racct_lock); +#ifdef RCTL + error = rctl_proc_fork(parent, child); + if (error != 0) + goto out; +#endif + /* * Inherit resource usage. */ @@ -581,12 +587,6 @@ racct_proc_fork(struct proc *parent, str goto out; } -#ifdef RCTL - error = rctl_proc_fork(parent, child); - if (error != 0) - goto out; -#endif - error = racct_add_locked(child, RACCT_NPROC, 1); error += racct_add_locked(child, RACCT_NTHR, 1); From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 15:00:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B46B71065670; Tue, 4 Oct 2011 15:00:54 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A41EC8FC0A; Tue, 4 Oct 2011 15:00:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94F0sYG062840; Tue, 4 Oct 2011 15:00:54 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94F0shB062838; Tue, 4 Oct 2011 15:00:54 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110041500.p94F0shB062838@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 4 Oct 2011 15:00:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225982 - head/usr.bin/fetch X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 15:00:54 -0000 Author: des Date: Tue Oct 4 15:00:54 2011 New Revision: 225982 URL: http://svn.freebsd.org/changeset/base/225982 Log: latin1 -> utf8 Modified: head/usr.bin/fetch/fetch.1 Modified: head/usr.bin/fetch/fetch.1 ============================================================================== --- head/usr.bin/fetch/fetch.1 Tue Oct 4 14:56:33 2011 (r225981) +++ head/usr.bin/fetch/fetch.1 Tue Oct 4 15:00:54 2011 (r225982) @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000-2011 Dag-Erling Smørgrav +.\" Copyright (c) 2000-2011 Dag-Erling Smørgrav .\" All rights reserved. .\" Portions Copyright (c) 1999 Massachusetts Institute of Technology; used .\" by permission. From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 15:06:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00C92106566B; Tue, 4 Oct 2011 15:06:12 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CA7088FC12; Tue, 4 Oct 2011 15:06:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94F6BOg063041; Tue, 4 Oct 2011 15:06:11 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94F6BOd063039; Tue, 4 Oct 2011 15:06:11 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110041506.p94F6BOd063039@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 4 Oct 2011 15:06:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225983 - stable/9/crypto/openssh X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 15:06:12 -0000 Author: des Date: Tue Oct 4 15:06:11 2011 New Revision: 225983 URL: http://svn.freebsd.org/changeset/base/225983 Log: MFH r225852: regenerate after hpn patch Approved by: re (kib) Modified: stable/9/crypto/openssh/ssh_namespace.h Directory Properties: stable/9/crypto/openssh/ (props changed) Modified: stable/9/crypto/openssh/ssh_namespace.h ============================================================================== --- stable/9/crypto/openssh/ssh_namespace.h Tue Oct 4 15:00:54 2011 (r225982) +++ stable/9/crypto/openssh/ssh_namespace.h Tue Oct 4 15:06:11 2011 (r225983) @@ -7,7 +7,7 @@ * * A list of symbols which need munging is obtained as follows: * - * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define" $3 "\t\tssh_" $3 }' + * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define " $3 "\t\tssh_" $3 }' * * $FreeBSD$ */ @@ -58,6 +58,7 @@ #define buffer_get_int64 ssh_buffer_get_int64 #define buffer_get_int64_ret ssh_buffer_get_int64_ret #define buffer_get_int_ret ssh_buffer_get_int_ret +#define buffer_get_max_len ssh_buffer_get_max_len #define buffer_get_ret ssh_buffer_get_ret #define buffer_get_short ssh_buffer_get_short #define buffer_get_short_ret ssh_buffer_get_short_ret @@ -139,6 +140,7 @@ #define channel_send_window_changes ssh_channel_send_window_changes #define channel_set_af ssh_channel_set_af #define channel_set_fds ssh_channel_set_fds +#define channel_set_hpn ssh_channel_set_hpn #define channel_setup_local_fwd_listener ssh_channel_setup_local_fwd_listener #define channel_setup_remote_fwd_listener ssh_channel_setup_remote_fwd_listener #define channel_still_open ssh_channel_still_open @@ -438,6 +440,7 @@ #define set_nonblock ssh_set_nonblock #define shadow_pw ssh_shadow_pw #define sigdie ssh_sigdie +#define sock_get_rcvbuf ssh_sock_get_rcvbuf #define sock_set_v6only ssh_sock_set_v6only #define ssh1_3des_iv ssh_ssh1_3des_iv #define start_progress_meter ssh_start_progress_meter From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 16:52:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0E5B1065678; Tue, 4 Oct 2011 16:52:18 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail05.syd.optusnet.com.au (mail05.syd.optusnet.com.au [211.29.132.186]) by mx1.freebsd.org (Postfix) with ESMTP id 2EA898FC20; Tue, 4 Oct 2011 16:52:17 +0000 (UTC) Received: from c122-106-165-191.carlnfd1.nsw.optusnet.com.au (c122-106-165-191.carlnfd1.nsw.optusnet.com.au [122.106.165.191]) by mail05.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p94GqE14022513 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 5 Oct 2011 03:52:15 +1100 Date: Wed, 5 Oct 2011 03:52:14 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Attilio Rao In-Reply-To: Message-ID: <20111005023142.G8617@besplex.bde.org> References: <201109041307.p84D72GY092462@svn.freebsd.org> <20110905023251.C832@besplex.bde.org> <20111004043232.K11186@besplex.bde.org> MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-1554855478-1317747134=:8617" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Bruce Evans Subject: Re: svn commit: r225372 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 16:52:18 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-1554855478-1317747134=:8617 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE On Tue, 4 Oct 2011, Attilio Rao wrote: > 2011/10/3 Bruce Evans : >> On Mon, 26 Sep 2011, Attilio Rao wrote: >> >>> 2011/9/4 Bruce Evans : >>>> >>>> On Sun, 4 Sep 2011, Attilio Rao wrote: >>>> >>>>> Also please notice that intr enable/disable happens in the wrong way >>>>> as it is done via the MD (x86 specific likely) interface. This is >>>>> wrong for 2 reasons: >>>> >>>> No, intr_disable() is MI. =C2=A0It is also used by witness. =C2=A0disa= ble_intr() >>>> is the corresponding x86 interface that you may be thinking of. =C2=A0= The MI >>>> interface intr_disable() was introduced to avoid the MD'ness of >>>> intr_disable(). >>> >>> I was a bit surprised to verify that you are right but >>> spinlock_enter() has the big difference besides disable_intr() of also >>> explicitly disabling preemption via critical_enter() which some >>> codepath can trigger without even noticing it. >>> This means it is more safer in presence of PREEMPTION option on and >>> thus should be preferred to the normal intr_disable(), in particular >>> for convoluted codepaths. >> >> I think this is another implementation detail which shouldn't be depende= d >> on. =C2=A0Spinlocks may or may not need either interrupts disabled or a = critical >> section to work. =C2=A0Now I'm a little surprised to remember that they = use a >> critical section. =C2=A0This is to prevent context switching. =C2=A0It i= s useful >> behaviour, but not strictly necessary. >> >> Since disabling interrupts also prevents context switching (excep by bug= gy >> trap handlers including NMI), it is safe to use hard interrupt disabling >> instead of critical_enter() to prevent context switching. =C2=A0This is = safe >> because code that has interrupts disabled cannot wander off into other >> code that doesn't understand this and does context switching! (unless it >> is broken). =C2=A0But for preventing context switching, critical_enter()= is >> better now that it doesn't hard-disable interrupts internally. > > This is not entirely correct, infact you may have preemption even with > interrupts disabled by calling code that schedule threads. This is why > spinlock_enter() disables interrupts _and_ preemption altogether. > Look for example at hardclock() and its internal magic (this is what I > meant, earlier, with "non convoluted codepaths"). That is a bug in -current. As I said, only broken code can wander off into other code that doesn't understand the caller's context. This is one of the things that prevents hardclock() being a non-broken fast interrupt handler. hardclock() wants to call scheduling code, but non- broken fast interrupt handlers can't do that. >> By un-inlining (un-macroizing) mtx_lock_spin(), but inlining >> critical_enter(), I get the same number of function calls but much small= er >> code since it is the tiny critical_enter() function and not the big >> mtx_lock_spin() one that is inlined. > > I'm not entirely sure I follow. > > In -CURRENT, right now mtx_lock_spin() just yields > _mtx_lock_spin_flags() which is not inlined. That is the debugging version. is obfuscated as follows: - mtx_lock_spin(m) is mtx_lock_spin_flags((m), 0) - if LOCK_DEBUG > 0 or defined(MUTEX_NOINLINE) mtx_lock_spin_flags((m), 0) is _mtx_lock_spin_flags((m), curthread, (0= ), =09LOCK_FILE, LOCK_LINE) This gives the version that you described. if LOCK_DEBUG > 0 LOCK_FILE is __FILE__ and LOCK_LINE is __LINE__ else LOCK_FILE is NULL and LOCK_LINE is 0 else mtx_lock_spin_flags((m), 0) is __mtx_lock_spin((m), curthread, (0), =09NULL, 0) This gives the version that I described. __mtx_lock_spin() is passed a dummy LOCK_FILE and LOCK_LINE although it doesn't use them in this case. It is convoluted so that it can be used both in this case and in the non-inlined case, where it is expanded in _mtx_lock_spin_flags(), where it is passed __FILE__ and __LINE__ iff LOCK_DEBUG > 0. But this reuse is not so good since it gives a further obfuscations: __mtx_lock_spin() takes flags args but doesn't have `flags' in its name like some other mtx functions. In the non-inlined case: mtx_lock_spin(...) is _mtx_lock_spin_flags() as described above =09_mtx_lock_spin_flags(...) invokes __mtx_lock_spin(...) as desc. above __mtx_lock_spin(...) invokes _mtx_lock_spin(...) =09The macro obfuscations end at this point -- _mtx_lock_spin() is =09always a function. _mtx_lock_spin(), like __mtx_lock_spin(), takes flags args but =09doesn't have `flags' in its name. end if > So the improvement here is just to have inlined critical_enter()? How > this can lead to smaller code? This should be obvious now. Another detail is that my mtx_lock_spin() takes only 1 arg (this is the normal API). It doesn't need to support passing (td, opt, file, line). critical_enter() takes no args at all (td =3D curthread is implicit for it, as it is for mtx_lock_spin()). So mtx_lock_spin(mp) calls expand to slightly more object code than critical_enter() calls. In -current for the inlined case, mtx_lock_spin() expands to critical_enter() plus about 40 bytes (on i386) for the atomic op on the mutex followed by the _mtx_lock_function call. >> The complications are mainly in critical_exit(): >> - in my version, when td_critnest is decremented to 0, a MD function is >> =C2=A0called to "unpend" any pending interrupts that have accumulated wh= ile >> =C2=A0in the critical region. =C2=A0Since mtx_lock_spin() doesn't hard-d= isable >> =C2=A0interrupts, they may occur when a spinlock is held. =C2=A0Fast int= errupts >> =C2=A0proceed. =C2=A0Others are blocked until critical_exit() unpends th= em. >> =C2=A0This includes software interrupts. =C2=A0The only really complicat= ed part >> =C2=A0is letting fast interrupts proceed. =C2=A0Fast interrupt handlers = cannot >> =C2=A0use or be blocked by any normal locking, since they don't respect >> =C2=A0normal spinlocks. =C2=A0So for example, hardclock() cannot be a fa= st interrupt >> =C2=A0handler. > > I don't think this is a good idea. > We hardly rely on interrupts disabling during spinlock helding in > order to get them be used by fast handlers and then avoid deadlocks > with code running in interrupt/kernel context. I think you mean "We strongly rely on...". -current certainly relies on this. IMO this is mostly a bug. There is the implementation detail that spinlocks hard-disable interrupts to avoid a deadlock problem in the UP case. Too much code has come to depend on this IMO. >>> [register_t intr_disable() interface not being quite NMI] >>> >>> I mostly agree, I think we should have an MD specified type to replace >>> register_t for this (it could alias it, if it is suitable, but this >>> interface smells a lot like x86-centric). >> >> Really vax-centric. =C2=A0spl "levels" are from vax or earlier CPUs. =C2= =A0x86 >> doesn't really have levels (the AT PIC has masks and precedences. =C2=A0= The >> precedences correspond to levels are but rarely depended on or programme= d >> specifically). =C2=A0alpha and sparc seem to have levels much closer to >> vax. >> >> With only levels, even an 8-bit interface for the level is enough (255 >> levels should be enough for anyone). =C2=A0With masks, even a 64-bit int= erface >> for the mask might not be enough. =C2=A0When masks were mapped to levels >> for FreeBSD on i386, the largish set of possible mask values was mapped >> into < 8 standard levels (tty, net, bio, etc). =C2=A0Related encoding of >> MD details as cookies would probably work well enough in general. > > For cookie you just mean a void * ptr? Either a pointer, or an integer that indexes a table of pointers, or an an integer that encodes all the info in the integer's bits, possibly with an identity encoding. Bruce --0-1554855478-1317747134=:8617-- From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 16:52:26 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D6B91065670; Tue, 4 Oct 2011 16:52:26 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D0FB8FC28; Tue, 4 Oct 2011 16:52:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94GqQqs066540; Tue, 4 Oct 2011 16:52:26 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94GqQg8066537; Tue, 4 Oct 2011 16:52:26 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201110041652.p94GqQg8066537@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Tue, 4 Oct 2011 16:52:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225987 - svnadmin/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 16:52:26 -0000 Author: ae Date: Tue Oct 4 16:52:25 2011 New Revision: 225987 URL: http://svn.freebsd.org/changeset/base/225987 Log: Please welcome Alexander V. Chernikov (melifaro@) as a new src committer. Konstantin Belousov and I will be mentoring Alexander. Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access ============================================================================== --- svnadmin/conf/access Tue Oct 4 16:51:59 2011 (r225986) +++ svnadmin/conf/access Tue Oct 4 16:52:25 2011 (r225987) @@ -156,6 +156,7 @@ mckay mckusick mdf mdodd +melifaro miwi mjacob mlaier Modified: svnadmin/conf/mentors ============================================================================== --- svnadmin/conf/mentors Tue Oct 4 16:51:59 2011 (r225986) +++ svnadmin/conf/mentors Tue Oct 4 16:52:25 2011 (r225987) @@ -23,6 +23,7 @@ jinmei gnn jonathan rwatson jpaetzel kib kargl das +melifaro ae Co-mentor: kib miwi rwatson nork imp randi cperciva From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 16:53:11 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC4D71065670; Tue, 4 Oct 2011 16:53:11 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A26908FC1F; Tue, 4 Oct 2011 16:53:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94GrBUF066663; Tue, 4 Oct 2011 16:53:11 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94GrBj8066661; Tue, 4 Oct 2011 16:53:11 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041653.p94GrBj8066661@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 16:53:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225988 - head/sys/arm/arm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 16:53:11 -0000 Author: marcel Date: Tue Oct 4 16:53:11 2011 New Revision: 225988 URL: http://svn.freebsd.org/changeset/base/225988 Log: Fix build when DEBUG is defined (e.g. for LINT). Modified: head/sys/arm/arm/pmap.c Modified: head/sys/arm/arm/pmap.c ============================================================================== --- head/sys/arm/arm/pmap.c Tue Oct 4 16:52:25 2011 (r225987) +++ head/sys/arm/arm/pmap.c Tue Oct 4 16:53:11 2011 (r225988) @@ -185,6 +185,9 @@ int pmap_debug_level = 0; #endif /* PMAP_DEBUG */ extern struct pv_addr systempage; + +extern int last_fault_code; + /* * Internal function prototypes */ @@ -2054,9 +2057,8 @@ pmap_fault_fixup(pmap_t pm, vm_offset_t * the TLB. */ if (rv == 0 && pm->pm_l1->l1_domain_use_count == 1) { - extern int last_fault_code; printf("fixup: pm %p, va 0x%lx, ftype %d - nothing to do!\n", - pm, va, ftype); + pm, (u_long)va, ftype); printf("fixup: l2 %p, l2b %p, ptep %p, pl1pd %p\n", l2, l2b, ptep, pl1pd); printf("fixup: pte 0x%x, l1pd 0x%x, last code 0x%x\n", @@ -4012,13 +4014,6 @@ pmap_zero_page_generic(vm_paddr_t phys, char *dstpg; #endif -#ifdef DEBUG - struct vm_page *pg = PHYS_TO_VM_PAGE(phys); - - if (pg->md.pvh_list != NULL) - panic("pmap_zero_page: page has mappings"); -#endif - if (_arm_bzero && size >= _min_bzero_size && _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0) return; @@ -4290,13 +4285,6 @@ pmap_copy_page_generic(vm_paddr_t src, v #if 0 struct vm_page *src_pg = PHYS_TO_VM_PAGE(src); #endif -#ifdef DEBUG - struct vm_page *dst_pg = PHYS_TO_VM_PAGE(dst); - - if (dst_pg->md.pvh_list != NULL) - panic("pmap_copy_page: dst page has mappings"); -#endif - /* * Clean the source page. Hold the source page's lock for @@ -4342,13 +4330,6 @@ pmap_copy_page_xscale(vm_paddr_t src, vm /* XXX: Only needed for pmap_clean_page(), which is commented out. */ struct vm_page *src_pg = PHYS_TO_VM_PAGE(src); #endif -#ifdef DEBUG - struct vm_page *dst_pg = PHYS_TO_VM_PAGE(dst); - - if (dst_pg->md.pvh_list != NULL) - panic("pmap_copy_page: dst page has mappings"); -#endif - /* * Clean the source page. Hold the source page's lock for From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 16:55:53 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78D64106564A; Tue, 4 Oct 2011 16:55:53 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 684CE8FC18; Tue, 4 Oct 2011 16:55:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94GtrMO067138; Tue, 4 Oct 2011 16:55:53 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94GtrjG067136; Tue, 4 Oct 2011 16:55:53 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041655.p94GtrjG067136@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 16:55:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225990 - head/sys/arm/arm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 16:55:53 -0000 Author: marcel Date: Tue Oct 4 16:55:53 2011 New Revision: 225990 URL: http://svn.freebsd.org/changeset/base/225990 Log: Include opt_* headers first. Otherwise we can end up with redefined symbols. Modified: head/sys/arm/arm/elf_trampoline.c Modified: head/sys/arm/arm/elf_trampoline.c ============================================================================== --- head/sys/arm/arm/elf_trampoline.c Tue Oct 4 16:54:21 2011 (r225989) +++ head/sys/arm/arm/elf_trampoline.c Tue Oct 4 16:55:53 2011 (r225990) @@ -22,6 +22,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Since we are compiled outside of the normal kernel build process, we + * need to include opt_global.h manually. + */ +#include "opt_global.h" +#include "opt_kernname.h" + #include __FBSDID("$FreeBSD$"); #include @@ -33,13 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* - * Since we are compiled outside of the normal kernel build process, we - * need to include opt_global.h manually. - */ -#include "opt_global.h" -#include "opt_kernname.h" - extern char kernel_start[]; extern char kernel_end[]; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 16:58:20 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EBA3106564A; Tue, 4 Oct 2011 16:58:20 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8E6838FC0C; Tue, 4 Oct 2011 16:58:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94GwKPW067591; Tue, 4 Oct 2011 16:58:20 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94GwKep067588; Tue, 4 Oct 2011 16:58:20 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041658.p94GwKep067588@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 16:58:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225991 - head/sys/arm/mv X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 16:58:20 -0000 Author: marcel Date: Tue Oct 4 16:58:20 2011 New Revision: 225991 URL: http://svn.freebsd.org/changeset/base/225991 Log: Fix build when DEBUG is defined in the kernel configuration file (e.g. LINT). Modified: head/sys/arm/mv/common.c head/sys/arm/mv/mv_machdep.c Modified: head/sys/arm/mv/common.c ============================================================================== --- head/sys/arm/mv/common.c Tue Oct 4 16:55:53 2011 (r225990) +++ head/sys/arm/mv/common.c Tue Oct 4 16:58:20 2011 (r225991) @@ -49,9 +49,6 @@ __FBSDID("$FreeBSD$"); #define MAX_CPU_WIN 5 -#define DEBUG -#undef DEBUG - #ifdef DEBUG #define debugf(fmt, args...) do { printf("%s(): ", __func__); \ printf(fmt,##args); } while (0) Modified: head/sys/arm/mv/mv_machdep.c ============================================================================== --- head/sys/arm/mv/mv_machdep.c Tue Oct 4 16:55:53 2011 (r225990) +++ head/sys/arm/mv/mv_machdep.c Tue Oct 4 16:58:20 2011 (r225991) @@ -91,9 +91,6 @@ __FBSDID("$FreeBSD$"); #include /* XXX eventually this should be eliminated */ #include -#define DEBUG -#undef DEBUG - #ifdef DEBUG #define debugf(fmt, args...) printf(fmt, ##args) #else From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 17:00:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 277DB1065700; Tue, 4 Oct 2011 17:00:51 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 172C48FC0A; Tue, 4 Oct 2011 17:00:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94H0oPh068136; Tue, 4 Oct 2011 17:00:50 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94H0oLb068134; Tue, 4 Oct 2011 17:00:50 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041700.p94H0oLb068134@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 17:00:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225995 - head/sys/arm/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 17:00:51 -0000 Author: marcel Date: Tue Oct 4 17:00:50 2011 New Revision: 225995 URL: http://svn.freebsd.org/changeset/base/225995 Log: Properly guard definitions of DFLDSIZ, MAXDSIZ, DFLSSIZ, MAXSSIZ and SGROWSIZ. They can be set in the kernel configuration file. Modified: head/sys/arm/include/vmparam.h Modified: head/sys/arm/include/vmparam.h ============================================================================== --- head/sys/arm/include/vmparam.h Tue Oct 4 17:00:39 2011 (r225994) +++ head/sys/arm/include/vmparam.h Tue Oct 4 17:00:50 2011 (r225995) @@ -141,11 +141,21 @@ #endif #define MAXTSIZ (16*1024*1024) +#ifndef DFLDSIZ #define DFLDSIZ (128*1024*1024) +#endif +#ifndef MAXDSIZ #define MAXDSIZ (512*1024*1024) +#endif +#ifndef DFLSSIZ #define DFLSSIZ (2*1024*1024) +#endif +#ifndef MAXSSIZ #define MAXSSIZ (8*1024*1024) +#endif +#ifndef SGROWSIZ #define SGROWSIZ (128*1024) +#endif #ifdef ARM_USE_SMALL_ALLOC #define UMA_MD_SMALL_ALLOC From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 17:11:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A5421065670; Tue, 4 Oct 2011 17:11:39 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 09FF28FC1A; Tue, 4 Oct 2011 17:11:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94HBcpF070644; Tue, 4 Oct 2011 17:11:38 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94HBca3070642; Tue, 4 Oct 2011 17:11:38 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041711.p94HBca3070642@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 17:11:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226013 - head/sys/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 17:11:39 -0000 Author: marcel Date: Tue Oct 4 17:11:38 2011 New Revision: 226013 URL: http://svn.freebsd.org/changeset/base/226013 Log: Match the files directive and all the ways to add or subtract options and makeoptions by being a little smarter about REs. Modified: head/sys/conf/makeLINT.sed Modified: head/sys/conf/makeLINT.sed ============================================================================== --- head/sys/conf/makeLINT.sed Tue Oct 4 17:09:10 2011 (r226012) +++ head/sys/conf/makeLINT.sed Tue Oct 4 17:11:38 2011 (r226013) @@ -1,7 +1,7 @@ #!/usr/bin/sed -E -n -f # $FreeBSD$ -/^(machine|ident|device|nodevice|makeoptions|nomakeoption|options|option|nooption|profile|cpu|maxusers)[[:space:]]/ { +/^(machine|files|ident|(no)?device|(no)?makeoption(s)?|(no)?option(s)?|profile|cpu|maxusers)[[:space:]]/ { s/[[:space:]]*#.*$// p } From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 17:26:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 691811065673; Tue, 4 Oct 2011 17:26:41 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E7398FC0C; Tue, 4 Oct 2011 17:26:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94HQfc4071880; Tue, 4 Oct 2011 17:26:41 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94HQflE071877; Tue, 4 Oct 2011 17:26:41 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110041726.p94HQflE071877@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 4 Oct 2011 17:26:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226015 - stable/9/lib/libfetch X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 17:26:41 -0000 Author: des Date: Tue Oct 4 17:26:40 2011 New Revision: 226015 URL: http://svn.freebsd.org/changeset/base/226015 Log: MFH r225810 r225812: make passive mode the default. Approved by: re (kib) Modified: stable/9/lib/libfetch/fetch.3 stable/9/lib/libfetch/ftp.c Directory Properties: stable/9/lib/libfetch/ (props changed) Modified: stable/9/lib/libfetch/fetch.3 ============================================================================== --- stable/9/lib/libfetch/fetch.3 Tue Oct 4 17:14:59 2011 (r226014) +++ stable/9/lib/libfetch/fetch.3 Tue Oct 4 17:26:40 2011 (r226015) @@ -318,9 +318,19 @@ and implement the FTP protocol as described in RFC959. .Pp If the +.Ql P +(not passive) flag is specified, an active (rather than passive) +connection will be attempted. +.Pp +The .Ql p -(passive) flag is specified, a passive (rather than active) connection -will be attempted. +flag is supported for compatibility with earlier versions where active +connections were the default. +It has precedence over the +.Ql P +flag, so if both are specified, +.Nm +will use a passive connection. .Pp If the .Ql l @@ -475,9 +485,11 @@ connections will be bound. .It Ev FTP_LOGIN Default FTP login if none was provided in the URL. .It Ev FTP_PASSIVE_MODE -If set to anything but +If set to .Ql no , -forces the FTP code to use passive mode. +forces the FTP code to use active mode. +If set to any other value, forces passive mode even if the application +requested active mode. .It Ev FTP_PASSWORD Default FTP password if the remote server requests one and none was provided in the URL. Modified: stable/9/lib/libfetch/ftp.c ============================================================================== --- stable/9/lib/libfetch/ftp.c Tue Oct 4 17:14:59 2011 (r226014) +++ stable/9/lib/libfetch/ftp.c Tue Oct 4 17:26:40 2011 (r226015) @@ -633,13 +633,12 @@ ftp_transfer(conn_t *conn, const char *o /* check flags */ low = CHECK_FLAG('l'); - pasv = CHECK_FLAG('p'); + pasv = CHECK_FLAG('p') || !CHECK_FLAG('P'); verbose = CHECK_FLAG('v'); /* passive mode */ - if (!pasv) - pasv = ((s = getenv("FTP_PASSIVE_MODE")) != NULL && - strncasecmp(s, "no", 2) != 0); + if ((s = getenv("FTP_PASSIVE_MODE")) != NULL) + pasv = (strncasecmp(s, "no", 2) != 0); /* isolate filename */ filename = ftp_filename(file, &filenamelen, &type); From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 17:27:11 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 055E1106564A; Tue, 4 Oct 2011 17:27:11 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CEE708FC18; Tue, 4 Oct 2011 17:27:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94HRAm4071935; Tue, 4 Oct 2011 17:27:10 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94HRAZO071932; Tue, 4 Oct 2011 17:27:10 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110041727.p94HRAZO071932@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 4 Oct 2011 17:27:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226016 - stable/9/usr.bin/fetch X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 17:27:11 -0000 Author: des Date: Tue Oct 4 17:27:10 2011 New Revision: 226016 URL: http://svn.freebsd.org/changeset/base/226016 Log: MFH r225815: document that passive mode is the default MFH r225982: convert to UTF-8 Approved by: re (kib) Modified: stable/9/usr.bin/fetch/fetch.1 stable/9/usr.bin/fetch/fetch.c Directory Properties: stable/9/usr.bin/fetch/ (props changed) Modified: stable/9/usr.bin/fetch/fetch.1 ============================================================================== --- stable/9/usr.bin/fetch/fetch.1 Tue Oct 4 17:26:40 2011 (r226015) +++ stable/9/usr.bin/fetch/fetch.1 Tue Oct 4 17:27:10 2011 (r226016) @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2000-2011 Dag-Erling Smørgrav .\" All rights reserved. .\" Portions Copyright (c) 1999 Massachusetts Institute of Technology; used .\" by permission. @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2008 +.Dd September 27, 2011 .Dt FETCH 1 .Os .Sh NAME @@ -165,11 +165,13 @@ directory, with name(s) selected as in t .It Fl P .It Fl p Use passive FTP. -This is useful if you are behind a firewall which blocks incoming -connections. -Try this flag if -.Nm -seems to hang when retrieving FTP URLs. +These flags have no effect, since passive FTP is the default, but are +provided for compatibility with earlier versions where active FTP was +the default. +To force active mode, set the +.Ev FTP_PASSIVE_MODE +environment variable to +.Ql NO . .It Fl q Quiet mode. .It Fl R Modified: stable/9/usr.bin/fetch/fetch.c ============================================================================== --- stable/9/usr.bin/fetch/fetch.c Tue Oct 4 17:26:40 2011 (r226015) +++ stable/9/usr.bin/fetch/fetch.c Tue Oct 4 17:27:10 2011 (r226016) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2000-2011 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 17:49:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CEB0106564A; Tue, 4 Oct 2011 17:49:19 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8C5ED8FC12; Tue, 4 Oct 2011 17:49:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94HnJUw072703; Tue, 4 Oct 2011 17:49:19 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94HnJhQ072699; Tue, 4 Oct 2011 17:49:19 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041749.p94HnJhQ072699@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 17:49:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226018 - head/sys/mips/cavium X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 17:49:19 -0000 Author: marcel Date: Tue Oct 4 17:49:19 2011 New Revision: 226018 URL: http://svn.freebsd.org/changeset/base/226018 Log: Partially revert r224661: octeon_ap_boot is not a bitmask. It holds the CPU Id of the AP currently being started. As such there's no need to make it a 64-bit integral and we're not limited to 64 CPUs. Reported by: jmallet Obtained from: Andre Duane Modified: head/sys/mips/cavium/asm_octeon.S head/sys/mips/cavium/octeon_mp.c Modified: head/sys/mips/cavium/asm_octeon.S ============================================================================== --- head/sys/mips/cavium/asm_octeon.S Tue Oct 4 17:32:01 2011 (r226017) +++ head/sys/mips/cavium/asm_octeon.S Tue Oct 4 17:49:19 2011 (r226018) @@ -50,12 +50,12 @@ LEAF(octeon_ap_wait) jal platform_processor_id nop -1: lld t0, octeon_ap_boot +1: ll t0, octeon_ap_boot bne v0, t0, 1b nop move t0, zero - scd t0, octeon_ap_boot + sc t0, octeon_ap_boot beqz t0, 1b nop Modified: head/sys/mips/cavium/octeon_mp.c ============================================================================== --- head/sys/mips/cavium/octeon_mp.c Tue Oct 4 17:32:01 2011 (r226017) +++ head/sys/mips/cavium/octeon_mp.c Tue Oct 4 17:49:19 2011 (r226018) @@ -46,8 +46,7 @@ __FBSDID("$FreeBSD$"); /* XXX */ extern cvmx_bootinfo_t *octeon_bootinfo; -/* NOTE: this 64-bit mask (and many others) limits MAXCPU to 64 */ -uint64_t octeon_ap_boot = ~0ULL; +unsigned octeon_ap_boot = ~0; void platform_ipi_send(int cpuid) @@ -139,11 +138,11 @@ platform_start_ap(int cpuid) DELAY(2000); /* Give it a moment to start */ } - if (atomic_cmpset_64(&octeon_ap_boot, ~0, cpuid) == 0) + if (atomic_cmpset_32(&octeon_ap_boot, ~0, cpuid) == 0) return (-1); for (;;) { DELAY(1000); - if (atomic_cmpset_64(&octeon_ap_boot, 0, ~0) != 0) + if (atomic_cmpset_32(&octeon_ap_boot, 0, ~0) != 0) return (0); printf("Waiting for cpu%d to start\n", cpuid); } From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 18:03:55 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DB911065672; Tue, 4 Oct 2011 18:03:55 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 53CAA8FC17; Tue, 4 Oct 2011 18:03:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94I3tai073241; Tue, 4 Oct 2011 18:03:55 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94I3te6073239; Tue, 4 Oct 2011 18:03:55 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041803.p94I3te6073239@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 18:03:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226020 - head/sys/mips/cavium X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 18:03:55 -0000 Author: marcel Date: Tue Oct 4 18:03:55 2011 New Revision: 226020 URL: http://svn.freebsd.org/changeset/base/226020 Log: o Clean up some ID printfs, and put under bootverbose o Remove redundant lookups of base address in cf_identify o Fix some indenting issues o Fix an identification bug that uses DRQ to checlk for ident block returned. The correct spec is to look for BSY to be cleared. Reviewed by: imp, marcel Obtained from: Juniper Networks, Inc Author: Andrew Duane Modified: head/sys/mips/cavium/octeon_ebt3000_cf.c Modified: head/sys/mips/cavium/octeon_ebt3000_cf.c ============================================================================== --- head/sys/mips/cavium/octeon_ebt3000_cf.c Tue Oct 4 17:50:22 2011 (r226019) +++ head/sys/mips/cavium/octeon_ebt3000_cf.c Tue Oct 4 18:03:55 2011 (r226020) @@ -484,7 +484,12 @@ static int cf_cmd_identify (void) drive_param.sec_track = SWAP_SHORT (drive_param.u.driveid.current_sectors); drive_param.nr_sectors = (uint32_t)SWAP_SHORT (drive_param.u.driveid.lba_size_1) | ((uint32_t)SWAP_SHORT (drive_param.u.driveid.lba_size_2)); - printf("cf0: <%s> %lld sectors\n", drive_param.model, (long long)drive_param.nr_sectors); + if (bootverbose) { + printf(" model %s\n", drive_param.model); + printf(" heads %d tracks %d sec_tracks %d sectors %d\n", + drive_param.heads, drive_param.tracks, + drive_param.sec_track, drive_param.nr_sectors); + } return (0); } @@ -578,7 +583,10 @@ static int cf_wait_busy (void) } break; } - if ((status & STATUS_DRQ) == 0) { + + /* DRQ is only for when read data is actually available; check BSY */ + /* Some vendors do assert DRQ, but not all. Check BSY instead. */ + if (status & STATUS_BSY) { printf("%s: device not ready (status=%x)\n", __func__, status); return (ENXIO); } @@ -634,24 +642,25 @@ static int cf_probe (device_t dev) * inserted. * */ -typedef unsigned long long llu; static void cf_identify (driver_t *drv, device_t parent) { - int bus_region; + int bus_region; int count = 0; - cvmx_mio_boot_reg_cfgx_t cfg; + cvmx_mio_boot_reg_cfgx_t cfg; + + uint64_t phys_base = octeon_bootinfo->compact_flash_common_base_addr; if (octeon_is_simulation()) return; - base_addr = cvmx_phys_to_ptr(octeon_bootinfo->compact_flash_common_base_addr); + base_addr = cvmx_phys_to_ptr(phys_base); for (bus_region = 0; bus_region < 8; bus_region++) { cfg.u64 = cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(bus_region)); - if (cfg.s.base == octeon_bootinfo->compact_flash_common_base_addr >> 16) + if (cfg.s.base == phys_base >> 16) { - if (octeon_bootinfo->compact_flash_attribute_base_addr == 0) + if (cvmx_sysinfo_get()->compact_flash_attribute_base_addr == 0) bus_type = CF_TRUE_IDE_8; else bus_type = (cfg.s.width) ? CF_16 : CF_8; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 18:06:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D50E106568C; Tue, 4 Oct 2011 18:06:08 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7CDBD8FC27; Tue, 4 Oct 2011 18:06:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94I68dF073351; Tue, 4 Oct 2011 18:06:08 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94I68Cd073349; Tue, 4 Oct 2011 18:06:08 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110041806.p94I68Cd073349@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 18:06:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226021 - head/sys/mips/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 18:06:08 -0000 Author: marcel Date: Tue Oct 4 18:06:08 2011 New Revision: 226021 URL: http://svn.freebsd.org/changeset/base/226021 Log: Remove bogus and wrong definition of BLKDEV_IOSIZE. Wrong in that it must be guarded (it's configurable) and bogus in that there's absolutely no rationale for it not default to a page size like all other archs. Modified: head/sys/mips/include/param.h Modified: head/sys/mips/include/param.h ============================================================================== --- head/sys/mips/include/param.h Tue Oct 4 18:03:55 2011 (r226020) +++ head/sys/mips/include/param.h Tue Oct 4 18:06:08 2011 (r226021) @@ -149,7 +149,6 @@ #define MAXPAGESIZES 1 /* max supported pagesizes */ -#define BLKDEV_IOSIZE 2048 /* xxx: Why is this 1/2 page? */ #define MAXDUMPPGS 1 /* xxx: why is this only one? */ /* From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 18:45:29 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE9D7106566C; Tue, 4 Oct 2011 18:45:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C51538FC0A; Tue, 4 Oct 2011 18:45:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94IjThq074590; Tue, 4 Oct 2011 18:45:29 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94IjTEB074588; Tue, 4 Oct 2011 18:45:29 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110041845.p94IjTEB074588@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 4 Oct 2011 18:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226022 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 18:45:30 -0000 Author: kib Date: Tue Oct 4 18:45:29 2011 New Revision: 226022 URL: http://svn.freebsd.org/changeset/base/226022 Log: Move parts of the commit log for r166167, where Tor explained the interaction between vnode locks and vfs_busy(), into comment. MFC after: 1 week Modified: head/sys/kern/vfs_subr.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Tue Oct 4 18:06:08 2011 (r226021) +++ head/sys/kern/vfs_subr.c Tue Oct 4 18:45:29 2011 (r226022) @@ -348,6 +348,38 @@ SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, /* * Mark a mount point as busy. Used to synchronize access and to delay * unmounting. Eventually, mountlist_mtx is not released on failure. + * + * vfs_busy() is a custom lock, it can block the caller. + * vfs_busy() only sleeps if the unmount is active on the mount point. + * For a mountpoint mp, vfs_busy-enforced lock is before lock of any + * vnode belonging to mp. + * + * Lookup uses vfs_busy() to traverse mount points. + * root fs var fs + * / vnode lock A / vnode lock (/var) D + * /var vnode lock B /log vnode lock(/var/log) E + * vfs_busy lock C vfs_busy lock F + * + * Within each file system, the lock order is C->A->B and F->D->E. + * + * When traversing across mounts, the system follows that lock order: + * + * C->A->B + * | + * +->F->D->E + * + * The lookup() process for namei("/var") illustrates the process: + * VOP_LOOKUP() obtains B while A is held + * vfs_busy() obtains a shared lock on F while A and B are held + * vput() releases lock on B + * vput() releases lock on A + * VFS_ROOT() obtains lock on D while shared lock on F is held + * vfs_unbusy() releases shared lock on F + * vn_lock() obtains lock on deadfs vnode vp_crossmp instead of A. + * Attempt to lock A (instead of vp_crossmp) while D is held would + * violate the global order, causing deadlocks. + * + * dounmount() locks B while F is drained. */ int vfs_busy(struct mount *mp, int flags) From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 19:00:27 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 90A2F106567B; Tue, 4 Oct 2011 19:00:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id D123517A864; Tue, 4 Oct 2011 19:00:00 +0000 (UTC) Message-ID: <4E8B57B0.2090604@FreeBSD.org> Date: Tue, 04 Oct 2011 12:00:00 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1 MIME-Version: 1.0 To: Craig Rodrigues References: <201110031513.p93FD9ev015593@svn.freebsd.org> In-Reply-To: X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Garrett Cooper , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Nathan Whitehorn Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 19:00:27 -0000 On 10/03/2011 16:32, Craig Rodrigues wrote: > Hi, > > If pc-sysinstall can be a drop-in replacement for sysinstall in > "SCRIPT SYNTAX" mode, even better. sysinstall needs to go... > while people do use it, it has a lot of problems that aren't getting fixed, > and it is clear that bsdinstall is the future for FreeBSD installation. My initial point was not about installation, it was about post-installation configuration. We don't have a new tool for that yet. > Nathan is doing a good thing by forcing the issue by removing > it....there is too much brokenness in sysinstall that is not getting > fixed, and the sooner we can move to > bsdinstall/pc-sysinstall, the better. > > Since the sysinstall removal is happening only in HEAD/10.0, we have > some time to fix the issues before 10.0 is released. Sorry, that's backwards. Garrett was right. I'll have no objection to sysinstall being gone in 10.0-RELEASE after it's lived with the deprecated tag in 9.x, but the new functionality needs to be feature complete first. And for the record, yes I am aware that this problem is why sysinstall has lived so long in the first place. I should also point out for the record that I don't see anything malicious in Nathan's actions, my only concern is that they are premature. Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 19:07:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78B361065679; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4B70C8FC0C; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94J7dgm075276; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94J7d0x075274; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201110041907.p94J7d0x075274@svn.freebsd.org> From: Colin Percival Date: Tue, 4 Oct 2011 19:07:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226023 - head/sys/compat/linux releng/7.3 releng/7.3/sys/compat/linux releng/7.3/sys/conf releng/7.4 releng/7.4/sys/compat/linux releng/7.4/sys/conf releng/8.1 releng/8.1/sys/compat/li... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 19:07:39 -0000 Author: cperciva Date: Tue Oct 4 19:07:38 2011 New Revision: 226023 URL: http://svn.freebsd.org/changeset/base/226023 Log: Fix a bug in UNIX socket handling in the linux emulator which was exposed by the security fix in FreeBSD-SA-11:05.unix. Approved by: so (cperciva) Approved by: re (kib) Security: Related to FreeBSD-SA-11:05.unix, but not actually a security fix. Modified: stable/7/sys/compat/linux/linux_socket.c Changes in other areas also in this revision: Modified: head/sys/compat/linux/linux_socket.c releng/7.3/UPDATING releng/7.3/sys/compat/linux/linux_socket.c releng/7.3/sys/conf/newvers.sh releng/7.4/UPDATING releng/7.4/sys/compat/linux/linux_socket.c releng/7.4/sys/conf/newvers.sh releng/8.1/UPDATING releng/8.1/sys/compat/linux/linux_socket.c releng/8.1/sys/conf/newvers.sh releng/8.2/UPDATING releng/8.2/sys/compat/linux/linux_socket.c releng/8.2/sys/conf/newvers.sh stable/8/sys/compat/linux/linux_socket.c stable/9/sys/compat/linux/linux_socket.c Modified: stable/7/sys/compat/linux/linux_socket.c ============================================================================== --- stable/7/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ stable/7/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -101,6 +101,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -163,6 +164,20 @@ do_sa_get(struct sockaddr **sap, const s } } + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 19:07:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 986FC106567A; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6BE448FC12; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94J7dL0075282; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94J7dPf075280; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201110041907.p94J7dPf075280@svn.freebsd.org> From: Colin Percival Date: Tue, 4 Oct 2011 19:07:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226023 - head/sys/compat/linux releng/7.3 releng/7.3/sys/compat/linux releng/7.3/sys/conf releng/7.4 releng/7.4/sys/compat/linux releng/7.4/sys/conf releng/8.1 releng/8.1/sys/compat/li... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 19:07:39 -0000 Author: cperciva Date: Tue Oct 4 19:07:38 2011 New Revision: 226023 URL: http://svn.freebsd.org/changeset/base/226023 Log: Fix a bug in UNIX socket handling in the linux emulator which was exposed by the security fix in FreeBSD-SA-11:05.unix. Approved by: so (cperciva) Approved by: re (kib) Security: Related to FreeBSD-SA-11:05.unix, but not actually a security fix. Modified: head/sys/compat/linux/linux_socket.c Changes in other areas also in this revision: Modified: releng/7.3/UPDATING releng/7.3/sys/compat/linux/linux_socket.c releng/7.3/sys/conf/newvers.sh releng/7.4/UPDATING releng/7.4/sys/compat/linux/linux_socket.c releng/7.4/sys/conf/newvers.sh releng/8.1/UPDATING releng/8.1/sys/compat/linux/linux_socket.c releng/8.1/sys/conf/newvers.sh releng/8.2/UPDATING releng/8.2/sys/compat/linux/linux_socket.c releng/8.2/sys/conf/newvers.sh stable/7/sys/compat/linux/linux_socket.c stable/8/sys/compat/linux/linux_socket.c stable/9/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ head/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -104,6 +104,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -166,6 +167,20 @@ do_sa_get(struct sockaddr **sap, const s } } + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 19:07:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5393106567C; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B0FB88FC13; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94J7dUL075299; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94J7dnD075286; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201110041907.p94J7dnD075286@svn.freebsd.org> From: Colin Percival Date: Tue, 4 Oct 2011 19:07:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226023 - head/sys/compat/linux releng/7.3 releng/7.3/sys/compat/linux releng/7.3/sys/conf releng/7.4 releng/7.4/sys/compat/linux releng/7.4/sys/conf releng/8.1 releng/8.1/sys/compat/li... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 19:07:40 -0000 Author: cperciva Date: Tue Oct 4 19:07:38 2011 New Revision: 226023 URL: http://svn.freebsd.org/changeset/base/226023 Log: Fix a bug in UNIX socket handling in the linux emulator which was exposed by the security fix in FreeBSD-SA-11:05.unix. Approved by: so (cperciva) Approved by: re (kib) Security: Related to FreeBSD-SA-11:05.unix, but not actually a security fix. Modified: releng/7.3/UPDATING releng/7.3/sys/compat/linux/linux_socket.c releng/7.3/sys/conf/newvers.sh releng/7.4/UPDATING releng/7.4/sys/compat/linux/linux_socket.c releng/7.4/sys/conf/newvers.sh releng/8.1/UPDATING releng/8.1/sys/compat/linux/linux_socket.c releng/8.1/sys/conf/newvers.sh releng/8.2/UPDATING releng/8.2/sys/compat/linux/linux_socket.c releng/8.2/sys/conf/newvers.sh Changes in other areas also in this revision: Modified: head/sys/compat/linux/linux_socket.c stable/7/sys/compat/linux/linux_socket.c stable/8/sys/compat/linux/linux_socket.c stable/9/sys/compat/linux/linux_socket.c Modified: releng/7.3/UPDATING ============================================================================== --- releng/7.3/UPDATING Tue Oct 4 18:45:29 2011 (r226022) +++ releng/7.3/UPDATING Tue Oct 4 19:07:38 2011 (r226023) @@ -8,6 +8,10 @@ Items affecting the ports and packages s /usr/ports/UPDATING. Please read that file before running portupgrade. +20111004: p8 FreeBSD-SA-11:05.unix (revised) + Fix a bug in UNIX socket handling in the linux emulator which was + exposed by the security fix in FreeBSD-SA-11:05.unix. + 20110928: p7 FreeBSD-SA-11:04.compress, FreeBSD-SA-11:05.unix Fix handling of corrupt compress(1)ed data. [11:04] Modified: releng/7.3/sys/compat/linux/linux_socket.c ============================================================================== --- releng/7.3/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ releng/7.3/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -101,6 +101,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -158,6 +159,20 @@ do_sa_get(struct sockaddr **sap, const s if (bdom == AF_INET) alloclen = sizeof(struct sockaddr_in); + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; Modified: releng/7.3/sys/conf/newvers.sh ============================================================================== --- releng/7.3/sys/conf/newvers.sh Tue Oct 4 18:45:29 2011 (r226022) +++ releng/7.3/sys/conf/newvers.sh Tue Oct 4 19:07:38 2011 (r226023) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.3" -BRANCH="RELEASE-p7" +BRANCH="RELEASE-p8" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/7.4/UPDATING ============================================================================== --- releng/7.4/UPDATING Tue Oct 4 18:45:29 2011 (r226022) +++ releng/7.4/UPDATING Tue Oct 4 19:07:38 2011 (r226023) @@ -8,6 +8,10 @@ Items affecting the ports and packages s /usr/ports/UPDATING. Please read that file before running portupgrade. +20111004: p4 FreeBSD-SA-11:05.unix (revised) + Fix a bug in UNIX socket handling in the linux emulator which was + exposed by the security fix in FreeBSD-SA-11:05.unix. + 20110928: p3 FreeBSD-SA-11:04.compress, FreeBSD-SA-11:05.unix Fix handling of corrupt compress(1)ed data. [11:04] Modified: releng/7.4/sys/compat/linux/linux_socket.c ============================================================================== --- releng/7.4/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ releng/7.4/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -101,6 +101,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -163,6 +164,20 @@ do_sa_get(struct sockaddr **sap, const s } } + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; Modified: releng/7.4/sys/conf/newvers.sh ============================================================================== --- releng/7.4/sys/conf/newvers.sh Tue Oct 4 18:45:29 2011 (r226022) +++ releng/7.4/sys/conf/newvers.sh Tue Oct 4 19:07:38 2011 (r226023) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.4" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.1/UPDATING ============================================================================== --- releng/8.1/UPDATING Tue Oct 4 18:45:29 2011 (r226022) +++ releng/8.1/UPDATING Tue Oct 4 19:07:38 2011 (r226023) @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20111004: p6 FreeBSD-SA-11:05.unix (revised) + Fix a bug in UNIX socket handling in the linux emulator which was + exposed by the security fix in FreeBSD-SA-11:05.unix. + 20110928: p5 FreeBSD-SA-11:04.compress, FreeBSD-SA-11:05.unix Fix handling of corrupt compress(1)ed data. [11:04] Modified: releng/8.1/sys/compat/linux/linux_socket.c ============================================================================== --- releng/8.1/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ releng/8.1/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -103,6 +103,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -165,6 +166,20 @@ do_sa_get(struct sockaddr **sap, const s } } + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; Modified: releng/8.1/sys/conf/newvers.sh ============================================================================== --- releng/8.1/sys/conf/newvers.sh Tue Oct 4 18:45:29 2011 (r226022) +++ releng/8.1/sys/conf/newvers.sh Tue Oct 4 19:07:38 2011 (r226023) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.1" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.2/UPDATING ============================================================================== --- releng/8.2/UPDATING Tue Oct 4 18:45:29 2011 (r226022) +++ releng/8.2/UPDATING Tue Oct 4 19:07:38 2011 (r226023) @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20111004: p4 FreeBSD-SA-11:05.unix (revised) + Fix a bug in UNIX socket handling in the linux emulator which was + exposed by the security fix in FreeBSD-SA-11:05.unix. + 20110928: p3 FreeBSD-SA-11:04.compress, FreeBSD-SA-11:05.unix Fix handling of corrupt compress(1)ed data. [11:04] Modified: releng/8.2/sys/compat/linux/linux_socket.c ============================================================================== --- releng/8.2/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ releng/8.2/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -103,6 +103,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -165,6 +166,20 @@ do_sa_get(struct sockaddr **sap, const s } } + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; Modified: releng/8.2/sys/conf/newvers.sh ============================================================================== --- releng/8.2/sys/conf/newvers.sh Tue Oct 4 18:45:29 2011 (r226022) +++ releng/8.2/sys/conf/newvers.sh Tue Oct 4 19:07:38 2011 (r226023) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.2" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 19:07:40 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B011106568D; Tue, 4 Oct 2011 19:07:40 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D1F9F8FC14; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94J7d8V075305; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94J7dHA075303; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201110041907.p94J7dHA075303@svn.freebsd.org> From: Colin Percival Date: Tue, 4 Oct 2011 19:07:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226023 - head/sys/compat/linux releng/7.3 releng/7.3/sys/compat/linux releng/7.3/sys/conf releng/7.4 releng/7.4/sys/compat/linux releng/7.4/sys/conf releng/8.1 releng/8.1/sys/compat/li... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 19:07:40 -0000 Author: cperciva Date: Tue Oct 4 19:07:38 2011 New Revision: 226023 URL: http://svn.freebsd.org/changeset/base/226023 Log: Fix a bug in UNIX socket handling in the linux emulator which was exposed by the security fix in FreeBSD-SA-11:05.unix. Approved by: so (cperciva) Approved by: re (kib) Security: Related to FreeBSD-SA-11:05.unix, but not actually a security fix. Modified: stable/9/sys/compat/linux/linux_socket.c Changes in other areas also in this revision: Modified: head/sys/compat/linux/linux_socket.c releng/7.3/UPDATING releng/7.3/sys/compat/linux/linux_socket.c releng/7.3/sys/conf/newvers.sh releng/7.4/UPDATING releng/7.4/sys/compat/linux/linux_socket.c releng/7.4/sys/conf/newvers.sh releng/8.1/UPDATING releng/8.1/sys/compat/linux/linux_socket.c releng/8.1/sys/conf/newvers.sh releng/8.2/UPDATING releng/8.2/sys/compat/linux/linux_socket.c releng/8.2/sys/conf/newvers.sh stable/7/sys/compat/linux/linux_socket.c stable/8/sys/compat/linux/linux_socket.c Modified: stable/9/sys/compat/linux/linux_socket.c ============================================================================== --- stable/9/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ stable/9/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -104,6 +104,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -166,6 +167,20 @@ do_sa_get(struct sockaddr **sap, const s } } + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 19:07:40 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BD20106568E; Tue, 4 Oct 2011 19:07:40 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F2A568FC15; Tue, 4 Oct 2011 19:07:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94J7dUh075311; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94J7dSw075309; Tue, 4 Oct 2011 19:07:39 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201110041907.p94J7dSw075309@svn.freebsd.org> From: Colin Percival Date: Tue, 4 Oct 2011 19:07:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226023 - head/sys/compat/linux releng/7.3 releng/7.3/sys/compat/linux releng/7.3/sys/conf releng/7.4 releng/7.4/sys/compat/linux releng/7.4/sys/conf releng/8.1 releng/8.1/sys/compat/li... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 19:07:40 -0000 Author: cperciva Date: Tue Oct 4 19:07:38 2011 New Revision: 226023 URL: http://svn.freebsd.org/changeset/base/226023 Log: Fix a bug in UNIX socket handling in the linux emulator which was exposed by the security fix in FreeBSD-SA-11:05.unix. Approved by: so (cperciva) Approved by: re (kib) Security: Related to FreeBSD-SA-11:05.unix, but not actually a security fix. Modified: stable/8/sys/compat/linux/linux_socket.c Changes in other areas also in this revision: Modified: head/sys/compat/linux/linux_socket.c releng/7.3/UPDATING releng/7.3/sys/compat/linux/linux_socket.c releng/7.3/sys/conf/newvers.sh releng/7.4/UPDATING releng/7.4/sys/compat/linux/linux_socket.c releng/7.4/sys/conf/newvers.sh releng/8.1/UPDATING releng/8.1/sys/compat/linux/linux_socket.c releng/8.1/sys/conf/newvers.sh releng/8.2/UPDATING releng/8.2/sys/compat/linux/linux_socket.c releng/8.2/sys/conf/newvers.sh stable/7/sys/compat/linux/linux_socket.c stable/9/sys/compat/linux/linux_socket.c Modified: stable/8/sys/compat/linux/linux_socket.c ============================================================================== --- stable/8/sys/compat/linux/linux_socket.c Tue Oct 4 18:45:29 2011 (r226022) +++ stable/8/sys/compat/linux/linux_socket.c Tue Oct 4 19:07:38 2011 (r226023) @@ -103,6 +103,7 @@ do_sa_get(struct sockaddr **sap, const s int oldv6size; struct sockaddr_in6 *sin6; #endif + int namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -165,6 +166,20 @@ do_sa_get(struct sockaddr **sap, const s } } + if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { + for (namelen = 0; + namelen < *osalen - offsetof(struct sockaddr_un, sun_path); + namelen++) + if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) + break; + if (namelen + offsetof(struct sockaddr_un, sun_path) > + sizeof(struct sockaddr_un)) { + error = EINVAL; + goto out; + } + alloclen = sizeof(struct sockaddr_un); + } + sa = (struct sockaddr *) kosa; sa->sa_family = bdom; sa->sa_len = alloclen; From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 20:17:44 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EBC51065673; Tue, 4 Oct 2011 20:17:44 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0DF3D8FC16; Tue, 4 Oct 2011 20:17:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94KHhcI077520; Tue, 4 Oct 2011 20:17:43 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94KHhNu077514; Tue, 4 Oct 2011 20:17:43 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110042017.p94KHhNu077514@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 20:17:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226024 - in head/sys/mips/cavium: . octe X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 20:17:44 -0000 Author: marcel Date: Tue Oct 4 20:17:43 2011 New Revision: 226024 URL: http://svn.freebsd.org/changeset/base/226024 Log: Remove octeon_bootinfo from all files except octeon_machdep.c. Use instead cvmx_sysinfo_get() consistently. Reviewed by: jmallett, marcel Obtained from: Juniper Networks, Inc Author: Andrew Duane Modified: head/sys/mips/cavium/if_octm.c head/sys/mips/cavium/octe/ethernet-common.c head/sys/mips/cavium/octe/ethernet.c head/sys/mips/cavium/octeon_ebt3000_cf.c head/sys/mips/cavium/octeon_mp.c Modified: head/sys/mips/cavium/if_octm.c ============================================================================== --- head/sys/mips/cavium/if_octm.c Tue Oct 4 19:07:38 2011 (r226023) +++ head/sys/mips/cavium/if_octm.c Tue Oct 4 20:17:43 2011 (r226024) @@ -64,8 +64,6 @@ #include #include -extern cvmx_bootinfo_t *octeon_bootinfo; - struct octm_softc { struct ifnet *sc_ifp; device_t sc_dev; @@ -179,7 +177,7 @@ octm_attach(device_t dev) * Set MAC address for this management port. */ mac = 0; - memcpy((u_int8_t *)&mac + 2, octeon_bootinfo->mac_addr_base, 6); + memcpy((u_int8_t *)&mac + 2, cvmx_sysinfo_get()->mac_addr_base, 6); mac += sc->sc_port; cvmx_mgmt_port_set_mac(sc->sc_port, mac); Modified: head/sys/mips/cavium/octe/ethernet-common.c ============================================================================== --- head/sys/mips/cavium/octe/ethernet-common.c Tue Oct 4 19:07:38 2011 (r226023) +++ head/sys/mips/cavium/octe/ethernet-common.c Tue Oct 4 20:17:43 2011 (r226024) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "ethernet-headers.h" extern int octeon_is_simulation(void); -extern cvmx_bootinfo_t *octeon_bootinfo; /** @@ -270,12 +269,12 @@ void cvm_oct_common_poll(struct ifnet *i int cvm_oct_common_init(struct ifnet *ifp) { char mac[6] = { - octeon_bootinfo->mac_addr_base[0], - octeon_bootinfo->mac_addr_base[1], - octeon_bootinfo->mac_addr_base[2], - octeon_bootinfo->mac_addr_base[3], - octeon_bootinfo->mac_addr_base[4], - octeon_bootinfo->mac_addr_base[5] }; + cvmx_sysinfo_get()->mac_addr_base[0], + cvmx_sysinfo_get()->mac_addr_base[1], + cvmx_sysinfo_get()->mac_addr_base[2], + cvmx_sysinfo_get()->mac_addr_base[3], + cvmx_sysinfo_get()->mac_addr_base[4], + cvmx_sysinfo_get()->mac_addr_base[5] }; cvm_oct_private_t *priv = (cvm_oct_private_t *)ifp->if_softc; mac[5] += cvm_oct_mac_addr_offset++; Modified: head/sys/mips/cavium/octe/ethernet.c ============================================================================== --- head/sys/mips/cavium/octe/ethernet.c Tue Oct 4 19:07:38 2011 (r226023) +++ head/sys/mips/cavium/octe/ethernet.c Tue Oct 4 20:17:43 2011 (r226024) @@ -77,12 +77,6 @@ TUNABLE_INT("hw.octe.pow_receive_group", extern int octeon_is_simulation(void); /** - * Exported from the kernel so we can determine board information. It is - * passed by the bootloader to the kernel. - */ -extern cvmx_bootinfo_t *octeon_bootinfo; - -/** * Periodic timer to check auto negotiation */ static struct callout cvm_oct_poll_timer; @@ -475,7 +469,7 @@ int cvm_oct_init_module(device_t bus) if (INTERRUPT_LIMIT) { /* Set the POW timer rate to give an interrupt at most INTERRUPT_LIMIT times per second */ - cvmx_write_csr(CVMX_POW_WQ_INT_PC, octeon_bootinfo->eclock_hz/(INTERRUPT_LIMIT*16*256)<<8); + cvmx_write_csr(CVMX_POW_WQ_INT_PC, cvmx_clock_get_rate(CVMX_CLOCK_CORE)/(INTERRUPT_LIMIT*16*256)<<8); /* Enable POW timer interrupt. It will count when there are packets available */ cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0x1ful<<24); Modified: head/sys/mips/cavium/octeon_ebt3000_cf.c ============================================================================== --- head/sys/mips/cavium/octeon_ebt3000_cf.c Tue Oct 4 19:07:38 2011 (r226023) +++ head/sys/mips/cavium/octeon_ebt3000_cf.c Tue Oct 4 20:17:43 2011 (r226024) @@ -100,9 +100,6 @@ __FBSDID("$FreeBSD$"); #define SWAP_SHORT(x) ((x << 8) | (x >> 8)) #define MODEL_STR_SIZE 40 -/* XXX */ -extern cvmx_bootinfo_t *octeon_bootinfo; - /* Globals */ /* * There's three bus types supported by this driver. @@ -648,7 +645,7 @@ static void cf_identify (driver_t *drv, int count = 0; cvmx_mio_boot_reg_cfgx_t cfg; - uint64_t phys_base = octeon_bootinfo->compact_flash_common_base_addr; + uint64_t phys_base = cvmx_sysinfo_get()->compact_flash_common_base_addr; if (octeon_is_simulation()) return; Modified: head/sys/mips/cavium/octeon_mp.c ============================================================================== --- head/sys/mips/cavium/octeon_mp.c Tue Oct 4 19:07:38 2011 (r226023) +++ head/sys/mips/cavium/octeon_mp.c Tue Oct 4 20:17:43 2011 (r226024) @@ -43,9 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* XXX */ -extern cvmx_bootinfo_t *octeon_bootinfo; - unsigned octeon_ap_boot = ~0; void @@ -105,7 +102,7 @@ platform_init_ap(int cpuid) void platform_cpu_mask(cpuset_t *mask) { - uint64_t core_mask = octeon_bootinfo->core_mask; + uint64_t core_mask = cvmx_sysinfo_get()->core_mask; uint64_t i, m; CPU_ZERO(mask); From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 20:30:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D51B2106566B; Tue, 4 Oct 2011 20:30:15 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C534B8FC12; Tue, 4 Oct 2011 20:30:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94KUFcV077935; Tue, 4 Oct 2011 20:30:15 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94KUFOQ077933; Tue, 4 Oct 2011 20:30:15 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110042030.p94KUFOQ077933@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 4 Oct 2011 20:30:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226025 - head/sys/mips/cavium X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 20:30:15 -0000 Author: marcel Date: Tue Oct 4 20:30:15 2011 New Revision: 226025 URL: http://svn.freebsd.org/changeset/base/226025 Log: Add default address for FLASH mapping on the boot bus. Reviewed by: jmallett, marcel Obtained from: Juniper Networks, Inc Author: Andrew Duane Modified: head/sys/mips/cavium/octeon_pcmap_regs.h Modified: head/sys/mips/cavium/octeon_pcmap_regs.h ============================================================================== --- head/sys/mips/cavium/octeon_pcmap_regs.h Tue Oct 4 20:17:43 2011 (r226024) +++ head/sys/mips/cavium/octeon_pcmap_regs.h Tue Oct 4 20:30:15 2011 (r226025) @@ -297,4 +297,9 @@ extern int octeon_is_simulation(void); */ #define OCTEON_CHAR_LED_BASE_ADDR (0x1d020000 | (0x1ffffffffull << 31)) +/* + * Default FLASH device (physical) base address + */ +#define OCTEON_FLASH_BASE_ADDR (0x1d040000ull) + #endif /* !OCTEON_PCMAP_REGS_H__ */ From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 20:44:14 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id C71AE1065670; Tue, 4 Oct 2011 20:44:14 +0000 (UTC) Date: Tue, 4 Oct 2011 20:44:14 +0000 From: Alexander Best To: Glen Barber Message-ID: <20111004204414.GA4218@freebsd.org> References: <201110021605.p92G5JXb070257@svn.freebsd.org> <20111003152828.GA75007@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111003152828.GA75007@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225927 - head/bin/ps X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 20:44:14 -0000 On Mon Oct 3 11, Alexander Best wrote: > On Sun Oct 2 11, Glen Barber wrote: > > Author: gjb (doc committer) > > Date: Sun Oct 2 16:05:19 2011 > > New Revision: 225927 > > URL: http://svn.freebsd.org/changeset/base/225927 > > > > Log: > > Correct a typo that was introduced in 225912 > > > > Submitted by: Valentin Nechayev (netch % netch!kiev!ua), arundel > > MFC after: 1 week > > With-MFC: 225908 > > > > Modified: > > head/bin/ps/ps.1 > > i've been reviewing the ps(1) man page some more and found several other > issues. in addition to those, i think some of the recent changes could be > improved, too. > > it would be nice to hear what people think regarding these changes. i'll try tidying up the man page a bit more and will then submit a PR. the patch is quite extensive, so i guess filing this as PR is a better idea. cheers. alex > > cheers. > alex > > > > > Modified: head/bin/ps/ps.1 > > ============================================================================== > > --- head/bin/ps/ps.1 Sun Oct 2 14:10:25 2011 (r225926) > > +++ head/bin/ps/ps.1 Sun Oct 2 16:05:19 2011 (r225927) > > @@ -431,7 +431,7 @@ The process is being traced or debugged. > > An abbreviation for the pathname of the controlling terminal, if any. > > The abbreviation consists of the three letters following > > .Pa /dev/tty , > > -or, for psuedo-terminals, the corresponding entry in > > +or, for pseudo-terminals, the corresponding entry in > > .Pa /dev/pts . > > This is followed by a > > .Ql - > diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 > index 2c04c21..965abcb 100644 > --- a/bin/ps/ps.1 > +++ b/bin/ps/ps.1 > @@ -29,7 +29,7 @@ > .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 > .\" $FreeBSD$ > .\" > -.Dd October 1, 2011 > +.Dd October 3, 2011 > .Dt PS 1 > .Os > .Sh NAME > @@ -98,6 +98,16 @@ The default output format includes, for each process, the process' ID, > controlling terminal, state, CPU time (including both user and system time) > and associated command. > .Pp > +The > +.Fl G , O , o , p , t > +and > +.Fl U > +options accept, in addition to a single argument, a list of arguments > +which must be space or comma seperated. > +Also these options can be used more than once in a single > +.Nm > +command. > +.Pp > The process file system (see > .Xr procfs 5 ) > should be mounted when > @@ -184,11 +194,15 @@ Add the information associated with the space or comma separated list > of keywords specified, after the process ID, > in the default information > display. > -Keywords may be appended with an equals > +The last keyword in the list may be appended with an equals > .Pq Ql = > -sign and a string. > +sign and a string that spans the rest of the argument, and can contain > +space and comma characters. > This causes the printed header to use the specified string instead of > the standard header. > +To specify header texts for multiple keywords, more than one > +.Fl O > +option must be used. > .It Fl o > Display information associated with the space or comma separated > list of keywords specified. > @@ -198,10 +212,9 @@ sign and a string that spans the rest of the argument, and can contain > space and comma characters. > This causes the printed header to use the specified string instead of > the standard header. > -Multiple keywords may also be given in the form of more than one > +To specify header texts for multiple keywords, more than one > .Fl o > -option. > -So the header texts for multiple keywords can be changed. > +option must be used. > If all keywords have empty header texts, no header line is written. > .It Fl p > Display information about processes which match the specified process IDs. > @@ -217,7 +230,9 @@ with the standard input. > .It Fl t > Display information about processes attached to the specified terminal > devices. > -Full pathnames, as well as abbreviations (see explanation of the > +Full pathnames, relative pathnames to > +.Pa /dev , > +as well as abbreviations (see explanation of the > .Cm tt > keyword) can be specified. > .It Fl U > @@ -428,16 +443,16 @@ The process is swapped out. > The process is being traced or debugged. > .El > .It Cm tt > -An abbreviation for the pathname of the controlling terminal, if any. > -The abbreviation consists of the three letters following > +An abbreviation for the device name of the controlling terminal, if any. > +The abbreviation consists of the two letters following > .Pa /dev/tty , > -or, for pseudo-terminals, the corresponding entry in > +or, for pseudo-terminals, the corresponding device number in > .Pa /dev/pts . > This is followed by a > .Ql - > if the process can no longer reach that > controlling terminal (i.e., it has been revoked). > -The full pathname of the controlling terminal is available via the > +The full device name of the controlling terminal is available via the > .Cm tty > keyword. > .It Cm wchan > @@ -636,9 +651,12 @@ control terminal session ID > .It Cm tsiz > text size (in Kbytes) > .It Cm tt > -control terminal name (two letter abbreviation) > +abbreviated two letter control terminal name or > +device number for pseudo-terminals > .It Cm tty > -full name of control terminal > +full name of control terminal or > +.Pa pts/ Ns Ao Ar tt Ac > +for pseudo-terminals > .It Cm ucomm > name to be used for accounting > .It Cm uid From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 20:50:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2956D1065670; Tue, 4 Oct 2011 20:50:54 +0000 (UTC) (envelope-from juli@clockworksquid.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id 423218FC14; Tue, 4 Oct 2011 20:50:52 +0000 (UTC) Received: by wwe3 with SMTP id 3so1390678wwe.31 for ; Tue, 04 Oct 2011 13:50:52 -0700 (PDT) Received: by 10.227.20.77 with SMTP id e13mr1934733wbb.97.1317760107312; Tue, 04 Oct 2011 13:28:27 -0700 (PDT) MIME-Version: 1.0 Sender: juli@clockworksquid.com Received: by 10.227.199.140 with HTTP; Tue, 4 Oct 2011 13:28:07 -0700 (PDT) In-Reply-To: <201110041749.p94HnJhQ072699@svn.freebsd.org> References: <201110041749.p94HnJhQ072699@svn.freebsd.org> From: Juli Mallett Date: Tue, 4 Oct 2011 13:28:07 -0700 X-Google-Sender-Auth: YcSRYc2ZYEuwa0H7_mywluMQYAo Message-ID: To: Marcel Moolenaar Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226018 - head/sys/mips/cavium X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 20:50:54 -0000 VGhhbmtzIQoKT24gVHVlLCBPY3QgNCwgMjAxMSBhdCAxMDo0OSwgTWFyY2VsIE1vb2xlbmFhciA8 bWFyY2VsQGZyZWVic2Qub3JnPiB3cm90ZToKPiBBdXRob3I6IG1hcmNlbAo+IERhdGU6IFR1ZSBP Y3QgwqA0IDE3OjQ5OjE5IDIwMTEKPiBOZXcgUmV2aXNpb246IDIyNjAxOAo+IFVSTDogaHR0cDov L3N2bi5mcmVlYnNkLm9yZy9jaGFuZ2VzZXQvYmFzZS8yMjYwMTgKPgo+IExvZzoKPiDCoFBhcnRp YWxseSByZXZlcnQgcjIyNDY2MToKPiDCoG9jdGVvbl9hcF9ib290IGlzIG5vdCBhIGJpdG1hc2su IEl0IGhvbGRzIHRoZSBDUFUgSWQgb2YgdGhlCj4gwqBBUCBjdXJyZW50bHkgYmVpbmcgc3RhcnRl ZC4gQXMgc3VjaCB0aGVyZSdzIG5vIG5lZWQgdG8gbWFrZQo+IMKgaXQgYSA2NC1iaXQgaW50ZWdy YWwgYW5kIHdlJ3JlIG5vdCBsaW1pdGVkIHRvIDY0IENQVXMuCj4KPiDCoFJlcG9ydGVkIGJ5OiBq bWFsbGV0Cj4gwqBPYnRhaW5lZCBmcm9tOiDCoCDCoCDCoCDCoEFuZHJlIER1YW5lCj4KPiBNb2Rp ZmllZDoKPiDCoGhlYWQvc3lzL21pcHMvY2F2aXVtL2FzbV9vY3Rlb24uUwo+IMKgaGVhZC9zeXMv bWlwcy9jYXZpdW0vb2N0ZW9uX21wLmMKPgo+IE1vZGlmaWVkOiBoZWFkL3N5cy9taXBzL2Nhdml1 bS9hc21fb2N0ZW9uLlMKPiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KPiAtLS0gaGVhZC9zeXMvbWlw cy9jYXZpdW0vYXNtX29jdGVvbi5TIMKgIFR1ZSBPY3QgwqA0IDE3OjMyOjAxIDIwMTEgwqAgwqAg wqAgwqAocjIyNjAxNykKPiArKysgaGVhZC9zeXMvbWlwcy9jYXZpdW0vYXNtX29jdGVvbi5TIMKg IFR1ZSBPY3QgwqA0IDE3OjQ5OjE5IDIwMTEgwqAgwqAgwqAgwqAocjIyNjAxOCkKPiBAQCAtNTAs MTIgKzUwLDEyIEBAIExFQUYob2N0ZW9uX2FwX3dhaXQpCj4gwqAgwqAgwqAgwqBqYWwgwqAgwqAg cGxhdGZvcm1fcHJvY2Vzc29yX2lkCj4gwqAgwqAgwqAgwqBub3AKPgo+IC0xOiDCoCDCoCBsbGQg wqAgwqAgdDAsIG9jdGVvbl9hcF9ib290Cj4gKzE6IMKgIMKgIGxsIMKgIMKgIMKgdDAsIG9jdGVv bl9hcF9ib290Cj4gwqAgwqAgwqAgwqBibmUgwqAgwqAgdjAsIHQwLCAxYgo+IMKgIMKgIMKgIMKg bm9wCj4KPiDCoCDCoCDCoCDCoG1vdmUgwqAgwqB0MCwgemVybwo+IC0gwqAgwqAgwqAgc2NkIMKg IMKgIHQwLCBvY3Rlb25fYXBfYm9vdAo+ICsgwqAgwqAgwqAgc2MgwqAgwqAgwqB0MCwgb2N0ZW9u X2FwX2Jvb3QKPgo+IMKgIMKgIMKgIMKgYmVxeiDCoCDCoHQwLCAxYgo+IMKgIMKgIMKgIMKgbm9w Cj4KPiBNb2RpZmllZDogaGVhZC9zeXMvbWlwcy9jYXZpdW0vb2N0ZW9uX21wLmMKPiA9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KPiAtLS0gaGVhZC9zeXMvbWlwcy9jYXZpdW0vb2N0ZW9uX21wLmMgwqAg wqBUdWUgT2N0IMKgNCAxNzozMjowMSAyMDExIMKgIMKgIMKgIMKgKHIyMjYwMTcpCj4gKysrIGhl YWQvc3lzL21pcHMvY2F2aXVtL29jdGVvbl9tcC5jIMKgIMKgVHVlIE9jdCDCoDQgMTc6NDk6MTkg MjAxMSDCoCDCoCDCoCDCoChyMjI2MDE4KQo+IEBAIC00Niw4ICs0Niw3IEBAIF9fRkJTRElEKCIk RnJlZUJTRCQiKTsKPiDCoC8qIFhYWCAqLwo+IMKgZXh0ZXJuIGN2bXhfYm9vdGluZm9fdCAqb2N0 ZW9uX2Jvb3RpbmZvOwo+Cj4gLS8qIE5PVEU6IHRoaXMgNjQtYml0IG1hc2sgKGFuZCBtYW55IG90 aGVycykgbGltaXRzIE1BWENQVSB0byA2NCAqLwo+IC11aW50NjRfdCBvY3Rlb25fYXBfYm9vdCA9 IH4wVUxMOwo+ICt1bnNpZ25lZCBvY3Rlb25fYXBfYm9vdCA9IH4wOwo+Cj4gwqB2b2lkCj4gwqBw bGF0Zm9ybV9pcGlfc2VuZChpbnQgY3B1aWQpCj4gQEAgLTEzOSwxMSArMTM4LDExIEBAIHBsYXRm b3JtX3N0YXJ0X2FwKGludCBjcHVpZCkKPiDCoCDCoCDCoCDCoCDCoCDCoERFTEFZKDIwMDApOyDC oCDCoC8qIEdpdmUgaXQgYSBtb21lbnQgdG8gc3RhcnQgKi8KPiDCoCDCoCDCoCDCoH0KPgo+IC0g wqAgwqAgwqAgaWYgKGF0b21pY19jbXBzZXRfNjQoJm9jdGVvbl9hcF9ib290LCB+MCwgY3B1aWQp ID09IDApCj4gKyDCoCDCoCDCoCBpZiAoYXRvbWljX2NtcHNldF8zMigmb2N0ZW9uX2FwX2Jvb3Qs IH4wLCBjcHVpZCkgPT0gMCkKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHJldHVybiAoLTEpOwo+ IMKgIMKgIMKgIMKgZm9yICg7Oykgewo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgREVMQVkoMTAw MCk7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAoYXRvbWljX2NtcHNldF82NCgmb2N0ZW9u X2FwX2Jvb3QsIDAsIH4wKSAhPSAwKQo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKGF0b21p Y19jbXBzZXRfMzIoJm9jdGVvbl9hcF9ib290LCAwLCB+MCkgIT0gMCkKPiDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoHJldHVybiAoMCk7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqBwcmludGYoIldhaXRpbmcgZm9yIGNwdSVkIHRvIHN0YXJ0XG4iLCBjcHVpZCk7Cj4gwqAgwqAg wqAgwqB9Cj4K From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 21:04:55 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E42FB106564A; Tue, 4 Oct 2011 21:04:55 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from mail.xcllnt.net (mail.xcllnt.net [70.36.220.4]) by mx1.freebsd.org (Postfix) with ESMTP id 9AB038FC16; Tue, 4 Oct 2011 21:04:55 +0000 (UTC) Received: from sa-nc-common3-64.static.jnpr.net (natint3.juniper.net [66.129.224.36]) (authenticated bits=0) by mail.xcllnt.net (8.14.5/8.14.5) with ESMTP id p94L4k5S014732 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 4 Oct 2011 14:04:53 -0700 (PDT) (envelope-from marcel@xcllnt.net) Mime-Version: 1.0 (Apple Message framework v1244.3) Content-Type: text/plain; charset=us-ascii From: Marcel Moolenaar In-Reply-To: Date: Tue, 4 Oct 2011 23:04:40 +0200 Content-Transfer-Encoding: 7bit Message-Id: <669F359D-B88F-40C3-9AF8-9E534E996D52@xcllnt.net> References: <201110041749.p94HnJhQ072699@svn.freebsd.org> To: Juli Mallett X-Mailer: Apple Mail (2.1244.3) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r226018 - head/sys/mips/cavium X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 21:04:56 -0000 On Oct 4, 2011, at 10:28 PM, Juli Mallett wrote: > Thanks! Sorry for the delay. -- Marcel Moolenaar marcel@xcllnt.net From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 21:40:25 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67CF6106564A; Tue, 4 Oct 2011 21:40:25 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 540248FC17; Tue, 4 Oct 2011 21:40:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94LePN9080725; Tue, 4 Oct 2011 21:40:25 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94LePCK080718; Tue, 4 Oct 2011 21:40:25 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201110042140.p94LePCK080718@svn.freebsd.org> From: Xin LI Date: Tue, 4 Oct 2011 21:40:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226026 - in head: share/man/man4 sys/amd64/conf sys/conf sys/dev/tws sys/i386/conf sys/modules sys/modules/tws X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 21:40:25 -0000 Author: delphij Date: Tue Oct 4 21:40:25 2011 New Revision: 226026 URL: http://svn.freebsd.org/changeset/base/226026 Log: Add the 9750 SATA+SAS 6Gb/s RAID controller card driver, tws(4). Many thanks for their contiued support to FreeBSD. This is version 10.80.00.003 from codeset 10.2.1 [1] Obtained from: LSI http://kb.lsi.com/Download16574.aspx [1] Added: head/share/man/man4/tws.4 (contents, props changed) head/sys/dev/tws/ head/sys/dev/tws/tws.c (contents, props changed) head/sys/dev/tws/tws.h (contents, props changed) head/sys/dev/tws/tws_cam.c (contents, props changed) head/sys/dev/tws/tws_hdm.c (contents, props changed) head/sys/dev/tws/tws_hdm.h (contents, props changed) head/sys/dev/tws/tws_services.c (contents, props changed) head/sys/dev/tws/tws_services.h (contents, props changed) head/sys/dev/tws/tws_user.c (contents, props changed) head/sys/dev/tws/tws_user.h (contents, props changed) head/sys/modules/tws/ head/sys/modules/tws/Makefile (contents, props changed) Modified: head/share/man/man4/Makefile head/sys/amd64/conf/GENERIC head/sys/conf/files head/sys/i386/conf/GENERIC head/sys/modules/Makefile Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Tue Oct 4 20:30:15 2011 (r226025) +++ head/share/man/man4/Makefile Tue Oct 4 21:40:25 2011 (r226026) @@ -447,6 +447,7 @@ MAN= aac.4 \ tun.4 \ twa.4 \ twe.4 \ + tws.4 \ tx.4 \ txp.4 \ u3g.4 \ Added: head/share/man/man4/tws.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/tws.4 Tue Oct 4 21:40:25 2011 (r226026) @@ -0,0 +1,118 @@ +.\" +.\"Copyright (c) 2010, 2011 iXsystems, Inc. +.\"All rights reserved. +.\" written by: Xin LI +.\" +.\"Redistribution and use in source and binary forms, with or without +.\"modification, are permitted provided that the following conditions +.\"are met: +.\"1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\"2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\"THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\"ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\"ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\"OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\"HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\"SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 4, 2011 +.Dt TWS 4 +.Os +.Sh NAME +.Nm tws +.Nd 3ware 9750 SATA+SAS 6Gb/s RAID controller card driver +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" +.Cd "device tws" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +tws_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for LSI's 3ware 9750 SATA+SAS 6Gb/s RAID controller cards. +.Pp +These controllers feature the LSISAS2108 6Gb/s SAS RAID-on-Chip (ROC) +and are available in 4- and 8-port configurations, supports RAID levels +0, 1, 5, 6, 10, 50 and single disk, with 96 SATA and/or SAS hard drives and SSDs. +.Pp +For further hardware information, see +.Pa http://www.lsi.com/. +.Sh HARDWARE +The +.Nm +driver supports the following SATA/SAS RAID controller: +.Pp +.Bl -bullet -compact +.It +LSI's 3ware SAS 9750 series +.El +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width "hw.tws.use_32bit_sgls" +.It Va hw.tws.cam_depth +The maximium queued CAM SIM requests for one controller. +The default value is 256. +.It Va hw.tws.enable_msi +This tunable enables MSI support on the controller if set to a non-zero value. +The default value is 0. +.It Va hw.tws.queue_depth +The maximium queued requests for one controller. +.It Va hw.tws.use_32bit_sgls +Limit the driver to use only 32-bit SG elements regardless whether the operating +system is running in 64-bit mode. +The default value is 0. +.El +.Sh FILES +.Bl -tag -width ".Pa /dev/tws?" -compact +.It Pa /dev/da? +array/logical disk interface +.It Pa /dev/tws? +management interface +.El +.Sh DIAGNOSTICS +Whenever the driver encounters a command failure, it prints out an error code in +the format: +.Qq Li "ERROR: (: ):" , +followed by a text description of the error. +There are other error messages and warnings that the +driver prints out, depending on the kinds of errors that it encounters. +If the driver is compiled with +.Dv TWS_DEBUG +defined, it prints out a whole bunch of debug +messages. +.Sh SEE ALSO +.Xr da 4 , +.Xr scsi 4 +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Manjunath Ranganathaiah +for LSI and this manual page was written by +.An Xin LI Aq delphij@FreeBSD.org +for iXsystems, Inc. Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Tue Oct 4 20:30:15 2011 (r226025) +++ head/sys/amd64/conf/GENERIC Tue Oct 4 21:40:25 2011 (r226026) @@ -151,6 +151,7 @@ device mlx # Mylex DAC960 family #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID +device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Oct 4 20:30:15 2011 (r226025) +++ head/sys/conf/files Tue Oct 4 21:40:25 2011 (r226026) @@ -1833,6 +1833,11 @@ dev/twa/tw_osl_freebsd.c optional twa \ compile-with "${NORMAL_C} -I$S/dev/twa" dev/twe/twe.c optional twe dev/twe/twe_freebsd.c optional twe +dev/tws/tws.c optional tws +dev/tws/tws_cam.c optional tws +dev/tws/tws_hdm.c optional tws +dev/tws/tws_services.c optional tws +dev/tws/tws_user.c optional tws dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp dev/uart/uart_bus_acpi.c optional uart acpi Added: head/sys/dev/tws/tws.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/tws/tws.c Tue Oct 4 21:40:25 2011 (r226026) @@ -0,0 +1,905 @@ +/* + * Copyright (c) 2010, LSI Corp. + * All rights reserved. + * Author : Manjunath Ranganathaiah + * Support: freebsdraid@lsi.com + * + * 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. + * 3. Neither the name of the nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ +*/ + + +#include +#include +#include + +#include +#include + +MALLOC_DEFINE(M_TWS, "twsbuf", "buffers used by tws driver"); +int tws_queue_depth = TWS_MAX_REQS; +int tws_enable_msi = 0; +int tws_enable_msix = 0; + + + +/* externs */ +extern int tws_cam_attach(struct tws_softc *sc); +extern void tws_cam_detach(struct tws_softc *sc); +extern int tws_init_ctlr(struct tws_softc *sc); +extern boolean tws_ctlr_ready(struct tws_softc *sc); +extern void tws_turn_off_interrupts(struct tws_softc *sc); +extern void tws_q_insert_tail(struct tws_softc *sc, struct tws_request *req, + u_int8_t q_type ); +extern struct tws_request *tws_q_remove_request(struct tws_softc *sc, + struct tws_request *req, u_int8_t q_type ); +extern struct tws_request *tws_q_remove_head(struct tws_softc *sc, + u_int8_t q_type ); +extern boolean tws_get_response(struct tws_softc *sc, u_int16_t *req_id); +extern boolean tws_ctlr_reset(struct tws_softc *sc); +extern void tws_intr(void *arg); +extern int tws_use_32bit_sgls; + + +struct tws_request *tws_get_request(struct tws_softc *sc, u_int16_t type); +int tws_init_connect(struct tws_softc *sc, u_int16_t mc); +void tws_send_event(struct tws_softc *sc, u_int8_t event); +uint8_t tws_get_state(struct tws_softc *sc); +void tws_release_request(struct tws_request *req); + + + +/* Function prototypes */ +static d_open_t tws_open; +static d_close_t tws_close; +static d_read_t tws_read; +static d_write_t tws_write; +extern d_ioctl_t tws_ioctl; + +static int tws_init(struct tws_softc *sc); +static void tws_dmamap_cmds_load_cbfn(void *arg, bus_dma_segment_t *segs, + int nseg, int error); + +static int tws_init_reqs(struct tws_softc *sc, u_int32_t dma_mem_size); +static int tws_init_aen_q(struct tws_softc *sc); +static int tws_init_trace_q(struct tws_softc *sc); +static int tws_setup_irq(struct tws_softc *sc); +int tws_setup_intr(struct tws_softc *sc, int irqs); +int tws_teardown_intr(struct tws_softc *sc); + + +/* Character device entry points */ + +static struct cdevsw tws_cdevsw = { + .d_version = D_VERSION, + .d_open = tws_open, + .d_close = tws_close, + .d_read = tws_read, + .d_write = tws_write, + .d_ioctl = tws_ioctl, + .d_name = "tws", +}; + +/* + * In the cdevsw routines, we find our softc by using the si_drv1 member + * of struct cdev. We set this variable to point to our softc in our + * attach routine when we create the /dev entry. + */ + +int +tws_open(struct cdev *dev, int oflags, int devtype, d_thread_t *td) +{ + struct tws_softc *sc = dev->si_drv1; + + if ( sc ) + TWS_TRACE_DEBUG(sc, "entry", dev, oflags); + return (0); +} + +int +tws_close(struct cdev *dev, int fflag, int devtype, d_thread_t *td) +{ + struct tws_softc *sc = dev->si_drv1; + + if ( sc ) + TWS_TRACE_DEBUG(sc, "entry", dev, fflag); + return (0); +} + +int +tws_read(struct cdev *dev, struct uio *uio, int ioflag) +{ + struct tws_softc *sc = dev->si_drv1; + + if ( sc ) + TWS_TRACE_DEBUG(sc, "entry", dev, ioflag); + return (0); +} + +int +tws_write(struct cdev *dev, struct uio *uio, int ioflag) +{ + struct tws_softc *sc = dev->si_drv1; + + if ( sc ) + TWS_TRACE_DEBUG(sc, "entry", dev, ioflag); + return (0); +} + +/* PCI Support Functions */ + +/* + * Compare the device ID of this device against the IDs that this driver + * supports. If there is a match, set the description and return success. + */ +static int +tws_probe(device_t dev) +{ + static u_int8_t first_ctlr = 1; + + if ((pci_get_vendor(dev) == TWS_VENDOR_ID) && + (pci_get_device(dev) == TWS_DEVICE_ID)) { + device_set_desc(dev, "LSI 3ware SAS/SATA Storage Controller"); + if (first_ctlr) { + printf("LSI 3ware device driver for SAS/SATA storage " + "controllers, version: %s\n", TWS_DRIVER_VERSION_STRING); + first_ctlr = 0; + } + + return(0); + } + return (ENXIO); +} + +/* Attach function is only called if the probe is successful. */ + +static int +tws_attach(device_t dev) +{ + struct tws_softc *sc = device_get_softc(dev); + u_int32_t cmd, bar; + int error=0,i; + + /* no tracing yet */ + /* Look up our softc and initialize its fields. */ + sc->tws_dev = dev; + sc->device_id = pci_get_device(dev); + sc->subvendor_id = pci_get_subvendor(dev); + sc->subdevice_id = pci_get_subdevice(dev); + + /* Intialize mutexes */ + mtx_init( &sc->q_lock, "tws_q_lock", NULL, MTX_DEF); + mtx_init( &sc->sim_lock, "tws_sim_lock", NULL, MTX_DEF); + mtx_init( &sc->gen_lock, "tws_gen_lock", NULL, MTX_DEF); + mtx_init( &sc->io_lock, "tws_io_lock", NULL, MTX_DEF); + + if ( tws_init_trace_q(sc) == FAILURE ) + printf("trace init failure\n"); + /* send init event */ + mtx_lock(&sc->gen_lock); + tws_send_event(sc, TWS_INIT_START); + mtx_unlock(&sc->gen_lock); + + +#if _BYTE_ORDER == _BIG_ENDIAN + TWS_TRACE(sc, "BIG endian", 0, 0); +#endif + /* sysctl context setup */ + sysctl_ctx_init(&sc->tws_clist); + sc->tws_oidp = SYSCTL_ADD_NODE(&sc->tws_clist, + SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO, + device_get_nameunit(dev), + CTLFLAG_RD, 0, ""); + if ( sc->tws_oidp == NULL ) { + tws_log(sc, SYSCTL_TREE_NODE_ADD); + goto attach_fail_1; + } + SYSCTL_ADD_STRING(&sc->tws_clist, SYSCTL_CHILDREN(sc->tws_oidp), + OID_AUTO, "driver_version", CTLFLAG_RD, + TWS_DRIVER_VERSION_STRING, 0, "TWS driver version"); + + cmd = pci_read_config(dev, PCIR_COMMAND, 2); + if ( (cmd & PCIM_CMD_PORTEN) == 0) { + tws_log(sc, PCI_COMMAND_READ); + goto attach_fail_1; + } + /* Force the busmaster enable bit on. */ + cmd |= PCIM_CMD_BUSMASTEREN; + pci_write_config(dev, PCIR_COMMAND, cmd, 2); + + bar = pci_read_config(dev, TWS_PCI_BAR0, 4); + TWS_TRACE_DEBUG(sc, "bar0 ", bar, 0); + bar = pci_read_config(dev, TWS_PCI_BAR1, 4); + bar = bar & ~TWS_BIT2; + TWS_TRACE_DEBUG(sc, "bar1 ", bar, 0); + + /* MFA base address is BAR2 register used for + * push mode. Firmware will evatualy move to + * pull mode during witch this needs to change + */ +#ifndef TWS_PULL_MODE_ENABLE + sc->mfa_base = (u_int64_t)pci_read_config(dev, TWS_PCI_BAR2, 4); + sc->mfa_base = sc->mfa_base & ~TWS_BIT2; + TWS_TRACE_DEBUG(sc, "bar2 ", sc->mfa_base, 0); +#endif + + /* allocate MMIO register space */ + sc->reg_res_id = TWS_PCI_BAR1; /* BAR1 offset */ + if ((sc->reg_res = bus_alloc_resource(dev, SYS_RES_MEMORY, + &(sc->reg_res_id), 0, ~0, 1, RF_ACTIVE)) + == NULL) { + tws_log(sc, ALLOC_MEMORY_RES); + goto attach_fail_1; + } + sc->bus_tag = rman_get_bustag(sc->reg_res); + sc->bus_handle = rman_get_bushandle(sc->reg_res); + +#ifndef TWS_PULL_MODE_ENABLE + /* Allocate bus space for inbound mfa */ + sc->mfa_res_id = TWS_PCI_BAR2; /* BAR2 offset */ + if ((sc->mfa_res = bus_alloc_resource(dev, SYS_RES_MEMORY, + &(sc->mfa_res_id), 0, ~0, 0x100000, RF_ACTIVE)) + == NULL) { + tws_log(sc, ALLOC_MEMORY_RES); + goto attach_fail_2; + } + sc->bus_mfa_tag = rman_get_bustag(sc->mfa_res); + sc->bus_mfa_handle = rman_get_bushandle(sc->mfa_res); +#endif + + /* Allocate and register our interrupt. */ + sc->intr_type = TWS_INTx; /* default */ + + if ( tws_enable_msi ) + sc->intr_type = TWS_MSI; + if ( tws_setup_irq(sc) == FAILURE ) { + tws_log(sc, ALLOC_MEMORY_RES); + goto attach_fail_3; + } + + /* + * Create a /dev entry for this device. The kernel will assign us + * a major number automatically. We use the unit number of this + * device as the minor number and name the character device + * "tws". + */ + sc->tws_cdev = make_dev(&tws_cdevsw, device_get_unit(dev), + UID_ROOT, GID_OPERATOR, S_IRUSR | S_IWUSR, "tws%u", + device_get_unit(dev)); + sc->tws_cdev->si_drv1 = sc; + + if ( tws_init(sc) == FAILURE ) { + tws_log(sc, TWS_INIT_FAILURE); + goto attach_fail_4; + } + if ( tws_init_ctlr(sc) == FAILURE ) { + tws_log(sc, TWS_CTLR_INIT_FAILURE); + goto attach_fail_4; + } + if ((error = tws_cam_attach(sc))) { + tws_log(sc, TWS_CAM_ATTACH); + goto attach_fail_4; + } + /* send init complete event */ + mtx_lock(&sc->gen_lock); + tws_send_event(sc, TWS_INIT_COMPLETE); + mtx_unlock(&sc->gen_lock); + + TWS_TRACE_DEBUG(sc, "attached successfully", 0, sc->device_id); + return(0); + +attach_fail_4: + tws_teardown_intr(sc); + destroy_dev(sc->tws_cdev); +attach_fail_3: + for(i=0;iirqs;i++) { + if ( sc->irq_res[i] ){ + if (bus_release_resource(sc->tws_dev, + SYS_RES_IRQ, sc->irq_res_id[i], sc->irq_res[i])) + TWS_TRACE(sc, "bus irq res", 0, 0); + } + } +#ifndef TWS_PULL_MODE_ENABLE +attach_fail_2: +#endif + if ( sc->mfa_res ){ + if (bus_release_resource(sc->tws_dev, + SYS_RES_MEMORY, sc->mfa_res_id, sc->mfa_res)) + TWS_TRACE(sc, "bus release ", 0, sc->mfa_res_id); + } + if ( sc->reg_res ){ + if (bus_release_resource(sc->tws_dev, + SYS_RES_MEMORY, sc->reg_res_id, sc->reg_res)) + TWS_TRACE(sc, "bus release2 ", 0, sc->reg_res_id); + } +attach_fail_1: + mtx_destroy(&sc->q_lock); + mtx_destroy(&sc->sim_lock); + mtx_destroy(&sc->gen_lock); + mtx_destroy(&sc->io_lock); + sysctl_ctx_free(&sc->tws_clist); + return (ENXIO); +} + +/* Detach device. */ + +static int +tws_detach(device_t dev) +{ + struct tws_softc *sc = device_get_softc(dev); + int i; + u_int32_t reg; + + TWS_TRACE_DEBUG(sc, "entry", 0, 0); + + mtx_lock(&sc->gen_lock); + tws_send_event(sc, TWS_UNINIT_START); + mtx_unlock(&sc->gen_lock); + + /* needs to disable interrupt before detaching from cam */ + tws_turn_off_interrupts(sc); + /* clear door bell */ + tws_write_reg(sc, TWS_I2O0_HOBDBC, ~0, 4); + reg = tws_read_reg(sc, TWS_I2O0_HIMASK, 4); + TWS_TRACE_DEBUG(sc, "turn-off-intr", reg, 0); + sc->obfl_q_overrun = false; + tws_init_connect(sc, 1); + + /* Teardown the state in our softc created in our attach routine. */ + /* Disconnect the interrupt handler. */ + tws_teardown_intr(sc); + + /* Release irq resource */ + for(i=0;iirqs;i++) { + if ( sc->irq_res[i] ){ + if (bus_release_resource(sc->tws_dev, + SYS_RES_IRQ, sc->irq_res_id[i], sc->irq_res[i])) + TWS_TRACE(sc, "bus release irq resource", + i, sc->irq_res_id[i]); + } + } + if ( sc->intr_type == TWS_MSI ) { + pci_release_msi(sc->tws_dev); + } + + tws_cam_detach(sc); + + /* Release memory resource */ + if ( sc->mfa_res ){ + if (bus_release_resource(sc->tws_dev, + SYS_RES_MEMORY, sc->mfa_res_id, sc->mfa_res)) + TWS_TRACE(sc, "bus release mem resource", 0, sc->mfa_res_id); + } + if ( sc->reg_res ){ + if (bus_release_resource(sc->tws_dev, + SYS_RES_MEMORY, sc->reg_res_id, sc->reg_res)) + TWS_TRACE(sc, "bus release mem resource", 0, sc->reg_res_id); + } + + free(sc->reqs, M_TWS); + free(sc->sense_bufs, M_TWS); + free(sc->scan_ccb, M_TWS); + free(sc->aen_q.q, M_TWS); + free(sc->trace_q.q, M_TWS); + mtx_destroy(&sc->q_lock); + mtx_destroy(&sc->sim_lock); + mtx_destroy(&sc->gen_lock); + mtx_destroy(&sc->io_lock); + destroy_dev(sc->tws_cdev); + sysctl_ctx_free(&sc->tws_clist); + return (0); +} + +int +tws_setup_intr(struct tws_softc *sc, int irqs) +{ + int i, error; + + for(i=0;iintr_handle[i])) { + if ((error = bus_setup_intr(sc->tws_dev, sc->irq_res[i], + INTR_TYPE_CAM | INTR_MPSAFE, +#if (__FreeBSD_version >= 700000) + NULL, +#endif + tws_intr, sc, &sc->intr_handle[i]))) { + tws_log(sc, SETUP_INTR_RES); + return(FAILURE); + } + } + } + return(SUCCESS); + +} + + +int +tws_teardown_intr(struct tws_softc *sc) +{ + int i, error; + + for(i=0;iirqs;i++) { + if (sc->intr_handle[i]) { + error = bus_teardown_intr(sc->tws_dev, + sc->irq_res[i], sc->intr_handle[i]); + sc->intr_handle[i] = NULL; + } + } + return(SUCCESS); +} + + +static int +tws_setup_irq(struct tws_softc *sc) +{ + int messages; + u_int16_t cmd; + + cmd = pci_read_config(sc->tws_dev, PCIR_COMMAND, 2); + switch(sc->intr_type) { + case TWS_INTx : + cmd = cmd & ~0x0400; + pci_write_config(sc->tws_dev, PCIR_COMMAND, cmd, 2); + sc->irqs = 1; + sc->irq_res_id[0] = 0; + sc->irq_res[0] = bus_alloc_resource_any(sc->tws_dev, SYS_RES_IRQ, + &sc->irq_res_id[0], RF_SHAREABLE | RF_ACTIVE); + if ( ! sc->irq_res[0] ) + return(FAILURE); + if ( tws_setup_intr(sc, sc->irqs) == FAILURE ) + return(FAILURE); + device_printf(sc->tws_dev, "Using legacy INTx\n"); + break; + case TWS_MSI : + cmd = cmd | 0x0400; + pci_write_config(sc->tws_dev, PCIR_COMMAND, cmd, 2); + sc->irqs = 1; + sc->irq_res_id[0] = 1; + messages = 1; + if (pci_alloc_msi(sc->tws_dev, &messages) != 0 ) { + TWS_TRACE(sc, "pci alloc msi fail", 0, messages); + return(FAILURE); + } + sc->irq_res[0] = bus_alloc_resource_any(sc->tws_dev, SYS_RES_IRQ, + &sc->irq_res_id[0], RF_SHAREABLE | RF_ACTIVE); + + if ( !sc->irq_res[0] ) + return(FAILURE); + if ( tws_setup_intr(sc, sc->irqs) == FAILURE ) + return(FAILURE); + device_printf(sc->tws_dev, "Using MSI\n"); + break; + + } + + return(SUCCESS); +} + +static int +tws_init(struct tws_softc *sc) +{ + + u_int32_t max_sg_elements; + u_int32_t dma_mem_size; + int error; + u_int32_t reg; + + sc->seq_id = 0; + if ( tws_queue_depth > TWS_MAX_REQS ) + tws_queue_depth = TWS_MAX_REQS; + if (tws_queue_depth < TWS_RESERVED_REQS+1) + tws_queue_depth = TWS_RESERVED_REQS+1; + sc->is64bit = (sizeof(bus_addr_t) == 8) ? true : false; + max_sg_elements = (sc->is64bit && !tws_use_32bit_sgls) ? + TWS_MAX_64BIT_SG_ELEMENTS : + TWS_MAX_32BIT_SG_ELEMENTS; + dma_mem_size = (sizeof(struct tws_command_packet) * tws_queue_depth) + + (TWS_SECTOR_SIZE) ; + if ( bus_dma_tag_create(NULL, /* parent */ + TWS_ALIGNMENT, /* alignment */ + 0, /* boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + BUS_SPACE_MAXSIZE, /* maxsize */ + max_sg_elements, /* numsegs */ + BUS_SPACE_MAXSIZE, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockfuncarg */ + &sc->parent_tag /* tag */ + )) { + TWS_TRACE_DEBUG(sc, "DMA parent tag Create fail", max_sg_elements, + sc->is64bit); + return(ENOMEM); + } + /* In bound message frame requires 16byte alignment. + * Outbound MF's can live with 4byte alignment - for now just + * use 16 for both. + */ + if ( bus_dma_tag_create(sc->parent_tag, /* parent */ + TWS_IN_MF_ALIGNMENT, /* alignment */ + 0, /* boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + dma_mem_size, /* maxsize */ + 1, /* numsegs */ + BUS_SPACE_MAXSIZE, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockfuncarg */ + &sc->cmd_tag /* tag */ + )) { + TWS_TRACE_DEBUG(sc, "DMA cmd tag Create fail", max_sg_elements, sc->is64bit); + return(ENOMEM); + } + + if (bus_dmamem_alloc(sc->cmd_tag, &sc->dma_mem, + BUS_DMA_NOWAIT, &sc->cmd_map)) { + TWS_TRACE_DEBUG(sc, "DMA mem alloc fail", max_sg_elements, sc->is64bit); + return(ENOMEM); + } + + /* if bus_dmamem_alloc succeeds then bus_dmamap_load will succeed */ + sc->dma_mem_phys=0; + error = bus_dmamap_load(sc->cmd_tag, sc->cmd_map, sc->dma_mem, + dma_mem_size, tws_dmamap_cmds_load_cbfn, + &sc->dma_mem_phys, 0); + + /* + * Create a dma tag for data buffers; size will be the maximum + * possible I/O size (128kB). + */ + if (bus_dma_tag_create(sc->parent_tag, /* parent */ + TWS_ALIGNMENT, /* alignment */ + 0, /* boundary */ + BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + TWS_MAX_IO_SIZE, /* maxsize */ + max_sg_elements, /* nsegments */ + TWS_MAX_IO_SIZE, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + busdma_lock_mutex, /* lockfunc */ + &sc->io_lock, /* lockfuncarg */ + &sc->data_tag /* tag */)) { + TWS_TRACE_DEBUG(sc, "DMA cmd tag Create fail", max_sg_elements, sc->is64bit); + return(ENOMEM); + } + + sc->reqs = malloc(sizeof(struct tws_request) * tws_queue_depth, M_TWS, + M_WAITOK | M_ZERO); + if ( sc->reqs == NULL ) { + TWS_TRACE_DEBUG(sc, "malloc failed", 0, sc->is64bit); + return(ENOMEM); + } + sc->sense_bufs = malloc(sizeof(struct tws_sense) * tws_queue_depth, M_TWS, + M_WAITOK | M_ZERO); + if ( sc->sense_bufs == NULL ) { + TWS_TRACE_DEBUG(sc, "sense malloc failed", 0, sc->is64bit); + return(ENOMEM); + } + sc->scan_ccb = malloc(sizeof(union ccb), M_TWS, M_WAITOK | M_ZERO); + if ( sc->scan_ccb == NULL ) { + TWS_TRACE_DEBUG(sc, "ccb malloc failed", 0, sc->is64bit); + return(ENOMEM); + } + + if ( !tws_ctlr_ready(sc) ) + if( !tws_ctlr_reset(sc) ) + return(FAILURE); + + bzero(&sc->stats, sizeof(struct tws_stats)); + tws_init_qs(sc); + tws_turn_off_interrupts(sc); + + /* + * enable pull mode by setting bit1 . + * setting bit0 to 1 will enable interrupt coalesing + * will revisit. + */ + +#ifdef TWS_PULL_MODE_ENABLE + + reg = tws_read_reg(sc, TWS_I2O0_CTL, 4); + TWS_TRACE_DEBUG(sc, "i20 ctl", reg, TWS_I2O0_CTL); + tws_write_reg(sc, TWS_I2O0_CTL, reg | TWS_BIT1, 4); + +#endif + + TWS_TRACE_DEBUG(sc, "dma_mem_phys", sc->dma_mem_phys, TWS_I2O0_CTL); + if ( tws_init_reqs(sc, dma_mem_size) == FAILURE ) + return(FAILURE); + if ( tws_init_aen_q(sc) == FAILURE ) + return(FAILURE); + + return(SUCCESS); + +} + +static int +tws_init_aen_q(struct tws_softc *sc) +{ + sc->aen_q.head=0; + sc->aen_q.tail=0; + sc->aen_q.depth=256; + sc->aen_q.overflow=0; + sc->aen_q.q = malloc(sizeof(struct tws_event_packet)*sc->aen_q.depth, + M_TWS, M_WAITOK | M_ZERO); + if ( ! sc->aen_q.q ) + return(FAILURE); + return(SUCCESS); +} + +static int +tws_init_trace_q(struct tws_softc *sc) +{ + sc->trace_q.head=0; + sc->trace_q.tail=0; + sc->trace_q.depth=256; + sc->trace_q.overflow=0; + sc->trace_q.q = malloc(sizeof(struct tws_trace_rec)*sc->trace_q.depth, + M_TWS, M_WAITOK | M_ZERO); + if ( ! sc->trace_q.q ) + return(FAILURE); + return(SUCCESS); +} + +static int +tws_init_reqs(struct tws_softc *sc, u_int32_t dma_mem_size) +{ + + struct tws_command_packet *cmd_buf; + cmd_buf = (struct tws_command_packet *)sc->dma_mem; + int i; + + bzero(cmd_buf, dma_mem_size); + TWS_TRACE_DEBUG(sc, "phy cmd", sc->dma_mem_phys, 0); + mtx_lock(&sc->q_lock); + for ( i=0; i< tws_queue_depth; i++) + { + if (bus_dmamap_create(sc->data_tag, 0, &sc->reqs[i].dma_map)) { + /* log a ENOMEM failure msg here */ + return(FAILURE); + } + sc->reqs[i].cmd_pkt = &cmd_buf[i]; + + sc->sense_bufs[i].hdr = &cmd_buf[i].hdr ; + sc->sense_bufs[i].hdr_pkt_phy = sc->dma_mem_phys + + (i * sizeof(struct tws_command_packet)); + + sc->reqs[i].cmd_pkt_phy = sc->dma_mem_phys + + sizeof(struct tws_command_header) + + (i * sizeof(struct tws_command_packet)); + sc->reqs[i].request_id = i; + sc->reqs[i].sc = sc; + + sc->reqs[i].cmd_pkt->hdr.header_desc.size_header = 128; + + sc->reqs[i].state = TWS_REQ_STATE_FREE; + if ( i >= TWS_RESERVED_REQS ) + tws_q_insert_tail(sc, &sc->reqs[i], TWS_FREE_Q); + } + mtx_unlock(&sc->q_lock); + return(SUCCESS); +} + +static void +tws_dmamap_cmds_load_cbfn(void *arg, bus_dma_segment_t *segs, + int nseg, int error) +{ + + /* printf("command load done \n"); */ + + *((bus_addr_t *)arg) = segs[0].ds_addr; +} + +void +tws_send_event(struct tws_softc *sc, u_int8_t event) +{ + mtx_assert(&sc->gen_lock, MA_OWNED); + TWS_TRACE_DEBUG(sc, "received event ", 0, event); + switch (event) { + + case TWS_INIT_START: + sc->tws_state = TWS_INIT; + break; + + case TWS_INIT_COMPLETE: + if (sc->tws_state != TWS_INIT) { + device_printf(sc->tws_dev, "invalid state transition %d => TWS_ONLINE\n", sc->tws_state); + } else { + sc->tws_state = TWS_ONLINE; + } + break; + + case TWS_RESET_START: + /* We can transition to reset state from any state except reset*/ + if (sc->tws_state != TWS_RESET) { + sc->tws_prev_state = sc->tws_state; + sc->tws_state = TWS_RESET; + } + break; + + case TWS_RESET_COMPLETE: + if (sc->tws_state != TWS_RESET) { + device_printf(sc->tws_dev, "invalid state transition %d => %d (previous state)\n", sc->tws_state, sc->tws_prev_state); + } else { + sc->tws_state = sc->tws_prev_state; + } + break; + + case TWS_SCAN_FAILURE: + if (sc->tws_state != TWS_ONLINE) { + device_printf(sc->tws_dev, "invalid state transition %d => TWS_OFFLINE\n", sc->tws_state); + } else { + sc->tws_state = TWS_OFFLINE; + } + break; + + case TWS_UNINIT_START: + if ((sc->tws_state != TWS_ONLINE) && (sc->tws_state != TWS_OFFLINE)) { + device_printf(sc->tws_dev, "invalid state transition %d => TWS_UNINIT\n", sc->tws_state); + } else { + sc->tws_state = TWS_UNINIT; + } + break; + } + +} + +uint8_t +tws_get_state(struct tws_softc *sc) +{ + + return((u_int8_t)sc->tws_state); + +} + +/* Called during system shutdown after sync. */ + +static int +tws_shutdown(device_t dev) +{ + + struct tws_softc *sc = device_get_softc(dev); + + TWS_TRACE_DEBUG(sc, "entry", 0, 0); + + tws_turn_off_interrupts(sc); + tws_init_connect(sc, 1); + + return (0); +} + +/* + * Device suspend routine. + */ +static int +tws_suspend(device_t dev) +{ + struct tws_softc *sc = device_get_softc(dev); + + if ( sc ) + TWS_TRACE_DEBUG(sc, "entry", 0, 0); + return (0); +} + +/* + * Device resume routine. + */ +static int +tws_resume(device_t dev) +{ + + struct tws_softc *sc = device_get_softc(dev); + + if ( sc ) + TWS_TRACE_DEBUG(sc, "entry", 0, 0); + return (0); +} + + +struct tws_request * +tws_get_request(struct tws_softc *sc, u_int16_t type) +{ + struct mtx *my_mutex = ((type == TWS_REQ_TYPE_SCSI_IO) ? &sc->q_lock : &sc->gen_lock); + struct tws_request *r = NULL; + + mtx_lock(my_mutex); + + if (type == TWS_REQ_TYPE_SCSI_IO) { + r = tws_q_remove_head(sc, TWS_FREE_Q); + } else { + if ( sc->reqs[type].state == TWS_REQ_STATE_FREE ) { + r = &sc->reqs[type]; + } + } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 22:23:01 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3ABF3106566B; Tue, 4 Oct 2011 22:23:01 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B5428FC13; Tue, 4 Oct 2011 22:23:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94MN1XQ082111; Tue, 4 Oct 2011 22:23:01 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94MN1ow082109; Tue, 4 Oct 2011 22:23:01 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201110042223.p94MN1ow082109@svn.freebsd.org> From: Jilles Tjoelker Date: Tue, 4 Oct 2011 22:23:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226027 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 22:23:01 -0000 Author: jilles Date: Tue Oct 4 22:23:00 2011 New Revision: 226027 URL: http://svn.freebsd.org/changeset/base/226027 Log: Work around the autotools problem with the 10.0 version. With this, I can build various ports on a 10.0-CURRENT system without hacking or hiding the version number. This commit should be reverted when there is a cleaner fix in autotools and/or ports/Mk/bsd.port.mk. The original patch is from Ed Schouten but needed some additions. Modified: head/share/mk/bsd.port.mk Modified: head/share/mk/bsd.port.mk ============================================================================== --- head/share/mk/bsd.port.mk Tue Oct 4 21:40:25 2011 (r226026) +++ head/share/mk/bsd.port.mk Tue Oct 4 22:23:00 2011 (r226027) @@ -14,3 +14,15 @@ _WITHOUT_SRCCONF= .include .include "${BSDPORTMK}" + +.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK) +# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. +run-autotools-fixup: + find ${WRKSRC} -type f \( -name config.libpath -o \ + -name config.rpath -o -name configure -o -name libtool.m4 \) \ + -exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \ + -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + + +.ORDER: run-autotools run-autotools-fixup do-configure +do-configure: run-autotools-fixup +.endif From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 22:28:07 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 497DD1065672; Tue, 4 Oct 2011 22:28:07 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 39C838FC17; Tue, 4 Oct 2011 22:28:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94MS76c082286; Tue, 4 Oct 2011 22:28:07 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94MS7r7082284; Tue, 4 Oct 2011 22:28:07 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201110042228.p94MS7r7082284@svn.freebsd.org> From: Jilles Tjoelker Date: Tue, 4 Oct 2011 22:28:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226028 - head/usr.sbin/portsnap/portsnap X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 22:28:07 -0000 Author: jilles Date: Tue Oct 4 22:28:06 2011 New Revision: 226028 URL: http://svn.freebsd.org/changeset/base/226028 Log: portsnap: Detect error immediately if we can't fetch the snapshot metadata. Also add some quotes around command substitution where useful and possible. Reviewed by: cperciva MFC after: 1 week Modified: head/usr.sbin/portsnap/portsnap/portsnap.sh Modified: head/usr.sbin/portsnap/portsnap/portsnap.sh ============================================================================== --- head/usr.sbin/portsnap/portsnap/portsnap.sh Tue Oct 4 22:23:00 2011 (r226027) +++ head/usr.sbin/portsnap/portsnap/portsnap.sh Tue Oct 4 22:28:06 2011 (r226028) @@ -536,9 +536,9 @@ fetch_metadata() { rm -f ${SNAPSHOTHASH} tINDEX.new echo ${NDEBUG} "Fetching snapshot metadata... " - fetch ${QUIETFLAG} http://${SERVERNAME}/t/${SNAPSHOTHASH} + fetch ${QUIETFLAG} http://${SERVERNAME}/t/${SNAPSHOTHASH} \ 2>${QUIETREDIR} || return - if [ `${SHA256} -q ${SNAPSHOTHASH}` != ${SNAPSHOTHASH} ]; then + if [ "`${SHA256} -q ${SNAPSHOTHASH}`" != ${SNAPSHOTHASH} ]; then echo "snapshot metadata corrupt." return 1 fi @@ -606,7 +606,7 @@ fetch_index_sanity() { # Verify a list of files fetch_snapshot_verify() { while read F; do - if [ `gunzip -c snap/${F} | ${SHA256} -q` != ${F} ]; then + if [ "`gunzip -c snap/${F} | ${SHA256} -q`" != ${F} ]; then echo "snapshot corrupt." return 1 fi From owner-svn-src-all@FreeBSD.ORG Tue Oct 4 23:53:47 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1A33106566B; Tue, 4 Oct 2011 23:53:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B10EF8FC13; Tue, 4 Oct 2011 23:53:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p94Nrlet084942; Tue, 4 Oct 2011 23:53:47 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94NrlTG084938; Tue, 4 Oct 2011 23:53:47 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110042353.p94NrlTG084938@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 4 Oct 2011 23:53:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226029 - in head/sys: conf libkern sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 23:53:47 -0000 Author: jkim Date: Tue Oct 4 23:53:47 2011 New Revision: 226029 URL: http://svn.freebsd.org/changeset/base/226029 Log: Add strnlen() to libkern. Added: head/sys/libkern/strnlen.c - copied, changed from r225884, head/lib/libc/string/strnlen.c Modified: head/sys/conf/files head/sys/sys/libkern.h Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Oct 4 22:28:06 2011 (r226028) +++ head/sys/conf/files Tue Oct 4 23:53:47 2011 (r226029) @@ -2553,6 +2553,7 @@ libkern/strlcpy.c standard libkern/strlen.c standard libkern/strncmp.c standard libkern/strncpy.c standard +libkern/strnlen.c standard libkern/strsep.c standard libkern/strspn.c standard libkern/strstr.c standard Copied and modified: head/sys/libkern/strnlen.c (from r225884, head/lib/libc/string/strnlen.c) ============================================================================== --- head/lib/libc/string/strnlen.c Fri Sep 30 08:05:58 2011 (r225884, copy source) +++ head/sys/libkern/strnlen.c Tue Oct 4 23:53:47 2011 (r226029) @@ -27,7 +27,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include size_t strnlen(const char *s, size_t maxlen) Modified: head/sys/sys/libkern.h ============================================================================== --- head/sys/sys/libkern.h Tue Oct 4 22:28:06 2011 (r226028) +++ head/sys/sys/libkern.h Tue Oct 4 23:53:47 2011 (r226029) @@ -116,6 +116,7 @@ size_t strlen(const char *); int strncasecmp(const char *, const char *, size_t); int strncmp(const char *, const char *, size_t); char *strncpy(char * __restrict, const char * __restrict, size_t); +size_t strnlen(const char *, size_t); char *strsep(char **, const char *delim); size_t strspn(const char *, const char *); char *strstr(const char *, const char *); From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 04:02:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AB561065673; Wed, 5 Oct 2011 04:02:19 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3A47F8FC0A; Wed, 5 Oct 2011 04:02:17 +0000 (UTC) Received: by bkbzs8 with SMTP id zs8so1866328bkb.13 for ; Tue, 04 Oct 2011 21:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=cgMbPFyECUWdy0fw7kOoz6RS/4E5iPS/VZ2JNL/2GpE=; b=EiFXfb1/ynRMWen4nyVnC95psAqzoyImu9RENKKx36cfk632BfsjTiqbs6OBXau63L VMXV/egg0xlHrn4ZQcsOnRQdZ+14J6a2+zl3fQ/1Cw9MxxizadDqXMXwys6Q248Xu1Vg /HKCPOQWMgFe9nGvzBGwnlw9KY6NZMeaZ+cD8= MIME-Version: 1.0 Received: by 10.204.13.74 with SMTP id b10mr1091547bka.95.1317787337144; Tue, 04 Oct 2011 21:02:17 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.204.132.140 with HTTP; Tue, 4 Oct 2011 21:02:16 -0700 (PDT) In-Reply-To: <4E8B0982.8010508@freebsd.org> References: <201110031513.p93FD9ev015593@svn.freebsd.org> <4E8B0982.8010508@freebsd.org> Date: Tue, 4 Oct 2011 21:02:16 -0700 X-Google-Sender-Auth: LXAZMeEJLzedE54iDyCytRwhQU8 Message-ID: From: Craig Rodrigues To: Nathan Whitehorn Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, Daniel O'Connor , svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 04:02:19 -0000 Nathan, I took at look at this page: http://wiki.pcbsd.org/index.php/Creating_an_Automated_Installation_with_pc-sysinstall and compared it to the man page for sysinstall: http://www.freebsd.org/cgi/man.cgi?query=sysinstall&apropos=0&sektion=0&manpath=FreeBSD+8.2-RELEASE&arch=default&format=html pc-sysinstall pretty much does all of the same stuff as sysinstall, and even many of the variable names are the same. pc-sysinstall seems far superior to sysinstall. In the timeframe before 10.0, do you think it is worth doing the following: (1) import pc-sysinstall into FreeBSD (2) make pc-sysinstall compatible with all the variables from the *or* if it is not worth doing (2) (3) provide a document somewhere that guides users in migrating their old install.cfg syntax to pc-sysinstall (or bsdinstall). bsdinstall and pc-sysinstall are really good improvements! -- Craig Rodrigues rodrigc@crodrigues.org From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 07:15:56 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B110106564A; Wed, 5 Oct 2011 07:15:56 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 617BB8FC14; Wed, 5 Oct 2011 07:15:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p957Fuc2098886; Wed, 5 Oct 2011 07:15:56 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p957Fu7X098884; Wed, 5 Oct 2011 07:15:56 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110050715.p957Fu7X098884@svn.freebsd.org> From: Stanislav Sedov Date: Wed, 5 Oct 2011 07:15:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226030 - svnadmin/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 07:15:56 -0000 Author: stas Date: Wed Oct 5 07:15:55 2011 New Revision: 226030 URL: http://svn.freebsd.org/changeset/base/226030 Log: - Disable sizelimit for myself to import the new heimdal revision. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Tue Oct 4 23:53:47 2011 (r226029) +++ svnadmin/conf/sizelimit.conf Wed Oct 5 07:15:55 2011 (r226030) @@ -33,4 +33,5 @@ obrien rpaulo rwatson sam +stas thompsa From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 07:23:33 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F76A1065674; Wed, 5 Oct 2011 07:23:33 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 58C3E8FC19; Wed, 5 Oct 2011 07:23:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p957NXTW099184; Wed, 5 Oct 2011 07:23:33 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p957NX4k099181; Wed, 5 Oct 2011 07:23:33 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110050723.p957NX4k099181@svn.freebsd.org> From: Stanislav Sedov Date: Wed, 5 Oct 2011 07:23:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226031 - in vendor-crypto/heimdal/dist: . admin appl appl/afsutil appl/dceutils appl/ftp appl/ftp/common appl/ftp/ftp appl/ftp/ftpd appl/gssmask appl/kf appl/kx appl/login appl/otp app... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 07:23:33 -0000 Author: stas Date: Wed Oct 5 07:23:29 2011 New Revision: 226031 URL: http://svn.freebsd.org/changeset/base/226031 Log: - Import Heimdal 1.5 distribution. Added: vendor-crypto/heimdal/dist/NTMakefile vendor-crypto/heimdal/dist/TODO (contents, props changed) vendor-crypto/heimdal/dist/admin/NTMakefile vendor-crypto/heimdal/dist/admin/destroy.c (contents, props changed) vendor-crypto/heimdal/dist/admin/ktutil-version.rc vendor-crypto/heimdal/dist/admin/ktutil.cat8 vendor-crypto/heimdal/dist/appl/NTMakefile vendor-crypto/heimdal/dist/appl/afsutil/NTMakefile vendor-crypto/heimdal/dist/appl/afsutil/afslog.cat1 vendor-crypto/heimdal/dist/appl/afsutil/pagsh.cat1 vendor-crypto/heimdal/dist/appl/dceutils/ vendor-crypto/heimdal/dist/appl/dceutils/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/dceutils/Makefile.am vendor-crypto/heimdal/dist/appl/dceutils/Makefile.in vendor-crypto/heimdal/dist/appl/dceutils/NTMakefile vendor-crypto/heimdal/dist/appl/dceutils/README.dcedfs (contents, props changed) vendor-crypto/heimdal/dist/appl/dceutils/README.original (contents, props changed) vendor-crypto/heimdal/dist/appl/dceutils/dfspag.exp vendor-crypto/heimdal/dist/appl/dceutils/dpagaix.c (contents, props changed) vendor-crypto/heimdal/dist/appl/dceutils/k5dce.h (contents, props changed) vendor-crypto/heimdal/dist/appl/dceutils/k5dcecon.c (contents, props changed) vendor-crypto/heimdal/dist/appl/dceutils/testpag.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/NTMakefile vendor-crypto/heimdal/dist/appl/ftp/common/NTMakefile vendor-crypto/heimdal/dist/appl/ftp/ftp/NTMakefile vendor-crypto/heimdal/dist/appl/ftp/ftp/ftp.cat1 vendor-crypto/heimdal/dist/appl/ftp/ftpd/NTMakefile vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpd.cat8 vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpusers.cat5 vendor-crypto/heimdal/dist/appl/gssmask/NTMakefile vendor-crypto/heimdal/dist/appl/kf/NTMakefile vendor-crypto/heimdal/dist/appl/kf/kf.cat1 vendor-crypto/heimdal/dist/appl/kf/kfd.cat8 vendor-crypto/heimdal/dist/appl/kx/ vendor-crypto/heimdal/dist/appl/kx/ChangeLog vendor-crypto/heimdal/dist/appl/kx/Makefile.am vendor-crypto/heimdal/dist/appl/kx/Makefile.in vendor-crypto/heimdal/dist/appl/kx/NTMakefile vendor-crypto/heimdal/dist/appl/kx/common.c (contents, props changed) vendor-crypto/heimdal/dist/appl/kx/context.c (contents, props changed) vendor-crypto/heimdal/dist/appl/kx/krb5.c (contents, props changed) vendor-crypto/heimdal/dist/appl/kx/kx.1 vendor-crypto/heimdal/dist/appl/kx/kx.c (contents, props changed) vendor-crypto/heimdal/dist/appl/kx/kx.cat1 vendor-crypto/heimdal/dist/appl/kx/kx.h (contents, props changed) vendor-crypto/heimdal/dist/appl/kx/kxd.8 vendor-crypto/heimdal/dist/appl/kx/kxd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/kx/kxd.cat8 vendor-crypto/heimdal/dist/appl/kx/rxtelnet.1 vendor-crypto/heimdal/dist/appl/kx/rxtelnet.cat1 vendor-crypto/heimdal/dist/appl/kx/rxtelnet.in vendor-crypto/heimdal/dist/appl/kx/rxterm.1 vendor-crypto/heimdal/dist/appl/kx/rxterm.cat1 vendor-crypto/heimdal/dist/appl/kx/rxterm.in vendor-crypto/heimdal/dist/appl/kx/tenletxr.1 vendor-crypto/heimdal/dist/appl/kx/tenletxr.cat1 vendor-crypto/heimdal/dist/appl/kx/tenletxr.in vendor-crypto/heimdal/dist/appl/kx/writeauth.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/NTMakefile vendor-crypto/heimdal/dist/appl/login/login-protos.h (contents, props changed) vendor-crypto/heimdal/dist/appl/login/login.access.cat5 vendor-crypto/heimdal/dist/appl/login/login.cat1 vendor-crypto/heimdal/dist/appl/otp/ vendor-crypto/heimdal/dist/appl/otp/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/otp/Makefile.am vendor-crypto/heimdal/dist/appl/otp/Makefile.in vendor-crypto/heimdal/dist/appl/otp/NTMakefile vendor-crypto/heimdal/dist/appl/otp/otp.1 vendor-crypto/heimdal/dist/appl/otp/otp.c (contents, props changed) vendor-crypto/heimdal/dist/appl/otp/otp.cat1 vendor-crypto/heimdal/dist/appl/otp/otp_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/otp/otpprint.1 vendor-crypto/heimdal/dist/appl/otp/otpprint.c (contents, props changed) vendor-crypto/heimdal/dist/appl/otp/otpprint.cat1 vendor-crypto/heimdal/dist/appl/popper/ vendor-crypto/heimdal/dist/appl/popper/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/Makefile.am vendor-crypto/heimdal/dist/appl/popper/Makefile.in vendor-crypto/heimdal/dist/appl/popper/NTMakefile vendor-crypto/heimdal/dist/appl/popper/README (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/README-FIRST (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/auth_gssapi.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/maildir.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop3.rfc1081 (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop3e.rfc1082 (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_auth.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_auth.h (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_debug.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_dele.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_dropcopy.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_dropinfo.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_get_command.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_init.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_last.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_list.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_log.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_msg.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_parse.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_pass.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_quit.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_rset.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_send.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_stat.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_uidl.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_updt.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_user.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/pop_xover.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/popper.8 vendor-crypto/heimdal/dist/appl/popper/popper.README.release (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/popper.c (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/popper.cat8 vendor-crypto/heimdal/dist/appl/popper/popper.h (contents, props changed) vendor-crypto/heimdal/dist/appl/popper/version.h (contents, props changed) vendor-crypto/heimdal/dist/appl/push/NTMakefile vendor-crypto/heimdal/dist/appl/push/pfrom.cat1 vendor-crypto/heimdal/dist/appl/push/push.cat8 vendor-crypto/heimdal/dist/appl/rcp/NTMakefile vendor-crypto/heimdal/dist/appl/rcp/rcp.cat1 vendor-crypto/heimdal/dist/appl/rsh/NTMakefile vendor-crypto/heimdal/dist/appl/rsh/rsh.cat1 vendor-crypto/heimdal/dist/appl/rsh/rshd.cat8 vendor-crypto/heimdal/dist/appl/su/NTMakefile vendor-crypto/heimdal/dist/appl/su/su.cat1 vendor-crypto/heimdal/dist/appl/telnet/NTMakefile vendor-crypto/heimdal/dist/appl/telnet/libtelnet/NTMakefile vendor-crypto/heimdal/dist/appl/telnet/telnet/NTMakefile vendor-crypto/heimdal/dist/appl/telnet/telnet/telnet.cat1 vendor-crypto/heimdal/dist/appl/telnet/telnetd/NTMakefile vendor-crypto/heimdal/dist/appl/telnet/telnetd/telnetd.cat8 vendor-crypto/heimdal/dist/appl/test/NTMakefile vendor-crypto/heimdal/dist/appl/xnlock/ vendor-crypto/heimdal/dist/appl/xnlock/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/xnlock/Makefile.am vendor-crypto/heimdal/dist/appl/xnlock/Makefile.in vendor-crypto/heimdal/dist/appl/xnlock/NTMakefile vendor-crypto/heimdal/dist/appl/xnlock/README (contents, props changed) vendor-crypto/heimdal/dist/appl/xnlock/nose.0.left vendor-crypto/heimdal/dist/appl/xnlock/nose.0.right vendor-crypto/heimdal/dist/appl/xnlock/nose.1.left vendor-crypto/heimdal/dist/appl/xnlock/nose.1.right vendor-crypto/heimdal/dist/appl/xnlock/nose.down vendor-crypto/heimdal/dist/appl/xnlock/nose.front vendor-crypto/heimdal/dist/appl/xnlock/nose.left.front vendor-crypto/heimdal/dist/appl/xnlock/nose.right.front vendor-crypto/heimdal/dist/appl/xnlock/xnlock.1 vendor-crypto/heimdal/dist/appl/xnlock/xnlock.c (contents, props changed) vendor-crypto/heimdal/dist/appl/xnlock/xnlock.cat1 vendor-crypto/heimdal/dist/base/ vendor-crypto/heimdal/dist/base/Makefile.am vendor-crypto/heimdal/dist/base/Makefile.in vendor-crypto/heimdal/dist/base/NTMakefile vendor-crypto/heimdal/dist/base/array.c (contents, props changed) vendor-crypto/heimdal/dist/base/baselocl.h (contents, props changed) vendor-crypto/heimdal/dist/base/bool.c (contents, props changed) vendor-crypto/heimdal/dist/base/dict.c (contents, props changed) vendor-crypto/heimdal/dist/base/heimbase.c (contents, props changed) vendor-crypto/heimdal/dist/base/heimbase.h (contents, props changed) vendor-crypto/heimdal/dist/base/heimbasepriv.h (contents, props changed) vendor-crypto/heimdal/dist/base/heimqueue.h (contents, props changed) vendor-crypto/heimdal/dist/base/null.c (contents, props changed) vendor-crypto/heimdal/dist/base/number.c (contents, props changed) vendor-crypto/heimdal/dist/base/string.c (contents, props changed) vendor-crypto/heimdal/dist/base/test_base.c (contents, props changed) vendor-crypto/heimdal/dist/base/version-script.map vendor-crypto/heimdal/dist/cf/dispatch.m4 vendor-crypto/heimdal/dist/cf/libtool.m4 vendor-crypto/heimdal/dist/cf/ltoptions.m4 vendor-crypto/heimdal/dist/cf/ltsugar.m4 vendor-crypto/heimdal/dist/cf/ltversion.m4 vendor-crypto/heimdal/dist/cf/lt~obsolete.m4 vendor-crypto/heimdal/dist/cf/pkg.m4 vendor-crypto/heimdal/dist/configure.ac vendor-crypto/heimdal/dist/depcomp (contents, props changed) vendor-crypto/heimdal/dist/doc/NTMakefile vendor-crypto/heimdal/dist/doc/copyright.texi vendor-crypto/heimdal/dist/doc/doxyout/ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/doxygen.css vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/doxygen.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/graph_legend.dot vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/graph_legend.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/group__gssapi.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_mechs_intro.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_services_intro.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/internalvsmechname.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/pages.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/tab_b.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/tab_l.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/tab_r.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/tabs.css vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/__gss_c_attr_stream_sizes_oid_desc.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_add_oid_set_member.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_canonicalize_name.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_import_name.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_init_sec_context.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_inquire_attrs_for_mech.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_inquire_saslname_for_mech.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_oid_equal.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_release_cred.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_release_iov_buffer.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_release_name.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_unwrap_iov.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_wrap.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_wrap_iov.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gss_wrap_iov_length.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_mechs_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_services_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/internalvsmechname.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/manpages vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/doxygen.css vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/doxygen.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/example__evp__cipher_8c-example.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/examples.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/graph_legend.dot vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/graph_legend.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__core.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__des.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__dh.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__evp.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__misc.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rand.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rsa.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_des.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_dh.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_evp.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rand.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rsa.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/tab_b.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/tab_l.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/tab_r.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/tabs.css vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_cbc_cksum.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_cbc_encrypt.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_cfb64_encrypt.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_check_key_parity.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_ecb3_encrypt.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_ecb_encrypt.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_ede3_cbc_encrypt.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_encrypt.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_init_random_number_generator.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_is_weak_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_key_sched.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_new_random_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_pcbc_encrypt.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_random_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_set_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_set_key_checked.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_set_key_unchecked.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_set_odd_parity.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DES_string_to_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_check_pubkey.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_compute_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_generate_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_generate_parameters_ex.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_get_default_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_get_ex_data.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_ltm_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_new.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_new_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_null_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_set_default_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_set_ex_data.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_set_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_size.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/DH_up_ref.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_BytesToKey.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_block_size.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_cipher.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_cleanup.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_ctrl.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_get_app_data.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_iv_length.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_key_length.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_mode.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_rand_key.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_set_app_data.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_CTX_set_key_length.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_block_size.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_iv_length.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CIPHER_key_length.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CipherFinal_ex.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CipherInit_ex.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_CipherUpdate.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_Digest.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_DigestFinal_ex.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_DigestInit_ex.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_DigestUpdate.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_CTX_block_size.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_CTX_cleanup.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_CTX_create.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_CTX_destroy.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_CTX_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_CTX_md.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_CTX_size.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_block_size.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_MD_size.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_aes_128_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_aes_128_cfb8.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_aes_192_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_aes_192_cfb8.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_aes_256_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_aes_256_cfb8.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_camellia_128_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_camellia_192_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_camellia_256_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_des_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_des_ede3_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_enc_null.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_get_cipherbyname.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_aes_128_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_aes_128_cfb8.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_aes_192_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_aes_192_cfb8.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_aes_256_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_aes_256_cfb8.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_camellia_128_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_camellia_192_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_camellia_256_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_des_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_des_ede3_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_md2.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_md4.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_md5.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_rc2_40_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_rc2_64_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_rc2_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_sha1.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_sha256.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_sha384.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_hcrypto_sha512.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_md2.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_md4.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_md5.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_md_null.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_rc2_40_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_rc2_64_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_rc2_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_rc4.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_rc4_40.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_sha.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_sha1.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_sha256.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_sha384.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_sha512.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/EVP_wincrypt_des_ede3_cbc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/OpenSSL_add_all_algorithms.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/OpenSSL_add_all_algorithms_conf.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/OpenSSL_add_all_algorithms_noconf.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/PKCS5_PBKDF2_HMAC_SHA1.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_add.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_bytes.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_cleanup.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_file_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_get_rand_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_load_file.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_pseudo_bytes.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_seed.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_set_rand_engine.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_set_rand_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_status.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RAND_write_file.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_get_app_data.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_get_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_new.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_new_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_set_app_data.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_set_method.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/RSA_up_ref.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_core.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_des.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_dh.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_evp.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_misc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rand.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rsa.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_des.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_dh.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_evp.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rand.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rsa.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/manpages vendor-crypto/heimdal/dist/doc/doxyout/hdb/ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/annotated.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/doxygen.css vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/doxygen.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions_vars.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/graph_legend.dot vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/graph_legend.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/struct_h_d_b.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/structhdb__entry__ex.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/tab_b.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/tab_l.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/tab_r.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/tabs.css vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/ vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/ vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/HDB.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb__del.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb__get.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb__put.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_auth_status.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_check_constrained_delegation.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_check_pkinit_ms_upn_match.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_check_s4u2self.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_close.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_destroy.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_entry_ex.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_fetch_kvno.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_firstkey.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_get_realms.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_lock.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_nextkey.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_open.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_password.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_remove.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_rename.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_store.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_unlock.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/manpages vendor-crypto/heimdal/dist/doc/doxyout/hx509/ vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/ vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/doxygen.css vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/doxygen.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/graph_legend.dot vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/graph_legend.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__ca.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cert.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cms.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__crypto.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__env.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__error.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__keyset.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__lock.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__misc.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__name.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__peer.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__print.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__query.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__revoke.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__verify.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_ca.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_cert.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_cms.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_env.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_error.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_keyset.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_lock.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_name.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_peer.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_print.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_revoke.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/pages.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/tab_b.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/tab_l.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/tab_r.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/tabs.css vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/ vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/ vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_bitstring_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_sign.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_sign_self.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_crl_dp_uri.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_eku.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_san_hostname.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_san_jid.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_san_ms_upn.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_san_otherName.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_san_pkinit.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_add_san_rfc822name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_ca.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_domaincontroller.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_notAfter.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_notAfter_lifetime.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_notBefore.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_proxy.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_serialnumber.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_spki.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_subject.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_template.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_set_unique.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_subject_expand.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca_tbs_template_units.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_binary.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_check_eku.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_cmp.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_find_subjectAltName_otherName.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_SPKI.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_SPKI_AlgorithmIdentifier.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_attribute.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_base_subject.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_friendly_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_issuer.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_issuer_unique_id.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_notAfter.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_notBefore.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_serialnumber.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_subject.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_get_subject_unique_id.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_init_data.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_keyusage_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_ref.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert_set_friendly_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_add.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_append.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_end_seq.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_filter.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_find.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_info.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_iter_f.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_merge.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_next_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_start_seq.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_certs_store.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ci_print_names.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_clear_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms_create_signed_1.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms_envelope_1.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms_unenvelope.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms_unwrap_ContentInfo.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms_verify_signed.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms_wrap_ContentInfo.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_context_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_context_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_context_set_missing_revoke.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_crl_add_revoked_certs.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_crl_alloc.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_crl_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_crl_lifetime.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_crl_sign.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_crypto.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env_add.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env_add_binding.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env_find.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env_find_binding.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env_lfind.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_err.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_error.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_free_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_free_octet_string_list.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_general_name_unparse.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_get_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_get_one_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_keyset.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_lock.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_misc.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_binary.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_cmp.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_copy.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_expand.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_is_null_p.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_to_Name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name_to_string.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ocsp_request.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ocsp_verify.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_oid_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_oid_sprint.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_parse_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_peer.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_peer_info_add_cms_alg.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_peer_info_alloc.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_peer_info_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_peer_info_set_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_peer_info_set_cms_algs.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_print_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_print_stdout.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_alloc.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_match_cmp_func.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_match_eku.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_match_friendly_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_match_issuer_serial.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_match_option.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_statistic_file.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query_unparse_stats.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke_add_crl.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke_add_ocsp.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke_ocsp_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke_verify.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_set_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_set_error_stringv.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_unparse_der_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_validate_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_validate_ctx_add_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_validate_ctx_free.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_validate_ctx_init.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_validate_ctx_set_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_attach_anchors.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_attach_revoke.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_ctx_f_allow_default_trustanchors.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_destroy_ctx.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_hostname.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_init_ctx.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_path.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_set_max_depth.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_set_proxy_certificate.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_set_strict_rfc3280_verification.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_set_time.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify_signature.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_xfree.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_ca.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_cms.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_env.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_error.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_keyset.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_lock.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_peer.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_revoke.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/manpages vendor-crypto/heimdal/dist/doc/doxyout/krb5/ vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/ vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/annotated.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/doxygen.css vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/doxygen.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/graph_legend.dot vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/graph_legend.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__address.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__auth.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__ccache.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__credential.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__crypto.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__deprecated.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__digest.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__error.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__keytab.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__pac.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__principal.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__storage.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__support.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__ticket.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__v4compat.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_ccache_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_fileformats.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_init_creds_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_introduction.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_keytab_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_principal_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/pages.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/structkrb5__crypto__iov.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/tab_b.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/tab_l.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/tab_r.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/tabs.css vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/ vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/ vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb524_convert_creds_kdc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb524_convert_creds_kdc_ccache.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_acc_ops.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_acl_match_file.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_acl_match_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_add_et_list.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_add_extra_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_add_ignore_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_addr2sockaddr.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_address_compare.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_address_order.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_address_prefixlen_boundary.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_address_search.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_allow_weak_crypto.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_anyaddr.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_append_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_auth.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_auth_getremoteseqnumber.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_build_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_c_enctype_compare.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_cache_end_seq_get.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_cache_get_first.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_cache_match.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_cache_next.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_clear_mcred.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_close.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_copy_cache.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_copy_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_copy_match_f.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_default_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_destroy.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_end_seq_get.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_gen_new.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_config.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_friendly_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_full_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_kdc_offset.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_lifetime.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_ops.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_prefix_ops.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_type.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_get_version.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_initialize.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_last_change_time.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_move.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_new_unique.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_next_cred.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_register.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_remove_cred.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_resolve.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_retrieve_cred.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_set_config.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_set_default_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_set_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_set_friendly_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_set_kdc_offset.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_start_seq_get.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_store_cred.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_support_switch.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cc_switch.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ccache.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ccache_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cccol_cursor_free.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cccol_cursor_new.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cccol_cursor_next.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cccol_last_change_time.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_change_password.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_cksumtype_to_enctype.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_clear_error_message.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_clear_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_compare_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_file_free.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_free_strings.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_bool.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_bool_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_list.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_string_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_strings.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_time.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_get_time_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_parse_file_multi.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_parse_string_multi.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_bool.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_bool_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_list.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_string_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_strings.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_time.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_config_vget_time_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_context.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_creds_contents.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_data.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_host_realm.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_keyblock.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_keyblock_contents.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_copy_ticket.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_create_checksum_iov.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_credential.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_creds_get_ticket_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_destroy.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_fx_cf2.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_getblocksize.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_getconfoundersize.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_getenctype.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_getpadsize.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_init.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_iov.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_data_alloc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_data_cmp.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_data_copy.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_data_ct_cmp.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_data_free.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_data_realloc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_data_zero.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_decrypt_iov_ivec.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_deprecated.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_digest.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_digest_probe.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_eai_to_heim_errno.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_encrypt_iov_ivec.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_enctype_disable.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_enctype_enable.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_enctype_valid.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_enctypes_compatible_keys.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_error.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_expand_hostname.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_expand_hostname_realms.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_fcc_ops.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_fileformats.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_config_files.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_context.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_cred_contents.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_creds_contents.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_data.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_data_contents.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_host_realm.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_keyblock.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_keyblock_contents.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_ticket.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_free_unparsed_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_fwd_tgt_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_generate_subkey.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_generate_subkey_extended.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_cred_from_kdc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_cred_from_kdc_opt.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_default_config_files.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_default_in_tkt_etypes.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_dns_canonicalize_hostname.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_extra_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_fcache_version.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_forwarded_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_ignore_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_in_tkt_with_keytab.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_in_tkt_with_password.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_in_tkt_with_skey.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_init_creds_keyblock.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_init_creds_keytab.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_init_creds_opt_alloc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_init_creds_opt_free.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_init_creds_opt_get_error.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_init_creds_opt_init.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_init_creds_password.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_kdc_sec_offset.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_max_time_skew.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_use_admin_kdc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_get_validated_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_h_addr2addr.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_h_addr2sockaddr.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_h_errno_to_heim_errno.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_context.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_free.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_get.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_get_error.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_init.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_set_keytab.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_set_password.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_set_service.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_step.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_ets.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_introduction.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_is_config_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_is_thread_safe.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kerberos_enctypes.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keyblock_get_enctype.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keyblock_init.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keyblock_zero.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytab.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytab_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytab_key_proc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytype_to_enctypes.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytype_to_enctypes_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytype_to_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_krbhst_get_addrinfo.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_add_entry.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_close.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_compare.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_copy_entry_contents.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_default_modify_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_default_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_destroy.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_end_seq_get.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_free_entry.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_get_entry.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_get_full_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_get_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_get_type.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_have_content.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_next_entry.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_read_service_key.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_register.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_remove_entry.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_resolve.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kt_start_seq_get.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_kuserok.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_make_addrport.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_make_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_max_sockaddr_size.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_mcc_ops.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_pac.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_pac_get_buffer.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_pac_verify.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_parse_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_parse_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_parse_name_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_parse_nametype.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_password_key_proc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_plugin_register.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_prepend_config_files_default.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_princ_realm.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_princ_set_realm.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_compare.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_compare_any_realm.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_get_num_comp.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_get_realm.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_get_type.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_is_krbtgt.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_match.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_set_realm.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_set_type.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_print_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_random_to_key.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_rd_req_ctx.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_rd_req_in_ctx_alloc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_rd_req_in_set_keytab.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_rd_req_in_set_pac_check.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_rd_req_out_ctx_free.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_rd_req_out_get_server.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_realm_compare.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_addrs.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_authdata.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_creds_tag.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_data.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_int16.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_int32.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_int8.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_keyblock.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_stringz.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_times.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_uint16.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_uint32.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ret_uint8.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_config_files.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_default_in_tkt_etypes.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_dns_canonicalize_hostname.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_error_message.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_extra_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_fcache_version.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_home_dir_access.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_ignore_addresses.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_kdc_sec_offset.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_max_time_skew.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_password.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_real_time.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_set_use_admin_kdc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_sname_to_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_sockaddr2address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_sockaddr2port.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_sockaddr_uninteresting.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_clear_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_emem.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_free.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_from_data.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_from_fd.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_from_mem.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_from_readonly_mem.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_get_byteorder.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_get_eof_code.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_is_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_read.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_seek.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_set_byteorder.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_set_eof_code.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_set_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_set_max_alloc.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_to_data.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_truncate.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage_write.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_addrs.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_authdata.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_creds.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_creds_tag.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_data.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_int16.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_int32.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_int8.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_keyblock.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_stringz.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_times.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_uint16.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_uint32.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_store_uint8.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_string_to_keytype.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_support.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ticket.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ticket_get_authorization_data_type.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ticket_get_client.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ticket_get_endtime.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ticket_get_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ticket_get_server.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_unparse_name.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_unparse_name_fixed.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_unparse_name_fixed_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_unparse_name_fixed_short.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_unparse_name_flags.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_unparse_name_short.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_v4compat.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_verify_checksum_iov.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_vset_error_string.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_vwarn.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/manpages vendor-crypto/heimdal/dist/doc/doxyout/ntlm/ vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/ vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/annotated.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/doxygen.css vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/doxygen.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/examples.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/functions.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/functions_vars.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/graph_legend.dot vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/graph_legend.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/group__ntlm__core.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__buf.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type1.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type2.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type2__coll__graph.map vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type2__coll__graph.md5 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type2__coll__graph.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type3.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type3__coll__graph.map vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type3__coll__graph.md5 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type3__coll__graph.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/tab_b.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/tab_l.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/tab_r.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/tabs.css vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/test__ntlm_8c-example.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/ vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/challenge.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/context.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/data.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/domain.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/flags.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_build_ntlm1_master.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_build_ntlm2_master.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_calculate_lm2.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_calculate_ntlm1.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_calculate_ntlm2.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_decode_targetinfo.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_encode_targetinfo.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_encode_type1.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_encode_type2.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_encode_type3.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_free_buf.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_free_targetinfo.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_free_type1.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_free_type2.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_free_type3.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_keyex_unwrap.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_nt_key.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_ntlmv2_key.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/heim_ntlm_verify_ntlm2.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/hostname.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/length.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/lm.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_buf.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_core.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_type1.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_type2.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_type3.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/os.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/sessionkey.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/targetinfo.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/targetname.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/username.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ws.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/manpages vendor-crypto/heimdal/dist/doc/doxyout/wind/ vendor-crypto/heimdal/dist/doc/doxyout/wind/html/ vendor-crypto/heimdal/dist/doc/doxyout/wind/html/doxygen.css vendor-crypto/heimdal/dist/doc/doxyout/wind/html/doxygen.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/wind/html/graph_legend.dot vendor-crypto/heimdal/dist/doc/doxyout/wind/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/wind/html/graph_legend.png (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/wind/html/group__wind.html vendor-crypto/heimdal/dist/doc/doxyout/wind/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/wind/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/wind/html/tab_b.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/wind/html/tab_l.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/wind/html/tab_r.gif (contents, props changed) vendor-crypto/heimdal/dist/doc/doxyout/wind/html/tabs.css vendor-crypto/heimdal/dist/doc/doxyout/wind/man/ vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/ vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_profile.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_punycode_label_toascii.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_stringprep.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_ucs2read.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_ucs2utf8.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_ucs2utf8_length.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_ucs2write.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_ucs4utf8.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_ucs4utf8_length.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_utf8ucs2.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_utf8ucs2_length.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_utf8ucs4.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind_utf8ucs4_length.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/manpages vendor-crypto/heimdal/dist/doc/footer.html vendor-crypto/heimdal/dist/doc/gssapi.din vendor-crypto/heimdal/dist/doc/hdb.din vendor-crypto/heimdal/dist/doc/header.html vendor-crypto/heimdal/dist/doc/heimdal.info vendor-crypto/heimdal/dist/doc/hx509.info vendor-crypto/heimdal/dist/doc/wind.din vendor-crypto/heimdal/dist/etc/NTMakefile vendor-crypto/heimdal/dist/include/NTMakefile vendor-crypto/heimdal/dist/include/crypto-headers.h (contents, props changed) vendor-crypto/heimdal/dist/include/gssapi/NTMakefile vendor-crypto/heimdal/dist/include/hcrypto/NTMakefile vendor-crypto/heimdal/dist/include/heim_threads.h (contents, props changed) vendor-crypto/heimdal/dist/include/kadm5/NTMakefile vendor-crypto/heimdal/dist/include/krb5-types.cross vendor-crypto/heimdal/dist/kadmin/NTMakefile vendor-crypto/heimdal/dist/kadmin/kadmin-version.rc vendor-crypto/heimdal/dist/kadmin/kadmin.cat8 vendor-crypto/heimdal/dist/kadmin/kadmind-version.rc vendor-crypto/heimdal/dist/kadmin/kadmind.cat8 vendor-crypto/heimdal/dist/kadmin/rpc.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/NTMakefile vendor-crypto/heimdal/dist/kcm/kcm-protos.h (contents, props changed) vendor-crypto/heimdal/dist/kcm/kcm.cat8 vendor-crypto/heimdal/dist/kcm/sessions.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/NTMakefile vendor-crypto/heimdal/dist/kdc/announce.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/digest-service.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/hprop-version.rc vendor-crypto/heimdal/dist/kdc/hprop.cat8 vendor-crypto/heimdal/dist/kdc/hpropd-version.rc vendor-crypto/heimdal/dist/kdc/hpropd.cat8 vendor-crypto/heimdal/dist/kdc/kdc-version.rc vendor-crypto/heimdal/dist/kdc/kdc.cat8 vendor-crypto/heimdal/dist/kdc/kstash-version.rc vendor-crypto/heimdal/dist/kdc/kstash.cat8 vendor-crypto/heimdal/dist/kdc/libkdc-exports.def vendor-crypto/heimdal/dist/kdc/libkdc-version.rc vendor-crypto/heimdal/dist/kdc/string2key-version.rc vendor-crypto/heimdal/dist/kdc/string2key.cat8 vendor-crypto/heimdal/dist/kpasswd/NTMakefile vendor-crypto/heimdal/dist/kpasswd/kpasswd.cat1 vendor-crypto/heimdal/dist/kpasswd/kpasswdd.cat8 vendor-crypto/heimdal/dist/kuser/NTMakefile vendor-crypto/heimdal/dist/kuser/kcc-commands.in vendor-crypto/heimdal/dist/kuser/kcc-version.rc vendor-crypto/heimdal/dist/kuser/kcc.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kdestroy-version.rc vendor-crypto/heimdal/dist/kuser/kdestroy.cat1 vendor-crypto/heimdal/dist/kuser/kdigest-version.rc vendor-crypto/heimdal/dist/kuser/kdigest.8 vendor-crypto/heimdal/dist/kuser/kdigest.cat8 vendor-crypto/heimdal/dist/kuser/kgetcred-version.rc vendor-crypto/heimdal/dist/kuser/kgetcred.cat1 vendor-crypto/heimdal/dist/kuser/kimpersonate-version.rc vendor-crypto/heimdal/dist/kuser/kimpersonate.8 vendor-crypto/heimdal/dist/kuser/kimpersonate.cat8 vendor-crypto/heimdal/dist/kuser/kinit-version.rc vendor-crypto/heimdal/dist/kuser/kinit.cat1 vendor-crypto/heimdal/dist/kuser/klist.cat1 vendor-crypto/heimdal/dist/kuser/kswitch.1 vendor-crypto/heimdal/dist/kuser/kswitch.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kswitch.cat1 vendor-crypto/heimdal/dist/lib/NTMakefile vendor-crypto/heimdal/dist/lib/asn1/NTMakefile vendor-crypto/heimdal/dist/lib/asn1/asn1-template.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/asn1_compile-version.rc vendor-crypto/heimdal/dist/lib/asn1/asn1parse.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/asn1parse.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/asn1parse.y vendor-crypto/heimdal/dist/lib/asn1/check-ber.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/check-template.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/cms.asn1 vendor-crypto/heimdal/dist/lib/asn1/cms.opt vendor-crypto/heimdal/dist/lib/asn1/der-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_template.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/krb5.asn1 vendor-crypto/heimdal/dist/lib/asn1/krb5.opt vendor-crypto/heimdal/dist/lib/asn1/libasn1-exports.def vendor-crypto/heimdal/dist/lib/asn1/template.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/version-script.map vendor-crypto/heimdal/dist/lib/com_err/NTMakefile vendor-crypto/heimdal/dist/lib/com_err/compile_et-version.rc vendor-crypto/heimdal/dist/lib/com_err/libcom_err-exports.def vendor-crypto/heimdal/dist/lib/com_err/libcom_err-version.rc vendor-crypto/heimdal/dist/lib/gssapi/NTMakefile vendor-crypto/heimdal/dist/lib/gssapi/gss_acquire_cred.cat3 vendor-crypto/heimdal/dist/lib/gssapi/gssapi.cat3 vendor-crypto/heimdal/dist/lib/gssapi/gssapi/gssapi_ntlm.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/gssapi/gssapi_oid.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/gsstool.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/aeap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/authorize_localname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/creds.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/pname_to_uid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/store_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/libgssapi-exports.def vendor-crypto/heimdal/dist/lib/gssapi/libgssapi-version.rc vendor-crypto/heimdal/dist/lib/gssapi/mech/ vendor-crypto/heimdal/dist/lib/gssapi/mech/compat.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/context.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/cred.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/doxygen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_accept_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_acquire_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_acquire_cred_ext.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_acquire_cred_with_password.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_add_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_add_cred_with_password.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_add_oid_set_member.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_aeap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_authorize_localname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_buffer_set.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_canonicalize_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_compare_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_context_time.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_create_empty_oid_set.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_decapsulate_token.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_delete_name_attribute.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_delete_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_display_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_display_name_ext.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_display_status.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_duplicate_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_duplicate_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_encapsulate_token.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_export_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_export_name_composite.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_export_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_get_mic.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_get_name_attribute.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_import_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_import_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_indicate_mechs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_init_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_cred_by_mech.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_cred_by_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_mechs_for_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_names_for_mech.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_krb5.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_mech_switch.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_mo.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_names.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_oid_equal.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_oid_to_str.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_process_context_token.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_pseudo_random.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_release_buffer.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_release_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_release_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_release_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_release_oid_set.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_seal.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_set_cred_option.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_set_name_attribute.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_set_sec_context_option.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_sign.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_store_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_test_oid_set_member.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_unseal.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_unwrap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_utils.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_verify.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_verify_mic.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_wrap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gss_wrap_size_limit.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/gssapi.asn1 vendor-crypto/heimdal/dist/lib/gssapi/mech/mech.5 vendor-crypto/heimdal/dist/lib/gssapi/mech/mech.cat5 vendor-crypto/heimdal/dist/lib/gssapi/mech/mech_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/mech_switch.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/mechqueue.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/name.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/mech/utils.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/creds.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/inquire_sec_context_by_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/iter_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/kdc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/spnego.opt vendor-crypto/heimdal/dist/lib/hcrypto/ vendor-crypto/heimdal/dist/lib/hcrypto/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/DESperate.txt vendor-crypto/heimdal/dist/lib/hcrypto/Makefile.am vendor-crypto/heimdal/dist/lib/hcrypto/Makefile.in vendor-crypto/heimdal/dist/lib/hcrypto/NTMakefile vendor-crypto/heimdal/dist/lib/hcrypto/aes.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/aes.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/bn.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/bn.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/camellia-ntt.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/camellia-ntt.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/camellia.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/camellia.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/common.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/des-tables.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/des.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/des.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/destest.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/dh-ltm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/dh.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/dh.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/dllmain.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/doxygen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/dsa.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/dsa.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/ec.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/ecdh.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/ecdsa.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/engine.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/engine.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/evp-cc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/evp-cc.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/evp-hcrypto.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/evp-hcrypto.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/evp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/evp.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/example_evp_cipher.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/gen-des.pl vendor-crypto/heimdal/dist/lib/hcrypto/hash.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/hmac.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/hmac.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libhcrypto-exports.def vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/ vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_error.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_fast_mp_invmod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_fast_mp_montgomery_reduce.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_fast_s_mp_mul_digs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_fast_s_mp_mul_high_digs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_fast_s_mp_sqr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_2expt.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_abs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_add.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_add_d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_addmod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_and.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_clamp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_clear.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_clear_multi.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cmp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cmp_d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cmp_mag.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cnt_lsb.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_copy.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_count_bits.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_2.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_2d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_3.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_dr_is_modulus.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_dr_reduce.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_dr_setup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exch.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_expt_d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exptmod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exptmod_fast.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exteuclid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_find_prime.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_fread.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_fwrite.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_gcd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_get_int.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_grow.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_copy.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_multi.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_set.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_set_int.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_size.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_invmod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_invmod_slow.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_is_square.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_isprime.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_jacobi.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_karatsuba_mul.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_karatsuba_sqr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_lcm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_lshd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mod_2d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mod_d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_montgomery_calc_normalization.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_montgomery_reduce.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_montgomery_setup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul_2.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul_2d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul_d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mulmod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_n_root.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_neg.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_or.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_fermat.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_is_divisible.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_is_prime.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_miller_rabin.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_next_prime.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_rabin_miller_trials.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_random_ex.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_radix_size.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_radix_smap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_rand.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_read_radix.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_read_signed_bin.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_read_unsigned_bin.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k_l.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup_l.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_is_2k.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_is_2k_l.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_setup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_rshd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_set.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_set_int.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_shrink.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_signed_bin_size.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sqr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sqrmod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sqrt.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sub.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sub_d.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_submod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_signed_bin.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_signed_bin_n.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin_n.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toom_mul.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toom_sqr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toradix.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toradix_n.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_unsigned_bin_size.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_xor.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_zero.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_mp_zero_multi.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_prime_tab.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_reverse.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_add.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_exptmod.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_mul_digs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_mul_high_digs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_sqr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_sub.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/bncore.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/tommath.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/tommath_class.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/libtommath/tommath_superclass.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/md2.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/md2.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/md4.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/md4.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/md5.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/md5.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/md5crypt_test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/mdtest.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/passwd_dialog.aps (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/passwd_dialog.clw vendor-crypto/heimdal/dist/lib/hcrypto/passwd_dialog.rc vendor-crypto/heimdal/dist/lib/hcrypto/passwd_dialog.res (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/passwd_dlg.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/passwd_dlg.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/pkcs12.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/pkcs12.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/pkcs5.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rand-egd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rand-fortuna.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rand-timer.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rand-unix.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rand.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rand.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/randi.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rc2.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rc2.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rc2test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rc4.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rc4.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rctest.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/resource.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rijndael-alg-fst.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rijndael-alg-fst.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rnd_keys.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rsa-gmp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rsa-ltm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rsa.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rsa.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rsakey.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rsakey2048.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/rsakey4096.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/sha.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/sha.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/sha256.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/sha512.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_bn.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_cipher.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_crypto.in vendor-crypto/heimdal/dist/lib/hcrypto/test_dh.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_engine_dso.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_hmac.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_pkcs12.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_pkcs5.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_rand.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/test_rsa.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/ui.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/ui.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/validate.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hcrypto/version-script.map vendor-crypto/heimdal/dist/lib/hdb/NTMakefile vendor-crypto/heimdal/dist/lib/hdb/data-mkey.mit.des3.be (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/data-mkey.mit.des3.le (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb-keytab.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb-mitdb.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb-sqlite.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/libhdb-exports.def vendor-crypto/heimdal/dist/lib/hdb/libhdb-version.rc vendor-crypto/heimdal/dist/lib/hdb/test_hdbkeys.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/test_mkey.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/version-script.map vendor-crypto/heimdal/dist/lib/heimdal/ vendor-crypto/heimdal/dist/lib/heimdal/NTMakefile vendor-crypto/heimdal/dist/lib/heimdal/dllmain.c (contents, props changed) vendor-crypto/heimdal/dist/lib/heimdal/heimdal-version.rc vendor-crypto/heimdal/dist/lib/hx509/NTMakefile vendor-crypto/heimdal/dist/lib/hx509/TODO vendor-crypto/heimdal/dist/lib/hx509/char_map.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/n0ll.pem vendor-crypto/heimdal/dist/lib/hx509/data/pkinit-ec.crt vendor-crypto/heimdal/dist/lib/hx509/data/pkinit-ec.key vendor-crypto/heimdal/dist/lib/hx509/data/secp160r1TestCA.cert.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r1TestCA.key.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r1TestCA.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r2TestClient.cert.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r2TestClient.key.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r2TestClient.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r2TestServer.cert.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r2TestServer.key.pem vendor-crypto/heimdal/dist/lib/hx509/data/secp160r2TestServer.pem vendor-crypto/heimdal/dist/lib/hx509/data/test-signed-sha-1 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-signed-sha-256 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-signed-sha-512 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/win-u16-in-printablestring.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/hxtool-version.rc vendor-crypto/heimdal/dist/lib/hx509/libhx509-exports.def vendor-crypto/heimdal/dist/lib/hx509/ocsp.opt vendor-crypto/heimdal/dist/lib/hx509/pkcs10.opt vendor-crypto/heimdal/dist/lib/hx509/quote.py vendor-crypto/heimdal/dist/lib/hx509/sel-gram.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/sel-gram.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/sel-gram.y vendor-crypto/heimdal/dist/lib/hx509/sel-lex.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/sel-lex.l vendor-crypto/heimdal/dist/lib/hx509/sel.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/sel.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/test_expr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/ vendor-crypto/heimdal/dist/lib/ipc/Makefile.am vendor-crypto/heimdal/dist/lib/ipc/Makefile.in vendor-crypto/heimdal/dist/lib/ipc/client.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/heim-ipc.h (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/heim_ipc.defs vendor-crypto/heimdal/dist/lib/ipc/heim_ipc_async.defs vendor-crypto/heimdal/dist/lib/ipc/heim_ipc_reply.defs vendor-crypto/heimdal/dist/lib/ipc/heim_ipc_types.h (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/hi_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/server.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/tc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/ts-http.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ipc/ts.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/NTMakefile vendor-crypto/heimdal/dist/lib/kadm5/iprop-log-version.rc vendor-crypto/heimdal/dist/lib/kadm5/iprop-log.cat8 vendor-crypto/heimdal/dist/lib/kadm5/iprop.cat8 vendor-crypto/heimdal/dist/lib/kadm5/ipropd-master-version.rc vendor-crypto/heimdal/dist/lib/kadm5/ipropd-slave-version.rc vendor-crypto/heimdal/dist/lib/kadm5/kadm5_pwcheck.cat3 vendor-crypto/heimdal/dist/lib/kadm5/libkadm5srv-exports.def vendor-crypto/heimdal/dist/lib/kadm5/libkadm5srv-version.rc vendor-crypto/heimdal/dist/lib/kafs/NTMakefile vendor-crypto/heimdal/dist/lib/kafs/kafs.cat3 vendor-crypto/heimdal/dist/lib/kdfs/ vendor-crypto/heimdal/dist/lib/kdfs/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/kdfs/Makefile.am vendor-crypto/heimdal/dist/lib/kdfs/Makefile.in vendor-crypto/heimdal/dist/lib/kdfs/NTMakefile vendor-crypto/heimdal/dist/lib/kdfs/k5dfspag.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/NTMakefile vendor-crypto/heimdal/dist/lib/krb5/ccache_plugin.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-aes.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-algs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-arcfour.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-des-common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-des.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-des3.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-evp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-null.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-pk.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-rand.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto-stubs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/deprecated.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/expand_path.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/kerberos.cat8 vendor-crypto/heimdal/dist/lib/krb5/krb5.conf.cat5 vendor-crypto/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_425_conv_principal.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_acl_match_file.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_aname_to_localname.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_appdefault.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_auth_context.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_c_make_checksum.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_check_transited.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_create_checksum.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_creds.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_digest.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_eai_to_heim_errno.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_encrypt.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_find_padata.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_generate_random_block.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_all_client_addrs.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_credentials.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_creds.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_forwarded_creds.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_in_cred.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_init_creds.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_krbhst.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_getportbyname.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_init_context.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_is_thread_safe.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_krbhst_init.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_mk_req.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_mk_safe.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_openlog.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_parse_name.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_principal.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_rcache.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_rd_error.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_rd_safe.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_set_default_realm.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_set_password.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_string_to_key.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_timeofday.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_verify_init_creds.cat3 vendor-crypto/heimdal/dist/lib/krb5/krb5_verify_user.cat3 vendor-crypto/heimdal/dist/lib/krb5/pcache.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/salt-aes.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/salt-arcfour.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/salt-des.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/salt-des3.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/salt.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/scache.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/send_to_kdc_plugin.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/store-int.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_ap-req.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_config_strings.cfg vendor-crypto/heimdal/dist/lib/krb5/test_fx.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_gic.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_pknistkdf.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_rfc3961.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_x500.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/verify_krb5_conf-version.rc vendor-crypto/heimdal/dist/lib/krb5/verify_krb5_conf.cat8 vendor-crypto/heimdal/dist/lib/libedit/ vendor-crypto/heimdal/dist/lib/libedit/COPYING vendor-crypto/heimdal/dist/lib/libedit/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/INSTALL vendor-crypto/heimdal/dist/lib/libedit/Makefile.am vendor-crypto/heimdal/dist/lib/libedit/Makefile.in vendor-crypto/heimdal/dist/lib/libedit/THANKS vendor-crypto/heimdal/dist/lib/libedit/acinclude.m4 vendor-crypto/heimdal/dist/lib/libedit/aclocal.m4 vendor-crypto/heimdal/dist/lib/libedit/config.guess (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/config.h.in vendor-crypto/heimdal/dist/lib/libedit/config.sub (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/configure (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/configure.ac vendor-crypto/heimdal/dist/lib/libedit/depcomp (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/install-sh (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/ltmain.sh (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/missing (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/ vendor-crypto/heimdal/dist/lib/libedit/src/Makefile.am vendor-crypto/heimdal/dist/lib/libedit/src/Makefile.in vendor-crypto/heimdal/dist/lib/libedit/src/chared.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/chared.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/chartype.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/chartype.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/editline/ vendor-crypto/heimdal/dist/lib/libedit/src/editline/readline.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/el.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/el.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/el_term.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/eln.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/emacs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/fgetln.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/filecomplete.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/filecomplete.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/hist.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/hist.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/histedit.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/history.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/key.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/key.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/makelist vendor-crypto/heimdal/dist/lib/libedit/src/map.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/map.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/parse.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/parse.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/prompt.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/prompt.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/read.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/read.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/readline.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/refresh.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/refresh.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/search.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/search.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/shlib_version vendor-crypto/heimdal/dist/lib/libedit/src/sig.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/sig.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/strlcat.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/strlcpy.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/sys.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/term.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/tokenizer.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/tty.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/tty.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/unvis.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/vi.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/vis.c (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/vis.h (contents, props changed) vendor-crypto/heimdal/dist/lib/libedit/src/wcsdup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ntlm/NTMakefile vendor-crypto/heimdal/dist/lib/ntlm/libheimntlm-exports.def vendor-crypto/heimdal/dist/lib/ntlm/libheimntlm-version.rc vendor-crypto/heimdal/dist/lib/ntlm/ntlm_err.et vendor-crypto/heimdal/dist/lib/otp/ vendor-crypto/heimdal/dist/lib/otp/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/Makefile.am vendor-crypto/heimdal/dist/lib/otp/Makefile.in vendor-crypto/heimdal/dist/lib/otp/NTMakefile vendor-crypto/heimdal/dist/lib/otp/otp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp.h (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_challenge.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_db.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_md.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_md.h (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_parse.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_print.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otp_verify.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/otptest.c (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/roken_rename.h (contents, props changed) vendor-crypto/heimdal/dist/lib/otp/version-script.map vendor-crypto/heimdal/dist/lib/roken/NTMakefile vendor-crypto/heimdal/dist/lib/roken/cloexec.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/ct.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/doxygen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/ecalloc.cat3 vendor-crypto/heimdal/dist/lib/roken/getarg.cat3 vendor-crypto/heimdal/dist/lib/roken/getifaddrs-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_time.cat3 vendor-crypto/heimdal/dist/lib/roken/qsort.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/rand.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/rkpty.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/rtbl.cat3 vendor-crypto/heimdal/dist/lib/roken/search.hin vendor-crypto/heimdal/dist/lib/roken/strerror_r.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/tsearch-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/tsearch.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/version-script.map vendor-crypto/heimdal/dist/lib/roken/xfree.c (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/NTMakefile vendor-crypto/heimdal/dist/lib/sqlite/ vendor-crypto/heimdal/dist/lib/sqlite/Makefile.am vendor-crypto/heimdal/dist/lib/sqlite/Makefile.in vendor-crypto/heimdal/dist/lib/sqlite/NTMakefile vendor-crypto/heimdal/dist/lib/sqlite/sqlite3.c (contents, props changed) vendor-crypto/heimdal/dist/lib/sqlite/sqlite3.h (contents, props changed) vendor-crypto/heimdal/dist/lib/sqlite/sqlite3ext.h (contents, props changed) vendor-crypto/heimdal/dist/lib/vers/NTMakefile vendor-crypto/heimdal/dist/lib/wind/ vendor-crypto/heimdal/dist/lib/wind/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/CompositionExclusions-3.2.0.txt vendor-crypto/heimdal/dist/lib/wind/DerivedNormalizationProps.txt vendor-crypto/heimdal/dist/lib/wind/Makefile.am vendor-crypto/heimdal/dist/lib/wind/Makefile.in vendor-crypto/heimdal/dist/lib/wind/NTMakefile vendor-crypto/heimdal/dist/lib/wind/NormalizationCorrections.txt vendor-crypto/heimdal/dist/lib/wind/NormalizationTest.txt vendor-crypto/heimdal/dist/lib/wind/UnicodeData.py vendor-crypto/heimdal/dist/lib/wind/UnicodeData.txt vendor-crypto/heimdal/dist/lib/wind/bidi.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/bidi_table.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/bidi_table.h (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/combining.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/combining_table.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/combining_table.h (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/doxygen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/errorlist.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/errorlist_table.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/errorlist_table.h (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/gen-bidi.py vendor-crypto/heimdal/dist/lib/wind/gen-combining.py vendor-crypto/heimdal/dist/lib/wind/gen-errorlist.py vendor-crypto/heimdal/dist/lib/wind/gen-map.py vendor-crypto/heimdal/dist/lib/wind/gen-normalize.py vendor-crypto/heimdal/dist/lib/wind/gen-punycode-examples.py vendor-crypto/heimdal/dist/lib/wind/generate.py vendor-crypto/heimdal/dist/lib/wind/idn-lookup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/ldap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/libwind-exports.def vendor-crypto/heimdal/dist/lib/wind/map.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/map_table.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/map_table.h (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/normalize.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/normalize_table.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/normalize_table.h (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/punycode.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/punycode_examples.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/punycode_examples.h (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/rfc3454.py vendor-crypto/heimdal/dist/lib/wind/rfc3454.txt vendor-crypto/heimdal/dist/lib/wind/rfc3490.txt vendor-crypto/heimdal/dist/lib/wind/rfc3491.txt vendor-crypto/heimdal/dist/lib/wind/rfc3492.txt vendor-crypto/heimdal/dist/lib/wind/rfc4013.txt vendor-crypto/heimdal/dist/lib/wind/rfc4518.py vendor-crypto/heimdal/dist/lib/wind/rfc4518.txt vendor-crypto/heimdal/dist/lib/wind/stringprep.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/stringprep.py vendor-crypto/heimdal/dist/lib/wind/test-bidi.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/test-ldap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/test-map.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/test-normalize.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/test-prohibited.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/test-punycode.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/test-rw.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/test-utf8.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/utf8.c (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/util.py vendor-crypto/heimdal/dist/lib/wind/version-script.map vendor-crypto/heimdal/dist/lib/wind/wind.h (contents, props changed) vendor-crypto/heimdal/dist/lib/wind/wind_err.et vendor-crypto/heimdal/dist/lib/wind/windlocl.h (contents, props changed) vendor-crypto/heimdal/dist/packages/windows/ vendor-crypto/heimdal/dist/packages/windows/NTMakefile vendor-crypto/heimdal/dist/packages/windows/assembly/ vendor-crypto/heimdal/dist/packages/windows/assembly/Heimdal.Application.manifest.in vendor-crypto/heimdal/dist/packages/windows/assembly/Heimdal.Kerberos.manifest.in vendor-crypto/heimdal/dist/packages/windows/assembly/NTMakefile vendor-crypto/heimdal/dist/packages/windows/assembly/policy.Heimdal.Kerberos.in vendor-crypto/heimdal/dist/packages/windows/installer/ vendor-crypto/heimdal/dist/packages/windows/installer/NTMakefile vendor-crypto/heimdal/dist/packages/windows/installer/heimdal-assemblies.wxs vendor-crypto/heimdal/dist/packages/windows/installer/heimdal-installer.wxs vendor-crypto/heimdal/dist/packages/windows/installer/heimdal-policy.wxs vendor-crypto/heimdal/dist/packages/windows/installer/lang/ vendor-crypto/heimdal/dist/packages/windows/installer/lang/en-us.wxl vendor-crypto/heimdal/dist/packages/windows/installer/lang/license-en-us.rtf (contents, props changed) vendor-crypto/heimdal/dist/packages/windows/sdk/ vendor-crypto/heimdal/dist/packages/windows/sdk/NTMakefile vendor-crypto/heimdal/dist/po/ vendor-crypto/heimdal/dist/po/Makefile.am vendor-crypto/heimdal/dist/po/Makefile.in vendor-crypto/heimdal/dist/po/gen-po.in vendor-crypto/heimdal/dist/po/heim_com_err-1750206208/ vendor-crypto/heimdal/dist/po/heim_com_err-1750206208/heim_com_err-1750206208.pot vendor-crypto/heimdal/dist/po/heim_com_err-1765328384/ vendor-crypto/heimdal/dist/po/heim_com_err-1765328384/heim_com_err-1765328384.pot vendor-crypto/heimdal/dist/po/heim_com_err-1765328384/sv_SE.mo (contents, props changed) vendor-crypto/heimdal/dist/po/heim_com_err-1765328384/sv_SE.po vendor-crypto/heimdal/dist/po/heim_com_err-1980176640/ vendor-crypto/heimdal/dist/po/heim_com_err-1980176640/heim_com_err-1980176640.pot vendor-crypto/heimdal/dist/po/heim_com_err-969269760/ vendor-crypto/heimdal/dist/po/heim_com_err-969269760/heim_com_err-969269760.pot vendor-crypto/heimdal/dist/po/heim_com_err1859794432/ vendor-crypto/heimdal/dist/po/heim_com_err1859794432/heim_com_err1859794432.pot vendor-crypto/heimdal/dist/po/heim_com_err35224064/ vendor-crypto/heimdal/dist/po/heim_com_err35224064/heim_com_err35224064.pot vendor-crypto/heimdal/dist/po/heim_com_err36150272/ vendor-crypto/heimdal/dist/po/heim_com_err36150272/heim_com_err36150272.pot vendor-crypto/heimdal/dist/po/heim_com_err39525376/ vendor-crypto/heimdal/dist/po/heim_com_err39525376/heim_com_err39525376.pot vendor-crypto/heimdal/dist/po/heim_com_err43787520/ vendor-crypto/heimdal/dist/po/heim_com_err43787520/heim_com_err43787520.pot vendor-crypto/heimdal/dist/po/heim_com_err569856/ vendor-crypto/heimdal/dist/po/heim_com_err569856/heim_com_err569856.pot vendor-crypto/heimdal/dist/po/heimdal_krb5/ vendor-crypto/heimdal/dist/po/heimdal_krb5/heimdal_krb5.pot vendor-crypto/heimdal/dist/po/heimdal_krb5/sv_SE.mo (contents, props changed) vendor-crypto/heimdal/dist/po/heimdal_krb5/sv_SE.po vendor-crypto/heimdal/dist/po/heimdal_kuser/ vendor-crypto/heimdal/dist/po/heimdal_kuser/heimdal_kuser.pot vendor-crypto/heimdal/dist/tests/NTMakefile vendor-crypto/heimdal/dist/tests/bin/ vendor-crypto/heimdal/dist/tests/bin/Makefile.am vendor-crypto/heimdal/dist/tests/bin/Makefile.in vendor-crypto/heimdal/dist/tests/bin/setup-env.in vendor-crypto/heimdal/dist/tests/can/NTMakefile vendor-crypto/heimdal/dist/tests/db/NTMakefile vendor-crypto/heimdal/dist/tests/db/check-aliases.in vendor-crypto/heimdal/dist/tests/db/krb5-mit.conf.in vendor-crypto/heimdal/dist/tests/gss/NTMakefile vendor-crypto/heimdal/dist/tests/java/NTMakefile vendor-crypto/heimdal/dist/tests/kdc/NTMakefile vendor-crypto/heimdal/dist/tests/kdc/check-cc.in vendor-crypto/heimdal/dist/tests/kdc/check-delegation.in vendor-crypto/heimdal/dist/tests/kdc/check-des.in vendor-crypto/heimdal/dist/tests/kdc/check-kdc-weak.in vendor-crypto/heimdal/dist/tests/kdc/check-kpasswdd.in vendor-crypto/heimdal/dist/tests/kdc/leaks-kill.sh vendor-crypto/heimdal/dist/tests/ldap/NTMakefile vendor-crypto/heimdal/dist/tests/plugin/NTMakefile vendor-crypto/heimdal/dist/tools/NTMakefile vendor-crypto/heimdal/dist/tools/krb5-config.cat1 vendor-crypto/heimdal/dist/windows/ vendor-crypto/heimdal/dist/windows/NTMakefile.config vendor-crypto/heimdal/dist/windows/NTMakefile.w32 vendor-crypto/heimdal/dist/windows/README vendor-crypto/heimdal/dist/windows/maint.el vendor-crypto/heimdal/dist/windows/version.rc vendor-crypto/heimdal/dist/ylwrap (contents, props changed) Deleted: vendor-crypto/heimdal/dist/appl/ftp/ftp/krb4.c vendor-crypto/heimdal/dist/appl/ftp/ftpd/krb4.c vendor-crypto/heimdal/dist/appl/login/login_protos.h vendor-crypto/heimdal/dist/appl/telnet/libtelnet/kerberos.c vendor-crypto/heimdal/dist/appl/telnet/libtelnet/krb4encpwd.c vendor-crypto/heimdal/dist/cf/autobuild.m4 vendor-crypto/heimdal/dist/configure.in vendor-crypto/heimdal/dist/include/make_crypto.c vendor-crypto/heimdal/dist/kcm/cursor.c vendor-crypto/heimdal/dist/kcm/kcm_protos.h vendor-crypto/heimdal/dist/kdc/524.c vendor-crypto/heimdal/dist/kdc/kadb.h vendor-crypto/heimdal/dist/kdc/kaserver.c vendor-crypto/heimdal/dist/kdc/kerberos4.c vendor-crypto/heimdal/dist/kdc/v4_dump.c vendor-crypto/heimdal/dist/kuser/kimpersonate.1 vendor-crypto/heimdal/dist/lib/45/ vendor-crypto/heimdal/dist/lib/asn1/CMS.asn1 vendor-crypto/heimdal/dist/lib/asn1/k5.asn1 vendor-crypto/heimdal/dist/lib/asn1/parse.c vendor-crypto/heimdal/dist/lib/asn1/parse.h vendor-crypto/heimdal/dist/lib/asn1/parse.y vendor-crypto/heimdal/dist/lib/auth/ vendor-crypto/heimdal/dist/lib/gssapi/gss.c vendor-crypto/heimdal/dist/lib/gssapi/krb5/v1.c vendor-crypto/heimdal/dist/lib/gssapi/ntlm/digest.c vendor-crypto/heimdal/dist/lib/gssapi/ntlm/inquire_cred.c vendor-crypto/heimdal/dist/lib/kafs/README.dlfcn vendor-crypto/heimdal/dist/lib/kafs/afskrb.c vendor-crypto/heimdal/dist/lib/kafs/dlfcn.c vendor-crypto/heimdal/dist/lib/kafs/dlfcn.h vendor-crypto/heimdal/dist/lib/krb5/config_file_netinfo.c vendor-crypto/heimdal/dist/lib/krb5/get_in_tkt_pw.c vendor-crypto/heimdal/dist/lib/krb5/get_in_tkt_with_keytab.c vendor-crypto/heimdal/dist/lib/krb5/get_in_tkt_with_skey.c vendor-crypto/heimdal/dist/lib/krb5/heim_threads.h vendor-crypto/heimdal/dist/lib/krb5/keytab_krb4.c vendor-crypto/heimdal/dist/lib/krb5/krb5.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_address.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_ccache.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_compare_creds.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_config.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_context.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_crypto_init.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_data.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_expand_hostname.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_keyblock.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_keytab.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_kuserok.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_storage.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_ticket.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_unparse_name.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_warn.3 vendor-crypto/heimdal/dist/lib/krb5/name-45-test.c vendor-crypto/heimdal/dist/lib/krb5/v4_glue.c vendor-crypto/heimdal/dist/lib/roken/snprintf-test.h vendor-crypto/heimdal/dist/lib/roken/vis.h vendor-crypto/heimdal/dist/lib/sl/lex.c vendor-crypto/heimdal/dist/lib/sl/lex.l vendor-crypto/heimdal/dist/lib/sl/make_cmds.c vendor-crypto/heimdal/dist/lib/sl/make_cmds.h vendor-crypto/heimdal/dist/lib/sl/parse.c vendor-crypto/heimdal/dist/lib/sl/parse.h vendor-crypto/heimdal/dist/lib/sl/parse.y vendor-crypto/heimdal/dist/lib/sl/ss.c vendor-crypto/heimdal/dist/lib/sl/ss.h vendor-crypto/heimdal/dist/lib/vers/make-print-version.c vendor-crypto/heimdal/dist/packages/debian/ vendor-crypto/heimdal/dist/tests/kdc/ap-req.c vendor-crypto/heimdal/dist/tools/heimdal-build.sh Modified: vendor-crypto/heimdal/dist/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/ChangeLog.2002 (contents, props changed) vendor-crypto/heimdal/dist/ChangeLog.2003 (contents, props changed) vendor-crypto/heimdal/dist/ChangeLog.2004 (contents, props changed) vendor-crypto/heimdal/dist/ChangeLog.2005 (contents, props changed) vendor-crypto/heimdal/dist/ChangeLog.2006 (contents, props changed) vendor-crypto/heimdal/dist/LICENSE (contents, props changed) vendor-crypto/heimdal/dist/Makefile.am vendor-crypto/heimdal/dist/Makefile.am.common vendor-crypto/heimdal/dist/Makefile.in vendor-crypto/heimdal/dist/NEWS (contents, props changed) vendor-crypto/heimdal/dist/README (contents, props changed) vendor-crypto/heimdal/dist/acinclude.m4 vendor-crypto/heimdal/dist/aclocal.m4 vendor-crypto/heimdal/dist/admin/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/admin/Makefile.am vendor-crypto/heimdal/dist/admin/Makefile.in vendor-crypto/heimdal/dist/admin/add.c (contents, props changed) vendor-crypto/heimdal/dist/admin/change.c (contents, props changed) vendor-crypto/heimdal/dist/admin/copy.c (contents, props changed) vendor-crypto/heimdal/dist/admin/get.c (contents, props changed) vendor-crypto/heimdal/dist/admin/ktutil-commands.in vendor-crypto/heimdal/dist/admin/ktutil.8 vendor-crypto/heimdal/dist/admin/ktutil.c (contents, props changed) vendor-crypto/heimdal/dist/admin/ktutil_locl.h (contents, props changed) vendor-crypto/heimdal/dist/admin/list.c (contents, props changed) vendor-crypto/heimdal/dist/admin/purge.c (contents, props changed) vendor-crypto/heimdal/dist/admin/remove.c (contents, props changed) vendor-crypto/heimdal/dist/admin/rename.c (contents, props changed) vendor-crypto/heimdal/dist/appl/Makefile.am vendor-crypto/heimdal/dist/appl/Makefile.in vendor-crypto/heimdal/dist/appl/afsutil/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/afsutil/Makefile.am vendor-crypto/heimdal/dist/appl/afsutil/Makefile.in vendor-crypto/heimdal/dist/appl/afsutil/afslog.1 vendor-crypto/heimdal/dist/appl/afsutil/afslog.c (contents, props changed) vendor-crypto/heimdal/dist/appl/afsutil/pagsh.1 vendor-crypto/heimdal/dist/appl/afsutil/pagsh.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/Makefile.am vendor-crypto/heimdal/dist/appl/ftp/Makefile.in vendor-crypto/heimdal/dist/appl/ftp/common/Makefile.am vendor-crypto/heimdal/dist/appl/ftp/common/Makefile.in vendor-crypto/heimdal/dist/appl/ftp/common/buffer.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/common/common.h (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/common/sockbuf.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/Makefile.am vendor-crypto/heimdal/dist/appl/ftp/ftp/Makefile.in vendor-crypto/heimdal/dist/appl/ftp/ftp/cmds.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/cmdtab.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/domacro.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/extern.h (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/ftp.1 vendor-crypto/heimdal/dist/appl/ftp/ftp/ftp.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/ftp_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/globals.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/gssapi.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/kauth.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/main.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/ruserpass.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/security.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/security.h (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/Makefile.am vendor-crypto/heimdal/dist/appl/ftp/ftpd/Makefile.in vendor-crypto/heimdal/dist/appl/ftp/ftpd/extern.h (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpcmd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpcmd.y (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpd.8 vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpd_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpusers.5 vendor-crypto/heimdal/dist/appl/ftp/ftpd/gss_userok.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/gssapi.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/kauth.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/klist.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/logwtmp.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/ls.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/popen.c (contents, props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/security.c (contents, props changed) vendor-crypto/heimdal/dist/appl/gssmask/Makefile.am vendor-crypto/heimdal/dist/appl/gssmask/Makefile.in vendor-crypto/heimdal/dist/appl/gssmask/common.c (contents, props changed) vendor-crypto/heimdal/dist/appl/gssmask/common.h (contents, props changed) vendor-crypto/heimdal/dist/appl/gssmask/gssmaestro.c (contents, props changed) vendor-crypto/heimdal/dist/appl/gssmask/gssmask.c (contents, props changed) vendor-crypto/heimdal/dist/appl/gssmask/protocol.h (contents, props changed) vendor-crypto/heimdal/dist/appl/kf/Makefile.am vendor-crypto/heimdal/dist/appl/kf/Makefile.in vendor-crypto/heimdal/dist/appl/kf/kf.1 vendor-crypto/heimdal/dist/appl/kf/kf.c (contents, props changed) vendor-crypto/heimdal/dist/appl/kf/kf_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/kf/kfd.8 vendor-crypto/heimdal/dist/appl/kf/kfd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/login/Makefile.am vendor-crypto/heimdal/dist/appl/login/Makefile.in vendor-crypto/heimdal/dist/appl/login/conf.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/env.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/limits_conf.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/login.1 vendor-crypto/heimdal/dist/appl/login/login.access.5 vendor-crypto/heimdal/dist/appl/login/login.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/login_access.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/login_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/login/loginpaths.h (contents, props changed) vendor-crypto/heimdal/dist/appl/login/osfc2.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/read_string.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/shadow.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/stty_default.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/tty.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/utmp_login.c (contents, props changed) vendor-crypto/heimdal/dist/appl/login/utmpx_login.c (contents, props changed) vendor-crypto/heimdal/dist/appl/push/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/push/Makefile.am vendor-crypto/heimdal/dist/appl/push/Makefile.in vendor-crypto/heimdal/dist/appl/push/pfrom.1 vendor-crypto/heimdal/dist/appl/push/pfrom.in vendor-crypto/heimdal/dist/appl/push/push.8 vendor-crypto/heimdal/dist/appl/push/push.c (contents, props changed) vendor-crypto/heimdal/dist/appl/push/push_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/rcp/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/rcp/Makefile.am vendor-crypto/heimdal/dist/appl/rcp/Makefile.in vendor-crypto/heimdal/dist/appl/rcp/extern.h (contents, props changed) vendor-crypto/heimdal/dist/appl/rcp/rcp.1 vendor-crypto/heimdal/dist/appl/rcp/rcp.c (contents, props changed) vendor-crypto/heimdal/dist/appl/rcp/rcp_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/rcp/util.c (contents, props changed) vendor-crypto/heimdal/dist/appl/rsh/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/rsh/Makefile.am vendor-crypto/heimdal/dist/appl/rsh/Makefile.in vendor-crypto/heimdal/dist/appl/rsh/common.c (contents, props changed) vendor-crypto/heimdal/dist/appl/rsh/limits_conf.c (contents, props changed) vendor-crypto/heimdal/dist/appl/rsh/login_access.c (contents, props changed) vendor-crypto/heimdal/dist/appl/rsh/rsh.1 vendor-crypto/heimdal/dist/appl/rsh/rsh.c (contents, props changed) vendor-crypto/heimdal/dist/appl/rsh/rsh_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/rsh/rshd.8 vendor-crypto/heimdal/dist/appl/rsh/rshd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/su/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/su/Makefile.am vendor-crypto/heimdal/dist/appl/su/Makefile.in vendor-crypto/heimdal/dist/appl/su/su.1 vendor-crypto/heimdal/dist/appl/su/su.c (contents, props changed) vendor-crypto/heimdal/dist/appl/su/supaths.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/Makefile.am vendor-crypto/heimdal/dist/appl/telnet/Makefile.in vendor-crypto/heimdal/dist/appl/telnet/libtelnet/Makefile.am vendor-crypto/heimdal/dist/appl/telnet/libtelnet/Makefile.in vendor-crypto/heimdal/dist/appl/telnet/libtelnet/auth-proto.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/auth.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/auth.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/enc-proto.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/enc_des.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/encrypt.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/encrypt.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/genget.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/kerberos5.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/misc-proto.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/misc.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/rsaencpwd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/spx.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/Makefile.am vendor-crypto/heimdal/dist/appl/telnet/telnet/Makefile.in vendor-crypto/heimdal/dist/appl/telnet/telnet/authenc.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/commands.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/externs.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/main.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/network.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/ring.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/ring.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/sys_bsd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/telnet.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/telnet_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/terminal.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/utilities.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/Makefile.am vendor-crypto/heimdal/dist/appl/telnet/telnetd/Makefile.in vendor-crypto/heimdal/dist/appl/telnet/telnetd/authenc.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/defs.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/ext.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/global.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/slc.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/state.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/sys_term.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/telnetd.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/telnetd.h (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/termstat.c (contents, props changed) vendor-crypto/heimdal/dist/appl/telnet/telnetd/utility.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/Makefile.am vendor-crypto/heimdal/dist/appl/test/Makefile.in vendor-crypto/heimdal/dist/appl/test/common.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/gss_common.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/gss_common.h (contents, props changed) vendor-crypto/heimdal/dist/appl/test/gssapi_client.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/gssapi_server.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/http_client.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/nt_gss_client.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/nt_gss_common.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/nt_gss_common.h (contents, props changed) vendor-crypto/heimdal/dist/appl/test/nt_gss_server.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/tcp_client.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/tcp_server.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/test_locl.h (contents, props changed) vendor-crypto/heimdal/dist/appl/test/uu_client.c (contents, props changed) vendor-crypto/heimdal/dist/appl/test/uu_server.c (contents, props changed) vendor-crypto/heimdal/dist/autogen.sh vendor-crypto/heimdal/dist/cf/ChangeLog vendor-crypto/heimdal/dist/cf/Makefile.am.common vendor-crypto/heimdal/dist/cf/aix.m4 vendor-crypto/heimdal/dist/cf/auth-modules.m4 vendor-crypto/heimdal/dist/cf/broken-getaddrinfo.m4 vendor-crypto/heimdal/dist/cf/broken-glob.m4 vendor-crypto/heimdal/dist/cf/broken-realloc.m4 vendor-crypto/heimdal/dist/cf/broken-snprintf.m4 vendor-crypto/heimdal/dist/cf/broken.m4 vendor-crypto/heimdal/dist/cf/broken2.m4 vendor-crypto/heimdal/dist/cf/c-attribute.m4 vendor-crypto/heimdal/dist/cf/c-function.m4 vendor-crypto/heimdal/dist/cf/capabilities.m4 vendor-crypto/heimdal/dist/cf/check-compile-et.m4 vendor-crypto/heimdal/dist/cf/check-getpwnam_r-posix.m4 vendor-crypto/heimdal/dist/cf/check-man.m4 vendor-crypto/heimdal/dist/cf/check-netinet-ip-and-tcp.m4 vendor-crypto/heimdal/dist/cf/check-type-extra.m4 vendor-crypto/heimdal/dist/cf/check-var.m4 vendor-crypto/heimdal/dist/cf/check-x.m4 vendor-crypto/heimdal/dist/cf/check-xau.m4 vendor-crypto/heimdal/dist/cf/crypto.m4 vendor-crypto/heimdal/dist/cf/db.m4 vendor-crypto/heimdal/dist/cf/destdirs.m4 vendor-crypto/heimdal/dist/cf/dlopen.m4 vendor-crypto/heimdal/dist/cf/find-func-no-libs.m4 vendor-crypto/heimdal/dist/cf/find-func-no-libs2.m4 vendor-crypto/heimdal/dist/cf/find-func.m4 vendor-crypto/heimdal/dist/cf/find-if-not-broken.m4 vendor-crypto/heimdal/dist/cf/have-pragma-weak.m4 vendor-crypto/heimdal/dist/cf/have-struct-field.m4 vendor-crypto/heimdal/dist/cf/have-type.m4 vendor-crypto/heimdal/dist/cf/have-types.m4 vendor-crypto/heimdal/dist/cf/install-catman.sh vendor-crypto/heimdal/dist/cf/irix.m4 vendor-crypto/heimdal/dist/cf/krb-bigendian.m4 vendor-crypto/heimdal/dist/cf/krb-func-getcwd-broken.m4 vendor-crypto/heimdal/dist/cf/krb-func-getlogin.m4 vendor-crypto/heimdal/dist/cf/krb-ipv6.m4 vendor-crypto/heimdal/dist/cf/krb-prog-ln-s.m4 vendor-crypto/heimdal/dist/cf/krb-prog-ranlib.m4 vendor-crypto/heimdal/dist/cf/krb-prog-yacc.m4 vendor-crypto/heimdal/dist/cf/krb-readline.m4 vendor-crypto/heimdal/dist/cf/krb-struct-spwd.m4 vendor-crypto/heimdal/dist/cf/krb-struct-winsize.m4 vendor-crypto/heimdal/dist/cf/krb-sys-aix.m4 vendor-crypto/heimdal/dist/cf/krb-sys-nextstep.m4 vendor-crypto/heimdal/dist/cf/krb-version.m4 vendor-crypto/heimdal/dist/cf/largefile.m4 vendor-crypto/heimdal/dist/cf/make-proto.pl vendor-crypto/heimdal/dist/cf/mips-abi.m4 vendor-crypto/heimdal/dist/cf/misc.m4 vendor-crypto/heimdal/dist/cf/need-proto.m4 vendor-crypto/heimdal/dist/cf/osfc2.m4 vendor-crypto/heimdal/dist/cf/otp.m4 vendor-crypto/heimdal/dist/cf/proto-compat.m4 vendor-crypto/heimdal/dist/cf/pthreads.m4 vendor-crypto/heimdal/dist/cf/resolv.m4 vendor-crypto/heimdal/dist/cf/retsigtype.m4 vendor-crypto/heimdal/dist/cf/roken-frag.m4 vendor-crypto/heimdal/dist/cf/roken.m4 vendor-crypto/heimdal/dist/cf/socket-wrapper.m4 vendor-crypto/heimdal/dist/cf/sunos.m4 vendor-crypto/heimdal/dist/cf/telnet.m4 vendor-crypto/heimdal/dist/cf/test-package.m4 vendor-crypto/heimdal/dist/cf/valgrind-suppressions vendor-crypto/heimdal/dist/cf/vararray.m4 vendor-crypto/heimdal/dist/cf/version-script.m4 vendor-crypto/heimdal/dist/cf/wflags.m4 vendor-crypto/heimdal/dist/cf/win32.m4 vendor-crypto/heimdal/dist/cf/with-all.m4 vendor-crypto/heimdal/dist/compile vendor-crypto/heimdal/dist/config.guess vendor-crypto/heimdal/dist/config.sub vendor-crypto/heimdal/dist/configure vendor-crypto/heimdal/dist/doc/Makefile.am vendor-crypto/heimdal/dist/doc/Makefile.in vendor-crypto/heimdal/dist/doc/ack.texi vendor-crypto/heimdal/dist/doc/apps.texi vendor-crypto/heimdal/dist/doc/doxytmpl.dxy vendor-crypto/heimdal/dist/doc/hcrypto.din vendor-crypto/heimdal/dist/doc/heimdal.texi vendor-crypto/heimdal/dist/doc/hx509.din vendor-crypto/heimdal/dist/doc/hx509.texi vendor-crypto/heimdal/dist/doc/install.texi vendor-crypto/heimdal/dist/doc/intro.texi vendor-crypto/heimdal/dist/doc/kerberos4.texi vendor-crypto/heimdal/dist/doc/krb5.din vendor-crypto/heimdal/dist/doc/migration.texi vendor-crypto/heimdal/dist/doc/misc.texi vendor-crypto/heimdal/dist/doc/ntlm.din vendor-crypto/heimdal/dist/doc/programming.texi vendor-crypto/heimdal/dist/doc/setup.texi vendor-crypto/heimdal/dist/doc/vars.texi vendor-crypto/heimdal/dist/doc/whatis.texi vendor-crypto/heimdal/dist/doc/win2k.texi vendor-crypto/heimdal/dist/etc/Makefile.am vendor-crypto/heimdal/dist/etc/Makefile.in vendor-crypto/heimdal/dist/etc/services.append vendor-crypto/heimdal/dist/include/Makefile.am vendor-crypto/heimdal/dist/include/Makefile.in vendor-crypto/heimdal/dist/include/bits.c (contents, props changed) vendor-crypto/heimdal/dist/include/config.h.in vendor-crypto/heimdal/dist/include/gssapi/Makefile.am vendor-crypto/heimdal/dist/include/gssapi/Makefile.in vendor-crypto/heimdal/dist/include/hcrypto/Makefile.am vendor-crypto/heimdal/dist/include/hcrypto/Makefile.in vendor-crypto/heimdal/dist/include/kadm5/Makefile.am vendor-crypto/heimdal/dist/include/kadm5/Makefile.in vendor-crypto/heimdal/dist/install-sh vendor-crypto/heimdal/dist/kadmin/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/kadmin/Makefile.am vendor-crypto/heimdal/dist/kadmin/Makefile.in vendor-crypto/heimdal/dist/kadmin/add-random-users.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/add_enctype.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/ank.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/check.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/cpw.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/del.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/del_enctype.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/dump.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/ext.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/get.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/init.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/kadm_conn.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/kadmin-commands.in vendor-crypto/heimdal/dist/kadmin/kadmin.8 vendor-crypto/heimdal/dist/kadmin/kadmin.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/kadmin_locl.h (contents, props changed) vendor-crypto/heimdal/dist/kadmin/kadmind.8 vendor-crypto/heimdal/dist/kadmin/kadmind.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/load.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/mod.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/pw_quality.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/random_password.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/rename.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/server.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/stash.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/test_util.c (contents, props changed) vendor-crypto/heimdal/dist/kadmin/util.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/Makefile.am vendor-crypto/heimdal/dist/kcm/Makefile.in vendor-crypto/heimdal/dist/kcm/acl.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/acquire.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/cache.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/client.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/config.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/connect.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/events.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/glue.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/headers.h (contents, props changed) vendor-crypto/heimdal/dist/kcm/kcm.8 vendor-crypto/heimdal/dist/kcm/kcm_locl.h (contents, props changed) vendor-crypto/heimdal/dist/kcm/log.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/main.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/protocol.c (contents, props changed) vendor-crypto/heimdal/dist/kcm/renew.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/Makefile.am vendor-crypto/heimdal/dist/kdc/Makefile.in vendor-crypto/heimdal/dist/kdc/config.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/connect.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/default_config.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/digest.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/headers.h (contents, props changed) vendor-crypto/heimdal/dist/kdc/hprop.8 vendor-crypto/heimdal/dist/kdc/hprop.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/hprop.h (contents, props changed) vendor-crypto/heimdal/dist/kdc/hpropd.8 vendor-crypto/heimdal/dist/kdc/hpropd.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/kdc-private.h (contents, props changed) vendor-crypto/heimdal/dist/kdc/kdc-protos.h (contents, props changed) vendor-crypto/heimdal/dist/kdc/kdc-replay.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/kdc.8 vendor-crypto/heimdal/dist/kdc/kdc.h (contents, props changed) vendor-crypto/heimdal/dist/kdc/kdc_locl.h (contents, props changed) vendor-crypto/heimdal/dist/kdc/kerberos5.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/krb5tgs.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/kstash.8 vendor-crypto/heimdal/dist/kdc/kstash.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/kx509.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/log.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/main.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/misc.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/mit_dump.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/pkinit.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/process.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/rx.h (contents, props changed) vendor-crypto/heimdal/dist/kdc/set_dbinfo.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/string2key.8 vendor-crypto/heimdal/dist/kdc/string2key.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/version-script.map vendor-crypto/heimdal/dist/kdc/windc.c (contents, props changed) vendor-crypto/heimdal/dist/kdc/windc_plugin.h (contents, props changed) vendor-crypto/heimdal/dist/kpasswd/Makefile.am vendor-crypto/heimdal/dist/kpasswd/Makefile.in vendor-crypto/heimdal/dist/kpasswd/kpasswd-generator.c (contents, props changed) vendor-crypto/heimdal/dist/kpasswd/kpasswd.1 vendor-crypto/heimdal/dist/kpasswd/kpasswd.c (contents, props changed) vendor-crypto/heimdal/dist/kpasswd/kpasswd_locl.h (contents, props changed) vendor-crypto/heimdal/dist/kpasswd/kpasswdd.8 vendor-crypto/heimdal/dist/kpasswd/kpasswdd.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/Makefile.am vendor-crypto/heimdal/dist/kuser/Makefile.in vendor-crypto/heimdal/dist/kuser/copy_cred_cache.1 vendor-crypto/heimdal/dist/kuser/copy_cred_cache.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/generate-requests.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kdecode_ticket.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kdestroy.1 vendor-crypto/heimdal/dist/kuser/kdestroy.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kdigest-commands.in vendor-crypto/heimdal/dist/kuser/kdigest.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kgetcred.1 vendor-crypto/heimdal/dist/kuser/kgetcred.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kimpersonate.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kinit.1 vendor-crypto/heimdal/dist/kuser/kinit.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/klist.1 vendor-crypto/heimdal/dist/kuser/klist.c (contents, props changed) vendor-crypto/heimdal/dist/kuser/kuser_locl.h (contents, props changed) vendor-crypto/heimdal/dist/kuser/kverify.c (contents, props changed) vendor-crypto/heimdal/dist/lib/Makefile.am vendor-crypto/heimdal/dist/lib/Makefile.in vendor-crypto/heimdal/dist/lib/asn1/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/Makefile.am vendor-crypto/heimdal/dist/lib/asn1/Makefile.in vendor-crypto/heimdal/dist/lib/asn1/asn1-common.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/asn1_err.et vendor-crypto/heimdal/dist/lib/asn1/asn1_gen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/asn1_print.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/asn1_queue.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/canthandle.asn1 vendor-crypto/heimdal/dist/lib/asn1/check-common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/check-common.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/check-der.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/check-gen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/check-timegm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der-protos.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_cmp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_copy.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_format.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_free.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_get.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_length.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/der_put.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/digest.asn1 vendor-crypto/heimdal/dist/lib/asn1/extra.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_copy.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_decode.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_encode.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_free.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_glue.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_length.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/gen_seq.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/hash.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/hash.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/heim_asn1.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/kx509.asn1 vendor-crypto/heimdal/dist/lib/asn1/lex.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/lex.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/lex.l vendor-crypto/heimdal/dist/lib/asn1/main.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/pkcs12.asn1 vendor-crypto/heimdal/dist/lib/asn1/pkcs8.asn1 vendor-crypto/heimdal/dist/lib/asn1/pkcs9.asn1 vendor-crypto/heimdal/dist/lib/asn1/pkinit.asn1 vendor-crypto/heimdal/dist/lib/asn1/rfc2459.asn1 vendor-crypto/heimdal/dist/lib/asn1/setchgpw2.asn1 vendor-crypto/heimdal/dist/lib/asn1/symbol.c (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/symbol.h (contents, props changed) vendor-crypto/heimdal/dist/lib/asn1/test.asn1 vendor-crypto/heimdal/dist/lib/asn1/test.gen vendor-crypto/heimdal/dist/lib/asn1/timegm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/Makefile.am vendor-crypto/heimdal/dist/lib/com_err/Makefile.in vendor-crypto/heimdal/dist/lib/com_err/com_err.c (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/com_err.h (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/com_right.h (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/compile_et.c (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/compile_et.h (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/error.c (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/lex.c (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/lex.h (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/lex.l vendor-crypto/heimdal/dist/lib/com_err/parse.c (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/parse.h (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/parse.y vendor-crypto/heimdal/dist/lib/com_err/roken_rename.h (contents, props changed) vendor-crypto/heimdal/dist/lib/com_err/version-script.map vendor-crypto/heimdal/dist/lib/gssapi/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/Makefile.am vendor-crypto/heimdal/dist/lib/gssapi/Makefile.in vendor-crypto/heimdal/dist/lib/gssapi/gss-commands.in vendor-crypto/heimdal/dist/lib/gssapi/gss_acquire_cred.3 vendor-crypto/heimdal/dist/lib/gssapi/gssapi.3 vendor-crypto/heimdal/dist/lib/gssapi/gssapi.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/gssapi/gssapi.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/gssapi/gssapi_krb5.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/gssapi/gssapi_spnego.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/gssapi_mech.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/8003.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/accept_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/acquire_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/add_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/address_to_krb5addr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/arcfour.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/canonicalize_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/ccache_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/cfx.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/cfx.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/compare_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/compat.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/context_time.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/copy_ccache.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/decapsulate.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/delete_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/display_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/display_status.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/duplicate_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/encapsulate.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/export_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/export_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/external.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/get_mic.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/gkrb5_err.et vendor-crypto/heimdal/dist/lib/gssapi/krb5/gsskrb5-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/gsskrb5_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/import_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/import_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/indicate_mechs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/init.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/init_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/inquire_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/inquire_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/inquire_cred_by_mech.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/inquire_cred_by_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/inquire_mechs_for_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/inquire_names_for_mech.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/inquire_sec_context_by_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/prf.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/process_context_token.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/release_buffer.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/release_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/release_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/sequence.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/set_cred_option.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/set_sec_context_option.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/test_cfx.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/ticket_flags.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/unwrap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/verify_mic.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/krb5/wrap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/accept_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/acquire_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/add_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/canonicalize_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/compare_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/context_time.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/crypto.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/delete_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/display_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/display_status.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/duplicate_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/export_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/export_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/external.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/import_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/import_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/indicate_mechs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/init_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/inquire_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/inquire_cred_by_mech.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/inquire_mechs_for_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/inquire_names_for_mech.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/ntlm-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/ntlm.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/process_context_token.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/release_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/ntlm/release_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/accept_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/compat.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/context_stubs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/cred_stubs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/external.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/init_sec_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/spnego-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/spnego/spnego.asn1 vendor-crypto/heimdal/dist/lib/gssapi/spnego/spnego_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_acquire_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_common.h (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_kcred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_names.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_ntlm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/test_oid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/gssapi/version-script.map vendor-crypto/heimdal/dist/lib/hdb/Makefile.am vendor-crypto/heimdal/dist/lib/hdb/Makefile.in vendor-crypto/heimdal/dist/lib/hdb/common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/db.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/db3.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/dbinfo.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/ext.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb-ldap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb-protos.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb.asn1 vendor-crypto/heimdal/dist/lib/hdb/hdb.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/hdb.schema vendor-crypto/heimdal/dist/lib/hdb/hdb_err.et vendor-crypto/heimdal/dist/lib/hdb/hdb_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/keys.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/keytab.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/mkey.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/ndbm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/print.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hdb/test_dbinfo.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/Makefile.am vendor-crypto/heimdal/dist/lib/hx509/Makefile.in vendor-crypto/heimdal/dist/lib/hx509/ca.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/cert.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/cms.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/collector.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/crmf.asn1 vendor-crypto/heimdal/dist/lib/hx509/crypto.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ca.crt vendor-crypto/heimdal/dist/lib/hx509/data/ca.key vendor-crypto/heimdal/dist/lib/hx509/data/crl1.crl vendor-crypto/heimdal/dist/lib/hx509/data/crl1.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/gen-req.sh vendor-crypto/heimdal/dist/lib/hx509/data/kdc.crt vendor-crypto/heimdal/dist/lib/hx509/data/kdc.key vendor-crypto/heimdal/dist/lib/hx509/data/nist-data vendor-crypto/heimdal/dist/lib/hx509/data/no-proxy-test.crt vendor-crypto/heimdal/dist/lib/hx509/data/no-proxy-test.key vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-req1.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-req2.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp1-ca.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp1-keyhash.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp1-ocsp.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp2.der (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-responder.crt vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-responder.key vendor-crypto/heimdal/dist/lib/hx509/data/openssl.cnf vendor-crypto/heimdal/dist/lib/hx509/data/pkinit-proxy-chain.crt vendor-crypto/heimdal/dist/lib/hx509/data/pkinit-proxy.crt vendor-crypto/heimdal/dist/lib/hx509/data/pkinit-proxy.key vendor-crypto/heimdal/dist/lib/hx509/data/pkinit-pw.key vendor-crypto/heimdal/dist/lib/hx509/data/pkinit.crt vendor-crypto/heimdal/dist/lib/hx509/data/pkinit.key vendor-crypto/heimdal/dist/lib/hx509/data/proxy-level-test.crt vendor-crypto/heimdal/dist/lib/hx509/data/proxy-level-test.key vendor-crypto/heimdal/dist/lib/hx509/data/proxy-test.crt vendor-crypto/heimdal/dist/lib/hx509/data/proxy-test.key vendor-crypto/heimdal/dist/lib/hx509/data/proxy10-child-child-test.crt vendor-crypto/heimdal/dist/lib/hx509/data/proxy10-child-child-test.key vendor-crypto/heimdal/dist/lib/hx509/data/proxy10-child-test.crt vendor-crypto/heimdal/dist/lib/hx509/data/proxy10-child-test.key vendor-crypto/heimdal/dist/lib/hx509/data/proxy10-test.crt vendor-crypto/heimdal/dist/lib/hx509/data/proxy10-test.key vendor-crypto/heimdal/dist/lib/hx509/data/revoke.crt vendor-crypto/heimdal/dist/lib/hx509/data/revoke.key vendor-crypto/heimdal/dist/lib/hx509/data/sub-ca.crt vendor-crypto/heimdal/dist/lib/hx509/data/sub-ca.key vendor-crypto/heimdal/dist/lib/hx509/data/sub-cert.crt vendor-crypto/heimdal/dist/lib/hx509/data/sub-cert.key vendor-crypto/heimdal/dist/lib/hx509/data/sub-cert.p12 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-ds-only.crt vendor-crypto/heimdal/dist/lib/hx509/data/test-ds-only.key vendor-crypto/heimdal/dist/lib/hx509/data/test-enveloped-aes-128 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-enveloped-aes-256 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-enveloped-des (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-enveloped-des-ede3 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-enveloped-rc2-128 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-enveloped-rc2-40 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-enveloped-rc2-64 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-ke-only.crt vendor-crypto/heimdal/dist/lib/hx509/data/test-ke-only.key vendor-crypto/heimdal/dist/lib/hx509/data/test-nopw.p12 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-pw.key vendor-crypto/heimdal/dist/lib/hx509/data/test-signed-data (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-signed-data-noattr (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test-signed-data-noattr-nocerts (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/data/test.combined.crt vendor-crypto/heimdal/dist/lib/hx509/data/test.crt vendor-crypto/heimdal/dist/lib/hx509/data/test.key vendor-crypto/heimdal/dist/lib/hx509/data/test.p12 (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/doxygen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/env.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/error.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/file.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/hx509-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/hx509-protos.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/hx509.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/hx509_err.et vendor-crypto/heimdal/dist/lib/hx509/hx_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/hxtool-commands.in vendor-crypto/heimdal/dist/lib/hx509/hxtool.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/keyset.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ks_dir.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ks_file.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ks_keychain.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ks_mem.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ks_null.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ks_p11.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ks_p12.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/lock.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/ocsp.asn1 vendor-crypto/heimdal/dist/lib/hx509/peer.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/pkcs10.asn1 vendor-crypto/heimdal/dist/lib/hx509/print.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/req.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/revoke.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/softp11.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/test_ca.in vendor-crypto/heimdal/dist/lib/hx509/test_cert.in vendor-crypto/heimdal/dist/lib/hx509/test_chain.in vendor-crypto/heimdal/dist/lib/hx509/test_cms.in vendor-crypto/heimdal/dist/lib/hx509/test_crypto.in vendor-crypto/heimdal/dist/lib/hx509/test_java_pkcs11.in vendor-crypto/heimdal/dist/lib/hx509/test_name.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/test_nist.in vendor-crypto/heimdal/dist/lib/hx509/test_nist2.in vendor-crypto/heimdal/dist/lib/hx509/test_nist_cert.in vendor-crypto/heimdal/dist/lib/hx509/test_nist_pkcs12.in vendor-crypto/heimdal/dist/lib/hx509/test_pkcs11.in vendor-crypto/heimdal/dist/lib/hx509/test_query.in vendor-crypto/heimdal/dist/lib/hx509/test_req.in vendor-crypto/heimdal/dist/lib/hx509/test_soft_pkcs11.c (contents, props changed) vendor-crypto/heimdal/dist/lib/hx509/test_windows.in vendor-crypto/heimdal/dist/lib/hx509/tst-crypto-available2 vendor-crypto/heimdal/dist/lib/hx509/tst-crypto-select1 vendor-crypto/heimdal/dist/lib/hx509/tst-crypto-select2 vendor-crypto/heimdal/dist/lib/hx509/version-script.map vendor-crypto/heimdal/dist/lib/kadm5/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/Makefile.am vendor-crypto/heimdal/dist/lib/kadm5/Makefile.in vendor-crypto/heimdal/dist/lib/kadm5/acl.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/ad.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/admin.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/bump_pw_expire.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/check-cracklib.pl vendor-crypto/heimdal/dist/lib/kadm5/chpass_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/chpass_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/client_glue.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/common_glue.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/context_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/create_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/create_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/default_keys.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/delete_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/delete_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/destroy_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/destroy_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/ent_setup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/error.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/flush.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/flush_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/flush_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/free.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/get_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/get_princs_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/get_princs_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/get_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/init_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/init_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/iprop-commands.in vendor-crypto/heimdal/dist/lib/kadm5/iprop-log.8 vendor-crypto/heimdal/dist/lib/kadm5/iprop-log.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/iprop.8 vendor-crypto/heimdal/dist/lib/kadm5/iprop.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/ipropd_common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/ipropd_master.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/ipropd_slave.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/kadm5-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/kadm5-pwcheck.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/kadm5_err.et vendor-crypto/heimdal/dist/lib/kadm5/kadm5_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/kadm5_pwcheck.3 vendor-crypto/heimdal/dist/lib/kadm5/keys.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/log.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/marshall.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/modify_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/modify_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/password_quality.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/privs_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/privs_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/randkey_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/randkey_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/rename_c.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/rename_s.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/sample_passwd_check.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/send_recv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/server_glue.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/set_keys.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/set_modifier.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kadm5/test_pw_quality.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/Makefile.am vendor-crypto/heimdal/dist/lib/kafs/Makefile.in vendor-crypto/heimdal/dist/lib/kafs/afskrb5.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/afslib.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/afssys.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/afssysdefs.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/common.c (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/kafs.3 vendor-crypto/heimdal/dist/lib/kafs/kafs.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/kafs_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/kafs/roken_rename.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/Makefile.am vendor-crypto/heimdal/dist/lib/krb5/Makefile.in vendor-crypto/heimdal/dist/lib/krb5/acache.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/acl.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/add_et_list.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/addr_families.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/aes-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/aname_to_localname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/appdefault.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/asn1_glue.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/auth_context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/build_ap_req.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/build_auth.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/cache.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/changepw.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/codec.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/config_file.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/constants.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/context.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/convert_creds.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/copy_host_realm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/creds.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/crypto.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/data.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/derived-key-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/digest.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/doxygen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/eai_to_heim_errno.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/error_string.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/expand_hostname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/fcache.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/free.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/free_host_realm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/generate_seq_number.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/generate_subkey.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_addrs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_default_principal.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_default_realm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_for_creds.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_host_realm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_in_tkt.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/get_port.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/heim_err.et vendor-crypto/heimdal/dist/lib/krb5/init_creds.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/init_creds_pw.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/k524_err.et vendor-crypto/heimdal/dist/lib/krb5/kcm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/kcm.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/kerberos.8 vendor-crypto/heimdal/dist/lib/krb5/keyblock.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/keytab.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/keytab_any.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/keytab_file.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/keytab_keyfile.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/keytab_memory.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krb5-private.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krb5-protos.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krb5-v4compat.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krb5.conf.5 vendor-crypto/heimdal/dist/lib/krb5/krb5.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krb5.moduli vendor-crypto/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_425_conv_principal.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_acl_match_file.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_aname_to_localname.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_appdefault.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_auth_context.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_c_make_checksum.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_ccapi.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krb5_check_transited.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_create_checksum.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_creds.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_digest.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_eai_to_heim_errno.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_encrypt.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_err.et vendor-crypto/heimdal/dist/lib/krb5/krb5_find_padata.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_generate_random_block.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_all_client_addrs.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_credentials.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_creds.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_forwarded_creds.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_in_cred.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_init_creds.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_get_krbhst.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_getportbyname.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_init_context.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_is_thread_safe.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_krbhst_init.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krb5_mk_req.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_mk_safe.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_openlog.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_parse_name.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_principal.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_rcache.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_rd_error.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_rd_safe.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_set_default_realm.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_set_password.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_string_to_key.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_timeofday.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_verify_init_creds.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_verify_user.3 vendor-crypto/heimdal/dist/lib/krb5/krbhst-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/krbhst.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/kuserok.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/locate_plugin.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/log.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mcache.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/misc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mit_glue.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mk_error.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mk_priv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mk_rep.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mk_req.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mk_req_ext.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/mk_safe.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/n-fold-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/n-fold.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/net_read.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/net_write.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/pac.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/padata.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/parse-name-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/pkinit.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/plugin.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/principal.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/prog_setup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/prompter_posix.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/rd_cred.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/rd_error.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/rd_priv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/rd_rep.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/rd_req.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/rd_safe.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/read_message.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/recvauth.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/replay.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/send_to_kdc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/sendauth.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/set_default_realm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/sock_principal.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/store-int.h (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/store-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/store.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/store_emem.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/store_fd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/store_mem.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/string-to-key-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_acl.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_addr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_alname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_cc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_config.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_crypto.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_crypto_wrapping.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_forward.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_get_addrs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_hostname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_keytab.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_kuserok.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_mem.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_pac.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_pkinit_dh2key.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_plugin.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_prf.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_princ.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_renew.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_store.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/test_time.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/ticket.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/time.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/transited.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/verify_init.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/verify_krb5_conf.8 vendor-crypto/heimdal/dist/lib/krb5/verify_krb5_conf.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/verify_user.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/version-script.map vendor-crypto/heimdal/dist/lib/krb5/version.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/warn.c (contents, props changed) vendor-crypto/heimdal/dist/lib/krb5/write_message.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ntlm/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/ntlm/Makefile.am vendor-crypto/heimdal/dist/lib/ntlm/Makefile.in vendor-crypto/heimdal/dist/lib/ntlm/heimntlm-protos.h (contents, props changed) vendor-crypto/heimdal/dist/lib/ntlm/heimntlm.h (contents, props changed) vendor-crypto/heimdal/dist/lib/ntlm/ntlm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ntlm/test_ntlm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/ntlm/version-script.map vendor-crypto/heimdal/dist/lib/roken/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/Makefile.am vendor-crypto/heimdal/dist/lib/roken/Makefile.in vendor-crypto/heimdal/dist/lib/roken/base64-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/base64.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/base64.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/bswap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/chown.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/closefrom.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/concat.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/copyhostent.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/daemon.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/dumpdata.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/ecalloc.3 vendor-crypto/heimdal/dist/lib/roken/ecalloc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/emalloc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/environment.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/eread.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/erealloc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/err.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/err.hin vendor-crypto/heimdal/dist/lib/roken/errx.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/esetenv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/estrdup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/ewrite.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/fchown.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/flock.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/fnmatch.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/fnmatch.hin vendor-crypto/heimdal/dist/lib/roken/freeaddrinfo.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/freehostent.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/gai_strerror.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/get_default_username.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/get_window_size.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getaddrinfo-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getaddrinfo.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getaddrinfo_hostspec.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getarg.3 vendor-crypto/heimdal/dist/lib/roken/getarg.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getarg.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getcap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getcwd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getdtablesize.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getegid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/geteuid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getgid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/gethostname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getifaddrs.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getipnodebyaddr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getipnodebyname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getnameinfo.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getnameinfo_verified.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getopt.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getprogname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/gettimeofday.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getuid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/getusershell.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/glob.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/glob.hin vendor-crypto/heimdal/dist/lib/roken/h_errno.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/hex-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/hex.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/hex.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/hostent_find_fqdn.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/hstrerror.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/ifaddrs.hin vendor-crypto/heimdal/dist/lib/roken/inet_aton.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/inet_ntop.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/inet_pton.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/initgroups.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/innetgr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/iruserok.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/issuid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/k_getpwnam.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/k_getpwuid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/localtime_r.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/lstat.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/memmove.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/mini_inetd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/mkstemp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/ndbm_wrap.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/ndbm_wrap.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/net_read.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/net_write.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_bytes-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_bytes.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_bytes.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_reply-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_time-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_time.3 vendor-crypto/heimdal/dist/lib/roken/parse_time.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_time.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_units.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/parse_units.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/putenv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/rcmd.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/readv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/realloc.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/recvmsg.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/resolve-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/resolve.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/resolve.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/roken-common.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/roken.awk vendor-crypto/heimdal/dist/lib/roken/roken.h.in vendor-crypto/heimdal/dist/lib/roken/roken_gethostby.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/rtbl.3 vendor-crypto/heimdal/dist/lib/roken/rtbl.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/rtbl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/sendmsg.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/setegid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/setenv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/seteuid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/setprogname.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/signal.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/simple_exec.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/snprintf-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/snprintf.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/socket.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/socket_wrapper.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/socket_wrapper.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strcasecmp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strcollect.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strdup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strerror.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strftime.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strlcat.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strlcpy.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strlwr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strncasecmp.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strndup.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strnlen.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strpftime-test.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strpftime-test.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strpool.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strptime.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strsep.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strsep_copy.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strtok_r.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/strupr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/swab.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/test-mem.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/test-mem.h (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/test-readenv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/timegm.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/timeval.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/tm2time.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/unsetenv.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/unvis.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/verify.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/verr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/verrx.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/vis.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/vis.hin vendor-crypto/heimdal/dist/lib/roken/vsyslog.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/vwarn.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/vwarnx.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/warn.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/warnerr.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/warnx.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/write_pid.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/writev.c (contents, props changed) vendor-crypto/heimdal/dist/lib/roken/xdbm.h (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/Makefile.am vendor-crypto/heimdal/dist/lib/sl/Makefile.in vendor-crypto/heimdal/dist/lib/sl/roken_rename.h (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/sl.c (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/sl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/sl_locl.h (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/slc-gram.c (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/slc-gram.h (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/slc-gram.y vendor-crypto/heimdal/dist/lib/sl/slc-lex.c (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/slc-lex.l vendor-crypto/heimdal/dist/lib/sl/slc.h (contents, props changed) vendor-crypto/heimdal/dist/lib/sl/test_sl.c (contents, props changed) vendor-crypto/heimdal/dist/lib/vers/ChangeLog (contents, props changed) vendor-crypto/heimdal/dist/lib/vers/Makefile.am vendor-crypto/heimdal/dist/lib/vers/Makefile.in vendor-crypto/heimdal/dist/lib/vers/print_version.c (contents, props changed) vendor-crypto/heimdal/dist/lib/vers/vers.h (contents, props changed) vendor-crypto/heimdal/dist/ltmain.sh vendor-crypto/heimdal/dist/missing vendor-crypto/heimdal/dist/packages/ChangeLog vendor-crypto/heimdal/dist/packages/Makefile.am vendor-crypto/heimdal/dist/packages/Makefile.in vendor-crypto/heimdal/dist/packages/mac/Makefile.am vendor-crypto/heimdal/dist/packages/mac/Makefile.in vendor-crypto/heimdal/dist/packages/mac/mac.sh vendor-crypto/heimdal/dist/tests/ChangeLog vendor-crypto/heimdal/dist/tests/Makefile.am vendor-crypto/heimdal/dist/tests/Makefile.in vendor-crypto/heimdal/dist/tests/can/Makefile.am vendor-crypto/heimdal/dist/tests/can/Makefile.in vendor-crypto/heimdal/dist/tests/can/check-can.in vendor-crypto/heimdal/dist/tests/can/krb5.conf.in vendor-crypto/heimdal/dist/tests/can/mit-pkinit-20070607.xf vendor-crypto/heimdal/dist/tests/can/test_can.in vendor-crypto/heimdal/dist/tests/db/Makefile.am vendor-crypto/heimdal/dist/tests/db/Makefile.in vendor-crypto/heimdal/dist/tests/db/add-modify-delete.in vendor-crypto/heimdal/dist/tests/db/check-dbinfo.in vendor-crypto/heimdal/dist/tests/db/have-db.in vendor-crypto/heimdal/dist/tests/db/krb5.conf.in vendor-crypto/heimdal/dist/tests/db/loaddump-db.in vendor-crypto/heimdal/dist/tests/gss/Makefile.am vendor-crypto/heimdal/dist/tests/gss/Makefile.in vendor-crypto/heimdal/dist/tests/gss/check-basic.in vendor-crypto/heimdal/dist/tests/gss/check-context.in vendor-crypto/heimdal/dist/tests/gss/check-gss.in vendor-crypto/heimdal/dist/tests/gss/check-gssmask.in vendor-crypto/heimdal/dist/tests/gss/check-ntlm.in vendor-crypto/heimdal/dist/tests/gss/check-spnego.in vendor-crypto/heimdal/dist/tests/gss/krb5.conf.in vendor-crypto/heimdal/dist/tests/gss/ntlm-user-file.txt vendor-crypto/heimdal/dist/tests/java/KerberosInit.java vendor-crypto/heimdal/dist/tests/java/Makefile.am vendor-crypto/heimdal/dist/tests/java/Makefile.in vendor-crypto/heimdal/dist/tests/java/check-kinit.in vendor-crypto/heimdal/dist/tests/java/have-java.sh vendor-crypto/heimdal/dist/tests/java/krb5.conf.in vendor-crypto/heimdal/dist/tests/kdc/Makefile.am vendor-crypto/heimdal/dist/tests/kdc/Makefile.in vendor-crypto/heimdal/dist/tests/kdc/check-digest.in vendor-crypto/heimdal/dist/tests/kdc/check-iprop.in vendor-crypto/heimdal/dist/tests/kdc/check-kadmin.in vendor-crypto/heimdal/dist/tests/kdc/check-kdc.in vendor-crypto/heimdal/dist/tests/kdc/check-keys.in vendor-crypto/heimdal/dist/tests/kdc/check-pkinit.in vendor-crypto/heimdal/dist/tests/kdc/check-referral.in vendor-crypto/heimdal/dist/tests/kdc/check-uu.in vendor-crypto/heimdal/dist/tests/kdc/heimdal.acl vendor-crypto/heimdal/dist/tests/kdc/iprop-acl vendor-crypto/heimdal/dist/tests/kdc/krb5-pkinit.conf.in vendor-crypto/heimdal/dist/tests/kdc/krb5.conf.in vendor-crypto/heimdal/dist/tests/kdc/krb5.conf.keys.in vendor-crypto/heimdal/dist/tests/kdc/ntlm-user-file.txt vendor-crypto/heimdal/dist/tests/kdc/pki-mapping vendor-crypto/heimdal/dist/tests/kdc/wait-kdc.sh vendor-crypto/heimdal/dist/tests/ldap/Makefile.am vendor-crypto/heimdal/dist/tests/ldap/Makefile.in vendor-crypto/heimdal/dist/tests/ldap/check-ldap.in vendor-crypto/heimdal/dist/tests/ldap/init.ldif vendor-crypto/heimdal/dist/tests/ldap/krb5.conf.in vendor-crypto/heimdal/dist/tests/ldap/slapd-init.in vendor-crypto/heimdal/dist/tests/ldap/slapd-stop vendor-crypto/heimdal/dist/tests/plugin/Makefile.am vendor-crypto/heimdal/dist/tests/plugin/Makefile.in vendor-crypto/heimdal/dist/tests/plugin/check-pac.in vendor-crypto/heimdal/dist/tests/plugin/krb5.conf.in vendor-crypto/heimdal/dist/tests/plugin/windc.c vendor-crypto/heimdal/dist/tools/Makefile.am vendor-crypto/heimdal/dist/tools/Makefile.in vendor-crypto/heimdal/dist/tools/heimdal-gssapi.pc.in vendor-crypto/heimdal/dist/tools/kdc-log-analyze.pl vendor-crypto/heimdal/dist/tools/krb5-config.1 vendor-crypto/heimdal/dist/tools/krb5-config.in Directory Properties: vendor-crypto/heimdal/dist/ChangeLog.1998 (props changed) vendor-crypto/heimdal/dist/ChangeLog.1999 (props changed) vendor-crypto/heimdal/dist/ChangeLog.2000 (props changed) vendor-crypto/heimdal/dist/ChangeLog.2001 (props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/ftp_var.h (props changed) vendor-crypto/heimdal/dist/appl/ftp/ftp/pathnames.h (props changed) vendor-crypto/heimdal/dist/appl/ftp/ftpd/pathnames.h (props changed) vendor-crypto/heimdal/dist/appl/telnet/README.ORIG (props changed) vendor-crypto/heimdal/dist/appl/telnet/arpa/telnet.h (props changed) vendor-crypto/heimdal/dist/appl/telnet/libtelnet/misc.h (props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet.state (props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/defines.h (props changed) vendor-crypto/heimdal/dist/appl/telnet/telnet/types.h (props changed) vendor-crypto/heimdal/dist/lib/hx509/data/key.der (props changed) vendor-crypto/heimdal/dist/lib/hx509/data/key2.der (props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp1-2.der (props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp1-3.der (props changed) vendor-crypto/heimdal/dist/lib/hx509/data/ocsp-resp1.der (props changed) vendor-crypto/heimdal/dist/lib/hx509/ref/pkcs11.h (props changed) vendor-crypto/heimdal/dist/lib/kadm5/kadm5-protos.h (props changed) vendor-crypto/heimdal/dist/tests/can/apple-10.4.req (props changed) vendor-crypto/heimdal/dist/tests/can/heim-0.8.req (props changed) vendor-crypto/heimdal/dist/tests/can/mit-pkinit-20070607.req (props changed) Modified: vendor-crypto/heimdal/dist/ChangeLog ============================================================================== --- vendor-crypto/heimdal/dist/ChangeLog Wed Oct 5 07:15:55 2011 (r226030) +++ vendor-crypto/heimdal/dist/ChangeLog Wed Oct 5 07:23:29 2011 (r226031) @@ -1,1356 +1,485 @@ -2008-01-24 Love Hörnquist Åstrand - * Release 1.1 - -2008-01-21 Love Hörnquist Åstrand - - * lib/krb5/get_for_creds.c: Use on variable less. - - * lib/krb5/get_for_creds.c: Try to handle ticket full and - ticketless tickets better. Add doxygen comments while here. - - * lib/krb5/test_forward.c: Used for testing - krb5_get_forwarded_creds(). - - * lib/krb5/Makefile.am: noinst_PROGRAMS += test_forward - - * lib/krb5/Makefile.am: drop CHECK_SYMBOLS - - * lib/hdb/Makefile.am: drop CHECK_SYMBOLS - - * kdc/Makefile.am: drop CHECK_SYMBOLS - -2008-01-18 Love Hörnquist Åstrand - - * lib/krb5/version-script.map: Add krb5_digest_probe. - -2008-01-13 Love Hörnquist Åstrand - - * lib/krb5/pkinit.c: Replace hx509_name_to_der_name with - hx509_name_binary. - -2008-01-12 Love Hörnquist Åstrand - - * lib/krb5/Makefile.am: add missing files - -2007-12-28 Love Hörnquist Åstrand - - * kdc/digest.c: Log probe message, add NTLM_TARGET_DOMAIN to the - type2 message. - -2007-12-14 Love Hörnquist Åstrand - - * lib/hdb/dbinfo.c: Add hdb_default_db(). - - * Makefile.am: Add some extra cf/*. - -2007-12-12 Love Hörnquist Åstrand - - * kuser/kgetcred.c: Fix type of name-type. From Andy Polyakov. - -2007-12-09 Love Hörnquist Åstrand - - * kdc/log.c: Use hdb_db_dir(). - - * kpasswd/kpasswdd.c: Use hdb_db_dir(). - -2007-12-08 Love Hörnquist Åstrand - - * kdc/config.c: Use hdb_db_dir(). - - * kdc/kdc_locl.h: add KDC_LOG_FILE - - * kdc/hpropd.c: Use hdb_default_db(). - - * kdc/kstash.c: Use hdb_db_dir(). - - * kdc/pkinit.c: Adapt to hx509 changes, use hdb_db_dir(). - - * lib/krb5/rd_req.c: Document krb5_rd_req_in_set_pac_check. - - * lib/krb5/verify_krb5_conf.c: Check check_pac. - - * lib/krb5/rd_req.c: use KRB5_CTX_F_CHECK_PAC to init check_pac - field in the krb5_rd_req_in_ctx - - * lib/krb5/expand_hostname.c: Adapt to changing - dns_canonicalize_hostname into flags field. - - * lib/krb5/context.c: Adapt to changing dns_canonicalize_hostname - into flags field, add check-pac as an libdefaults option. - - * lib/krb5/pkinit.c: Adapt to changes in hx509 interface. - - * doc: add doxygen documentation to hcrypto - - * doc/doxytmpl.dxy: generate links - -2007-12-07 Love Hörnquist Åstrand - - * lib/krb5/Makefile.am: build_HEADERZ += heim_threads.h - - * lib/hdb/dbinfo.c (hdb_db_dir): Return the directory where the - hdb database resides. - - * configure.in: Add --with-hdbdir to specify where the database is - stored. - - * lib/krb5/crypto.c: revert previous patch, the problem is located - in the RAND_file_name() function that will cause recursive nss - lookups, can't fix that here. - -2007-12-06 Love Hörnquist Åstrand - - * lib/krb5/crypto.c (krb5_generate_random_block): try to avoid the - dead-lock in by not holding the lock while running - RAND_file_name. Prompted by Hai Zaar. - - * lib/krb5/n-fold.c: spelling - -2007-12-04 Love Hörnquist Åstrand - - * kuser/kdigest.c (digest-probe): implement command. - - * kuser/kdigest-commands.in (digest-probe): new command - - * kdc/digest.c: Implement supportedMechs request. - - * lib/krb5/error_string.c: Make krb5_get_error_string return an - allocated string to make the function indempotent. From - Zeqing (Fred) Xia. - -2007-12-03 Love Hörnquist Åstrand - - * lib/krb5/krb5_locl.h (krb5_context_data): Flag if - default_cc_name was set by the user. - - * lib/krb5/fcache.c (fcc_move): make sure ->version is uptodate. - - * kcm/acquire.c: use krb5_free_cred_contents - - * kuser/kimpersonate.c: use krb5_free_cred_contents - - * kuser/kinit.c: Use krb5_cc_move to make an atomic switch of the - cred cache. - - * lib/krb5/cache.c: Put back code that was needed, move gen_new - into new_unique. - - * lib/krb5/mcache.c (mcc_default_name): Remove const - - * lib/krb5/krb5_locl.h: Add KRB5_DEFAULT_CCNAME_KCM, redefine - KRB5_DEFAULT_CCNAME to KRB5_DEFAULT_CCTYPE - - * lib/krb5/cache.c: Use krb5_cc_ops->default_name to get the - default name. - - * lib/krb5/kcm.c: Implement krb5_cc_ops->default_name. - - * lib/krb5/mcache.c: Implement krb5_cc_ops->default_name. - - * lib/krb5/fcache.c: Implement krb5_cc_ops->default_name. - - * lib/krb5/krb5.h: Add krb5_cc_ops->default_name. - - * lib/krb5/acache.c: Free context when done, implement - krb5_cc_ops->default_name. - - * lib/krb5/kcm.c: implement dummy kcm_move - - * lib/krb5/mcache.c: Implement the move operation. - - * lib/krb5/version-script.map: export krb5_cc_move - - * lib/krb5/cache.c: New function krb5_cc_move(). - - * lib/krb5/fcache.c: Implement the move operation. - - * lib/krb5/krb5.h: Add move to the krb5_cc_ops, causes major - version bump. - - * lib/krb5/acache.c: Implement the move operation. Avoid using - cc_set_principal() since it broken on Mac OS X 10.5.0. - -2007-12-02 Love Hörnquist Åstrand - - * lib/krb5/krb5_ccapi.h: Drop variable names to avoid -Wshadow. - -2007-11-14 Love Hörnquist Åstrand - - * kdc/krb5tgs.c: Should pass different key usage constants - depending on whether or not optional sub-session key was passed by - the client for the check of authorization data. The constant is - used to derive "specific key" and its values are specified in - 7.5.1 of RFC4120. - - Patch from Andy Polyakov. - - * kdc/krb5tgs.c: Don't send auth data in referrals, microsoft - clients have started to not like that. Thanks to Andy Polyakov for - excellent research. - -2007-11-11 Love Hörnquist Åstrand - - * lib/krb5/creds.c: use krb5_data_cmp - - * lib/krb5/acache.c: use krb5_free_cred_contents - - * lib/krb5/test_renew.c: use krb5_free_cred_contents - -2007-11-10 Love Hörnquist Åstrand - - * lib/krb5/acl.c: doxygen documentation - - * lib/krb5/addr_families.c: doxygen documentation - - * doc: add doxygen - - * lib/krb5/plugin.c: doxygen documentation - - * lib/krb5/kcm.c: doxygen documentation - - * lib/krb5/fcache.c: doxygen documentation - - * lib/krb5/cache.c: doxygen documentations - - * lib/krb5/doxygen.c: doxygen introduction - - * lib/krb5/error_string.c: Doxygen documentation. - -2007-11-03 Love Hörnquist Åstrand - - * lib/krb5/test_plugin.c: expose krb5_plugin_register - - * lib/krb5/plugin.c: expose krb5_plugin_register - - * lib/krb5/version-script.map: sort, expose krb5_plugin_register - -2007-10-24 Love Hörnquist Åstrand - - * kdc/kerberos5.c: Adding same enctype is enough one time. From - Andy Polyakov and Bjorn Sandell. - -2007-10-18 Love - - * lib/krb5/cache.c (krb5_cc_retrieve_cred): check return value - from krb5_cc_start_seq_get. From Zeqing (Fred) Xia - - * lib/krb5/fcache.c (init_fcc): provide better error codes - - * kdc/kerberos5.c (get_pa_etype_info2): more paranoia, avoid - sending warning about pruned etypes. - - * kdc/kerberos5.c (older_enctype): old windows enctypes (arcfour - based) "old", this to support windows 2000 clients (unjoined to a - domain). From Andy Polyakov. - -2007-10-07 Love Hörnquist Åstrand - - * doc/setup.texi: Spelling, from Mark Peoples via Bjorn Sandell. - -2007-10-04 Love Hörnquist Åstrand - - * kdc/krb5tgs.c: More prettier printing of enctype, from KAMADA - Ken'ichi. - - * lib/krb5/crypto.c (krb5_enctype_to_string): make sure string is - NULL on failure. - -2007-10-03 Love Hörnquist Åstrand - - * kdc/kdc-replay.c: Catch KRB5_PROG_ATYPE_NOSUPP from - krb5_addr2sockaddr and igore thte test is that case. - -2007-09-29 Love Hörnquist Åstrand - - * lib/krb5/context.c (krb5_free_context): free - default_cc_name_env, from Gunther Deschner. - -2007-08-27 Love Hörnquist Åstrand - - * lib/krb5/{krb5.h,pac.c,test_pac.c,send_to_kdc.c,rd_req.c}: Make - work with c++, reported by Hai Zaar - - * lib/krb5/{digest.c,krb5.h}: Make work with c++, reported by Hai Zaar - -2007-08-20 Love Hörnquist Åstrand - - * lib/hdb/Makefile.am: EXTRA_DIST += hdb.schema - -2007-07-31 Love Hörnquist Åstrand - - * check return value of alloc functions, from Charles Longeau - - * lib/krb5/principal.c: spelling. - - * kadmin/kadmin.8: spelling - - * lib/krb5/crypto.c: Check return values from alloc - functions. Prompted by patch of Charles Longeau. - - * lib/krb5/n-fold.c: Make _krb5_n_fold return a error - code. Prompted by patch of Charles Longeau. - -2007-07-27 Love Hörnquist Åstrand - - * lib/krb5/init_creds.c: Always set the ticket options, use - KRB5_ADDRESSLESS_DEFAULT as the default value, this make the unset - tri-state not so useful. - -2007-07-24 Love Hörnquist Åstrand - - * tools/heimdal-gssapi.pc.in: Add LIB_pkinit to the list of - libraries. - - * tools/heimdal-gssapi.pc.in: pkg-config file for libgssapi in - heimdal. - - * tools/Makefile.am: Add heimdal-gssapi.pc and install it into - $(libdir)/pkgconfig - -2007-07-23 Love Hörnquist Åstrand - - * lib/krb5/pkinit.c: Add RFC3526 modp group14 as a default. - -2007-07-22 Love Hörnquist Åstrand - - * lib/hdb/dbinfo.c (get_dbinfo): use dbname instead of realm as - key if the entry is a correct entry. - - * lib/krb5/get_cred.c: Make krb5_get_renewed_creds work, from - Gunther Deschner. - - * lib/krb5/Makefile.am: Add test_renew to noinst_PROGRAMS. - - * lib/krb5/test_renew.c: Test for krb5_get_renewed_creds. - -2007-07-21 Love Hörnquist Åstrand - - * lib/hdb/keys.c: Make parse_key_set handle key set string "v5", - from Peter Meinecke. - - * kdc/kaserver.c: Don't ovewrite the error code, from Peter - Meinecke. - -2007-07-18 Love Hörnquist Åstrand - - * TODO-1.0: remove - - * Makefile.am: remove TODO-1.0 - -2007-07-17 Love Hörnquist Åstrand - - * Heimdal 1.0 release branch cut here - - * doc/hx509.texi: use version.texi - - * doc/heimdal.texi: use version.texi - - * doc/version.texi: version.texi - - * lib/hdb/db3.c: avoid type-punned pointer warning. - - * kdc/kx509.c: Use unsigned char * as argument to HMAC_Update to - please OpenSSL and gcc. - - * kdc/digest.c: Use unsigned char * as argument to MD5_Update to - please OpenSSL and gcc. - -2007-07-16 Love Hörnquist Åstrand - - * include/Makefile.am: Add krb_err.h. - - * kdc/set_dbinfo.c: Print acl file too. - - * kdc/kerberos4.c: Error codes are just fine, remove XXX now. - - * lib/krb5/krb5-v4compat.h: Drop duplicate error codes. - - * kdc/kerberos4.c: switch to ET errors. - - * lib/krb5/Makefile.am: Add krb_err.h to build_HEADERZ. - - * lib/krb5/v4_glue.c: If its a Kerberos 4 error-code, remove the - et BASE. - -2007-07-15 Love Hörnquist Åstrand - - * lib/krb5/krb5-v4compat.h: Include "krb_err.h". - - * lib/krb5/v4_glue.c: return more interesting error codes. - - * lib/krb5/plugin.c: Prefix enum plugin_type. - - * lib/krb5/krb5_locl.h: Expose plugin structures. - - * lib/krb5/krb5.h: Add plugin structures. - - * lib/krb5/krb_err.et: V4 errors. - - * lib/krb5/version-script.map: First version of version script. - -2007-07-13 Love Hörnquist Åstrand - - * kdc/kerberos5.c: Java 1.6 expects the name to be the same type, - lets allow that for uncomplicated name-types. - -2007-07-12 Love Hörnquist Åstrand - - * lib/krb5/v4_glue.c (_krb5_krb_rd_req): if ticket contains - address 0, its ticket less and don't really care about - from_addr. return better error codes. - - * kpasswd/kpasswdd.c: Fix pointer vs strict alias rules. - -2007-07-11 Love Hörnquist Åstrand - - * lib/hdb/hdb-ldap.c: When using sambaNTPassword, avoid adding - more then one enctype 23 to krb5EncryptionType. - - * lib/krb5/cache.c: Spelling. - - * kdc/kerberos5.c: Don't send newer enctypes in ETYPE-INFO. - (get_pa_etype_info2): return the enctypes as sorted in the - database - -2007-07-10 Love Hörnquist Åstrand - - * kuser/kinit.c: krb5-v4compat.h defines prototypes for - v4 (semiprivate functions) in libkrb5, don't include - krb5-private.h any longer. - - * lib/krb5/krbhst.c: Set error string when there is no KDC for a - realm. - - * lib/krb5/Makefile.am: New library version. - - * kdc/Makefile.am: New library version. - - * lib/krb5/krb5_locl.h: Add default_cc_name_env. - - * lib/krb5/cache.c (enviroment_changed): return non-zero if - enviroment that will determine default krb5cc name has changed. - (krb5_cc_default_name): also check if cached value is uptodate. - - * lib/krb5/krb5_locl.h: Drop pkinit_flags. - -2007-07-05 Love Hörnquist Åstrand - - * configure.in: add tests/java/Makefile - - * lib/hdb/dbinfo.c: Add hdb_dbinfo_get_log_file. - -2007-07-04 Love Hörnquist Åstrand - - * kdc/kerberos5.c: Improve the default salt detection to avoid - returning v4 password salting to java that doesn't look at the - returning padata for salting. - - * kdc: Split out krb5_kdc_set_dbinfo, From Andrew Bartlett - -2007-07-02 Love Hörnquist Åstrand - - * kdc/digest.c: Try harder to provide better error message for - digest messages. - - * lib/krb5/Makefile.am: verify_krb5_conf_OBJECTS depends on - krb5-pr*.h, make -j finds this. +We stop writing change logs, see the source code version control systems history log instead -2007-06-28 Love Hörnquist Åstrand - - * kdc/digest.c: On success, print username, not ip-adress. - -2007-06-26 Love Hörnquist Åstrand - - * lib/krb5/get_cred.c: Add krb5_get_renewed_creds. +2008-07-28 Love Hornquist Astrand - * lib/krb5/krb5_get_credentials.3: add krb5_get_renewed_creds - - * lib/krb5/pkinit.c: Use hx509_cms_unwrap_ContentInfo. + * lib/krb5/v4_glue.c: The "kaserver" part of Heimdal occasionally + issues invalid AFS tokens + (here "occasionally" means for certain users in certain realms). -2007-06-25 Love Hörnquist Åstrand - - * doc/setup.texi: Add example for pkinit_win2k_require_binding - in [kdc] section. - - * kdc/default_config.c: Rename require_binding to - win2k_require_binding to match client configuration. - - * kdc/default_config.c: Add [kdc]pkinit_require_binding option. - - * kdc/pkinit.c (pk_mk_pa_reply_enckey): only allow non-bound reply - if its not required. - - * kdc/default_config.c: rename pkinit_princ_in_cert and add - pkinit_require_binding - - * kdc/kdc.h: rename pkinit_princ_in_cert and add - pkinit_require_binding - - * kdc/pkinit.c: rename pkinit_princ_in_cert - -2007-06-24 Love Hörnquist Åstrand - - * lib/krb5/pkinit.c: Adapt to hx509_verify_hostname change. - -2007-06-21 Love Hörnquist Åstrand - - * kdc/krb5tgs.c: Drop unused variable. - - * kdc/krb5tgs.c: disable anonyous tgs requests - - * kdc/krb5tgs.c: Don't check PAC on cross realm for now. - - * kuser/kgetcred.c: Set KRB5_GC_CONSTRAINED_DELEGATION and parse - nametypes. - - * lib/krb5/krb5_principal.3: Document krb5_parse_nametype. - - * lib/krb5/principal.c (krb5_parse_nametype): parse nametype and - return their integer values. - - * lib/krb5/krb5.h (krb5_get_creds): Add - KRB5_GC_CONSTRAINED_DELEGATION. - - * lib/krb5/get_cred.c (krb5_get_creds): if - KRB5_GC_CONSTRAINED_DELEGATION is set, set both request_anonymous - and constrained_delegation. - -2007-06-20 Love Hörnquist Åstrand - - * kdc/digest.c: Return an error message instead of dropping the - packet for more failure cases. - - * lib/krb5/krb5_principal.3: Add KRB5_PRINCIPAL_UNPARSE_DISPLAY. - - * appl/gssmask/gssmask.c (AcquirePKInitCreds): fail more - gracefully - -2007-06-18 Love Hörnquist Åstrand - - * lib/krb5/pac.c: make compile. - - * lib/krb5/pac.c (verify_checksum): memset cksum to avoid using - pointer from stack. - - * lib/krb5/plugin.c: Don't expose free pointer. - - * lib/krb5/pkinit.c (_krb5_pk_load_id): fail directoy for first - calloc. + In lib/krb5/v4_glue.c, in the routine storage_to_etext the ticket + is padded to a multiple of 8 bytes. If it is already a multiple of + 8 bytes, 8 additional 0-bytes are added. - * lib/krb5/pkinit.c (get_reply_key*): don't expose freed memory - - * lib/krb5/krbhst.c: Host is static memory, don't free. - - * lib/krb5/crypto.c (decrypt_internal_derived): make sure length - is longer then confounder + checksum. - - * kdc: export get_dbinfo as krb5_kdc_set_dbinfo and call from - users. This to allows libkdc users to to specify their own - databases - - * lib/krb5/pkinit.c (pk_rd_pa_reply_enckey): simplify handling of - content data (and avoid leaking memory). - - * kdc/misc.c (_kdc_db_fetch): set error string for failures. + This catches the AFS krb4 ticket decoder by surprise: unless the + ticket is exactly 56 bytes, it only supports the minimum necessary + padding. It detects the superfluous padding by comparing the + ticket length decoded to the advertised ticket length. -2007-06-15 Love Hörnquist Åstrand - - * kdc/pkinit.c: Use KRB5_AUTHDATA_INITIAL_VERIFIED_CAS. - -2007-06-13 Love Hörnquist Åstrand - - * kdc/pkinit.c: tell user when they got a pk-init request with - pkinit disabled. - -2007-06-12 Love Hörnquist Åstrand + Hence a 7-letter userid in "cern.ch" which resulted in a ticket of + 40 bytes, got "padded" to 48 bytes which the rxkad decoder + rejected. - * lib/krb5/principal.c: Rename UNPARSE_NO_QUOTE to - UNPARSE_DISPLAY. - - * lib/krb5/krb5.h: Rename UNPARSE_NO_QUOTE to UNPARSE_DISPLAY. + From Rainer Toebbicke. - * lib/krb5/principal.c: Make no-quote mean replace strange chars - with space. +2008-07-25 Love Hörnquist Ã…strand - * lib/krb5/principal.c: Support KRB5_PRINCIPAL_UNPARSE_NO_QUOTE. + * kuser/kinit.c: add --ok-as-delegate and --windows flags - * lib/krb5/krb5.h: Add KRB5_PRINCIPAL_UNPARSE_NO_QUOTE. + * kpasswd/kpasswd-generator.c: Switch to krb5_set_password. - * lib/krb5/test_princ.c: Test quoteing. + * kuser/kinit.c: Use krb5_cc_set_config. - * lib/krb5/pkinit.c: update (c) - - * lib/krb5/get_cred.c: use krb5_sendto_context to talk to the KDC. + * lib/krb5/cache.c: Add krb5_cc_[gs]et_config. - * lib/krb5/send_to_kdc.c (_krb5_kdc_retry): check if the whole - process needs to restart or just skip this KDC. +2008-07-22 Love Hörnquist Ã…strand - * lib/krb5/init_creds_pw.c: Use krb5_sendto_context to talk to - KDC. + * lib/krb5/crypto.c: Allow numbers to be enctypes to as long as + they are valid. - * lib/krb5/krb5.h: Add sendto hooks and opaque structure. +2008-07-17 Love Hörnquist Ã…strand - * lib/krb5/krb5_rd_error.3: Update prototype. + * lib/hdb/version-script.map: some random bits needed for libkadm - * lib/krb5/send_to_kdc.c: Add hooks for processing the reply from - the server. - -2007-06-11 Love Hörnquist Åstrand +2008-07-15 Love Hörnquist Ã…strand - * lib/krb5/krb5_err.et: Some new error codes from RFC 4120. + * lib/krb5/send_to_kdc_plugin.h: add name for send_to_kdc plugin. -2007-06-09 Love Hörnquist Åstrand - - * kdc/krb5tgs.c: Constify. - - * kdc/kerberos5.c: Constify. - - * kdc/pkinit.c: Check for KRB5-PADATA-PK-AS-09-BINDING. Constify. + * lib/krb5/krbhst.c: handle KRB5_PLUGIN_NO_HANDLE for lookup + plugin. -2007-06-08 Love Hörnquist Åstrand + * lib/krb5/send_to_kdc.c: Add support for the send_to_kdc plugin + interface. - * include/Makefile.am: Make krb5-types.h nodist_include_HEADERS. - - * kdc/Makefile.am: EXTRA_DIST += version-script.map. - -2007-06-07 Love Hörnquist Åstrand + * lib/krb5/Makefile.am: add send_to_kdc_plugin.h - * Makefile.am (print-distdir): print name of dist - - * kdc/pkinit.c: Break out loading of mappings file to a separate - function and remove warning that it can't open the mapping file, - there are now mappings in the db, maybe the users uses that - instead... + * lib/krb5/krb5_err.et: add plugin error codes - * lib/krb5/crypto.c: Require the raw key have the correct size and - do away with the minsize. Minsize was a thing that originated - from RC2, but since RC2 is done in the x509/cms subsystem now - there is no need to keep that around. +2008-07-14 Love Hornquist Astrand - * lib/hdb/dbinfo.c: If there is no default dbname, also check for - unset mkey_file and set it default mkey name, make backward compat - stuff work. + * lib/hdb/Makefile.am: EXTRA_DIST += version-script.map - * kdc/version-script.map: add new symbols +2008-07-14 Love Hornquist Astrand - * kdc/kdc-replay.c: Also update krb5_context view of what the time - is. + * lib/krb5/krb5_{address,ccache}.3: spelling, from openbsd via janne + johansson - * configure.in: add tests/can/Makefile +2008-07-13 Love Hörnquist Ã…strand - * kdc/kdc-replay.c: Add --[version|help]. + * lib/krb5/version-script.map: add krb5_free_error_message - * kdc/pkinit.c: Push down the kdc time into the x509 library. +2008-06-21 Love Hörnquist Ã…strand - * kdc/connect.c: Move up krb5_kdc_save_request so we can catch the - reply data too. + * lib/krb5/init_creds_pw.c: switch to krb5_set_password(). - * kdc/kdc-replay.c: verify reply by checking asn1 class, type and - tag of the reply if there is one. +2008-06-18 Love Hörnquist Ã…strand - * kdc/process.c: Save asn1 class, type and tag of the reply if - there is one. Used to verify the reply in kdc-replay. + * lib/krb5/time.c (krb5_set_real_time): handle negative usec -2007-06-06 Love Hörnquist Åstrand +2008-05-31 Love Hörnquist Ã…strand - * kdc/kdc_locl.h: extern for request_log. + * lib/krb5/krb5_locl.h: Add - * kdc/Makefile.am: Add kdc-replay. + * lib/krb5/crypto.c: Use wind_utf8ucs2_length to convert the password to utf16. - * kdc/kdc-replay.c: Replay kdc messages to the KDC library. +2008-05-30 Love Hörnquist Ã…strand - * kdc/config.c: Pick up request_log from [kdc]kdc-request-log. + * lib/krb5/kcm.c: Add back krb5_kcmcache argument to try_door(). - * kdc/connect.c: Option to save the request to disk. +2008-05-27 Love Hörnquist Ã…strand - * kdc/process.c (krb5_kdc_save_request): save request to file. - - * kdc/process.c (krb5_kdc_process*): dont update _kdc_time - automagicly. - (krb5_kdc_update_time): set or get current kdc-time. - - * kdc/pkinit.c (_kdc_pk_rd_padata): accept both pkcs-7 and - pkauthdata as the signeddata oid + * lib/krb5/error_string.c (krb5_free_error_message): constify - * kdc/pkinit.c (_kdc_pk_rd_padata): Try to log what went wrong. + * lib/krb5/error_string.c: Add krb5_get_error_message(). -2007-06-05 Love Hörnquist Åstrand - - * kdc/pkinit.c: Use oid_id_pkcs7_data for pkinit-9 encKey reply to - match windows DC behavior better. - -2007-06-04 Love Hörnquist Åstrand - - * configure.in: use test for -framework Security - - * appl/test/uu_server.c: Print status to stdout. - - * kdc/digest.c (digest ntlm): provide log entires by setting ret - to an error. + * lib/krb5/doxygen.c: krb5_cc_new_unique() is name of the creation + function. -2007-06-03 Love Hörnquist Åstrand - - * doc/hx509.texi: Indent crl-sign. +2008-04-30 Love Hörnquist Ã…strand - * doc/hx509.texi: One more crl-sign example. + * lib/hdb/hdb-ldap.c: Use the _ext api for OpenLDAP, from Honza + Machacek (gentoo). - * lib/krb5/test_princ.c: plug memory leaks. +2008-04-28 Love Hörnquist Ã…strand - * lib/krb5/pac.c: plug memory leaks. + * lib/krb5/crypto.c: Use DES_set_key_unchecked(). - * lib/krb5/test_pac.c: plug memory leaks. + * lib/krb5/krb5.conf.5: Document default_cc_type. - * lib/krb5/test_prf.c: plug memory leak. + * lib/krb5/cache.c: Pick up [libdefaults]default_cc_type - * lib/krb5/test_cc.c: plug memory leaks. - - * doc/hx509.texi: Simple blob about publishing CRLs. - - * doc/win2k.texi: drop text about enctypes. +2008-04-27 Love Hörnquist Ã…strand -2007-06-02 Love Hörnquist Åstrand + * kdc/kaserver.c: Use DES_set_key_unchecked(). - * kdc/pkinit.c: In case of OCSP verification failure, referash - every 5 min. In case of success, refreash 2 min before expiring or - faster. - -2007-05-31 Love Hörnquist Åstrand - - * lib/krb5/krb5_err.et: add error 68, WRONG_REALM +2008-04-21 Love Hörnquist Ã…strand - * kdc/pkinit.c: Handle the ms san in a propper way, still cheat - with the realm name. + * doc/hx509.texi: About the pkcs11 module. - * kdc/kerberos5.c: If _kdc_pk_check_client failes, bail out - directly and hand the error back to the client. + * doc/hx509.texi: Pick up version from vars.texi - * lib/krb5/krb5_err.et: Add missing REVOCATION_STATUS_UNAVAILABLE - and fix error message for CLIENT_NAME_MISMATCH. + * doc/hx509.texi: No MIT code in hx509. - * kdc/pkinit.c: More logging for pk-init client mismatch. + * hx509 now includes a pkcs11 implementation. - * kdc/kerberos5.c: Also add a KRB5_PADATA_PK_AS_REQ_WIN for - windows pk-init (-9) to make MIT clients happy. - -2007-05-30 Love Hörnquist Åstrand - - * kdc/pkinit.c: Force des3 for win2k. +2008-04-20 Love Hörnquist Ã…strand - * kdc/pkinit.c: Add wrapping to ContentInfo wrapping to - COMPAT_WIN2K. + * lib/hdb/Makefile.am: Move OpenLDAP includes to AM_CPPFLAGS to + avoid dropping other defines for the library. - * lib/krb5/keytab_keyfile.c: Spelling. +2008-04-17 Love Hörnquist Ã…strand - * kdc/pkinit.c: Allow matching by MS UPN SAN, note that this delta - doesn't deal with case of realm. - -2007-05-16 Love Hörnquist Åstrand - - * lib/krb5/crypto.c (krb5_crypto_overhead): return static overhead - of encryption. - -2007-05-10 Dave Love - - * doc/win2k.texi: Update some URLs. - -2007-05-13 Love Hörnquist Åstrand - - * kuser/kimpersonate.c: Fix version number of ticket, it should be - 5 not the kvno. - -2007-05-08 Love Hörnquist Åstrand - - * doc/setup.texi: Salting is really Encryption types and salting. - -2007-05-07 Love Hörnquist Åstrand - - * doc/setup.texi: spelling, from Ronny Blomme - - * doc/win2k.texi: Fix ksetup /SetComputerPassword, from Ronny - Blomme - -2007-05-02 Love Hörnquist Åstrand + * lib/krb5: add __declspec() for windows. - * lib/hdb/dbinfo.c (hdb_get_dbinfo) If there are no database - specified, create one and let it use the defaults. + * configure.in: Update rk_WIN32_EXPORT, add gssapi to + rk_WIN32_EXPORT. -2007-04-27 Love Hörnquist Åstrand + * configure.in: Lets try dependency tracking for automake 1.10 and + later. - * lib/hdb/test_dbinfo.c: test acl file + * configure.in: Use at least libtool-2.2. - * lib/hdb/test_dbinfo.c: test acl file + * configure.in: Use LT_INIT the right way. - * lib/hdb/dbinfo.c: add acl file + * lib/krb5/Makefile.am: Update make-proto usage. - * etc: ignore Makefile.in + * configure.in: Run autoupdate, use LT_INIT(). - * Makefile.am: SUBDIRS += etc +2008-04-15 Love Hörnquist Ã…strand - * configure.in: Add etc/Makefile. + * lib/krb5/test_forward.c: Don't print krb5_error_code since we + are using krb5_err(). - * etc/Makefile.am: make sure services.append is distributed + * lib/krb5/ticket.c: Cast krb5_error_code to int to avoid warning. -2007-04-24 Love Hörnquist Åstrand + * lib/krb5/scache.c: Cast krb5_error_code to int to avoid warning. - * kdc: rename windc_init to krb5_kdc_windc_init + * lib/krb5/principal.c: Cast enum to int to avoid warning. - * kdc/version-script.map: version script for libkdc - - * kdc/Makefile.am: version script for libkdc - -2007-04-23 Love Hörnquist Åstrand + * lib/krb5/pkinit.c: Cast krb5_error_code to int to avoid warning. - * lib/krb5/init_creds.c (krb5_get_init_creds_opt_get_error): - correct the order of the arguments. + * lib/krb5/pac.c: Cast size_t to unsigned long to avoid warning. - * lib/hdb/Makefile.am: Add and test dbinfo. + * lib/krb5/error_string.c: Cast krb5_error_code to int to avoid + warning. - * lib/hdb/hdb.h: Forward declaration for struct hdb_dbinfo; + * lib/krb5/keytab_keyfile.c: Make num_entries an uint32 to avoid + negative numbers and type warnings. - * kdc/config.c: Use krb5_kdc_get_config and just fill in what the - users wanted differently. + * lib/krb5: cc_get_version returns an int, update. - * kdc/default_config.c: Make the default configuration fetch info - from the krb5.conf. - -2007-04-22 Love Hörnquist Åstrand +2008-04-10 Love Hörnquist Ã…strand - * lib/krb5/store.c (krb5_store_creds_tag): use session.keytype to - determine if to send the session-key, for the second place in the - function. + * configure.in: Check for . - * tools/krb5-config.in: rename des to hcrypto +2008-04-09 Love Hörnquist Ã…strand - * kuser/Makefile.am: depend on libheimntlm + * lib/krb5/version-script.map: sort and export _krb5_pk_kdf - * kuser/kinit.c: Add --ntlm-domain that store the ntlm cred for - this domain if the Kerberos password auth worked. + * lib/krb5/crypto.c: Check kdf params. calculate the second half + of the key. - * kuser/klist.c: add new option --hidden that doesn't display - principal that starts with @ + * lib/krb5/Makefile.am: Add test_pknistkdf - * tools/krb5-config.in: Add heimntlm when we use gssapi. + * lib/krb5/test_pknistkdf.c: Test the new pkinit nist kdf. - * lib/krb5/krb5_ccache.3 (krb5_cc_retrieve_cred): document what to - free 'cred' with. + * lib/krb5/crypto.c: Complete _krb5_pk_kdf. - * lib/krb5/cache.c (krb5_cc_retrieve_cred): document what to free - 'cred' with. + * lib/krb5/crypto.c: First version of KDF in + draft-ietf-krb-wg-pkinit-alg-agility-03.txt. -2007-04-21 Love Hörnquist Åstrand - - * lib/krb5/store.c (krb5_store_creds_tag): use session.keytype to - determine if to send the session-key. +2008-04-08 Love Hörnquist Ã…strand - * kcm/client.c (kcm_ccache_new_client): make root be able to pass - the name constraints, not the opposite. From Bryan Jacobs. + * doc/setup.texi: Add text about smbk5pwd overlay from Buchan + Milne. -2007-04-20 Love Hörnquist Åstrand - - * kcm/acl.c: make compile again. + * lib/krb5/krb5_locl.h: Name the pkinit type enum. - * kcm/client.c: fix warning. - - * kcm: First, it allows root to ignore the naming conventions. - Second, it allows root to always perform any operation on any - ccache. Note that root could do this anyway with FILE ccaches. - From Bryan Jacobs. + * kdc/pkinit.c: Rename constants to match global header. - * Rename libdes to libhcrypto. + * lib/krb5/pkinit.c: Drop krb5_pk_identity and rename constants to + match global header. -2007-04-19 Love Hörnquist Åstrand + * kdc/pkinit.c: Pick up krb5_pk_identity from krb5_locl.h. - * kinit: remove code that depend on kerberos 4 library - - * kdc: remove code that depend on kerberos 4 library + * lib/krb5/scache.c (scc_alloc): %x is unsigned int. - * configure.in: Drop kerberos 4 support. - - * kdc/hpropd.c (main): free the message when done with it. +2008-04-07 Love Hörnquist Ã…strand - * lib/krb5/pkinit.c (_krb5_get_init_creds_opt_free_pkinit): - remember to free memory too. + * lib/krb5/version-script.map: Sort and add krb5_cc_switch. - * lib/krb5/pkinit.c (pk_rd_pa_reply_dh): free content-type when - done. + * lib/krb5/acache.c: Use unsigned where appropriate. - * configure.in: test rk_VERSIONSCRIPT - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 07:24:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7614C1065675; Wed, 5 Oct 2011 07:24:41 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4CAAA8FC1C; Wed, 5 Oct 2011 07:24:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p957OfRC099252; Wed, 5 Oct 2011 07:24:41 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p957OfWZ099250; Wed, 5 Oct 2011 07:24:41 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110050724.p957OfWZ099250@svn.freebsd.org> From: Stanislav Sedov Date: Wed, 5 Oct 2011 07:24:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226032 - svnadmin/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 07:24:41 -0000 Author: stas Date: Wed Oct 5 07:24:39 2011 New Revision: 226032 URL: http://svn.freebsd.org/changeset/base/226032 Log: - Heimdal 1.5 import is complete. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Wed Oct 5 07:23:29 2011 (r226031) +++ svnadmin/conf/sizelimit.conf Wed Oct 5 07:24:39 2011 (r226032) @@ -33,5 +33,4 @@ obrien rpaulo rwatson sam -stas thompsa From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 07:28:24 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FEBD106564A; Wed, 5 Oct 2011 07:28:24 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA6258FC16; Wed, 5 Oct 2011 07:28:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p957SNS7099403; Wed, 5 Oct 2011 07:28:23 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p957SNo8099402; Wed, 5 Oct 2011 07:28:23 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110050728.p957SNo8099402@svn.freebsd.org> From: Stanislav Sedov Date: Wed, 5 Oct 2011 07:28:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226033 - vendor-crypto/heimdal/1.5 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 07:28:24 -0000 Author: stas Date: Wed Oct 5 07:28:23 2011 New Revision: 226033 URL: http://svn.freebsd.org/changeset/base/226033 Log: - Add tag for Heimdal 1.5. Added: vendor-crypto/heimdal/1.5/ - copied from r226032, vendor-crypto/heimdal/dist/ From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 08:33:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3323B1065672; Wed, 5 Oct 2011 08:33:51 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 22A858FC0C; Wed, 5 Oct 2011 08:33:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p958Xppo001734; Wed, 5 Oct 2011 08:33:51 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p958XpeQ001732; Wed, 5 Oct 2011 08:33:51 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <201110050833.p958XpeQ001732@svn.freebsd.org> From: Andrew Thompson Date: Wed, 5 Oct 2011 08:33:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226034 - head/sys/arm/xscale/ixp425 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 08:33:51 -0000 Author: thompsa Date: Wed Oct 5 08:33:50 2011 New Revision: 226034 URL: http://svn.freebsd.org/changeset/base/226034 Log: Add missing newbus glue, this has never attached properly to gpiobus. Modified: head/sys/arm/xscale/ixp425/avila_gpio.c Modified: head/sys/arm/xscale/ixp425/avila_gpio.c ============================================================================== --- head/sys/arm/xscale/ixp425/avila_gpio.c Wed Oct 5 07:28:23 2011 (r226033) +++ head/sys/arm/xscale/ixp425/avila_gpio.c Wed Oct 5 08:33:50 2011 (r226034) @@ -356,5 +356,10 @@ static driver_t gpio_avila_driver = { sizeof(struct avila_gpio_softc), }; static devclass_t gpio_avila_devclass; +extern devclass_t gpiobus_devclass, gpioc_devclass; +extern driver_t gpiobus_driver, gpioc_driver; DRIVER_MODULE(gpio_avila, ixp, gpio_avila_driver, gpio_avila_devclass, 0, 0); +DRIVER_MODULE(gpiobus, gpio_avila, gpiobus_driver, gpiobus_devclass, 0, 0); +DRIVER_MODULE(gpioc, gpio_avila, gpioc_driver, gpioc_devclass, 0, 0); +MODULE_VERSION(gpio_avila, 1); From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 09:56:43 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D62D6106566B; Wed, 5 Oct 2011 09:56:43 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C46548FC18; Wed, 5 Oct 2011 09:56:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p959uhiB004386; Wed, 5 Oct 2011 09:56:43 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p959uhGu004376; Wed, 5 Oct 2011 09:56:43 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201110050956.p959uhGu004376@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 5 Oct 2011 09:56:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226035 - in head/usr.bin/grep: . regex X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 09:56:43 -0000 Author: gabor Date: Wed Oct 5 09:56:43 2011 New Revision: 226035 URL: http://svn.freebsd.org/changeset/base/226035 Log: Update BSD grep to the latest development version. It has some code backported that was written for the TRE integration project in Google Summer of Code 2011. This is a temporary solution until the whole regex library is not replaced so that BSD grep development can continue and the backported code gets some review and testing. This change only improves scalability slightly, there is no big performance boost yet but several minor bugs have been found and fixed. Approved by: delphij (mentor) Sposored by: Google Summer of Code 2011 MFC after: 1 week Added: head/usr.bin/grep/regex/ head/usr.bin/grep/regex/fastmatch.c (contents, props changed) head/usr.bin/grep/regex/fastmatch.h (contents, props changed) head/usr.bin/grep/regex/glue.h (contents, props changed) head/usr.bin/grep/regex/hashtable.c (contents, props changed) head/usr.bin/grep/regex/hashtable.h (contents, props changed) head/usr.bin/grep/regex/tre-compile.c (contents, props changed) head/usr.bin/grep/regex/tre-fastmatch.c (contents, props changed) head/usr.bin/grep/regex/tre-fastmatch.h (contents, props changed) head/usr.bin/grep/regex/xmalloc.c (contents, props changed) head/usr.bin/grep/regex/xmalloc.h (contents, props changed) Deleted: head/usr.bin/grep/fastgrep.c Modified: head/usr.bin/grep/Makefile head/usr.bin/grep/file.c head/usr.bin/grep/grep.c head/usr.bin/grep/grep.h head/usr.bin/grep/util.c Modified: head/usr.bin/grep/Makefile ============================================================================== --- head/usr.bin/grep/Makefile Wed Oct 5 08:33:50 2011 (r226034) +++ head/usr.bin/grep/Makefile Wed Oct 5 09:56:43 2011 (r226035) @@ -8,28 +8,52 @@ PROG= grep .else PROG= bsdgrep +CLEANFILES+= bsdgrep.1 + +bsdgrep.1: grep.1 + cp ${.ALLSRC} ${.TARGET} .endif -SRCS= fastgrep.c file.c grep.c queue.c util.c +SRCS= file.c grep.c queue.c util.c + +# Extra files ported backported form some regex improvements +.PATH: ${.CURDIR}/regex +SRCS+= fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c xmalloc.c +CFLAGS+=-I${.CURDIR}/regex .if ${MK_BSD_GREP} == "yes" LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep \ ${BINDIR}/grep ${BINDIR}/zgrep \ ${BINDIR}/grep ${BINDIR}/zegrep \ - ${BINDIR}/grep ${BINDIR}/zfgrep + ${BINDIR}/grep ${BINDIR}/zfgrep \ + ${BINDIR}/grep ${BINDIR}/bzgrep \ + ${BINDIR}/grep ${BINDIR}/bzegrep \ + ${BINDIR}/grep ${BINDIR}/bzfgrep \ + ${BINDIR}/grep ${BINDIR}/xzgrep \ + ${BINDIR}/grep ${BINDIR}/xzegrep \ + ${BINDIR}/grep ${BINDIR}/xzfgrep \ + ${BINDIR}/grep ${BINDIR}/lzgrep \ + ${BINDIR}/grep ${BINDIR}/lzegrep \ + ${BINDIR}/grep ${BINDIR}/lzfgrep MLINKS= grep.1 egrep.1 \ grep.1 fgrep.1 \ grep.1 zgrep.1 \ grep.1 zegrep.1 \ - grep.1 zfgrep.1 + grep.1 zfgrep.1 \ + grep.1 bzgrep.1 \ + grep.1 bzegrep.1 \ + grep.1 bzfgrep.1 \ + grep.1 xzgrep.1 \ + grep.1 xzegrep.1 \ + grep.1 xzfgrep.1 \ + grep.1 lzgrep.1 \ + grep.1 lzegrep.1 \ + grep.1 lzfgrep.1 .endif -bsdgrep.1: grep.1 - cp ${.ALLSRC} ${.TARGET} - -LDADD= -lz -lbz2 -DPADD= ${LIBZ} ${LIBBZ2} +LDADD= -lz -lbz2 -llzma +DPADD= ${LIBZ} ${LIBBZ2} ${LIBLZMA} .if !defined(WITHOUT_GNU_COMPAT) CFLAGS+= -I/usr/include/gnu Modified: head/usr.bin/grep/file.c ============================================================================== --- head/usr.bin/grep/file.c Wed Oct 5 08:33:50 2011 (r226034) +++ head/usr.bin/grep/file.c Wed Oct 5 09:56:43 2011 (r226035) @@ -34,13 +34,15 @@ __FBSDID("$FreeBSD$"); #include -#include +#include #include +#include #include #include #include #include +#include #include #include #include @@ -56,10 +58,12 @@ __FBSDID("$FreeBSD$"); static gzFile gzbufdesc; static BZFILE* bzbufdesc; +static lzma_stream lstrm = LZMA_STREAM_INIT; -static unsigned char buffer[MAXBUFSIZ]; +static unsigned char *buffer; static unsigned char *bufpos; static size_t bufrem; +static size_t fsiz; static unsigned char *lnbuf; static size_t lnbuflen; @@ -70,6 +74,9 @@ grep_refill(struct file *f) ssize_t nr; int bzerr; + if (filebehave == FILE_MMAP) + return (0); + bufpos = buffer; bufrem = 0; @@ -101,6 +108,36 @@ grep_refill(struct file *f) /* Make sure we exit with an error */ nr = -1; } + } else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) { + lzma_action action = LZMA_RUN; + uint8_t in_buf[MAXBUFSIZ]; + lzma_ret ret; + + ret = (filebehave == FILE_XZ) ? + lzma_stream_decoder(&lstrm, UINT64_MAX, + LZMA_CONCATENATED) : + lzma_alone_decoder(&lstrm, UINT64_MAX); + + if (ret != LZMA_OK) + return (-1); + + lstrm.next_out = buffer; + lstrm.avail_out = MAXBUFSIZ; + lstrm.next_in = in_buf; + nr = read(f->fd, in_buf, MAXBUFSIZ); + + if (nr < 0) + return (-1); + else if (nr == 0) + action = LZMA_FINISH; + + lstrm.avail_in = nr; + ret = lzma_code(&lstrm, action); + + if (ret != LZMA_OK && ret != LZMA_STREAM_END) + return (-1); + bufrem = MAXBUFSIZ - lstrm.avail_out; + return (0); } else nr = read(f->fd, buffer, MAXBUFSIZ); @@ -186,56 +223,76 @@ error: return (NULL); } -static inline struct file * -grep_file_init(struct file *f) +/* + * Opens a file for processing. + */ +struct file * +grep_open(const char *path) { + struct file *f; + + f = grep_malloc(sizeof *f); + memset(f, 0, sizeof *f); + if (path == NULL) { + /* Processing stdin implies --line-buffered. */ + lbflag = true; + f->fd = STDIN_FILENO; + } else if ((f->fd = open(path, O_RDONLY)) == -1) + goto error1; + + if (filebehave == FILE_MMAP) { + struct stat st; + + if ((fstat(f->fd, &st) == -1) || (st.st_size > OFF_MAX) || + (!S_ISREG(st.st_mode))) + filebehave = FILE_STDIO; + else { + int flags = MAP_PRIVATE | MAP_NOCORE | MAP_NOSYNC; +#ifdef MAP_PREFAULT_READ + flags |= MAP_PREFAULT_READ; +#endif + fsiz = st.st_size; + buffer = mmap(NULL, fsiz, PROT_READ, flags, + f->fd, (off_t)0); + if (buffer == MAP_FAILED) + filebehave = FILE_STDIO; + else { + bufrem = st.st_size; + bufpos = buffer; + madvise(buffer, st.st_size, MADV_SEQUENTIAL); + } + } + } + + if ((buffer == NULL) || (buffer == MAP_FAILED)) + buffer = grep_malloc(MAXBUFSIZ); if (filebehave == FILE_GZIP && (gzbufdesc = gzdopen(f->fd, "r")) == NULL) - goto error; + goto error2; if (filebehave == FILE_BZIP && (bzbufdesc = BZ2_bzdopen(f->fd, "r")) == NULL) - goto error; + goto error2; /* Fill read buffer, also catches errors early */ - if (grep_refill(f) != 0) - goto error; + if (bufrem == 0 && grep_refill(f) != 0) + goto error2; /* Check for binary stuff, if necessary */ if (binbehave != BINFILE_TEXT && memchr(bufpos, '\0', bufrem) != NULL) - f->binary = true; + f->binary = true; return (f); -error: + +error2: close(f->fd); +error1: free(f); return (NULL); } /* - * Opens a file for processing. - */ -struct file * -grep_open(const char *path) -{ - struct file *f; - - f = grep_malloc(sizeof *f); - memset(f, 0, sizeof *f); - if (path == NULL) { - /* Processing stdin implies --line-buffered. */ - lbflag = true; - f->fd = STDIN_FILENO; - } else if ((f->fd = open(path, O_RDONLY)) == -1) { - free(f); - return (NULL); - } - - return (grep_file_init(f)); -} - -/* * Closes a file. */ void @@ -245,6 +302,10 @@ grep_close(struct file *f) close(f->fd); /* Reset read buffer and line buffer */ + if (filebehave == FILE_MMAP) { + munmap(buffer, fsiz); + buffer = NULL; + } bufpos = buffer; bufrem = 0; Modified: head/usr.bin/grep/grep.c ============================================================================== --- head/usr.bin/grep/grep.c Wed Oct 5 08:33:50 2011 (r226034) +++ head/usr.bin/grep/grep.c Wed Oct 5 09:56:43 2011 (r226035) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -48,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "fastmatch.h" #include "grep.h" #ifndef WITHOUT_NLS @@ -81,9 +83,9 @@ bool matchall; /* Searching patterns */ unsigned int patterns, pattern_sz; -char **pattern; +struct pat *pattern; regex_t *r_pattern; -fastgrep_t *fg_pattern; +fastmatch_t *fg_pattern; /* Filename exclusion/inclusion patterns */ unsigned int fpatterns, fpattern_sz; @@ -104,7 +106,7 @@ bool hflag; /* -h: don't print filenam bool iflag; /* -i: ignore case */ bool lflag; /* -l: only show names of files with matches */ bool mflag; /* -m x: stop reading the files after x matches */ -unsigned long long mcount; /* count for -m */ +long long mcount; /* count for -m */ bool nflag; /* -n: show line numbers in front of matching lines */ bool oflag; /* -o: print only matching part */ bool qflag; /* -q: quiet mode (don't output anything) */ @@ -164,7 +166,7 @@ usage(void) exit(2); } -static const char *optstr = "0123456789A:B:C:D:EFGHIJLOPSRUVZabcd:e:f:hilm:nopqrsuvwxy"; +static const char *optstr = "0123456789A:B:C:D:EFGHIJMLOPSRUVZabcd:e:f:hilm:nopqrsuvwxXy"; struct option long_options[] = { @@ -200,6 +202,7 @@ struct option long_options[] = {"files-with-matches", no_argument, NULL, 'l'}, {"files-without-match", no_argument, NULL, 'L'}, {"max-count", required_argument, NULL, 'm'}, + {"lzma", no_argument, NULL, 'M'}, {"line-number", no_argument, NULL, 'n'}, {"only-matching", no_argument, NULL, 'o'}, {"quiet", no_argument, NULL, 'q'}, @@ -212,6 +215,7 @@ struct option long_options[] = {"version", no_argument, NULL, 'V'}, {"word-regexp", no_argument, NULL, 'w'}, {"line-regexp", no_argument, NULL, 'x'}, + {"xz", no_argument, NULL, 'X'}, {"decompress", no_argument, NULL, 'Z'}, {NULL, no_argument, NULL, 0} }; @@ -223,23 +227,35 @@ static void add_pattern(char *pat, size_t len) { + /* Do not add further pattern is we already match everything */ + if (matchall) + return; + /* Check if we can do a shortcut */ - if (len == 0 || matchall) { + if (len == 0) { matchall = true; + for (unsigned int i = 0; i < patterns; i++) { + free(pattern[i].pat); + } + pattern = grep_realloc(pattern, sizeof(struct pat)); + pattern[0].pat = NULL; + pattern[0].len = 0; + patterns = 1; return; } /* Increase size if necessary */ if (patterns == pattern_sz) { pattern_sz *= 2; pattern = grep_realloc(pattern, ++pattern_sz * - sizeof(*pattern)); + sizeof(struct pat)); } if (len > 0 && pat[len - 1] == '\n') --len; /* pat may not be NUL-terminated */ - pattern[patterns] = grep_malloc(len + 1); - memcpy(pattern[patterns], pat, len); - pattern[patterns][len] = '\0'; + pattern[patterns].pat = grep_malloc(len + 1); + memcpy(pattern[patterns].pat, pat, len); + pattern[patterns].len = len; + pattern[patterns].pat[len] = '\0'; ++patterns; } @@ -285,14 +301,19 @@ add_dpattern(const char *pat, int mode) static void read_patterns(const char *fn) { + struct stat st; FILE *f; char *line; size_t len; if ((f = fopen(fn, "r")) == NULL) err(2, "%s", fn); - while ((line = fgetln(f, &len)) != NULL) - add_pattern(line, *line == '\n' ? 0 : len); + if ((fstat(fileno(f), &st) == -1) || (S_ISDIR(st.st_mode))) { + fclose(f); + return; + } + while ((line = fgetln(f, &len)) != NULL) + add_pattern(line, line[0] == '\n' ? 0 : len); if (ferror(f)) err(2, "%s", fn); fclose(f); @@ -311,7 +332,7 @@ int main(int argc, char *argv[]) { char **aargv, **eargv, *eopts; - char *ep; + char *pn, *ep; unsigned long long l; unsigned int aargc, eargc, i; int c, lastc, needpattern, newarg, prevoptind; @@ -325,30 +346,27 @@ main(int argc, char *argv[]) /* Check what is the program name of the binary. In this way we can have all the funcionalities in one binary without the need of scripting and using ugly hacks. */ - switch (__progname[0]) { + pn = __progname; + if (pn[0] == 'b' && pn[1] == 'z') { + filebehave = FILE_BZIP; + pn += 2; + } else if (pn[0] == 'x' && pn[1] == 'z') { + filebehave = FILE_XZ; + pn += 2; + } else if (pn[0] == 'l' && pn[1] == 'z') { + filebehave = FILE_LZMA; + pn += 2; + } else if (pn[0] == 'z') { + filebehave = FILE_GZIP; + pn += 1; + } + switch (pn[0]) { case 'e': grepbehave = GREP_EXTENDED; break; case 'f': grepbehave = GREP_FIXED; break; - case 'g': - grepbehave = GREP_BASIC; - break; - case 'z': - filebehave = FILE_GZIP; - switch(__progname[1]) { - case 'e': - grepbehave = GREP_EXTENDED; - break; - case 'f': - grepbehave = GREP_FIXED; - break; - case 'g': - grepbehave = GREP_BASIC; - break; - } - break; } lastc = '\0'; @@ -503,8 +521,8 @@ main(int argc, char *argv[]) case 'm': mflag = true; errno = 0; - mcount = strtoull(optarg, &ep, 10); - if (((errno == ERANGE) && (mcount == ULLONG_MAX)) || + mcount = strtoll(optarg, &ep, 10); + if (((errno == ERANGE) && (mcount == LLONG_MAX)) || ((errno == EINVAL) && (mcount == 0))) err(2, NULL); else if (ep[0] != '\0') { @@ -512,6 +530,9 @@ main(int argc, char *argv[]) err(2, NULL); } break; + case 'M': + filebehave = FILE_LZMA; + break; case 'n': nflag = true; break; @@ -544,7 +565,7 @@ main(int argc, char *argv[]) break; case 'u': case MMAP_OPT: - /* noop, compatibility */ + filebehave = FILE_MMAP; break; case 'V': printf(getstr(9), __progname, VERSION); @@ -560,6 +581,9 @@ main(int argc, char *argv[]) xflag = true; cflags &= ~REG_NOSUB; break; + case 'X': + filebehave = FILE_XZ; + break; case 'Z': filebehave = FILE_GZIP; break; @@ -630,6 +654,10 @@ main(int argc, char *argv[]) aargc -= optind; aargv += optind; + /* Empty pattern file matches nothing */ + if (!needpattern && (patterns == 0)) + exit(1); + /* Fail if we don't have any pattern */ if (aargc == 0 && needpattern) usage(); @@ -642,9 +670,12 @@ main(int argc, char *argv[]) } switch (grepbehave) { - case GREP_FIXED: case GREP_BASIC: break; + case GREP_FIXED: + /* XXX: header mess, REG_LITERAL not defined in gnu/regex.h */ + cflags |= 0020; + break; case GREP_EXTENDED: cflags |= REG_EXTENDED; break; @@ -655,24 +686,17 @@ main(int argc, char *argv[]) fg_pattern = grep_calloc(patterns, sizeof(*fg_pattern)); r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); -/* - * XXX: fgrepcomp() and fastcomp() are workarounds for regexec() performance. - * Optimizations should be done there. - */ - /* Check if cheating is allowed (always is for fgrep). */ - if (grepbehave == GREP_FIXED) { - for (i = 0; i < patterns; ++i) - fgrepcomp(&fg_pattern[i], pattern[i]); - } else { - for (i = 0; i < patterns; ++i) { - if (fastcomp(&fg_pattern[i], pattern[i])) { - /* Fall back to full regex library */ - c = regcomp(&r_pattern[i], pattern[i], cflags); - if (c != 0) { - regerror(c, &r_pattern[i], re_error, - RE_ERROR_BUF); - errx(2, "%s", re_error); - } + + /* Check if cheating is allowed (always is for fgrep). */ + for (i = 0; i < patterns; ++i) { + if (fastncomp(&fg_pattern[i], pattern[i].pat, + pattern[i].len, cflags) != 0) { + /* Fall back to full regex library */ + c = regcomp(&r_pattern[i], pattern[i].pat, cflags); + if (c != 0) { + regerror(c, &r_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); } } } Modified: head/usr.bin/grep/grep.h ============================================================================== --- head/usr.bin/grep/grep.h Wed Oct 5 08:33:50 2011 (r226034) +++ head/usr.bin/grep/grep.h Wed Oct 5 09:56:43 2011 (r226035) @@ -36,6 +36,8 @@ #include #include +#include "fastmatch.h" + #ifdef WITHOUT_NLS #define getstr(n) errstr[n] #else @@ -58,8 +60,11 @@ extern const char *errstr[]; #define BINFILE_TEXT 2 #define FILE_STDIO 0 -#define FILE_GZIP 1 -#define FILE_BZIP 2 +#define FILE_MMAP 1 +#define FILE_GZIP 2 +#define FILE_BZIP 3 +#define FILE_XZ 4 +#define FILE_LZMA 5 #define DIR_READ 0 #define DIR_SKIP 1 @@ -90,22 +95,16 @@ struct str { int line_no; }; +struct pat { + char *pat; + int len; +}; + struct epat { char *pat; int mode; }; -typedef struct { - size_t len; - unsigned char *pattern; - int qsBc[UCHAR_MAX + 1]; - /* flags */ - bool bol; - bool eol; - bool reversed; - bool word; -} fastgrep_t; - /* Flags passed to regcomp() and regexec() */ extern int cflags, eflags; @@ -114,7 +113,8 @@ extern bool Eflag, Fflag, Gflag, Hflag, bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, qflag, sflag, vflag, wflag, xflag; extern bool dexclude, dinclude, fexclude, finclude, lbflag, nullflag; -extern unsigned long long Aflag, Bflag, mcount; +extern unsigned long long Aflag, Bflag; +extern long long mcount; extern char *label; extern const char *color; extern int binbehave, devbehave, dirbehave, filebehave, grepbehave, linkbehave; @@ -122,10 +122,10 @@ extern int binbehave, devbehave, dirbeh extern bool first, matchall, notfound, prev; extern int tail; extern unsigned int dpatterns, fpatterns, patterns; -extern char **pattern; +extern struct pat *pattern; extern struct epat *dpattern, *fpattern; extern regex_t *er_pattern, *r_pattern; -extern fastgrep_t *fg_pattern; +extern fastmatch_t *fg_pattern; /* For regex errors */ #define RE_ERROR_BUF 512 @@ -150,8 +150,3 @@ void clearqueue(void); void grep_close(struct file *f); struct file *grep_open(const char *path); char *grep_fgetln(struct file *f, size_t *len); - -/* fastgrep.c */ -int fastcomp(fastgrep_t *, const char *); -void fgrepcomp(fastgrep_t *, const char *); -int grep_search(fastgrep_t *, const unsigned char *, size_t, regmatch_t *); Added: head/usr.bin/grep/regex/fastmatch.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/grep/regex/fastmatch.c Wed Oct 5 09:56:43 2011 (r226035) @@ -0,0 +1,169 @@ +/* $FreeBSD$ */ + +/*- + * Copyright (C) 2011 Gabor Kovesdan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "glue.h" + +#include +#include +#include +#include + +#include "tre-fastmatch.h" +#include "xmalloc.h" + +int +tre_fixncomp(fastmatch_t *preg, const char *regex, size_t n, int cflags) +{ + int ret; + tre_char_t *wregex; + size_t wlen; + + if (n != 0) + { + ret = tre_convert_pattern(regex, n, &wregex, &wlen); + if (ret != REG_OK) + return ret; + else + ret = tre_compile_literal(preg, wregex, wlen, cflags); + tre_free_pattern(wregex); + return ret; + } + else + return tre_compile_literal(preg, NULL, 0, cflags); +} + +int +tre_fastncomp(fastmatch_t *preg, const char *regex, size_t n, int cflags) +{ + int ret; + tre_char_t *wregex; + size_t wlen; + + if (n != 0) + { + ret = tre_convert_pattern(regex, n, &wregex, &wlen); + if (ret != REG_OK) + return ret; + else + ret = (cflags & REG_LITERAL) + ? tre_compile_literal(preg, wregex, wlen, cflags) + : tre_compile_fast(preg, wregex, wlen, cflags); + tre_free_pattern(wregex); + return ret; + } + else + return tre_compile_literal(preg, NULL, 0, cflags); +} + + +int +tre_fixcomp(fastmatch_t *preg, const char *regex, int cflags) +{ + return tre_fixncomp(preg, regex, regex ? strlen(regex) : 0, cflags); +} + +int +tre_fastcomp(fastmatch_t *preg, const char *regex, int cflags) +{ + return tre_fastncomp(preg, regex, regex ? strlen(regex) : 0, cflags); +} + +int +tre_fixwncomp(fastmatch_t *preg, const wchar_t *regex, size_t n, int cflags) +{ + return tre_compile_literal(preg, regex, n, cflags); +} + +int +tre_fastwncomp(fastmatch_t *preg, const wchar_t *regex, size_t n, int cflags) +{ + return (cflags & REG_LITERAL) ? + tre_compile_literal(preg, regex, n, cflags) : + tre_compile_fast(preg, regex, n, cflags); +} + +int +tre_fixwcomp(fastmatch_t *preg, const wchar_t *regex, int cflags) +{ + return tre_fixwncomp(preg, regex, regex ? tre_strlen(regex) : 0, cflags); +} + +int +tre_fastwcomp(fastmatch_t *preg, const wchar_t *regex, int cflags) +{ + return tre_fastwncomp(preg, regex, regex ? tre_strlen(regex) : 0, cflags); +} + +void +tre_fastfree(fastmatch_t *preg) +{ + tre_free_fast(preg); +} + +int +tre_fastnexec(const fastmatch_t *preg, const char *string, size_t len, + size_t nmatch, regmatch_t pmatch[], int eflags) +{ + tre_str_type_t type = (TRE_MB_CUR_MAX == 1) ? STR_BYTE : STR_MBS; + + if (eflags & REG_STARTEND) + CALL_WITH_OFFSET(tre_match_fast(preg, &string[offset], slen, + type, nmatch, pmatch, eflags)); + else + return tre_match_fast(preg, string, len, type, nmatch, + pmatch, eflags); +} + +int +tre_fastexec(const fastmatch_t *preg, const char *string, size_t nmatch, + regmatch_t pmatch[], int eflags) +{ + return tre_fastnexec(preg, string, (size_t)-1, nmatch, pmatch, eflags); +} + +int +tre_fastwnexec(const fastmatch_t *preg, const wchar_t *string, size_t len, + size_t nmatch, regmatch_t pmatch[], int eflags) +{ + tre_str_type_t type = STR_WIDE; + + if (eflags & REG_STARTEND) + CALL_WITH_OFFSET(tre_match_fast(preg, &string[offset], slen, + type, nmatch, pmatch, eflags)); + else + return tre_match_fast(preg, string, len, type, nmatch, + pmatch, eflags); +} + +int +tre_fastwexec(const fastmatch_t *preg, const wchar_t *string, + size_t nmatch, regmatch_t pmatch[], int eflags) +{ + return tre_fastwnexec(preg, string, (size_t)-1, nmatch, pmatch, eflags); +} + Added: head/usr.bin/grep/regex/fastmatch.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/grep/regex/fastmatch.h Wed Oct 5 09:56:43 2011 (r226035) @@ -0,0 +1,108 @@ +/* $FreeBSD$ */ + +#ifndef FASTMATCH_H +#define FASTMATCH_H 1 + +#include +#include +#include +#include + +typedef struct { + size_t wlen; + size_t len; + wchar_t *wpattern; + bool *wescmap; + unsigned int qsBc[UCHAR_MAX + 1]; + unsigned int *bmGs; + char *pattern; + bool *escmap; + unsigned int defBc; + void *qsBc_table; + unsigned int *sbmGs; + const char *re_endp; + + /* flags */ + bool hasdot; + bool bol; + bool eol; + bool word; + bool icase; + bool newline; + bool nosub; + bool matchall; + bool reversed; +} fastmatch_t; + +extern int +tre_fixcomp(fastmatch_t *preg, const char *regex, int cflags); + +extern int +tre_fastcomp(fastmatch_t *preg, const char *regex, int cflags); + +extern int +tre_fastexec(const fastmatch_t *preg, const char *string, size_t nmatch, + regmatch_t pmatch[], int eflags); + +extern void +tre_fastfree(fastmatch_t *preg); + +extern int +tre_fixwcomp(fastmatch_t *preg, const wchar_t *regex, int cflags); + +extern int +tre_fastwcomp(fastmatch_t *preg, const wchar_t *regex, int cflags); + +extern int +tre_fastwexec(const fastmatch_t *preg, const wchar_t *string, + size_t nmatch, regmatch_t pmatch[], int eflags); + +/* Versions with a maximum length argument and therefore the capability to + handle null characters in the middle of the strings. */ +extern int +tre_fixncomp(fastmatch_t *preg, const char *regex, size_t len, int cflags); + +extern int +tre_fastncomp(fastmatch_t *preg, const char *regex, size_t len, int cflags); + +extern int +tre_fastnexec(const fastmatch_t *preg, const char *string, size_t len, + size_t nmatch, regmatch_t pmatch[], int eflags); + +extern int +tre_fixwncomp(fastmatch_t *preg, const wchar_t *regex, size_t len, int cflags); + +extern int +tre_fastwncomp(fastmatch_t *preg, const wchar_t *regex, size_t len, int cflags); + +extern int +tre_fastwnexec(const fastmatch_t *preg, const wchar_t *string, size_t len, + size_t nmatch, regmatch_t pmatch[], int eflags); + +#define fixncomp tre_fixncomp +#define fastncomp tre_fastncomp +#define fixcomp tre_fixcomp +#define fastcomp tre_fastcomp +#define fixwncomp tre_fixwncomp +#define fastwncomp tre_fastwncomp +#define fixwcomp tre_fixwcomp +#define fastwcomp tre_fastwcomp +#define fastfree tre_fastfree +#define fastnexec tre_fastnexec +#define fastexec tre_fastexec +#define fastwnexec tre_fastwnexec +#define fastwexec tre_fastwexec +#define fixcomp tre_fixcomp +#define fastcomp tre_fastcomp +#define fastexec tre_fastexec +#define fastfree tre_fastfree +#define fixwcomp tre_fixwcomp +#define fastwcomp tre_fastwcomp +#define fastwexec tre_fastwexec +#define fixncomp tre_fixncomp +#define fastncomp tre_fastncomp +#define fastnexec tre_fastnexec +#define fixwncomp tre_fixwncomp +#define fastwncomp tre_fastwncomp +#define fastwnexec tre_fastwnexec +#endif /* FASTMATCH_H */ Added: head/usr.bin/grep/regex/glue.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/grep/regex/glue.h Wed Oct 5 09:56:43 2011 (r226035) @@ -0,0 +1,67 @@ +/* $FreeBSD$ */ + +#ifndef GLUE_H +#define GLUE_H + +#include +#undef RE_DUP_MAX +#include +#include +#include + +#define TRE_WCHAR 1 +#define TRE_MULTIBYTE 1 +#define HAVE_MBSTATE_T 1 + +#define TRE_CHAR(n) L##n +#define CHF "%lc" + +#define tre_char_t wchar_t +#define tre_mbrtowc(pwc, s, n, ps) (mbrtowc((pwc), (s), (n), (ps))) +#define tre_strlen wcslen +#define tre_isspace iswspace +#define tre_isalnum iswalnum + +#define REG_OK 0 +#define REG_LITERAL 0020 +#define REG_WORD 0100 +#define REG_GNU 0400 + +#define TRE_MB_CUR_MAX MB_CUR_MAX + +#ifndef _GREP_DEBUG +#define DPRINT(msg) +#else +#define DPRINT(msg) do {printf msg; fflush(stdout);} while(/*CONSTCOND*/0) +#endif + +#define MIN(a,b) ((a > b) ? (b) : (a)) +#define MAX(a,b) ((a > b) ? (a) : (b)) + +typedef enum { STR_WIDE, STR_BYTE, STR_MBS, STR_USER } tre_str_type_t; + +#define CALL_WITH_OFFSET(fn) \ + do \ + { \ + size_t slen = (size_t)(pmatch[0].rm_eo - pmatch[0].rm_so); \ + size_t offset = pmatch[0].rm_so; \ + int ret; \ + \ + if ((long long)pmatch[0].rm_eo - pmatch[0].rm_so < 0) \ + return REG_NOMATCH; \ + ret = fn; \ + for (unsigned i = 0; (!(eflags & REG_NOSUB) && (i < nmatch)); i++)\ + { \ + pmatch[i].rm_so += offset; \ + pmatch[i].rm_eo += offset; \ + } \ + return ret; \ + } while (0 /*CONSTCOND*/) + +int +tre_convert_pattern(const char *regex, size_t n, tre_char_t **w, + size_t *wn); + +void +tre_free_pattern(tre_char_t *wregex); +#endif Added: head/usr.bin/grep/regex/hashtable.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/grep/regex/hashtable.c Wed Oct 5 09:56:43 2011 (r226035) @@ -0,0 +1,268 @@ +/* $FreeBSD$ */ + +/*- + * Copyright (C) 2011 Gabor Kovesdan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 14:40:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91A40106566C; Wed, 5 Oct 2011 14:40:38 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from agogare.doit.wisc.edu (agogare.doit.wisc.edu [144.92.197.211]) by mx1.freebsd.org (Postfix) with ESMTP id 5DA2C8FC15; Wed, 5 Oct 2011 14:40:38 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII; format=flowed Received: from avs-daemon.smtpauth2.wiscmail.wisc.edu by smtpauth2.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) id <0LSL00702KRP0U00@smtpauth2.wiscmail.wisc.edu>; Wed, 05 Oct 2011 09:40:37 -0500 (CDT) Received: from comporellon.tachypleus.net ([unknown] [76.210.75.72]) by smtpauth2.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) with ESMTPSA id <0LSL00CP7KRM5O30@smtpauth2.wiscmail.wisc.edu>; Wed, 05 Oct 2011 09:40:34 -0500 (CDT) Date: Wed, 05 Oct 2011 09:40:33 -0500 From: Nathan Whitehorn In-reply-to: To: Craig Rodrigues Message-id: <4E8C6C61.7070200@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=76.210.75.72 X-Spam-PmxInfo: Server=avs-12, Version=5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.10.5.142714, SenderIP=76.210.75.72 References: <201110031513.p93FD9ev015593@svn.freebsd.org> <4E8B0982.8010508@freebsd.org> User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0) Gecko/20110928 Thunderbird/7.0 Cc: svn-src-head@freebsd.org, Daniel O'Connor , svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225937 - in head: . release release/amd64 release/i386 release/ia64 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 14:40:38 -0000 On 10/04/11 23:02, Craig Rodrigues wrote: > Nathan, > > I took at look at this page: > > http://wiki.pcbsd.org/index.php/Creating_an_Automated_Installation_with_pc-sysinstall > > and compared it to the man page for sysinstall: > > http://www.freebsd.org/cgi/man.cgi?query=sysinstall&apropos=0&sektion=0&manpath=FreeBSD+8.2-RELEASE&arch=default&format=html > > > pc-sysinstall pretty much does all of the same stuff as sysinstall, > and even many of the variable names are the same. pc-sysinstall > seems far superior to sysinstall. > > In the timeframe before 10.0, do you think it is worth doing the following: > > (1) import pc-sysinstall into FreeBSD > (2) make pc-sysinstall compatible with all the variables from the > > *or* if it is not worth doing (2) > > (3) provide a document somewhere that guides users in migrating their > old install.cfg syntax to pc-sysinstall (or bsdinstall). > > bsdinstall and pc-sysinstall are really good improvements! pc-sysinstall is already part of FreeBSD, and will be part of the 9.0 release. A manual for migration would probably be a good idea. -Nathan From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 15:50:05 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC70E106566B; Wed, 5 Oct 2011 15:50:05 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B71BA8FC08; Wed, 5 Oct 2011 15:50:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95Fo5ol018419; Wed, 5 Oct 2011 15:50:05 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95Fo5N1018417; Wed, 5 Oct 2011 15:50:05 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110051550.p95Fo5N1018417@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 5 Oct 2011 15:50:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226036 - stable/9/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 15:50:06 -0000 Author: jkim Date: Wed Oct 5 15:50:05 2011 New Revision: 226036 URL: http://svn.freebsd.org/changeset/base/226036 Log: MFC: r226035 Avoid accidental conflicts with C++ operator keywords. Approved by: re (kib) Modified: stable/9/include/iso646.h Directory Properties: stable/9/include/ (props changed) Modified: stable/9/include/iso646.h ============================================================================== --- stable/9/include/iso646.h Wed Oct 5 09:56:43 2011 (r226035) +++ stable/9/include/iso646.h Wed Oct 5 15:50:05 2011 (r226036) @@ -29,6 +29,8 @@ #ifndef _ISO646_H_ #define _ISO646_H_ +#ifndef __cplusplus + #define and && #define and_eq &= #define bitand & @@ -41,4 +43,6 @@ #define xor ^ #define xor_eq ^= +#endif /* !__cplusplus */ + #endif /* !_ISO646_H_ */ From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 15:52:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E755106564A; Wed, 5 Oct 2011 15:52:04 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D9848FC13; Wed, 5 Oct 2011 15:52:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95Fq4ZQ018516; Wed, 5 Oct 2011 15:52:04 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95Fq4bN018514; Wed, 5 Oct 2011 15:52:04 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110051552.p95Fq4bN018514@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 5 Oct 2011 15:52:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226037 - stable/8/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 15:52:04 -0000 Author: jkim Date: Wed Oct 5 15:52:04 2011 New Revision: 226037 URL: http://svn.freebsd.org/changeset/base/226037 Log: MFC: r225801 Avoid accidental conflicts with C++ operator keywords. Modified: stable/8/include/iso646.h Directory Properties: stable/8/include/ (props changed) Modified: stable/8/include/iso646.h ============================================================================== --- stable/8/include/iso646.h Wed Oct 5 15:50:05 2011 (r226036) +++ stable/8/include/iso646.h Wed Oct 5 15:52:04 2011 (r226037) @@ -29,6 +29,8 @@ #ifndef _ISO646_H_ #define _ISO646_H_ +#ifndef __cplusplus + #define and && #define and_eq &= #define bitand & @@ -41,4 +43,6 @@ #define xor ^ #define xor_eq ^= +#endif /* !__cplusplus */ + #endif /* !_ISO646_H_ */ From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 15:52:40 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7214A106566B; Wed, 5 Oct 2011 15:52:40 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 614BE8FC17; Wed, 5 Oct 2011 15:52:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95FqepI018568; Wed, 5 Oct 2011 15:52:40 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95FqebU018566; Wed, 5 Oct 2011 15:52:40 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110051552.p95FqebU018566@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 5 Oct 2011 15:52:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226038 - stable/7/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 15:52:40 -0000 Author: jkim Date: Wed Oct 5 15:52:40 2011 New Revision: 226038 URL: http://svn.freebsd.org/changeset/base/226038 Log: MFC: r225801 Avoid accidental conflicts with C++ operator keywords. Modified: stable/7/include/iso646.h Directory Properties: stable/7/include/ (props changed) Modified: stable/7/include/iso646.h ============================================================================== --- stable/7/include/iso646.h Wed Oct 5 15:52:04 2011 (r226037) +++ stable/7/include/iso646.h Wed Oct 5 15:52:40 2011 (r226038) @@ -29,6 +29,8 @@ #ifndef _ISO646_H_ #define _ISO646_H_ +#ifndef __cplusplus + #define and && #define and_eq &= #define bitand & @@ -41,4 +43,6 @@ #define xor ^ #define xor_eq ^= +#endif /* !__cplusplus */ + #endif /* !_ISO646_H_ */ From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 15:54:40 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by hub.freebsd.org (Postfix) with ESMTP id 86EF7106564A; Wed, 5 Oct 2011 15:54:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: src-committers@FreeBSD.org Date: Wed, 5 Oct 2011 11:54:26 -0400 User-Agent: KMail/1.6.2 References: <201110051550.p95Fo5N1018417@svn.freebsd.org> In-Reply-To: <201110051550.p95Fo5N1018417@svn.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201110051154.28931.jkim@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r226036 - stable/9/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 15:54:40 -0000 On Wednesday 05 October 2011 11:50 am, Jung-uk Kim wrote: > Author: jkim > Date: Wed Oct 5 15:50:05 2011 > New Revision: 226036 > URL: http://svn.freebsd.org/changeset/base/226036 > > Log: > MFC: r226035 ^^^^^^^ r225801 > > Avoid accidental conflicts with C++ operator keywords. > > Approved by: re (kib) Sorry for the copy-and-pasto. Jung-uk Kim From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 16:03:47 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8D801065670; Wed, 5 Oct 2011 16:03:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A8AA48FC0A; Wed, 5 Oct 2011 16:03:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95G3lSq018970; Wed, 5 Oct 2011 16:03:47 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95G3lYR018968; Wed, 5 Oct 2011 16:03:47 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201110051603.p95G3lYR018968@svn.freebsd.org> From: John Baldwin Date: Wed, 5 Oct 2011 16:03:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226039 - head/sys/x86/acpica X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 16:03:47 -0000 Author: jhb Date: Wed Oct 5 16:03:47 2011 New Revision: 226039 URL: http://svn.freebsd.org/changeset/base/226039 Log: Ignore SRAT memory entries if the memory range does not overlap with an existing phys_avail[] table. If a hw.physmem setting causes a memory domain to not be present in phys_avail[], the SRAT table will now be ignored rather than triggering a panic when a CPU in the missing domain tries to allocate a page. MFC after: 1 week Modified: head/sys/x86/acpica/srat.c Modified: head/sys/x86/acpica/srat.c ============================================================================== --- head/sys/x86/acpica/srat.c Wed Oct 5 15:52:40 2011 (r226038) +++ head/sys/x86/acpica/srat.c Wed Oct 5 16:03:47 2011 (r226039) @@ -59,6 +59,26 @@ static vm_paddr_t srat_physaddr; static void srat_walk_table(acpi_subtable_handler *handler, void *arg); +/* + * Returns true if a memory range overlaps with at least one range in + * phys_avail[]. + */ +static int +overlaps_phys_avail(vm_paddr_t start, vm_paddr_t end) +{ + int i; + + for (i = 0; phys_avail[i] != 0 && phys_avail[i + 1] != 0; i += 2) { + if (phys_avail[i + 1] < start) + continue; + if (phys_avail[i] < end) + return (1); + break; + } + return (0); + +} + static void srat_parse_entry(ACPI_SUBTABLE_HEADER *entry, void *arg) { @@ -111,6 +131,12 @@ srat_parse_entry(ACPI_SUBTABLE_HEADER *e "enabled" : "disabled"); if (!(mem->Flags & ACPI_SRAT_MEM_ENABLED)) break; + if (!overlaps_phys_avail(mem->BaseAddress, + mem->BaseAddress + mem->Length)) { + printf("SRAT: Ignoring memory at addr %jx\n", + (uintmax_t)mem->BaseAddress); + break; + } if (num_mem == VM_PHYSSEG_MAX) { printf("SRAT: Too many memory regions\n"); *(int *)arg = ENXIO; From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 16:27:11 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFE141065673; Wed, 5 Oct 2011 16:27:11 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9FB558FC14; Wed, 5 Oct 2011 16:27:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95GRB9N019799; Wed, 5 Oct 2011 16:27:11 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95GRBc1019797; Wed, 5 Oct 2011 16:27:11 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <201110051627.p95GRBc1019797@svn.freebsd.org> From: Qing Li Date: Wed, 5 Oct 2011 16:27:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226040 - head/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 16:27:11 -0000 Author: qingli Date: Wed Oct 5 16:27:11 2011 New Revision: 226040 URL: http://svn.freebsd.org/changeset/base/226040 Log: The IFA_RTSELF instead of the IFA_ROUTE flag should be checked to determine if a loopback route should be installed for an interface IPv6 address. Another condition is the address must not belong to a looopback interface. Reviewed by: hrs MFC after: 3 days Modified: head/sys/netinet6/in6.c Modified: head/sys/netinet6/in6.c ============================================================================== --- head/sys/netinet6/in6.c Wed Oct 5 16:03:47 2011 (r226039) +++ head/sys/netinet6/in6.c Wed Oct 5 16:27:11 2011 (r226040) @@ -1810,9 +1810,9 @@ in6_ifinit(struct ifnet *ifp, struct in6 /* * add a loopback route to self */ - if (!(ia->ia_flags & IFA_ROUTE) + if (!(ia->ia_flags & IFA_RTSELF) && (V_nd6_useloopback - || (ifp->if_flags & IFF_LOOPBACK))) { + && !(ifp->if_flags & IFF_LOOPBACK))) { error = ifa_add_loopback_route((struct ifaddr *)ia, (struct sockaddr *)&ia->ia_addr); if (error == 0) From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 16:34:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 894A51065672; Wed, 5 Oct 2011 16:34:08 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 648758FC15; Wed, 5 Oct 2011 16:34:08 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.5/8.14.5) with ESMTP id p95GY8w3019952; Wed, 5 Oct 2011 09:34:08 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.5/8.14.4/Submit) id p95GY7Uh019951; Wed, 5 Oct 2011 09:34:07 -0700 (PDT) (envelope-from obrien) Date: Wed, 5 Oct 2011 09:34:07 -0700 From: "David O'Brien" To: Alexander Best Message-ID: <20111005163407.GA19894@dragon.NUXI.org> References: <201109290631.p8T6VgJ3008377@svn.freebsd.org> <20110929121457.GA53600@freebsd.org> <11B87D92-4C1E-4AD9-BEC5-13D28B022FB1@FreeBSD.org> <20110929185700.GA18684@freebsd.org> <20111001124323.GA14050@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111001124323.GA14050@freebsd.org> X-Operating-System: FreeBSD 9.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.20 (2009-06-14) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Edward Tomasz Napiera?a Subject: Re: svn commit: r225868 - head/bin/ps X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 16:34:08 -0000 On Sat, Oct 01, 2011 at 12:43:23PM +0000, Alexander Best wrote: > we could then add an envar $PS, so users can set PS=-k to restore the Should be spelled "PS_OPTIONS" please. Many of us likely have "export PS=_____" in order to have dot files that support multiple OS's. This is also in-line with FreeBSD's existing "MALLOC_OPTIONS", "DIFF_OPTIONS", "GREP_OPTIONS", "GCC_OPTIONS", etc... -- -- David (obrien@FreeBSD.org) From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 16:39:57 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8402C106566B; Wed, 5 Oct 2011 16:39:57 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 5F99A8FC0C; Wed, 5 Oct 2011 16:39:57 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.5/8.14.5) with ESMTP id p95GHcv9019674; Wed, 5 Oct 2011 09:17:38 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.5/8.14.4/Submit) id p95GHbJv019673; Wed, 5 Oct 2011 09:17:37 -0700 (PDT) (envelope-from obrien) Date: Wed, 5 Oct 2011 09:17:37 -0700 From: "David O'Brien" To: Kip Macy Message-ID: <20111005161737.GA19568@dragon.NUXI.org> References: <201109161358.p8GDwptH024793@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201109161358.p8GDwptH024793@svn.freebsd.org> X-Operating-System: FreeBSD 9.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.20 (2009-06-14) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r225617 - in head/sys: amd64/amd64 amd64/linux32 arm/arm cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/sparc/dtrace compat/freebsd32 compat/linux compat/svr4 d... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 16:39:57 -0000 On Fri, Sep 16, 2011 at 01:58:51PM +0000, Kip Macy wrote: > Author: kmacy > Date: Fri Sep 16 13:58:51 2011 > New Revision: 225617 > Log: > In order to maximize the re-usability of kernel code in user space this > patch modifies makesyscalls.sh to prefix all of the non-compatibility > calls (e.g. not linux_, freebsd32_) with sys_ and updates the kernel > entry points and all places in the code that use them. It also Hi Kip, __FreeBSD_version does not seem to have been bumped for this. Unfortunately this change has made a kernel module we use at work unbuildable, and I don't have a __FreeBSD_version value to #ifdef on. If ever there was a change that needed __FreeBSD_version this is one. Can you please get __FreeBSD_version bumped in 9-STABLE along with 9-RELENG? thanks, -- -- David (obrien@FreeBSD.org) From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 16:50:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AF6810656B3; Wed, 5 Oct 2011 16:50:15 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A8C78FC08; Wed, 5 Oct 2011 16:50:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95GoFol020529; Wed, 5 Oct 2011 16:50:15 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95GoFL3020526; Wed, 5 Oct 2011 16:50:15 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110051650.p95GoFL3020526@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 5 Oct 2011 16:50:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226041 - in head/sys: fs/devfs sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 16:50:15 -0000 Author: kib Date: Wed Oct 5 16:50:15 2011 New Revision: 226041 URL: http://svn.freebsd.org/changeset/base/226041 Log: Export devfs inode number allocator for the kernel consumers. Reviewed by: jhb MFC after: 2 weeks Modified: head/sys/fs/devfs/devfs_devs.c head/sys/sys/conf.h Modified: head/sys/fs/devfs/devfs_devs.c ============================================================================== --- head/sys/fs/devfs/devfs_devs.c Wed Oct 5 16:27:11 2011 (r226040) +++ head/sys/fs/devfs/devfs_devs.c Wed Oct 5 16:50:15 2011 (r226041) @@ -171,8 +171,7 @@ devfs_free(struct cdev *cdev) cdp = cdev2priv(cdev); if (cdev->si_cred != NULL) crfree(cdev->si_cred); - if (cdp->cdp_inode > 0) - free_unr(devfs_inos, cdp->cdp_inode); + devfs_free_cdp_inode(cdp->cdp_inode); if (cdp->cdp_maxdirent > 0) free(cdp->cdp_dirents, M_DEVFS2); free(cdp, M_CDEVP); @@ -394,7 +393,7 @@ devfs_delete(struct devfs_mount *dm, str mac_devfs_destroy(de); #endif if (de->de_inode > DEVFS_ROOTINO) { - free_unr(devfs_inos, de->de_inode); + devfs_free_cdp_inode(de->de_inode); de->de_inode = 0; } if (DEVFS_DE_DROP(de)) @@ -685,6 +684,21 @@ devfs_destroy(struct cdev *dev) devfs_generation++; } +ino_t +devfs_alloc_cdp_inode(void) +{ + + return (alloc_unr(devfs_inos)); +} + +void +devfs_free_cdp_inode(ino_t ino) +{ + + if (ino > 0) + free_unr(devfs_inos, ino); +} + static void devfs_devs_init(void *junk __unused) { Modified: head/sys/sys/conf.h ============================================================================== --- head/sys/sys/conf.h Wed Oct 5 16:27:11 2011 (r226040) +++ head/sys/sys/conf.h Wed Oct 5 16:50:15 2011 (r226041) @@ -301,6 +301,9 @@ int devfs_set_cdevpriv(void *priv, cdevp void devfs_clear_cdevpriv(void); void devfs_fpdrop(struct file *fp); /* XXX This is not public KPI */ +ino_t devfs_alloc_cdp_inode(void); +void devfs_free_cdp_inode(ino_t ino); + #define UID_ROOT 0 #define UID_BIN 3 #define UID_UUCP 66 From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 16:56:07 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F41F11065673; Wed, 5 Oct 2011 16:56:06 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA3108FC21; Wed, 5 Oct 2011 16:56:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95Gu6jg020747; Wed, 5 Oct 2011 16:56:06 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95Gu6Cw020744; Wed, 5 Oct 2011 16:56:06 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110051656.p95Gu6Cw020744@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 5 Oct 2011 16:56:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226042 - in head/sys: kern sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 16:56:07 -0000 Author: kib Date: Wed Oct 5 16:56:06 2011 New Revision: 226042 URL: http://svn.freebsd.org/changeset/base/226042 Log: Supply unique (st_dev, st_ino) value pair for the fstat(2) done on the pipes. Reviewed by: jhb, Peter Jeremy MFC after: 2 weeks Modified: head/sys/kern/sys_pipe.c head/sys/sys/pipe.h Modified: head/sys/kern/sys_pipe.c ============================================================================== --- head/sys/kern/sys_pipe.c Wed Oct 5 16:50:15 2011 (r226041) +++ head/sys/kern/sys_pipe.c Wed Oct 5 16:56:06 2011 (r226042) @@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -224,6 +225,8 @@ static int pipe_zone_init(void *mem, int static void pipe_zone_fini(void *mem, int size); static uma_zone_t pipe_zone; +static struct unrhdr *pipeino_unr; +static dev_t pipedev_ino; SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_ANY, pipeinit, NULL); @@ -235,6 +238,10 @@ pipeinit(void *dummy __unused) pipe_zone_ctor, NULL, pipe_zone_init, pipe_zone_fini, UMA_ALIGN_PTR, 0); KASSERT(pipe_zone != NULL, ("pipe_zone not initialized")); + pipeino_unr = new_unrhdr(1, INT32_MAX, NULL); + KASSERT(pipeino_unr != NULL, ("pipe fake inodes not initialized")); + pipedev_ino = devfs_alloc_cdp_inode(); + KASSERT(pipedev_ino > 0, ("pipe dev inode not initialized")); } static int @@ -562,6 +569,12 @@ pipe_create(pipe, backing) /* If we're not backing this pipe, no need to do anything. */ error = 0; } + if (error == 0) { + pipe->pipe_ino = alloc_unr(pipeino_unr); + if (pipe->pipe_ino == -1) + /* pipeclose will clear allocated kva */ + error = ENOMEM; + } return (error); } @@ -1408,9 +1421,10 @@ pipe_stat(fp, ub, active_cred, td) ub->st_ctim = pipe->pipe_ctime; ub->st_uid = fp->f_cred->cr_uid; ub->st_gid = fp->f_cred->cr_gid; + ub->st_dev = pipedev_ino; + ub->st_ino = pipe->pipe_ino; /* - * Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen. - * XXX (st_dev, st_ino) should be unique. + * Left as 0: st_nlink, st_rdev, st_flags, st_gen. */ return (0); } @@ -1463,6 +1477,7 @@ pipeclose(cpipe) { struct pipepair *pp; struct pipe *ppipe; + ino_t ino; KASSERT(cpipe != NULL, ("pipeclose: cpipe == NULL")); @@ -1521,6 +1536,12 @@ pipeclose(cpipe) knlist_destroy(&cpipe->pipe_sel.si_note); /* + * Postpone the destroy of the fake inode number allocated for + * our end, until pipe mtx is unlocked. + */ + ino = cpipe->pipe_ino; + + /* * If both endpoints are now closed, release the memory for the * pipe pair. If not, unlock. */ @@ -1532,6 +1553,9 @@ pipeclose(cpipe) uma_zfree(pipe_zone, cpipe->pipe_pair); } else PIPE_UNLOCK(cpipe); + + if (ino > 0) + free_unr(pipeino_unr, cpipe->pipe_ino); } /*ARGSUSED*/ Modified: head/sys/sys/pipe.h ============================================================================== --- head/sys/sys/pipe.h Wed Oct 5 16:50:15 2011 (r226041) +++ head/sys/sys/pipe.h Wed Oct 5 16:56:06 2011 (r226042) @@ -112,6 +112,7 @@ struct pipe { u_int pipe_state; /* pipe status info */ int pipe_busy; /* busy flag, mostly to handle rundown sanely */ int pipe_present; /* still present? */ + ino_t pipe_ino; /* fake inode for stat(2) */ }; /* From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 17:29:50 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75092106564A; Wed, 5 Oct 2011 17:29:50 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F36BC8FC1B; Wed, 5 Oct 2011 17:29:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95HTnRg021883; Wed, 5 Oct 2011 17:29:49 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95HTnq2021881; Wed, 5 Oct 2011 17:29:49 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201110051729.p95HTnq2021881@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 5 Oct 2011 17:29:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226043 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 17:29:50 -0000 Author: trasz Date: Wed Oct 5 17:29:49 2011 New Revision: 226043 URL: http://svn.freebsd.org/changeset/base/226043 Log: Remove assertion against empty NFSv4 ACLs. An empty ACL is not exactly valid - we don't allow for setting it on a file, for example - but it's not something we should assert on. For STABLE kernel, it changes nothing, because it's not compiled with INVARIANTS. If it was, it would fix crashes. It also fixes an assert in libc encountered with NFSv4 without nfsuserd(8) running. Submitted by: Yuri Pankov (earlier version) MFC after: 1 month Modified: head/sys/kern/subr_acl_nfs4.c Modified: head/sys/kern/subr_acl_nfs4.c ============================================================================== --- head/sys/kern/subr_acl_nfs4.c Wed Oct 5 16:56:06 2011 (r226042) +++ head/sys/kern/subr_acl_nfs4.c Wed Oct 5 17:29:49 2011 (r226043) @@ -114,7 +114,6 @@ _acl_denies(const struct acl *aclp, int if (denied_explicitly != NULL) *denied_explicitly = 0; - KASSERT(aclp->acl_cnt > 0, ("aclp->acl_cnt > 0")); KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES, ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); @@ -723,7 +722,6 @@ acl_nfs4_sync_mode_from_acl(mode_t *_mod mode_t old_mode = *_mode, mode = 0, seen = 0; const struct acl_entry *entry; - KASSERT(aclp->acl_cnt > 0, ("aclp->acl_cnt > 0")); KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES, ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); @@ -854,7 +852,6 @@ acl_nfs4_compute_inherited_acl_draft(con struct acl_entry *entry, *copy; KASSERT(child_aclp->acl_cnt == 0, ("child_aclp->acl_cnt == 0")); - KASSERT(parent_aclp->acl_cnt > 0, ("parent_aclp->acl_cnt > 0")); KASSERT(parent_aclp->acl_cnt <= ACL_MAX_ENTRIES, ("parent_aclp->acl_cnt <= ACL_MAX_ENTRIES")); @@ -1017,7 +1014,6 @@ acl_nfs4_inherit_entries(const struct ac const struct acl_entry *parent_entry; struct acl_entry *entry; - KASSERT(parent_aclp->acl_cnt > 0, ("parent_aclp->acl_cnt > 0")); KASSERT(parent_aclp->acl_cnt <= ACL_MAX_ENTRIES, ("parent_aclp->acl_cnt <= ACL_MAX_ENTRIES")); From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 18:16:11 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id E27AE1065670; Wed, 5 Oct 2011 18:16:11 +0000 (UTC) Date: Wed, 5 Oct 2011 18:16:11 +0000 From: Alexander Best To: David O'Brien Message-ID: <20111005181611.GA67812@freebsd.org> References: <201109290631.p8T6VgJ3008377@svn.freebsd.org> <20110929121457.GA53600@freebsd.org> <11B87D92-4C1E-4AD9-BEC5-13D28B022FB1@FreeBSD.org> <20110929185700.GA18684@freebsd.org> <20111001124323.GA14050@freebsd.org> <20111005163407.GA19894@dragon.NUXI.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111005163407.GA19894@dragon.NUXI.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Edward Tomasz Napiera?a Subject: Re: svn commit: r225868 - head/bin/ps X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 18:16:12 -0000 On Wed Oct 5 11, David O'Brien wrote: > On Sat, Oct 01, 2011 at 12:43:23PM +0000, Alexander Best wrote: > > we could then add an envar $PS, so users can set PS=-k to restore the > > Should be spelled "PS_OPTIONS" please. Many of us likely have > "export PS=_____" in order to have dot files that support multiple OS's. > > This is also in-line with FreeBSD's existing "MALLOC_OPTIONS", > "DIFF_OPTIONS", "GREP_OPTIONS", "GCC_OPTIONS", etc... thanks for the hint. *if* it is being decided that ps(1) should get its own envar, i'll make sure "PS_OPTIONS" gets chosen as the identifier. ;) cheers. alex > > -- > -- David (obrien@FreeBSD.org) From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 19:58:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AD8B1065670; Wed, 5 Oct 2011 19:58:00 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 39BF18FC12; Wed, 5 Oct 2011 19:58:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95Jw0DN026506; Wed, 5 Oct 2011 19:58:00 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95Jw0lb026504; Wed, 5 Oct 2011 19:58:00 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201110051958.p95Jw0lb026504@svn.freebsd.org> From: Martin Matuska Date: Wed, 5 Oct 2011 19:58:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226044 - stable/9/cddl/contrib/opensolaris/lib/libzfs/common X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 19:58:00 -0000 Author: mm Date: Wed Oct 5 19:57:59 2011 New Revision: 226044 URL: http://svn.freebsd.org/changeset/base/226044 Log: MFC r225828: Remove assertion that prevents zfs rename of datasets with mountpoint=none or mountpoint=legacy that have children datasets. This also fixes dataset rename when receiving incremental snapshots as reported on freebsd-fs@ This assertion was made triggerable by opensolaris change #10196. PR: bin/160400 Reviewed by: pjd Approved by: re (kib) Modified: stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Directory Properties: stable/9/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Wed Oct 5 17:29:49 2011 (r226043) +++ stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Wed Oct 5 19:57:59 2011 (r226044) @@ -467,7 +467,6 @@ change_one(zfs_handle_t *zhp, void *data * This is necessary when the original mountpoint * is legacy or none. */ - ASSERT(!clp->cl_alldependents); verify(uu_list_insert_before(clp->cl_list, uu_list_first(clp->cl_list), cn) == 0); } From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 20:00:50 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93EBE106566B; Wed, 5 Oct 2011 20:00:50 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 82EAF8FC15; Wed, 5 Oct 2011 20:00:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95K0oOv026669; Wed, 5 Oct 2011 20:00:50 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95K0o1c026667; Wed, 5 Oct 2011 20:00:50 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201110052000.p95K0o1c026667@svn.freebsd.org> From: Martin Matuska Date: Wed, 5 Oct 2011 20:00:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226045 - stable/8/cddl/contrib/opensolaris/lib/libzfs/common X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 20:00:50 -0000 Author: mm Date: Wed Oct 5 20:00:50 2011 New Revision: 226045 URL: http://svn.freebsd.org/changeset/base/226045 Log: MFC r225828: Remove assertion that prevents zfs rename of datasets with mountpoint=none or mountpoint=legacy that have children datasets. This also fixes dataset rename when receiving incremental snapshots as reported on freebsd-fs@ This assertion was made triggerable by opensolaris change #10196. PR: bin/160400 Reviewed by: pjd Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Directory Properties: stable/8/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c ============================================================================== --- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Wed Oct 5 19:57:59 2011 (r226044) +++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Wed Oct 5 20:00:50 2011 (r226045) @@ -467,7 +467,6 @@ change_one(zfs_handle_t *zhp, void *data * This is necessary when the original mountpoint * is legacy or none. */ - ASSERT(!clp->cl_alldependents); verify(uu_list_insert_before(clp->cl_list, uu_list_first(clp->cl_list), cn) == 0); } From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 22:08:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12AA41065673; Wed, 5 Oct 2011 22:08:18 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F3CF98FC0C; Wed, 5 Oct 2011 22:08:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95M8HBY030582; Wed, 5 Oct 2011 22:08:17 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95M8H3C030566; Wed, 5 Oct 2011 22:08:17 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110052208.p95M8H3C030566@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Wed, 5 Oct 2011 22:08:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226046 - in head: crypto/openssh crypto/openssh/openbsd-compat secure/usr.sbin/sshd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 22:08:18 -0000 Author: des Date: Wed Oct 5 22:08:17 2011 New Revision: 226046 URL: http://svn.freebsd.org/changeset/base/226046 Log: Upgrade to OpenSSH 5.9p1. MFC after: 3 months Added: head/crypto/openssh/sandbox-darwin.c - copied unchanged from r225834, vendor-crypto/openssh/dist/sandbox-darwin.c head/crypto/openssh/sandbox-null.c - copied unchanged from r225834, vendor-crypto/openssh/dist/sandbox-null.c head/crypto/openssh/sandbox-rlimit.c - copied unchanged from r225834, vendor-crypto/openssh/dist/sandbox-rlimit.c head/crypto/openssh/sandbox-systrace.c - copied unchanged from r225834, vendor-crypto/openssh/dist/sandbox-systrace.c head/crypto/openssh/ssh-sandbox.h - copied unchanged from r225834, vendor-crypto/openssh/dist/ssh-sandbox.h Deleted: head/crypto/openssh/WARNING.RNG head/crypto/openssh/ssh-rand-helper.8 head/crypto/openssh/ssh-rand-helper.c Modified: head/crypto/openssh/ChangeLog head/crypto/openssh/INSTALL head/crypto/openssh/PROTOCOL.mux head/crypto/openssh/README head/crypto/openssh/aclocal.m4 head/crypto/openssh/audit-linux.c (contents, props changed) head/crypto/openssh/auth-rsa.c head/crypto/openssh/auth-skey.c head/crypto/openssh/auth.c head/crypto/openssh/auth.h head/crypto/openssh/auth2-gss.c head/crypto/openssh/auth2-pubkey.c head/crypto/openssh/auth2.c head/crypto/openssh/authfd.c head/crypto/openssh/authfile.c head/crypto/openssh/authfile.h head/crypto/openssh/channels.c head/crypto/openssh/channels.h head/crypto/openssh/clientloop.c head/crypto/openssh/clientloop.h head/crypto/openssh/config.guess head/crypto/openssh/config.h head/crypto/openssh/config.h.in head/crypto/openssh/defines.h head/crypto/openssh/entropy.c head/crypto/openssh/gss-serv.c head/crypto/openssh/key.c head/crypto/openssh/log.c head/crypto/openssh/log.h head/crypto/openssh/mac.c head/crypto/openssh/misc.c head/crypto/openssh/misc.h head/crypto/openssh/moduli.5 head/crypto/openssh/monitor.c head/crypto/openssh/monitor.h head/crypto/openssh/monitor_wrap.c head/crypto/openssh/monitor_wrap.h head/crypto/openssh/mux.c head/crypto/openssh/myproposal.h head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h head/crypto/openssh/openbsd-compat/openssl-compat.c head/crypto/openssh/openbsd-compat/openssl-compat.h head/crypto/openssh/openbsd-compat/port-linux.c head/crypto/openssh/openbsd-compat/port-linux.h head/crypto/openssh/packet.c head/crypto/openssh/packet.h head/crypto/openssh/pathnames.h head/crypto/openssh/readconf.c head/crypto/openssh/readconf.h head/crypto/openssh/servconf.c head/crypto/openssh/servconf.h head/crypto/openssh/serverloop.c head/crypto/openssh/session.c head/crypto/openssh/sftp-server.c head/crypto/openssh/sftp.1 head/crypto/openssh/ssh-add.c head/crypto/openssh/ssh-agent.c head/crypto/openssh/ssh-keygen.1 head/crypto/openssh/ssh-keygen.c head/crypto/openssh/ssh-keyscan.c head/crypto/openssh/ssh-keysign.c head/crypto/openssh/ssh-pkcs11-helper.c head/crypto/openssh/ssh-pkcs11.c head/crypto/openssh/ssh.1 head/crypto/openssh/ssh.c head/crypto/openssh/ssh_config head/crypto/openssh/ssh_config.5 head/crypto/openssh/ssh_namespace.h head/crypto/openssh/sshconnect.c head/crypto/openssh/sshconnect2.c head/crypto/openssh/sshd.8 head/crypto/openssh/sshd.c head/crypto/openssh/sshd_config head/crypto/openssh/sshd_config.5 head/crypto/openssh/version.h head/secure/usr.sbin/sshd/Makefile Directory Properties: head/crypto/openssh/ (props changed) head/crypto/openssh/bufec.c (props changed) head/crypto/openssh/kexecdh.c (props changed) head/crypto/openssh/kexecdhc.c (props changed) head/crypto/openssh/kexecdhs.c (props changed) head/crypto/openssh/openbsd-compat/charclass.h (props changed) head/crypto/openssh/openbsd-compat/sha2.c (props changed) head/crypto/openssh/openbsd-compat/sha2.h (props changed) head/crypto/openssh/openbsd-compat/strptime.c (props changed) head/crypto/openssh/openbsd-compat/timingsafe_bcmp.c (props changed) head/crypto/openssh/ssh-ecdsa.c (props changed) Modified: head/crypto/openssh/ChangeLog ============================================================================== --- head/crypto/openssh/ChangeLog Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/ChangeLog Wed Oct 5 22:08:17 2011 (r226046) @@ -1,13 +1,463 @@ -20110403 +20110906 + - (djm) [README version.h] Correct version + - (djm) [contrib/redhat/openssh.spec] Correct restorcon => restorecon + - (djm) Respin OpenSSH-5.9p1 release + +20110905 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - [contrib/suse/openssh.spec] Prepare for 5.8p2 release. - - (djm) [version.h] crank version - - Release 5.8p2 - -20110329 - - (djm) [entropy.c] closefrom() before running ssh-rand-helper; leftover fds - noticed by tmraz AT redhat.com - + [contrib/suse/openssh.spec] Update version numbers. + +20110904 + - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal + regress errors for the sandbox to warnings. ok tim dtucker + - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations + ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen + support. + +20110829 + - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting + to switch SELinux context away from unconfined_t, based on patch from + Jan Chadima; bz#1919 ok dtucker@ + +20110827 + - (dtucker) [auth-skey.c] Add log.h to fix build --with-skey. + +20110818 + - (tim) [configure.ac] Typo in error message spotted by Andy Tsouladze + +20110817 + - (tim) [mac.c myproposal.h] Wrap SHA256 and SHA512 in ifdefs for + OpenSSL 0.9.7. ok djm + - (djm) [ openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h] + binary_pipe is no longer required on Cygwin; patch from Corinna Vinschen + - (djm) [configure.ac] error out if the host lacks the necessary bits for + an explicitly requested sandbox type + - (djm) [contrib/ssh-copy-id] Missing backlslash; spotted by + bisson AT archlinux.org + - (djm) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2011/06/03 05:35:10 + [regress/cfgmatch.sh] + use OBJ to find test configs, patch from Tim Rice + - markus@cvs.openbsd.org 2011/06/30 22:44:43 + [regress/connect-privsep.sh] + test with sandbox enabled; ok djm@ + - djm@cvs.openbsd.org 2011/08/02 01:23:41 + [regress/cipher-speed.sh regress/try-ciphers.sh] + add SHA256/SHA512 based HMAC modes + - (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2 + MAC tests for platforms that hack EVP_SHA2 support + +20110812 + - (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context + change error by reporting old and new context names Patch from + jchadima at redhat. + - (djm) [contrib/redhat/openssh.spec contrib/redhat/sshd.init] + [contrib/suse/openssh.spec contrib/suse/rc.sshd] Updated RHEL and SLES + init scrips from imorgan AT nas.nasa.gov; bz#1920 + - (djm) [contrib/ssh-copy-id] Fix failure for cases where the path to the + identify file contained whitespace. bz#1828 patch from gwenael.lambrouin + AT gmail.com; ok dtucker@ + +20110807 + - (dtucker) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2008/06/26 06:59:39 + [moduli.5] + tweak previous; + - sobrado@cvs.openbsd.org 2009/10/28 08:56:54 + [moduli.5] + "Diffie-Hellman" is the usual spelling for the cryptographic protocol + first published by Whitfield Diffie and Martin Hellman in 1976. + ok jmc@ + - jmc@cvs.openbsd.org 2010/10/14 20:41:28 + [moduli.5] + probabalistic -> probabilistic; from naddy + - dtucker@cvs.openbsd.org 2011/08/07 12:55:30 + [sftp.1] + typo, fix from Laurent Gautrot + +20110805 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/06/23 23:35:42 + [monitor.c] + ignore EINTR errors from poll() + - tedu@cvs.openbsd.org 2011/07/06 18:09:21 + [authfd.c] + bzero the agent address. the kernel was for a while very cranky about + these things. evne though that's fixed, always good to initialize + memory. ok deraadt djm + - djm@cvs.openbsd.org 2011/07/29 14:42:45 + [sandbox-systrace.c] + fail open(2) with EPERM rather than SIGKILLing the whole process. libc + will call open() to do strerror() when NLS is enabled; + feedback and ok markus@ + - markus@cvs.openbsd.org 2011/08/01 19:18:15 + [gss-serv.c] + prevent post-auth resource exhaustion (int overflow leading to 4GB malloc); + report Adam Zabrock; ok djm@, deraadt@ + - djm@cvs.openbsd.org 2011/08/02 01:22:11 + [mac.c myproposal.h ssh.1 ssh_config.5 sshd.8 sshd_config.5] + Add new SHA256 and SHA512 based HMAC modes from + http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt + Patch from mdb AT juniper.net; feedback and ok markus@ + - djm@cvs.openbsd.org 2011/08/02 23:13:01 + [version.h] + crank now, release later + - djm@cvs.openbsd.org 2011/08/02 23:15:03 + [ssh.c] + typo in comment + +20110624 + - (djm) [configure.ac Makefile.in sandbox-darwin.c] Add a sandbox for + Darwin/OS X using sandbox_init() + setrlimit(); feedback and testing + markus@ + +20110623 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/06/22 21:47:28 + [servconf.c] + reuse the multistate option arrays to pretty-print options for "sshd -T" + - djm@cvs.openbsd.org 2011/06/22 21:57:01 + [servconf.c servconf.h sshd.c sshd_config.5] + [configure.ac Makefile.in] + introduce sandboxing of the pre-auth privsep child using systrace(4). + + This introduces a new "UsePrivilegeSeparation=sandbox" option for + sshd_config that applies mandatory restrictions on the syscalls the + privsep child can perform. This prevents a compromised privsep child + from being used to attack other hosts (by opening sockets and proxying) + or probing local kernel attack surface. + + The sandbox is implemented using systrace(4) in unsupervised "fast-path" + mode, where a list of permitted syscalls is supplied. Any syscall not + on the list results in SIGKILL being sent to the privsep child. Note + that this requires a kernel with the new SYSTR_POLICY_KILL option. + + UsePrivilegeSeparation=sandbox will become the default in the future + so please start testing it now. + + feedback dtucker@; ok markus@ + - djm@cvs.openbsd.org 2011/06/22 22:08:42 + [channels.c channels.h clientloop.c clientloop.h mux.c ssh.c] + hook up a channel confirm callback to warn the user then requested X11 + forwarding was refused by the server; ok markus@ + - djm@cvs.openbsd.org 2011/06/23 09:34:13 + [sshd.c ssh-sandbox.h sandbox.h sandbox-rlimit.c sandbox-systrace.c] + [sandbox-null.c] + rename sandbox.h => ssh-sandbox.h to make things easier for portable + - (djm) [sandbox-null.c] Dummy sandbox for platforms that don't support + setrlimit(2) + +20110620 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/06/04 00:10:26 + [ssh_config.5] + explain IdentifyFile's semantics a little better, prompted by bz#1898 + ok dtucker jmc + - markus@cvs.openbsd.org 2011/06/14 22:49:18 + [authfile.c] + make sure key_parse_public/private_rsa1() no longer consumes its input + buffer. fixes ssh-add for passphrase-protected ssh1-keys; + noted by naddy@; ok djm@ + - djm@cvs.openbsd.org 2011/06/17 21:44:31 + [log.c log.h monitor.c monitor.h monitor_wrap.c monitor_wrap.h sshd.c] + make the pre-auth privsep slave log via a socketpair shared with the + monitor rather than /var/empty/dev/log; ok dtucker@ deraadt@ markus@ + - djm@cvs.openbsd.org 2011/06/17 21:46:16 + [sftp-server.c] + the protocol version should be unsigned; bz#1913 reported by mb AT + smartftp.com + - djm@cvs.openbsd.org 2011/06/17 21:47:35 + [servconf.c] + factor out multi-choice option parsing into a parse_multistate label + and some support structures; ok dtucker@ + - djm@cvs.openbsd.org 2011/06/17 21:57:25 + [clientloop.c] + setproctitle for a mux master that has been gracefully stopped; + bz#1911 from Bert.Wesarg AT googlemail.com + +20110603 + - (dtucker) [README version.h contrib/caldera/openssh.spec + contrib/redhat/openssh.spec contrib/suse/openssh.spec] Pull the version + bumps from the 5.8p2 branch into HEAD. ok djm. + - (tim) [configure.ac defines.h] Run test program to detect system mail + directory. Add --with-maildir option to override. Fixed OpenServer 6 + getting it wrong. Fixed many systems having MAIL=/var/mail//username + ok dtucker + - (dtucker) [monitor.c] Remove the !HAVE_SOCKETPAIR case. We use socketpair + unconditionally in other places and the survey data we have does not show + any systems that use it. "nuke it" djm@ + - (djm) [configure.ac] enable setproctitle emulation for OS X + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/06/03 00:54:38 + [ssh.c] + bz#1883 - setproctitle() to identify mux master; patch from Bert.Wesarg + AT googlemail.com; ok dtucker@ + NB. includes additional portability code to enable setproctitle emulation + on platforms that don't support it. + - dtucker@cvs.openbsd.org 2011/06/03 01:37:40 + [ssh-agent.c] + Check current parent process ID against saved one to determine if the parent + has exited, rather than attempting to send a zero signal, since the latter + won't work if the parent has changed privs. bz#1905, patch from Daniel Kahn + Gillmor, ok djm@ + - dtucker@cvs.openbsd.org 2011/05/31 02:01:58 + [regress/dynamic-forward.sh] + back out revs 1.6 and 1.5 since it's not reliable + - dtucker@cvs.openbsd.org 2011/05/31 02:03:34 + [regress/dynamic-forward.sh] + work around startup and teardown races; caught by deraadt + - dtucker@cvs.openbsd.org 2011/06/03 00:29:52 + [regress/dynamic-forward.sh] + Retry establishing the port forwarding after a small delay, should make + the tests less flaky when the previous test is slow to shut down and free + up the port. + - (tim) [regress/cfgmatch.sh] Build/test out of tree fix. + +20110529 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/05/23 03:30:07 + [auth-rsa.c auth.c auth.h auth2-pubkey.c monitor.c monitor_wrap.c] + [pathnames.h servconf.c servconf.h sshd.8 sshd_config sshd_config.5] + allow AuthorizedKeysFile to specify multiple files, separated by spaces. + Bring back authorized_keys2 as a default search path (to avoid breaking + existing users of this file), but override this in sshd_config so it will + be no longer used on fresh installs. Maybe in 2015 we can remove it + entierly :) + + feedback and ok markus@ dtucker@ + - djm@cvs.openbsd.org 2011/05/23 03:33:38 + [auth.c] + make secure_filename() spam debug logs less + - djm@cvs.openbsd.org 2011/05/23 03:52:55 + [sshconnect.c] + remove extra newline + - jmc@cvs.openbsd.org 2011/05/23 07:10:21 + [sshd.8 sshd_config.5] + tweak previous; ok djm + - djm@cvs.openbsd.org 2011/05/23 07:24:57 + [authfile.c] + read in key comments for v.2 keys (though note that these are not + passed over the agent protocol); bz#439, based on patch from binder + AT arago.de; ok markus@ + - djm@cvs.openbsd.org 2011/05/24 07:15:47 + [readconf.c readconf.h ssh.c ssh_config.5 sshconnect.c sshconnect2.c] + Remove undocumented legacy options UserKnownHostsFile2 and + GlobalKnownHostsFile2 by making UserKnownHostsFile/GlobalKnownHostsFile + accept multiple paths per line and making their defaults include + known_hosts2; ok markus + - djm@cvs.openbsd.org 2011/05/23 03:31:31 + [regress/cfgmatch.sh] + include testing of multiple/overridden AuthorizedKeysFiles + refactor to simply daemon start/stop and get rid of racy constructs + +20110520 + - (djm) [session.c] call setexeccon() before executing passwd for pw + changes; bz#1891 reported by jchadima AT redhat.com; ok dtucker@ + - (djm) [aclocal.m4 configure.ac] since gcc-4.x ignores all -Wno-options + options, we should corresponding -W-option when trying to determine + whether it is accepted. Also includes a warning fix on the program + fragment uses (bad main() return type). + bz#1900 and bz#1901 reported by g.esp AT free.fr; ok dtucker@ + - (djm) [servconf.c] remove leftover droppings of AuthorizedKeysFile2 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/05/15 08:09:01 + [authfd.c monitor.c serverloop.c] + use FD_CLOEXEC consistently; patch from zion AT x96.org + - djm@cvs.openbsd.org 2011/05/17 07:13:31 + [key.c] + fatal() if asked to generate a legacy ECDSA cert (these don't exist) + and fix the regress test that was trying to generate them :) + - djm@cvs.openbsd.org 2011/05/20 00:55:02 + [servconf.c] + the options TrustedUserCAKeys, RevokedKeysFile, AuthorizedKeysFile + and AuthorizedPrincipalsFile were not being correctly applied in + Match blocks, despite being overridable there; ok dtucker@ + - dtucker@cvs.openbsd.org 2011/05/20 02:00:19 + [servconf.c] + Add comment documenting what should be after the preauth check. ok djm + - djm@cvs.openbsd.org 2011/05/20 03:25:45 + [monitor.c monitor_wrap.c servconf.c servconf.h] + use a macro to define which string options to copy between configs + for Match. This avoids problems caused by forgetting to keep three + code locations in perfect sync and ordering + + "this is at once beautiful and horrible" + ok dtucker@ + - djm@cvs.openbsd.org 2011/05/17 07:13:31 + [regress/cert-userkey.sh] + fatal() if asked to generate a legacy ECDSA cert (these don't exist) + and fix the regress test that was trying to generate them :) + - djm@cvs.openbsd.org 2011/05/20 02:43:36 + [cert-hostkey.sh] + another attempt to generate a v00 ECDSA key that broke the test + ID sync only - portable already had this somehow + - dtucker@cvs.openbsd.org 2011/05/20 05:19:50 + [dynamic-forward.sh] + Prevent races in dynamic forwarding test; ok djm + - dtucker@cvs.openbsd.org 2011/05/20 06:32:30 + [dynamic-forward.sh] + fix dumb error in dynamic-forward test + +20110515 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/05/05 05:12:08 + [mux.c] + gracefully fall back when ControlPath is too large for a + sockaddr_un. ok markus@ as part of a larger diff + - dtucker@cvs.openbsd.org 2011/05/06 01:03:35 + [sshd_config] + clarify language about overriding defaults. bz#1892, from Petr Cerny + - djm@cvs.openbsd.org 2011/05/06 01:09:53 + [sftp.1] + mention that IPv6 addresses must be enclosed in square brackets; + bz#1845 + - djm@cvs.openbsd.org 2011/05/06 02:05:41 + [sshconnect2.c] + fix memory leak; bz#1849 ok dtucker@ + - djm@cvs.openbsd.org 2011/05/06 21:14:05 + [packet.c packet.h] + set traffic class for IPv6 traffic as we do for IPv4 TOS; + patch from lionel AT mamane.lu via Colin Watson in bz#1855; + ok markus@ + - djm@cvs.openbsd.org 2011/05/06 21:18:02 + [ssh.c ssh_config.5] + add a %L expansion (short-form of the local host name) for ControlPath; + sync some more expansions with LocalCommand; ok markus@ + - djm@cvs.openbsd.org 2011/05/06 21:31:38 + [readconf.c ssh_config.5] + support negated Host matching, e.g. + + Host *.example.org !c.example.org + User mekmitasdigoat + + Will match "a.example.org", "b.example.org", but not "c.example.org" + ok markus@ + - djm@cvs.openbsd.org 2011/05/06 21:34:32 + [clientloop.c mux.c readconf.c readconf.h ssh.c ssh_config.5] + Add a RequestTTY ssh_config option to allow configuration-based + control over tty allocation (like -t/-T); ok markus@ + - djm@cvs.openbsd.org 2011/05/06 21:38:58 + [ssh.c] + fix dropping from previous diff + - djm@cvs.openbsd.org 2011/05/06 22:20:10 + [PROTOCOL.mux] + fix numbering; from bert.wesarg AT googlemail.com + - jmc@cvs.openbsd.org 2011/05/07 23:19:39 + [ssh_config.5] + - tweak previous + - come consistency fixes + ok djm + - jmc@cvs.openbsd.org 2011/05/07 23:20:25 + [ssh.1] + +.It RequestTTY + - djm@cvs.openbsd.org 2011/05/08 12:52:01 + [PROTOCOL.mux clientloop.c clientloop.h mux.c] + improve our behaviour when TTY allocation fails: if we are in + RequestTTY=auto mode (the default), then do not treat at TTY + allocation error as fatal but rather just restore the local TTY + to cooked mode and continue. This is more graceful on devices that + never allocate TTYs. + + If RequestTTY is set to "yes" or "force", then failure to allocate + a TTY is fatal. + + ok markus@ + - djm@cvs.openbsd.org 2011/05/10 05:46:46 + [authfile.c] + despam debug() logs by detecting that we are trying to load a private key + in key_try_load_public() and returning early; ok markus@ + - djm@cvs.openbsd.org 2011/05/11 04:47:06 + [auth.c auth.h auth2-pubkey.c pathnames.h servconf.c servconf.h] + remove support for authorized_keys2; it is a relic from the early days + of protocol v.2 support and has been undocumented for many years; + ok markus@ + - djm@cvs.openbsd.org 2011/05/13 00:05:36 + [authfile.c] + warn on unexpected key type in key_parse_private_type() + - (djm) [packet.c] unbreak portability #endif + +20110510 + - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix + --with-ssl-engine which was broken with the change from deprecated + SSLeay_add_all_algorithms(). ok djm + +20110506 + - (dtucker) [openbsd-compat/regress/closefromtest.c] Bug #1875: add prototype + for closefrom() in test code. Report from Dan Wallis via Gentoo. + +20110505 + - (djm) [defines.h] Move up include of netinet/ip.h for IPTOS + definitions. From des AT des.no + - (djm) [Makefile.in WARNING.RNG aclocal.m4 buildpkg.sh.in configure.ac] + [entropy.c ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c] + [ssh-keysign.c ssh-pkcs11-helper.c ssh-rand-helper.8 ssh-rand-helper.c] + [ssh.c ssh_prng_cmds.in sshd.c contrib/aix/buildbff.sh] + [regress/README.regress] Remove ssh-rand-helper and all its + tentacles. PRNGd seeding has been rolled into entropy.c directly. + Thanks to tim@ for testing on affected platforms. + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/03/10 02:52:57 + [auth2-gss.c auth2.c auth.h] + allow GSSAPI authentication to detect when a server-side failure causes + authentication failure and don't count such failures against MaxAuthTries; + bz#1244 from simon AT sxw.org.uk; ok markus@ before lock + - okan@cvs.openbsd.org 2011/03/15 10:36:02 + [ssh-keyscan.c] + use timerclear macro + ok djm@ + - stevesk@cvs.openbsd.org 2011/03/23 15:16:22 + [ssh-keygen.1 ssh-keygen.c] + Add -A option. For each of the key types (rsa1, rsa, dsa and ecdsa) + for which host keys do not exist, generate the host keys with the + default key file path, an empty passphrase, default bits for the key + type, and default comment. This will be used by /etc/rc to generate + new host keys. Idea from deraadt. + ok deraadt + - stevesk@cvs.openbsd.org 2011/03/23 16:24:56 + [ssh-keygen.1] + -q not used in /etc/rc now so remove statement. + - stevesk@cvs.openbsd.org 2011/03/23 16:50:04 + [ssh-keygen.c] + remove -d, documentation removed >10 years ago; ok markus + - jmc@cvs.openbsd.org 2011/03/24 15:29:30 + [ssh-keygen.1] + zap trailing whitespace; + - stevesk@cvs.openbsd.org 2011/03/24 22:14:54 + [ssh-keygen.c] + use strcasecmp() for "clear" cert permission option also; ok djm + - stevesk@cvs.openbsd.org 2011/03/29 18:54:17 + [misc.c misc.h servconf.c] + print ipqos friendly string for sshd -T; ok markus + # sshd -Tf sshd_config|grep ipqos + ipqos lowdelay throughput + - djm@cvs.openbsd.org 2011/04/12 04:23:50 + [ssh-keygen.c] + fix -Wshadow + - djm@cvs.openbsd.org 2011/04/12 05:32:49 + [sshd.c] + exit with 0 status on SIGTERM; bz#1879 + - djm@cvs.openbsd.org 2011/04/13 04:02:48 + [ssh-keygen.1] + improve wording; bz#1861 + - djm@cvs.openbsd.org 2011/04/13 04:09:37 + [ssh-keygen.1] + mention valid -b sizes for ECDSA keys; bz#1862 + - djm@cvs.openbsd.org 2011/04/17 22:42:42 + [PROTOCOL.mux clientloop.c clientloop.h mux.c ssh.1 ssh.c] + allow graceful shutdown of multiplexing: request that a mux server + removes its listener socket and refuse future multiplexing requests; + ok markus@ + - djm@cvs.openbsd.org 2011/04/18 00:46:05 + [ssh-keygen.c] + certificate options are supposed to be packed in lexical order of + option name (though we don't actually enforce this at present). + Move one up that was out of sequence + - djm@cvs.openbsd.org 2011/05/04 21:15:29 + [authfile.c authfile.h ssh-add.c] + allow "ssh-add - < key"; feedback and ok markus@ + - (tim) [configure.ac] Add AC_LANG_SOURCE to OPENSSH_CHECK_CFLAG_COMPILE + so autoreconf 2.68 is happy. + - (tim) [defines.h] Deal with platforms that do not have S_IFSOCK ok djm@ + 20110221 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the Cygwin-specific service installer script ssh-host-config. The actual @@ -19,6 +469,13 @@ The new script also is more thorough to inform the user why the script failed. Patch from vinschen at redhat com. +20110218 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/02/16 00:31:14 + [ssh-keysign.c] + make hostbased auth with ECDSA keys work correctly. Based on patch + by harvey.eneman AT oracle.com in bz#1858; ok markus@ (pre-lock) + 20110206 - (dtucker) [openbsd-compat/port-linux.c] Bug #1851: fix syntax error in selinux code. Patch from Leonardo Chiquitto @@ -46,6 +503,14 @@ succeeded before using its result. Patch from cjwatson AT debian.org; bz#1851 +20110127 + - (tim) [config.guess config.sub] Sync with upstream. + - (tim) [configure.ac] Consistent M4 quoting throughout, updated obsolete + AC_TRY_COMPILE with AC_COMPILE_IFELSE, updated obsolete AC_TRY_LINK with + AC_LINK_IFELSE, updated obsolete AC_TRY_RUN with AC_RUN_IFELSE, misc white + space changes for consistency/readability. Makes autoconf 2.68 happy. + "Nice work" djm + 20110125 - (djm) [configure.ac Makefile.in ssh.c openbsd-compat/port-linux.c openbsd-compat/port-linux.h] Move SELinux-specific code from ssh.c to @@ -1256,4 +1721,3 @@ (use "ssh-keygen -t v00 -s ca_key ..." to generate a v00 certificate) ok markus@ - Modified: head/crypto/openssh/INSTALL ============================================================================== --- head/crypto/openssh/INSTALL Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/INSTALL Wed Oct 5 22:08:17 2011 (r226046) @@ -16,9 +16,7 @@ The remaining items are optional. NB. If you operating system supports /dev/random, you should configure OpenSSL to use it. OpenSSH relies on OpenSSL's direct support of -/dev/random, or failing that, either prngd or egd. If you don't have -any of these you will have to rely on ssh-rand-helper, which is inferior -to a good kernel-based solution or prngd. +/dev/random, or failing that, either prngd or egd PRNGD: @@ -262,4 +260,4 @@ Please refer to the "reporting bugs" sec http://www.openssh.com/ -$Id: INSTALL,v 1.85 2010/02/11 22:34:22 djm Exp $ +$Id: INSTALL,v 1.86 2011/05/05 03:48:37 djm Exp $ Modified: head/crypto/openssh/PROTOCOL.mux ============================================================================== --- head/crypto/openssh/PROTOCOL.mux Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/PROTOCOL.mux Wed Oct 5 22:08:17 2011 (r226046) @@ -73,6 +73,13 @@ non-multiplexed ssh(1) connection. Two a client must cope with are it receiving a signal itself and the server disconnecting without sending an exit message. +A master may also send a MUX_S_TTY_ALLOC_FAIL before MUX_S_EXIT_MESSAGE +if remote TTY allocation was unsuccessful. The client may use this to +return its local tty to "cooked" mode. + + uint32 MUX_S_TTY_ALLOC_FAIL + uint32 session id + 3. Health checks The client may request a health check/PID report from a server: @@ -149,10 +156,21 @@ The client then sends its standard input The contents of "reserved" are currently ignored. -A server may reply with a MUX_S_SESSION_OPEED, a MUX_S_PERMISSION_DENIED +A server may reply with a MUX_S_SESSION_OPENED, a MUX_S_PERMISSION_DENIED or a MUX_S_FAILURE. -8. Status messages +8. Requesting shutdown of mux listener + +A client may request the master to stop accepting new multiplexing requests +and remove its listener socket. + + uint32 MUX_C_STOP_LISTENING + uint32 request id + +A server may reply with a MUX_S_OK, a MUX_S_PERMISSION_DENIED or a +MUX_S_FAILURE. + +9. Status messages The MUX_S_OK message is empty: @@ -169,7 +187,7 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FA uint32 client request id string reason -9. Protocol numbers +10. Protocol numbers #define MUX_MSG_HELLO 0x00000001 #define MUX_C_NEW_SESSION 0x10000002 @@ -178,6 +196,7 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FA #define MUX_C_OPEN_FWD 0x10000006 #define MUX_C_CLOSE_FWD 0x10000007 #define MUX_C_NEW_STDIO_FWD 0x10000008 +#define MUX_C_STOP_LISTENING 0x10000009 #define MUX_S_OK 0x80000001 #define MUX_S_PERMISSION_DENIED 0x80000002 #define MUX_S_FAILURE 0x80000003 @@ -185,6 +204,7 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FA #define MUX_S_ALIVE 0x80000005 #define MUX_S_SESSION_OPENED 0x80000006 #define MUX_S_REMOTE_PORT 0x80000007 +#define MUX_S_TTY_ALLOC_FAIL 0x80000008 #define MUX_FWD_LOCAL 1 #define MUX_FWD_REMOTE 2 @@ -192,12 +212,10 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FA XXX TODO XXX extended status (e.g. report open channels / forwards) -XXX graceful close (delete listening socket, but keep existing sessions active) XXX lock (maybe) XXX watch in/out traffic (pre/post crypto) XXX inject packet (what about replies) XXX server->client error/warning notifications -XXX port0 rfwd (need custom response message) XXX send signals via mux -$OpenBSD: PROTOCOL.mux,v 1.4 2011/01/31 21:42:15 djm Exp $ +$OpenBSD: PROTOCOL.mux,v 1.7 2011/05/08 12:52:01 djm Exp $ Modified: head/crypto/openssh/README ============================================================================== --- head/crypto/openssh/README Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/README Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.8p2 for the release notes. +See http://www.openssh.com/txt/release-5.9 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ References - [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.75.4.2 2011/05/03 00:04:21 djm Exp $ +$Id: README,v 1.77.2.2 2011/09/06 23:11:20 djm Exp $ Modified: head/crypto/openssh/aclocal.m4 ============================================================================== --- head/crypto/openssh/aclocal.m4 Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/aclocal.m4 Wed Oct 5 22:08:17 2011 (r226046) @@ -1,8 +1,26 @@ -dnl $Id: aclocal.m4,v 1.6 2005/09/19 16:33:39 tim Exp $ +dnl $Id: aclocal.m4,v 1.8 2011/05/20 01:45:25 djm Exp $ dnl dnl OpenSSH-specific autoconf macros dnl +dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag]) +dnl Check that $CC accepts a flag 'check_flag'. If it is supported append +dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append +dnl 'check_flag'. +AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_MSG_CHECKING([if $CC supports $1]) + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + _define_flag="$2" + test "x$_define_flag" = "x" && _define_flag="$1" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])], + [ AC_MSG_RESULT([yes]) + CFLAGS="$saved_CFLAGS $_define_flag"], + [ AC_MSG_RESULT([no]) + CFLAGS="$saved_CFLAGS" ] + ) +}]) + dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol) dnl Does AC_EGREP_HEADER on 'header' for the string 'field' @@ -33,16 +51,6 @@ AC_DEFUN(OSSH_CHECK_HEADER_FOR_FIELD, [ fi ]) -dnl OSSH_PATH_ENTROPY_PROG(variablename, command): -dnl Tidiness function, sets 'undef' if not found, and does the AC_SUBST -AC_DEFUN(OSSH_PATH_ENTROPY_PROG, [ - AC_PATH_PROG($1, $2) - if test -z "[$]$1" ; then - $1="undef" - fi - AC_SUBST($1) -]) - dnl Check for socklen_t: historically on BSD it is an int, and in dnl POSIX 1g it is a type of its own, but some platforms use different dnl types for the argument to getsockopt, getpeername, etc. So we Modified: head/crypto/openssh/audit-linux.c ============================================================================== --- head/crypto/openssh/audit-linux.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/audit-linux.c Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: audit-linux.c,v 1.1 2011/01/17 10:15:30 dtucker Exp $ */ /* * Copyright 2010 Red Hat, Inc. All rights reserved. Modified: head/crypto/openssh/auth-rsa.c ============================================================================== --- head/crypto/openssh/auth-rsa.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/auth-rsa.c Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-rsa.c,v 1.79 2010/12/03 23:55:27 djm Exp $ */ +/* $OpenBSD: auth-rsa.c,v 1.80 2011/05/23 03:30:07 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -160,44 +160,27 @@ auth_rsa_challenge_dialog(Key *key) return (success); } -/* - * check if there's user key matching client_n, - * return key if login is allowed, NULL otherwise - */ - -int -auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) +static int +rsa_key_allowed_in_file(struct passwd *pw, char *file, + const BIGNUM *client_n, Key **rkey) { - char line[SSH_MAX_PUBKEY_BYTES], *file; + char line[SSH_MAX_PUBKEY_BYTES]; int allowed = 0; u_int bits; FILE *f; u_long linenum = 0; Key *key; - /* Temporarily use the user's uid. */ - temporarily_use_uid(pw); - - /* The authorized keys. */ - file = authorized_keys_file(pw); debug("trying public RSA key file %s", file); - f = auth_openkeyfile(file, pw, options.strict_modes); - if (!f) { - xfree(file); - restore_uid(); - return (0); - } - - /* Flag indicating whether the key is allowed. */ - allowed = 0; - - key = key_new(KEY_RSA1); + if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL) + return 0; /* * Go though the accepted keys, looking for the current key. If * found, perform a challenge-response dialog to verify that the * user really has the corresponding private key. */ + key = key_new(KEY_RSA1); while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { char *cp; char *key_options; @@ -235,7 +218,10 @@ auth_rsa_key_allowed(struct passwd *pw, } /* cp now points to the comment part. */ - /* Check if the we have found the desired key (identified by its modulus). */ + /* + * Check if the we have found the desired key (identified + * by its modulus). + */ if (BN_cmp(key->rsa->n, client_n) != 0) continue; @@ -264,11 +250,7 @@ auth_rsa_key_allowed(struct passwd *pw, break; } - /* Restore the privileged uid. */ - restore_uid(); - /* Close the file. */ - xfree(file); fclose(f); /* return key if allowed */ @@ -276,7 +258,33 @@ auth_rsa_key_allowed(struct passwd *pw, *rkey = key; else key_free(key); - return (allowed); + + return allowed; +} + +/* + * check if there's user key matching client_n, + * return key if login is allowed, NULL otherwise + */ + +int +auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) +{ + char *file; + u_int i, allowed = 0; + + temporarily_use_uid(pw); + + for (i = 0; !allowed && i < options.num_authkeys_files; i++) { + file = expand_authorized_keys( + options.authorized_keys_files[i], pw); + allowed = rsa_key_allowed_in_file(pw, file, client_n, rkey); + xfree(file); + } + + restore_uid(); + + return allowed; } /* Modified: head/crypto/openssh/auth-skey.c ============================================================================== --- head/crypto/openssh/auth-skey.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/auth-skey.c Wed Oct 5 22:08:17 2011 (r226046) @@ -39,6 +39,7 @@ #include "hostfile.h" #include "auth.h" #include "ssh-gss.h" +#include "log.h" #include "monitor_wrap.h" static void * Modified: head/crypto/openssh/auth.c ============================================================================== --- head/crypto/openssh/auth.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/auth.c Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.91 2010/11/29 23:45:51 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.94 2011/05/23 03:33:38 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -332,7 +332,7 @@ auth_root_allowed(char *method) * * This returns a buffer allocated by xmalloc. */ -static char * +char * expand_authorized_keys(const char *filename, struct passwd *pw) { char *file, ret[MAXPATHLEN]; @@ -356,18 +356,6 @@ expand_authorized_keys(const char *filen } char * -authorized_keys_file(struct passwd *pw) -{ - return expand_authorized_keys(options.authorized_keys_file, pw); -} - -char * -authorized_keys_file2(struct passwd *pw) -{ - return expand_authorized_keys(options.authorized_keys_file2, pw); -} - -char * authorized_principals_file(struct passwd *pw) { if (options.authorized_principals_file == NULL) @@ -469,7 +457,6 @@ secure_filename(FILE *f, const char *fil } strlcpy(buf, cp, sizeof(buf)); - debug3("secure_filename: checking '%s'", buf); if (stat(buf, &st) < 0 || (st.st_uid != 0 && st.st_uid != uid) || (st.st_mode & 022) != 0) { @@ -479,11 +466,9 @@ secure_filename(FILE *f, const char *fil } /* If are past the homedir then we can stop */ - if (comparehome && strcmp(homedir, buf) == 0) { - debug3("secure_filename: terminating check at '%s'", - buf); + if (comparehome && strcmp(homedir, buf) == 0) break; - } + /* * dirname should always complete with a "/" path, * but we can be paranoid and check for "." too Modified: head/crypto/openssh/auth.h ============================================================================== --- head/crypto/openssh/auth.h Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/auth.h Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.66 2010/05/07 11:30:29 djm Exp $ */ +/* $OpenBSD: auth.h,v 1.69 2011/05/23 03:30:07 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -53,6 +53,7 @@ struct Authctxt { int valid; /* user exists and is allowed to login */ int attempt; int failures; + int server_caused_failure; int force_pwchange; char *user; /* username sent by the client */ char *service; @@ -167,8 +168,7 @@ char *get_challenge(Authctxt *); int verify_response(Authctxt *, const char *); void abandon_challenge_response(Authctxt *); -char *authorized_keys_file(struct passwd *); -char *authorized_keys_file2(struct passwd *); +char *expand_authorized_keys(const char *, struct passwd *pw); char *authorized_principals_file(struct passwd *); FILE *auth_openkeyfile(const char *, struct passwd *, int); Modified: head/crypto/openssh/auth2-gss.c ============================================================================== --- head/crypto/openssh/auth2-gss.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/auth2-gss.c Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ +/* $OpenBSD: auth2-gss.c,v 1.17 2011/03/10 02:52:57 djm Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -102,6 +102,7 @@ userauth_gssapi(Authctxt *authctxt) if (!present) { xfree(doid); + authctxt->server_caused_failure = 1; return (0); } @@ -109,6 +110,7 @@ userauth_gssapi(Authctxt *authctxt) if (ctxt != NULL) ssh_gssapi_delete_ctx(&ctxt); xfree(doid); + authctxt->server_caused_failure = 1; return (0); } Modified: head/crypto/openssh/auth2-pubkey.c ============================================================================== --- head/crypto/openssh/auth2-pubkey.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/auth2-pubkey.c Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.27 2010/11/20 05:12:38 deraadt Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.29 2011/05/23 03:30:07 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -436,7 +436,7 @@ user_cert_trusted_ca(struct passwd *pw, int user_key_allowed(struct passwd *pw, Key *key) { - int success; + u_int success, i; char *file; if (auth_key_is_revoked(key)) @@ -448,16 +448,13 @@ user_key_allowed(struct passwd *pw, Key if (success) return success; - file = authorized_keys_file(pw); - success = user_key_allowed2(pw, key, file); - xfree(file); - if (success) - return success; + for (i = 0; !success && i < options.num_authkeys_files; i++) { + file = expand_authorized_keys( + options.authorized_keys_files[i], pw); + success = user_key_allowed2(pw, key, file); + xfree(file); + } - /* try suffix "2" for backward compat, too */ - file = authorized_keys_file2(pw); - success = user_key_allowed2(pw, key, file); - xfree(file); return success; } Modified: head/crypto/openssh/auth2.c ============================================================================== --- head/crypto/openssh/auth2.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/auth2.c Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.122 2010/08/31 09:58:37 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.123 2011/03/10 02:52:57 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -304,6 +304,7 @@ input_userauth_request(int type, u_int32 #endif authctxt->postponed = 0; + authctxt->server_caused_failure = 0; /* try to authenticate user */ m = authmethod_lookup(method); @@ -376,7 +377,8 @@ userauth_finish(Authctxt *authctxt, int } else { /* Allow initial try of "none" auth without failure penalty */ - if (authctxt->attempt > 1 || strcmp(method, "none") != 0) + if (!authctxt->server_caused_failure && + (authctxt->attempt > 1 || strcmp(method, "none") != 0)) authctxt->failures++; if (authctxt->failures >= options.max_authtries) { #ifdef SSH_AUDIT_EVENTS Modified: head/crypto/openssh/authfd.c ============================================================================== --- head/crypto/openssh/authfd.c Wed Oct 5 20:00:50 2011 (r226045) +++ head/crypto/openssh/authfd.c Wed Oct 5 22:08:17 2011 (r226046) @@ -1,4 +1,4 @@ -/* $OpenBSD: authfd.c,v 1.84 2010/08/31 11:54:45 djm Exp $ */ +/* $OpenBSD: authfd.c,v 1.86 2011/07/06 18:09:21 tedu Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -102,6 +102,7 @@ ssh_get_authentication_socket(void) if (!authsocket) return -1; + bzero(&sunaddr, sizeof(sunaddr)); sunaddr.sun_family = AF_UNIX; strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path)); @@ -110,7 +111,7 @@ ssh_get_authentication_socket(void) return -1; /* close on exec */ - if (fcntl(sock, F_SETFD, 1) == -1) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Wed Oct 5 23:21:42 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DDCB106566B; Wed, 5 Oct 2011 23:21:42 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) by mx1.freebsd.org (Postfix) with ESMTP id 43DF78FC16; Wed, 5 Oct 2011 23:21:42 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 5521925D3810; Wed, 5 Oct 2011 23:21:41 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 7F41ABD3C58; Wed, 5 Oct 2011 23:21:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id A5BI+tagqvTk; Wed, 5 Oct 2011 23:21:39 +0000 (UTC) Received: from [IPv6:::1] (shell.eq4-01.sbone.de [IPv6:fde9:577b:c1a9:3161::401:22]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 77D04BD3C2C; Wed, 5 Oct 2011 23:21:38 +0000 (UTC) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: "Bjoern A. Zeeb" In-Reply-To: <201110051627.p95GRBc1019797@svn.freebsd.org> Date: Wed, 5 Oct 2011 23:21:36 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <00D2231B-DB0D-420F-BE61-F6B982473159@lists.zabbadoz.net> References: <201110051627.p95GRBc1019797@svn.freebsd.org> To: Qing Li X-Mailer: Apple Mail (2.1084) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226040 - head/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 23:21:42 -0000 On 5. Oct 2011, at 16:27 , Qing Li wrote: > Author: qingli > Date: Wed Oct 5 16:27:11 2011 > New Revision: 226040 > URL: http://svn.freebsd.org/changeset/base/226040 >=20 > Log: > The IFA_RTSELF instead of the IFA_ROUTE flag should be checked to > determine if a loopback route should be installed for an interface > IPv6 address. Another condition is the address must not belong to a > looopback interface. If I set useloopback to 0 my loopback will no longer have a route to = itself anymore now? >=20 > Reviewed by: hrs > MFC after: 3 days >=20 > Modified: > head/sys/netinet6/in6.c >=20 > Modified: head/sys/netinet6/in6.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet6/in6.c Wed Oct 5 16:03:47 2011 = (r226039) > +++ head/sys/netinet6/in6.c Wed Oct 5 16:27:11 2011 = (r226040) > @@ -1810,9 +1810,9 @@ in6_ifinit(struct ifnet *ifp, struct in6 > /* > * add a loopback route to self > */ > - if (!(ia->ia_flags & IFA_ROUTE) > + if (!(ia->ia_flags & IFA_RTSELF) > && (V_nd6_useloopback > - || (ifp->if_flags & IFF_LOOPBACK))) { > + && !(ifp->if_flags & IFF_LOOPBACK))) { > error =3D ifa_add_loopback_route((struct ifaddr *)ia, > (struct sockaddr *)&ia->ia_addr); > if (error =3D=3D 0) --=20 Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family. From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 00:11:55 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E13AB10656EB; Thu, 6 Oct 2011 00:11:55 +0000 (UTC) (envelope-from tomelite82@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 7722E8FC18; Thu, 6 Oct 2011 00:11:50 +0000 (UTC) Received: by ggeq3 with SMTP id q3so1551161gge.13 for ; Wed, 05 Oct 2011 17:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=U/e0zPR7jR7kjzPH4uw1PfmgOhsW9C0fkahsQYBgKRA=; b=oRk1fL7LuD2S9jFXiuVL8VmYLoMKx2feXGh/0SDQstCr2qEaIttqs1zX0MHAUY+KBy LbaSKU9p3990T003Hq+Xskb30lR2axV+lEye2zok/ANPlqZeO+usj8A27gCTaxyA1O0+ FiWvBAnDqrmj6Ic+M02JRaqvAA6gMeQJCUcek= MIME-Version: 1.0 Received: by 10.150.131.2 with SMTP id e2mr105077ybd.10.1317858587977; Wed, 05 Oct 2011 16:49:47 -0700 (PDT) Sender: tomelite82@gmail.com Received: by 10.151.78.21 with HTTP; Wed, 5 Oct 2011 16:49:47 -0700 (PDT) In-Reply-To: <00D2231B-DB0D-420F-BE61-F6B982473159@lists.zabbadoz.net> References: <201110051627.p95GRBc1019797@svn.freebsd.org> <00D2231B-DB0D-420F-BE61-F6B982473159@lists.zabbadoz.net> Date: Wed, 5 Oct 2011 16:49:47 -0700 X-Google-Sender-Auth: wpySmkYnx2FChpl6fmkYX4LLBc4 Message-ID: From: Qing Li To: "Bjoern A. Zeeb" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226040 - head/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 00:11:56 -0000 Correct, but local addresses assigned to interfaces that support address resolution are still reachable. For those addresses mapped to pseduo interfaces, those are not reachable anyways. See ML thread http://unix.derkeiler.com/Mailing-Lists/FreeBSD/net/2009-09/msg00241.html --Qing On Wed, Oct 5, 2011 at 4:21 PM, Bjoern A. Zeeb wrote: > > On 5. Oct 2011, at 16:27 , Qing Li wrote: > >> Author: qingli >> Date: Wed Oct =A05 16:27:11 2011 >> New Revision: 226040 >> URL: http://svn.freebsd.org/changeset/base/226040 >> >> Log: >> =A0The IFA_RTSELF instead of the IFA_ROUTE flag should be checked to >> =A0determine if a loopback route should be installed for an interface >> =A0IPv6 address. Another condition is the address must not belong to a >> =A0looopback interface. > > If I set useloopback to 0 my loopback will no longer have a route to itse= lf anymore now? > >> >> =A0Reviewed by: hrs >> =A0MFC after: =A0 3 days >> >> Modified: >> =A0head/sys/netinet6/in6.c >> >> Modified: head/sys/netinet6/in6.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/netinet6/in6.c =A0 Wed Oct =A05 16:03:47 2011 =A0 =A0 =A0 = =A0(r226039) >> +++ head/sys/netinet6/in6.c =A0 Wed Oct =A05 16:27:11 2011 =A0 =A0 =A0 = =A0(r226040) >> @@ -1810,9 +1810,9 @@ in6_ifinit(struct ifnet *ifp, struct in6 >> =A0 =A0 =A0 /* >> =A0 =A0 =A0 =A0* add a loopback route to self >> =A0 =A0 =A0 =A0*/ >> - =A0 =A0 if (!(ia->ia_flags & IFA_ROUTE) >> + =A0 =A0 if (!(ia->ia_flags & IFA_RTSELF) >> =A0 =A0 =A0 =A0 =A0 && (V_nd6_useloopback >> - =A0 =A0 =A0 =A0 =A0 =A0 || (ifp->if_flags & IFF_LOOPBACK))) { >> + =A0 =A0 =A0 =A0 =A0 =A0 && !(ifp->if_flags & IFF_LOOPBACK))) { >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 error =3D ifa_add_loopback_route((struct ifa= ddr *)ia, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0(struct sockaddr *)&ia->ia_addr); >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (error =3D=3D 0) > > -- > Bjoern A. Zeeb =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 You have to have visions! > =A0 =A0 =A0 =A0 Stop bit received. Insert coin for new address family. > > From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 04:39:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93AAB1065688; Thu, 6 Oct 2011 04:39:18 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 839238FC13; Thu, 6 Oct 2011 04:39:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p964dIRm042831; Thu, 6 Oct 2011 04:39:18 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p964dIwT042829; Thu, 6 Oct 2011 04:39:18 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201110060439.p964dIwT042829@svn.freebsd.org> From: Xin LI Date: Thu, 6 Oct 2011 04:39:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226047 - head/usr.bin/grep/regex X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 04:39:18 -0000 Author: delphij Date: Thu Oct 6 04:39:18 2011 New Revision: 226047 URL: http://svn.freebsd.org/changeset/base/226047 Log: Fix build on i386 and arm. Tested with: make universe Pointy hat to: delphij Modified: head/usr.bin/grep/regex/tre-fastmatch.c Modified: head/usr.bin/grep/regex/tre-fastmatch.c ============================================================================== --- head/usr.bin/grep/regex/tre-fastmatch.c Wed Oct 5 22:08:17 2011 (r226046) +++ head/usr.bin/grep/regex/tre-fastmatch.c Thu Oct 6 04:39:18 2011 (r226047) @@ -163,7 +163,7 @@ static int fastcmp(const fastmatch_t *fg shift = bc; \ else \ { \ - ts = ((long)u - v < 0) ? 0 : (u - v); \ + ts = (u >= v) ? (u - v) : 0; \ shift = MAX(ts, bc); \ shift = MAX(shift, gs); \ if (shift == gs) \ From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 06:01:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DC091065674; Thu, 6 Oct 2011 06:01:13 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5CA718FC22; Thu, 6 Oct 2011 06:01:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9661DoY045465; Thu, 6 Oct 2011 06:01:13 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9661D2N045448; Thu, 6 Oct 2011 06:01:13 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201110060601.p9661D2N045448@svn.freebsd.org> From: "David E. O'Brien" Date: Thu, 6 Oct 2011 06:01:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226048 - in vendor/file/dist: . Magdir tests X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 06:01:13 -0000 Author: obrien Date: Thu Oct 6 06:01:12 2011 New Revision: 226048 URL: http://svn.freebsd.org/changeset/base/226048 Log: Virgin import of Christos Zoulas's FILE 5.09. Added: vendor/file/dist/Magdir/blcr vendor/file/dist/Magdir/bsi vendor/file/dist/Magdir/ebml vendor/file/dist/Magdir/fusecompress vendor/file/dist/Magdir/geo vendor/file/dist/Magdir/isz vendor/file/dist/Magdir/marc21 vendor/file/dist/Magdir/metastore vendor/file/dist/Magdir/msooxml vendor/file/dist/Magdir/oasis vendor/file/dist/Magdir/parrot vendor/file/dist/Magdir/rinex vendor/file/dist/Magdir/selinux vendor/file/dist/Magdir/sisu vendor/file/dist/Magdir/smile vendor/file/dist/Magdir/ssh vendor/file/dist/Magdir/ssl vendor/file/dist/Magdir/tcl vendor/file/dist/Magdir/virtual vendor/file/dist/Magdir/wsdl vendor/file/dist/getline.c (contents, props changed) Deleted: vendor/file/dist/FREEBSD-upgrade vendor/file/dist/Magdir/alpha vendor/file/dist/Magdir/psion vendor/file/dist/patchlevel.h Modified: vendor/file/dist/ChangeLog vendor/file/dist/Header vendor/file/dist/INSTALL vendor/file/dist/Magdir/acorn vendor/file/dist/Magdir/adi vendor/file/dist/Magdir/adventure vendor/file/dist/Magdir/allegro vendor/file/dist/Magdir/alliant vendor/file/dist/Magdir/amanda vendor/file/dist/Magdir/amigaos vendor/file/dist/Magdir/animation vendor/file/dist/Magdir/apl vendor/file/dist/Magdir/apple vendor/file/dist/Magdir/applix vendor/file/dist/Magdir/archive vendor/file/dist/Magdir/asterix vendor/file/dist/Magdir/att3b vendor/file/dist/Magdir/audio vendor/file/dist/Magdir/basis vendor/file/dist/Magdir/bflt vendor/file/dist/Magdir/blender vendor/file/dist/Magdir/blit vendor/file/dist/Magdir/bout vendor/file/dist/Magdir/bsdi vendor/file/dist/Magdir/btsnoop vendor/file/dist/Magdir/c-lang vendor/file/dist/Magdir/c64 vendor/file/dist/Magdir/cad vendor/file/dist/Magdir/cafebabe vendor/file/dist/Magdir/cddb vendor/file/dist/Magdir/chord vendor/file/dist/Magdir/cisco vendor/file/dist/Magdir/citrus vendor/file/dist/Magdir/clarion vendor/file/dist/Magdir/claris vendor/file/dist/Magdir/clipper vendor/file/dist/Magdir/commands vendor/file/dist/Magdir/communications vendor/file/dist/Magdir/compress vendor/file/dist/Magdir/console vendor/file/dist/Magdir/convex vendor/file/dist/Magdir/cracklib vendor/file/dist/Magdir/ctags vendor/file/dist/Magdir/dact vendor/file/dist/Magdir/database vendor/file/dist/Magdir/diamond vendor/file/dist/Magdir/diff vendor/file/dist/Magdir/digital vendor/file/dist/Magdir/dolby vendor/file/dist/Magdir/dump vendor/file/dist/Magdir/dyadic vendor/file/dist/Magdir/editors vendor/file/dist/Magdir/efi vendor/file/dist/Magdir/elf vendor/file/dist/Magdir/encore vendor/file/dist/Magdir/epoc vendor/file/dist/Magdir/erlang vendor/file/dist/Magdir/esri vendor/file/dist/Magdir/fcs vendor/file/dist/Magdir/filesystems vendor/file/dist/Magdir/flash vendor/file/dist/Magdir/fonts vendor/file/dist/Magdir/fortran vendor/file/dist/Magdir/frame vendor/file/dist/Magdir/freebsd vendor/file/dist/Magdir/fsav vendor/file/dist/Magdir/games vendor/file/dist/Magdir/gcc vendor/file/dist/Magdir/geos vendor/file/dist/Magdir/gimp vendor/file/dist/Magdir/gnome-keyring vendor/file/dist/Magdir/gnu vendor/file/dist/Magdir/gnumeric vendor/file/dist/Magdir/grace vendor/file/dist/Magdir/graphviz vendor/file/dist/Magdir/gringotts vendor/file/dist/Magdir/hitachi-sh vendor/file/dist/Magdir/hp vendor/file/dist/Magdir/human68k vendor/file/dist/Magdir/ibm370 vendor/file/dist/Magdir/ibm6000 vendor/file/dist/Magdir/iff vendor/file/dist/Magdir/images vendor/file/dist/Magdir/inform vendor/file/dist/Magdir/intel vendor/file/dist/Magdir/interleaf vendor/file/dist/Magdir/island vendor/file/dist/Magdir/ispell vendor/file/dist/Magdir/java vendor/file/dist/Magdir/jpeg vendor/file/dist/Magdir/karma vendor/file/dist/Magdir/kde vendor/file/dist/Magdir/kml vendor/file/dist/Magdir/lecter vendor/file/dist/Magdir/lex vendor/file/dist/Magdir/lif vendor/file/dist/Magdir/linux vendor/file/dist/Magdir/lisp vendor/file/dist/Magdir/llvm vendor/file/dist/Magdir/lua vendor/file/dist/Magdir/luks vendor/file/dist/Magdir/mach vendor/file/dist/Magdir/macintosh vendor/file/dist/Magdir/magic vendor/file/dist/Magdir/mail.news vendor/file/dist/Magdir/maple vendor/file/dist/Magdir/mathcad vendor/file/dist/Magdir/mathematica vendor/file/dist/Magdir/matroska vendor/file/dist/Magdir/mcrypt vendor/file/dist/Magdir/mercurial vendor/file/dist/Magdir/mime vendor/file/dist/Magdir/mips vendor/file/dist/Magdir/mirage vendor/file/dist/Magdir/misctools vendor/file/dist/Magdir/mkid vendor/file/dist/Magdir/mlssa vendor/file/dist/Magdir/mmdf vendor/file/dist/Magdir/modem vendor/file/dist/Magdir/motorola vendor/file/dist/Magdir/mozilla vendor/file/dist/Magdir/msdos vendor/file/dist/Magdir/msvc vendor/file/dist/Magdir/mup vendor/file/dist/Magdir/natinst vendor/file/dist/Magdir/ncr vendor/file/dist/Magdir/netbsd vendor/file/dist/Magdir/netscape vendor/file/dist/Magdir/netware vendor/file/dist/Magdir/news vendor/file/dist/Magdir/nitpicker vendor/file/dist/Magdir/ocaml vendor/file/dist/Magdir/octave vendor/file/dist/Magdir/ole2compounddocs vendor/file/dist/Magdir/olf vendor/file/dist/Magdir/os2 vendor/file/dist/Magdir/os400 vendor/file/dist/Magdir/os9 vendor/file/dist/Magdir/osf1 vendor/file/dist/Magdir/palm vendor/file/dist/Magdir/parix vendor/file/dist/Magdir/pbm vendor/file/dist/Magdir/pdf vendor/file/dist/Magdir/pdp vendor/file/dist/Magdir/perl vendor/file/dist/Magdir/pgp vendor/file/dist/Magdir/pkgadd vendor/file/dist/Magdir/plan9 vendor/file/dist/Magdir/plus5 vendor/file/dist/Magdir/printer vendor/file/dist/Magdir/project vendor/file/dist/Magdir/psdbms vendor/file/dist/Magdir/pulsar vendor/file/dist/Magdir/pyramid vendor/file/dist/Magdir/python vendor/file/dist/Magdir/revision vendor/file/dist/Magdir/riff vendor/file/dist/Magdir/rpm vendor/file/dist/Magdir/rtf vendor/file/dist/Magdir/ruby vendor/file/dist/Magdir/sc vendor/file/dist/Magdir/sccs vendor/file/dist/Magdir/scientific vendor/file/dist/Magdir/securitycerts vendor/file/dist/Magdir/sendmail vendor/file/dist/Magdir/sequent vendor/file/dist/Magdir/sgi vendor/file/dist/Magdir/sgml vendor/file/dist/Magdir/sharc vendor/file/dist/Magdir/sinclair vendor/file/dist/Magdir/sketch vendor/file/dist/Magdir/smalltalk vendor/file/dist/Magdir/sniffer vendor/file/dist/Magdir/softquad vendor/file/dist/Magdir/spec vendor/file/dist/Magdir/spectrum vendor/file/dist/Magdir/sql vendor/file/dist/Magdir/sun vendor/file/dist/Magdir/sysex vendor/file/dist/Magdir/teapot vendor/file/dist/Magdir/terminfo vendor/file/dist/Magdir/tex vendor/file/dist/Magdir/tgif vendor/file/dist/Magdir/ti-8x vendor/file/dist/Magdir/timezone vendor/file/dist/Magdir/troff vendor/file/dist/Magdir/tuxedo vendor/file/dist/Magdir/typeset vendor/file/dist/Magdir/unicode vendor/file/dist/Magdir/unknown vendor/file/dist/Magdir/uuencode vendor/file/dist/Magdir/varied.out vendor/file/dist/Magdir/varied.script vendor/file/dist/Magdir/vax vendor/file/dist/Magdir/vicar vendor/file/dist/Magdir/virtutech vendor/file/dist/Magdir/visx vendor/file/dist/Magdir/vms vendor/file/dist/Magdir/vmware vendor/file/dist/Magdir/vorbis vendor/file/dist/Magdir/vxl vendor/file/dist/Magdir/warc vendor/file/dist/Magdir/weak vendor/file/dist/Magdir/windows vendor/file/dist/Magdir/wireless vendor/file/dist/Magdir/wordprocessors vendor/file/dist/Magdir/xdelta vendor/file/dist/Magdir/xenix vendor/file/dist/Magdir/xilinx vendor/file/dist/Magdir/xo65 vendor/file/dist/Magdir/xwindows vendor/file/dist/Magdir/zilog vendor/file/dist/Magdir/zyxel vendor/file/dist/Makefile.am vendor/file/dist/Makefile.am-src vendor/file/dist/Makefile.in vendor/file/dist/README vendor/file/dist/TODO vendor/file/dist/acinclude.m4 vendor/file/dist/aclocal.m4 vendor/file/dist/apprentice.c vendor/file/dist/apptype.c vendor/file/dist/ascmagic.c vendor/file/dist/asprintf.c vendor/file/dist/cdf.c vendor/file/dist/cdf.h vendor/file/dist/cdf_time.c vendor/file/dist/compile vendor/file/dist/compress.c vendor/file/dist/config.h.in vendor/file/dist/configure vendor/file/dist/configure.ac vendor/file/dist/elfclass.h vendor/file/dist/encoding.c vendor/file/dist/file.c vendor/file/dist/file.h vendor/file/dist/file.man vendor/file/dist/file_opts.h vendor/file/dist/fsmagic.c vendor/file/dist/funcs.c vendor/file/dist/install-sh vendor/file/dist/is_tar.c vendor/file/dist/libmagic.man vendor/file/dist/magic.c vendor/file/dist/magic.h vendor/file/dist/magic.man vendor/file/dist/names.h vendor/file/dist/print.c vendor/file/dist/readcdf.c vendor/file/dist/readelf.c vendor/file/dist/readelf.h vendor/file/dist/softmagic.c vendor/file/dist/tar.h vendor/file/dist/tests/Makefile.am vendor/file/dist/tests/Makefile.in Modified: vendor/file/dist/ChangeLog ============================================================================== --- vendor/file/dist/ChangeLog Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/ChangeLog Thu Oct 6 06:01:12 2011 (r226048) @@ -1,3 +1,257 @@ +2011-09-01 12:12 Christos Zoulas + + * Don't wait for any subprocess, just the one we forked. + +2011-08-26 16:40 Christos Zoulas + + * If the application name is not set in a cdf file, try to see + if it has a directory with the application name on it. + +2011-08-17 14:32 Christos Zoulas + + * Fix ELF lseek(2) madness. Inspired by PR/134 by Jan Kaluza + +2011-08-14 09:03 Christos Zoulas + + * Don't use variable string formats. + +2011-07-12 12:32 Reuben Thomas + + * Fix detection of Zip files (Mantis #128). + * Make some minor improvements to file(1). + * Rename MIME types for filesystem objects for consistency with + xdg-utils. Typically this means that application/x-foo becomes + inode/foo, but some names also change slightly, e.g. + application/x-character-device becomes inode/chardevice. + +2011-05-10 20:57 Christos Zoulas + + * fix mingw compilation (Abradoks) + +2011-05-10 20:57 Christos Zoulas + + * remove patchlevel.h + * Fix read past allocated memory caused by double-incrementing + a pointer in a loop (reported by Roberto Maar) + +2011-03-30 15:45 Christos Zoulas + + * Fix cdf string buffer setting (Sven Anders) + +2011-03-20 16:35 Christos Zoulas + + * Eliminate MAXPATHLEN and use dynamic allocation for + path and file buffers. + +2011-03-15 18:15 Christos Zoulas + + * binary tests on magic entries with masks could spuriously + get converted to ascii. + +2011-03-12 18:06 Reuben Thomas + + * Improve file.man (remove BUGS, present email addresses consistently). + +2011-03-07 19:38 Christos Zoulas + + * add lrzip support (from Ville Skytta) + +2011-02-10 16:36 Christos Zoulas + + * fix CDF bounds checking (Guy Helmer) + +2011-02-10 12:03 Christos Zoulas + + * add cdf_ctime() that prints a meaningful error when time cannot + be converted. + +2011-02-02 20:40 Christos Zoulas + + * help and version output to stdout. + + * When matching softmagic for ascii files, don't just print + the softmagic classification, keep going and print the + text classification too. This fixes broken troff files when + we moved them from keyword recognition to softmagic + (they stopped printing "with CRLF" etc.) + Reported by Doug McIlroy. + +2011-01-16 19:31 Reuben Thomas + + * Fix two potential buffer overruns in apprentice_list. + +2011-01-14 22:33 Reuben Thomas + + * New Python binding in pure Python. + * Update libmagic(3). + +2011-01-06 21:40 Reuben Thomas + + * Fix Python bindings (including recent Python 3 compatibility + update). + +2011-01-04 18:43 Reuben Thomas + + * magic/Makefile.am: make it easier to recover from magic build failures. + * Fix pstring length specifier parsing to avoid generating invalid + magic files. + * Add pstring length "J" (for "JPEG") to specify that the length + include itself. + * Fix JPEG comment parsing at last using pstring/HJ! + * Ignore section 5 man pages in doc/.cvsignore. + +2010-12-22 13:12 Christos Zoulas + + * Add pstring/BHhLl to specify the type of the length of pascal + strings. + +2010-11-26 18:39 Reuben Thomas + + * Fix "-e soft": it was ignored when softmagic was called + during asciimagic. + * Improve comments and use "unsigned char" in tar.h/is_tar.c. + +2010-11-05 17:26 Reuben Thomas + + * Make bug reporting addresses more visible. + +2010-11-01 18:35 Reuben Thomas + + * Add tcl magic from Gustaf Neumann + +2010-10-24 10:42 Christos Zoulas + + * Fix the whitespace comparing code (Christopher Chittleborough) + +2010-10-06 21:05 Christos Zoulas + + * allow string/t to work (Jan Kaluza) + +2010-09-20 22:11 Reuben Thomas + + * Apply some patches from Ubuntu and Fedora. + +2010-09-20 21:16 Reuben Thomas + + * Apply all patches from Debian package 5.04-6 which have not + already been applied and are not Debian-specific. + +2010-09-20 15:24 Reuben Thomas + + * Minor security fix to softmagic.c (don't use untrusted + string as printf format). + +2010-07-21 12:20 Christos Zoulas + + * MINGW32 portability from LRN + + * Don't warn about escaping magic regex chars when we are in a regex. + +2010-07-19 10:55 Christos Zoulas + + * Only try to print prpsinfo for core files. (Jan Kaluza) + +2010-04-22 12:55 Christos Zoulas + + * Try more elf offsets for Debian core files. (Arnaud Giersch) + +2010-02-20 15:18 Reuben Thomas + + * Clarify which sort of CDF we mean. + +2010-02-14 22:58 Reuben Thomas + + * Re-jig Zip file type magic so that unsupported special + Zip types (those with "mimetype" at offset 30) can be + recognized. + +2010-02-02 21:50 Reuben Thomas + + * Add support for OCF (EPUB) files (application/epub+zip) + +2010-01-28 18:25 Christos Zoulas + + * Fix core-dump from unbound loop: + https://bugzilla.redhat.com/show_bug.cgi?id=533245 + +2010-01-22 15:45 Christos Zoulas + + * print proper mime for crystal reports file + + * print the last summary information of a cdf document, not the + first so that nested documents print the right info + +2010-01-16 18:42 Charles Longeau + + * bring back some fixes from OpenBSD: + - make gcc2 builds file + - fix typos in a magic file comment + +2009-11-17 18:35 Christos Zoulas + + * ctime/asctime can return NULL on some OS's although + they should not (Toshit Antani) + +2009-09-14 13:49 Christos Zoulas + + * Centralize magic path handling routines and remove the + special-casing from file.c so that the python module for + example comes up with the same magic path (Fixes ~/.magic + handling) (from Gab) + +2009-09-11 23:38 Reuben Thomas + + * When magic argument is a directory, read the files in + strcmp-sorted order (fixes Debian bug #488562 and our own FIXME). + +2009-09-11 13:11 Reuben Thomas + + * Combine overlapping epoc and psion magic files into one (epoc). + + * Add some more EPOC MIME types. + +2009-08-19 15:55 Christos Zoulas + + * Fix 3 bugs (From Ian Darwin): + - file_showstr could move one past the end of the array + - parse_apple did not nul terminate the string in the overflow case + - parse_mime truncated the wrong string in the overflow case + +2009-08-12 12:28 Robert Byrnes + + * Include Localstuff when compiling magic. + +2009-07-15 10:05 Christos Zoulas + + * Fix logic for including mygetopts.h + + * Make cdf.c compile again with debugging + + * Add the necessary field handling for crystal reports files to work + +2009-06-23 01:34 Reuben Thomas + + * Stop "(if" identifying Lisp files, that's plain dumb! + +2009-06-09 22:13 Reuben Thomas + + * Add a couple of missing MP3 MIME types. + +2009-05-27 23:00 Reuben Thomas + + * Add full range of hash-bang tests for Python and Ruby. + + * Add MIME types for Python and Ruby scripts. + +2009-05-13 10:44 Christos Zoulas + + * off by one in parsing hw capabilities in elf + (Cheng Renquan) + +2009-05-08 13:40 Christos Zoulas + + * lint fixes and more from NetBSD + 2009-05-06 10:25 Christos Zoulas * Avoid null dereference in cdf code (Drew Yao) Modified: vendor/file/dist/Header ============================================================================== --- vendor/file/dist/Header Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Header Thu Oct 6 06:01:12 2011 (r226048) @@ -1,5 +1,5 @@ -# Magic # Magic data for file(1) command. -# Machine-generated from src/cmd/file/magdir/*; edit there only! # Format is described in magic(files), where: -# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID. +# files is 5 on V7 and BSD, 4 on SV, and ?? on SVID. +# Don't edit this file, edit /etc/magic or send your magic improvements +# to the maintainers, at file@mx.gw.com Modified: vendor/file/dist/INSTALL ============================================================================== --- vendor/file/dist/INSTALL Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/INSTALL Thu Oct 6 06:01:12 2011 (r226048) @@ -2,18 +2,24 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ may remove or edit it. you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ The simplest way to compile this package 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,12 +83,22 @@ The simplest way to compile this package all sorts of other programs in order to regenerate files that came with the distribution. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -85,25 +111,41 @@ is an example: Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -114,16 +156,47 @@ Documentation and other data files still In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -135,14 +208,53 @@ find the X include and library files aut you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -150,7 +262,8 @@ type, such as `sun4', or a canonical nam where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -168,9 +281,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -179,7 +292,7 @@ A warning: not all `configure' scripts l Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -198,11 +311,19 @@ an Autoconf bug. Until the bug is fixed `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -229,6 +350,16 @@ an Autoconf bug. Until the bug is fixed Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. Modified: vendor/file/dist/Magdir/acorn ============================================================================== --- vendor/file/dist/Magdir/acorn Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/acorn Thu Oct 6 06:01:12 2011 (r226048) @@ -1,4 +1,6 @@ + #------------------------------------------------------------------------------ +# $File: acorn,v 1.5 2009/09/19 16:28:07 christos Exp $ # acorn: file(1) magic for files found on Acorn systems # Modified: vendor/file/dist/Magdir/adi ============================================================================== --- vendor/file/dist/Magdir/adi Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/adi Thu Oct 6 06:01:12 2011 (r226048) @@ -1,5 +1,6 @@ #------------------------------------------------------------------------------ +# $File: adi,v 1.4 2009/09/19 16:28:07 christos Exp $ # adi: file(1) magic for ADi's objects # From Gregory McGarry # Modified: vendor/file/dist/Magdir/adventure ============================================================================== --- vendor/file/dist/Magdir/adventure Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/adventure Thu Oct 6 06:01:12 2011 (r226048) @@ -1,5 +1,6 @@ #------------------------------------------------------------------------------ +# $File: adventure,v 1.13 2010/12/31 16:32:54 christos Exp $ # adventure: file(1) magic for Adventure game files # # from Allen Garvin @@ -16,18 +17,26 @@ # Infocom (see z-machine) #------------------------------------------------------------------------------ # Z-machine: file(1) magic for Z-machine binaries. +# Updated by Adam Buchbinder # -# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which -# appears to be a version-0 Z-machine binary. -# -# The (false match) message is to correct that behavior. Perhaps it is -# not needed. -# -16 belong&0xfe00f0f0 0x3030 Infocom game data ->0 ubyte 0 (false match) ->0 ubyte >0 (Z-machine %d, ->>2 ubeshort x Release %d / ->>18 string >\0 Serial %.6s) +#http://www.gnelson.demon.co.uk/zspec/sect11.html +#http://www.jczorkmid.net/~jpenney/ZSpec11-latest.txt +#http://en.wikipedia.org/wiki/Z-machine +# The first byte is the Z-machine revision; it is always between 1 and 8. We +# had false matches (for instance, inbig5.ocp from the Omega TeX extension as +# well as an occasional MP3 file), so we sanity-check the version number. +# +# It might be possible to sanity-check the release number as well, as it seems +# (at least in classic Infocom games) to always be a relatively small number, +# always under 150 or so, but as this isn't rigorous, we'll wait on that until +# it becomes clear that it's needed. +# +0 ubyte >0 +>0 ubyte <9 +>>16 belong&0xfe00f0f0 0x3030 Infocom game data +>>>0 ubyte x (Z-machine %d, +>>>>2 ubeshort x Release %d / +>>>>18 string >\0 Serial %.6s) #------------------------------------------------------------------------------ # Glulx: file(1) magic for Glulx binaries. @@ -45,10 +54,9 @@ # For Quetzal and blorb magic see iff -# TADS (Text Adventure Development System) +# TADS (Text Adventure Development System) version 2 # All files are machine-independent (games compile to byte-code) and are tagged -# with a version string of the form "V2..\0" (but TADS 3 is -# on the way). +# with a version string of the form "V2..\0". # Game files start with "TADS2 bin\n\r\032\0" then the compiler version. 0 string TADS2\ bin TADS >9 belong !0x0A0D1A00 game data, CORRUPTED @@ -73,6 +81,19 @@ >10 belong 0x0A0D1A00 >>14 string >\0 %s saved game data +# TADS (Text Adventure Development System) version 3 +# Game files start with "T3-image\015\012\032" +0 string T3-image\015\012\032 +>11 leshort x TADS 3 game data (format version %d) +# Saved game files start with "T3-state-v####\015\012\032" +# where #### is a format version number +0 string T3-state-v +>14 string \015\012\032 TADS 3 saved game data (format version +>>10 byte x %c +>>11 byte x \b%c +>>12 byte x \b%c +>>13 byte x \b%c) + # Danny Milosavljevic # this are adrift (adventure game standard) game files, extension .taf # depending on version magic continues with 0x93453E6139FA (V 4.0) Modified: vendor/file/dist/Magdir/allegro ============================================================================== --- vendor/file/dist/Magdir/allegro Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/allegro Thu Oct 6 06:01:12 2011 (r226048) @@ -1,4 +1,6 @@ + #------------------------------------------------------------------------------ +# $File: allegro,v 1.4 2009/09/19 16:28:07 christos Exp $ # allegro: file(1) magic for Allegro datafiles # Toby Deshane # Modified: vendor/file/dist/Magdir/alliant ============================================================================== --- vendor/file/dist/Magdir/alliant Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/alliant Thu Oct 6 06:01:12 2011 (r226048) @@ -1,5 +1,6 @@ #------------------------------------------------------------------------------ +# $File: alliant,v 1.7 2009/09/19 16:28:07 christos Exp $ # alliant: file(1) magic for Alliant FX series a.out files # # If the FX series is the one that had a processor with a 68K-derived Modified: vendor/file/dist/Magdir/amanda ============================================================================== --- vendor/file/dist/Magdir/amanda Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/amanda Thu Oct 6 06:01:12 2011 (r226048) @@ -1,4 +1,6 @@ + #------------------------------------------------------------------------------ +# $File: amanda,v 1.5 2009/09/19 16:28:07 christos Exp $ # amanda: file(1) magic for amanda file format # 0 string AMANDA:\ AMANDA Modified: vendor/file/dist/Magdir/amigaos ============================================================================== --- vendor/file/dist/Magdir/amigaos Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/amigaos Thu Oct 6 06:01:12 2011 (r226048) @@ -1,4 +1,6 @@ + #------------------------------------------------------------------------------ +# $File: amigaos,v 1.14 2009/09/19 16:28:07 christos Exp $ # amigaos: file(1) magic for AmigaOS binary formats: # Modified: vendor/file/dist/Magdir/animation ============================================================================== --- vendor/file/dist/Magdir/animation Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/animation Thu Oct 6 06:01:12 2011 (r226048) @@ -1,5 +1,6 @@ #------------------------------------------------------------------------------ +# $File: animation,v 1.45 2011/09/06 11:00:06 christos Exp $ # animation: file(1) magic for animation/movie formats # # animation formats @@ -29,7 +30,7 @@ #!:mime image/x-quicktime 4 string pckg Apple QuickTime compressed archive !:mime application/x-quicktime-player -4 string/B jP JPEG 2000 image +4 string/W jP JPEG 2000 image !:mime image/jp2 4 string ftyp ISO Media >8 string isom \b, MPEG v4 system, version 1 @@ -41,10 +42,18 @@ !:mime video/mp4 >8 string mp7t \b, MPEG v4 system, MPEG v7 XML >8 string mp7b \b, MPEG v4 system, MPEG v7 binary XML ->8 string/B jp2 \b, JPEG 2000 +>8 string/W jp2 \b, JPEG 2000 !:mime image/jp2 +>8 string 3ge \b, MPEG v4 system, 3GPP +!:mime video/3gpp +>8 string 3gg \b, MPEG v4 system, 3GPP +!:mime video/3gpp >8 string 3gp \b, MPEG v4 system, 3GPP !:mime video/3gpp +>8 string 3gs \b, MPEG v4 system, 3GPP +!:mime video/3gpp +>8 string 3g2 \b, MPEG v4 system, 3GPP2 +!:mime video/3gpp2 >>11 byte 4 \b v4 (H.263/AMR GSM 6.10) >>11 byte 5 \b v5 (H.263/AMR GSM 6.10) >>11 byte 6 \b v6 (ITU H.264/AMR GSM 6.10) @@ -52,13 +61,13 @@ !:mime video/mp4 >8 string avc1 \b, MPEG v4 system, 3GPP JVT AVC !:mime video/3gpp ->8 string/B M4A \b, MPEG v4 system, iTunes AAC-LC +>8 string/W M4A \b, MPEG v4 system, iTunes AAC-LC !:mime audio/mp4 ->8 string/B M4V \b, MPEG v4 system, iTunes AVC-LC +>8 string/W M4V \b, MPEG v4 system, iTunes AVC-LC !:mime video/mp4 ->8 string/B M4P \b, MPEG v4 system, iTunes AES encrypted ->8 string/B M4B \b, MPEG v4 system, iTunes bookmarked ->8 string/B qt \b, Apple QuickTime movie +>8 string/W M4P \b, MPEG v4 system, iTunes AES encrypted +>8 string/W M4B \b, MPEG v4 system, iTunes bookmarked +>8 string/W qt \b, Apple QuickTime movie !:mime video/quicktime # MPEG sequences @@ -71,6 +80,7 @@ >>7 byte x \b @ L %u 0 belong&0xFFFFFF00 0x00000100 >3 byte 0xBA MPEG sequence +!:mime video/mpeg >>4 byte &0x40 \b, v2, program multiplex >>4 byte ^0x40 \b, v1, system multiplex >3 byte 0xBB MPEG sequence, v1/2, multiplex (missing pack header) @@ -80,6 +90,7 @@ >>4 byte 88 \b, extended >>6 byte x \b @ L %u >3 byte 0xB0 MPEG sequence, v4 +!:mime video/mpeg4-generic >>5 belong 0x000001B5 >>>9 byte &0x80 >>>>10 byte&0xF0 16 \b, video @@ -149,6 +160,7 @@ >>4 byte 252 \b, FGS @ L4 >>4 byte 253 \b, FGS @ L5 >3 byte 0xB5 MPEG sequence, v4 +!:mime video/mpeg4-generic >>4 byte &0x80 >>>5 byte&0xF0 16 \b, video (missing profile header) >>>5 byte&0xF0 32 \b, still texture (missing profile header) @@ -159,6 +171,7 @@ >>4 byte&0xF8 24 \b, mesh (missing profile header) >>4 byte&0xF8 32 \b, face (missing profile header) >3 byte 0xB3 MPEG sequence +!:mime video/mpeg >>12 belong 0x000001B8 \b, v1, progressive Y'CbCr 4:2:0 video >>12 belong 0x000001B2 \b, v1, progressive Y'CbCr 4:2:0 video >>12 belong 0x000001B5 \b, v2, @@ -469,6 +482,7 @@ # MPA, M2A 0 beshort&0xFFFE 0xFFF6 MPEG ADTS, layer I, v2 +!:mime audio/mpeg # rate >2 byte&0xF0 0x10 \b, 32 kbps >2 byte&0xF0 0x20 \b, 48 kbps @@ -503,6 +517,7 @@ # MP3, M25A 0 beshort&0xFFFE 0xFFE2 MPEG ADTS, layer III, v2.5 +!:mime audio/mpeg # rate >2 byte&0xF0 0x10 \b, 8 kbps >2 byte&0xF0 0x20 \b, 16 kbps @@ -697,6 +712,7 @@ # Microsoft Advanced Streaming Format (ASF) 0 belong 0x3026b275 Microsoft ASF +!:mime video/x-ms-asf # MNG Video Format, 0 string \x8aMNG MNG video data, @@ -718,16 +734,16 @@ 3 string \x0D\x0AVersion:Vivo Vivo video data # VRML (Virtual Reality Modelling Language) -0 string/b #VRML\ V1.0\ ascii VRML 1 file +0 string/w #VRML\ V1.0\ ascii VRML 1 file !:mime model/vrml -0 string/b #VRML\ V2.0\ utf8 ISO/IEC 14772 VRML 97 file +0 string/w #VRML\ V2.0\ utf8 ISO/IEC 14772 VRML 97 file !:mime model/vrml # X3D (Extensible 3D) [http://www.web3d.org/specifications/x3d-3.0.dtd] # From Michel Briand -0 string \20 search/1000/cb \20 search/1000/cw \ 2008-07-18 0 string BIK Bink Video >3 regex =[a-z] rev.%s @@ -813,3 +830,66 @@ >>51 byte&0x20 !0 stereo #>>51 byte&0x10 0 FFT #>>51 byte&0x10 !0 DCT + +# Type: NUT Container +# URL: http://wiki.multimedia.cx/index.php?title=NUT +# From: Adam Buchbinder +0 string nut/multimedia\ container\0 NUT multimedia container + +# Type: Nullsoft Video (NSV) +# URL: http://wiki.multimedia.cx/index.php?title=Nullsoft_Video +# From: Mike Melanson +0 string NSVf Nullsoft Video + +# Type: REDCode Video +# URL: http://www.red.com/ ; http://wiki.multimedia.cx/index.php?title=REDCode +# From: Mike Melanson +4 string RED1 REDCode Video + +# Type: MTV Multimedia File +# URL: http://wiki.multimedia.cx/index.php?title=MTV +# From: Mike Melanson +0 string AMVS MTV Multimedia File + +# Type: ARMovie +# URL: http://wiki.multimedia.cx/index.php?title=ARMovie +# From: Mike Melanson +0 string ARMovie\012 ARMovie + +# Type: Interplay MVE Movie +# URL: http://wiki.multimedia.cx/index.php?title=Interplay_MVE +# From: Mike Melanson +0 string Interplay\040MVE\040File\032 Interplay MVE Movie + +# Type: Windows Television DVR File +# URL: http://wiki.multimedia.cx/index.php?title=WTV +# From: Mike Melanson +# This takes the form of a Windows-style GUID +0 bequad 0xB7D800203749DA11 +>8 bequad 0xA64E0007E95EAD8D Windows Television DVR Media + +# Type: Sega FILM/CPK Multimedia +# URL: http://wiki.multimedia.cx/index.php?title=Sega_FILM +# From: Mike Melanson +0 string FILM Sega FILM/CPK Multimedia, +>32 belong x %d x +>28 belong x %d + +# Type: Nintendo THP Multimedia +# URL: http://wiki.multimedia.cx/index.php?title=THP +# From: Mike Melanson +0 string THP\0 Nintendo THP Multimedia + +# Type: BBC Dirac Video +# URL: http://wiki.multimedia.cx/index.php?title=Dirac +# From: Mike Melanson +0 string BBCD BBC Dirac Video + +# Type: RAD Game Tools Smacker Multimedia +# URL: http://wiki.multimedia.cx/index.php?title=Smacker +# From: Mike Melanson +0 string SMK RAD Game Tools Smacker Multimedia +>3 byte x version %c, +>4 lelong x %d x +>8 lelong x %d, +>12 lelong x %d frames Modified: vendor/file/dist/Magdir/apl ============================================================================== --- vendor/file/dist/Magdir/apl Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/apl Thu Oct 6 06:01:12 2011 (r226048) @@ -1,5 +1,6 @@ #------------------------------------------------------------------------------ +# $File: apl,v 1.6 2009/09/19 16:28:07 christos Exp $ # apl: file(1) magic for APL (see also "pdp" and "vax" for other APL # workspaces) # Modified: vendor/file/dist/Magdir/apple ============================================================================== --- vendor/file/dist/Magdir/apple Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/apple Thu Oct 6 06:01:12 2011 (r226048) @@ -1,7 +1,9 @@ + #------------------------------------------------------------------------------ +# $File: apple,v 1.24 2010/11/25 15:00:12 christos Exp $ # apple: file(1) magic for Apple file formats # -0 search/1 FiLeStArTfIlEsTaRt binscii (apple ][) text +0 search/1/t FiLeStArTfIlEsTaRt binscii (apple ][) text 0 string \x0aGL Binary II (apple ][) data 0 string \x76\xff Squeezed (apple ][) data 0 string NuFile NuFile archive (apple ][) data Modified: vendor/file/dist/Magdir/applix ============================================================================== --- vendor/file/dist/Magdir/applix Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/applix Thu Oct 6 06:01:12 2011 (r226048) @@ -1,5 +1,6 @@ #------------------------------------------------------------------------------ +# $File: applix,v 1.5 2009/09/19 16:28:08 christos Exp $ # applix: file(1) magic for Applixware # From: Peter Soos # Modified: vendor/file/dist/Magdir/archive ============================================================================== --- vendor/file/dist/Magdir/archive Thu Oct 6 04:39:18 2011 (r226047) +++ vendor/file/dist/Magdir/archive Thu Oct 6 06:01:12 2011 (r226048) @@ -1,4 +1,5 @@ #------------------------------------------------------------------------------ +# $File: archive,v 1.68 2011/09/07 15:47:51 christos Exp $ # archive: file(1) magic for archive formats (see also "msdos" for self- # extracting compressed archives) # @@ -243,13 +244,13 @@ # MS Compress 4 string \x88\xf0\x27 MS Compress archive data # updated by Joerg Jenderek ->9 string \0 ->>0 string KWAJ +>9 string \0 +>>0 string KWAJ >>>7 string \321\003 MS Compress archive data >>>>14 ulong >0 \b, original size: %ld bytes ->>>>18 ubyte >0x65 ->>>>>18 string x \b, was %.8s ->>>>>(10.b-4) string x \b.%.3s +>>>>18 ubyte >0x65 +>>>>>18 string x \b, was %.8s +>>>>>(10.b-4) string x \b.%.3s # MP3 (archiver, not lossy audio compression) 0 string MP3\x1a MP3-Archiver archive data # ZET @@ -274,7 +275,7 @@ # Splint 0 string \x93\xb9\x06 Splint archive data # InstallShield *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 06:56:53 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE34C1065777; Thu, 6 Oct 2011 06:56:53 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9BC6E8FC08; Thu, 6 Oct 2011 06:56:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p966urGe047173; Thu, 6 Oct 2011 06:56:53 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p966urpT047168; Thu, 6 Oct 2011 06:56:53 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110060656.p966urpT047168@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 6 Oct 2011 06:56:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226049 - in vendor/com_err/dist: . contrib X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 06:56:53 -0000 Author: stas Date: Thu Oct 6 06:56:53 2011 New Revision: 226049 URL: http://svn.freebsd.org/changeset/base/226049 Log: - Flatten the com_err vendor tree. Added: vendor/com_err/dist/ChangeLog - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/ChangeLog vendor/com_err/dist/Makefile.am - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/Makefile.am vendor/com_err/dist/Makefile.in - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/Makefile.in vendor/com_err/dist/com_err.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/com_err.c vendor/com_err/dist/com_err.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/com_err.h vendor/com_err/dist/com_right.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/com_right.h vendor/com_err/dist/compile_et.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/compile_et.c vendor/com_err/dist/compile_et.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/compile_et.h vendor/com_err/dist/error.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/error.c vendor/com_err/dist/lex.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/lex.c vendor/com_err/dist/lex.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/lex.h vendor/com_err/dist/lex.l - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/lex.l vendor/com_err/dist/parse.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/parse.c vendor/com_err/dist/parse.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/parse.h vendor/com_err/dist/parse.y - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/parse.y vendor/com_err/dist/roken_rename.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/roken_rename.h vendor/com_err/dist/version-script.map - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/version-script.map Deleted: vendor/com_err/dist/contrib/ Copied: vendor/com_err/dist/ChangeLog (from r226048, vendor/com_err/dist/contrib/com_err/ChangeLog) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/com_err/dist/ChangeLog Thu Oct 6 06:56:53 2011 (r226049, copy of r226048, vendor/com_err/dist/contrib/com_err/ChangeLog) @@ -0,0 +1,235 @@ +2007-07-17 Love Hörnquist Åstrand + + * Makefile.am: split source files in dist and nodist. + +2007-07-16 Love Hörnquist Åstrand + + * Makefile.am: Only do roken rename for the library. + +2007-07-15 Love Hörnquist Åstrand + + * Makefile.am: use version script. + + * version-script.map: use version script. + +2007-07-10 Love Hörnquist Åstrand + + * Makefile.am: New library version. + +2006-10-19 Love Hörnquist Åstrand + + * Makefile.am (compile_et_SOURCES): add lex.h + +2005-12-12 Love Hörnquist Åstrand + + * com_err.3: Document the _r functions. + +2005-07-07 Love Hörnquist Åstrand + + * com_err.h: Include for va_list to help AIX 5.2. + +2005-06-16 Love Hörnquist Åstrand + + * parse.y: rename base to base_id since flex defines a function + with the argument base + + * compile_et.h: rename base to base_id since flex defines a + function with the argument base + + * compile_et.c: rename base to base_id since flex defines a + function with the argument base + + * parse.y (name2number): rename base to num to avoid shadowing + + * compile_et.c: rename optind to optidx + +2005-05-16 Love Hörnquist Åstrand + + * parse.y: check allocation errors + + * lex.l: check allocation errors correctly + + * compile_et.h: include + + * (main): compile_et.c: use strlcpy + +2005-04-29 Dave Love + + * Makefile.am (LDADD): Add libcom_err.la + +2005-04-24 Love Hörnquist Åstrand + + * include strlcpy and *printf and use them + +2005-02-03 Love Hörnquist Åstrand + + * com_right.h: de-__P + + * com_err.h: de-__P + +2002-08-20 Johan Danielsson + + * compile_et.c: don't add comma after last enum member + +2002-08-12 Johan Danielsson + + * compile_et.c: just declare er_list directly instead of including + com_right in generated header files + +2002-03-11 Assar Westerlund + + * Makefile.am (libcom_err_la_LDFLAGS): set version to 2:1:1 + +2002-03-10 Assar Westerlund + + * com_err.c (error_message): do not call strerror with a negative error + +2001-05-17 Assar Westerlund + + * Makefile.am: bump version to 2:0:1 + +2001-05-11 Assar Westerlund + + * com_err.h (add_to_error_table): add prototype + * com_err.c (add_to_error_table): new function, from Derrick J + Brashear + +2001-05-06 Assar Westerlund + + * com_err.h: add printf formats for gcc + +2001-02-28 Johan Danielsson + + * error.c (initialize_error_table_r): put table at end of the list + +2001-02-15 Assar Westerlund + + * com_err.c (default_proc): add printf attributes + +2000-08-16 Assar Westerlund + + * Makefile.am: bump version to 1:1:0 + +2000-07-31 Assar Westerlund + + * com_right.h (initialize_error_table_r): fix prototype + +2000-04-05 Assar Westerlund + + * com_err.c (_et_lit): explicitly initialize it to NULL to make + dyld on Darwin/MacOS X happy + +2000-01-16 Assar Westerlund + + * com_err.h: remove __P definition (now in com_right.h). this + file always includes com_right.h so that's where it should reside. + * com_right.h: moved __P here and added it to the function + prototypes + * com_err.h (error_table_name): add __P + +1999-07-03 Assar Westerlund + + * parse.y (statement): use asprintf + +1999-06-13 Assar Westerlund + + * Makefile.in: make it solaris make vpath-safe + +Thu Apr 1 11:13:53 1999 Johan Danielsson + + * compile_et.c: use getargs + +Sat Mar 20 00:16:30 1999 Assar Westerlund + + * compile_et.c: static-ize + +Thu Mar 18 11:22:13 1999 Johan Danielsson + + * Makefile.am: include Makefile.am.common + +Tue Mar 16 22:30:05 1999 Assar Westerlund + + * parse.y: use YYACCEPT instead of return + +Sat Mar 13 22:22:56 1999 Assar Westerlund + + * compile_et.c (generate_h): cast when calling is* to get rid of a + warning + +Thu Mar 11 15:00:51 1999 Johan Danielsson + + * parse.y: prototype for error_message + +Sun Nov 22 10:39:02 1998 Assar Westerlund + + * compile_et.h: include ctype and roken + + * compile_et.c: include err.h + (generate_h): remove unused variable + + * Makefile.in (WFLAGS): set + +Fri Nov 20 06:58:59 1998 Assar Westerlund + + * lex.l: undef ECHO to work around AIX lex bug + +Sun Sep 27 02:23:59 1998 Johan Danielsson + + * com_err.c (error_message): try to pass code to strerror, to see + if it might be an errno code (this if broken, but some MIT code + seems to expect this behaviour) + +Sat Sep 26 17:42:39 1998 Johan Danielsson + + * compile_et.c: -> "foo_err.h" + +Tue Jun 30 17:17:36 1998 Assar Westerlund + + * Makefile.in: add str{cpy,cat}_truncate + +Mon May 25 05:24:39 1998 Assar Westerlund + + * Makefile.in (clean): try to remove shared library debris + +Sun Apr 19 09:50:17 1998 Assar Westerlund + + * Makefile.in: add symlink magic for linux + +Sun Apr 5 09:22:11 1998 Assar Westerlund + + * parse.y: define alloca to malloc in case we're using bison but + don't have alloca + +Tue Mar 24 05:13:01 1998 Assar Westerlund + + * Makefile.in: link with snprintf (From Derrick J Brashear + ) + +Fri Feb 27 05:01:42 1998 Assar Westerlund + + * parse.y: initialize ec->next + +Thu Feb 26 02:22:25 1998 Assar Westerlund + + * Makefile.am: @LEXLIB@ + +Sat Feb 21 15:18:54 1998 assar westerlund + + * Makefile.in: set YACC and LEX + +Tue Feb 17 22:20:27 1998 Bjoern Groenvall + + * com_right.h: Change typedefs so that one may mix MIT compile_et + generated code with krb4 dito. + +Tue Feb 17 16:30:55 1998 Johan Danielsson + + * compile_et.c (generate): Always return a value. + + * parse.y: Files don't have to end with `end'. + +Mon Feb 16 16:09:20 1998 Johan Danielsson + + * lex.l (getstring): Replace getc() with input(). + + * Makefile.am: Fixes for new compile_et. Copied: vendor/com_err/dist/Makefile.am (from r226048, vendor/com_err/dist/contrib/com_err/Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/com_err/dist/Makefile.am Thu Oct 6 06:56:53 2011 (r226049, copy of r226048, vendor/com_err/dist/contrib/com_err/Makefile.am) @@ -0,0 +1,39 @@ +# $Id: Makefile.am 21619 2007-07-17 07:34:00Z lha $ + +include $(top_srcdir)/Makefile.am.common + +YFLAGS = -d + +lib_LTLIBRARIES = libcom_err.la +libcom_err_la_LDFLAGS = -version-info 2:3:1 + +if versionscript +libcom_err_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map +endif + +bin_PROGRAMS = compile_et + +include_HEADERS = com_err.h com_right.h + +compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l lex.h + +libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) +dist_libcom_err_la_SOURCES = error.c com_err.c roken_rename.h + +if do_roken_rename +nodist_libcom_err_la_SOURCES = snprintf.c strlcpy.c +endif + +$(compile_et_OBJECTS): parse.h parse.c ## XXX broken automake 1.4s + +compile_et_LDADD = \ + libcom_err.la \ + $(LIB_roken) \ + $(LEXLIB) + +snprintf.c: + $(LN_S) $(srcdir)/../roken/snprintf.c . +strlcpy.c: + $(LN_S) $(srcdir)/../roken/strlcpy.c . + +EXTRA_DIST = version-script.map Copied: vendor/com_err/dist/Makefile.in (from r226048, vendor/com_err/dist/contrib/com_err/Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/com_err/dist/Makefile.in Thu Oct 6 06:56:53 2011 (r226049, copy of r226048, vendor/com_err/dist/contrib/com_err/Makefile.in) @@ -0,0 +1,910 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# $Id: Makefile.am 21619 2007-07-17 07:34:00Z lha $ + +# $Id: Makefile.am.common 10998 2002-05-19 18:35:37Z joda $ + +# $Id: Makefile.am.common 22488 2008-01-21 11:47:22Z lha $ + + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \ + $(top_srcdir)/cf/Makefile.am.common ChangeLog lex.c parse.c \ + parse.h +@versionscript_TRUE@am__append_1 = $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map +bin_PROGRAMS = compile_et$(EXEEXT) +subdir = lib/com_err +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ + $(top_srcdir)/cf/auth-modules.m4 $(top_srcdir)/cf/autobuild.m4 \ + $(top_srcdir)/cf/broken-getaddrinfo.m4 \ + $(top_srcdir)/cf/broken-glob.m4 \ + $(top_srcdir)/cf/broken-realloc.m4 \ + $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ + $(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \ + $(top_srcdir)/cf/capabilities.m4 \ + $(top_srcdir)/cf/check-compile-et.m4 \ + $(top_srcdir)/cf/check-getpwnam_r-posix.m4 \ + $(top_srcdir)/cf/check-man.m4 \ + $(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \ + $(top_srcdir)/cf/check-type-extra.m4 \ + $(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \ + $(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \ + $(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \ + $(top_srcdir)/cf/dlopen.m4 \ + $(top_srcdir)/cf/find-func-no-libs.m4 \ + $(top_srcdir)/cf/find-func-no-libs2.m4 \ + $(top_srcdir)/cf/find-func.m4 \ + $(top_srcdir)/cf/find-if-not-broken.m4 \ + $(top_srcdir)/cf/framework-security.m4 \ + $(top_srcdir)/cf/have-struct-field.m4 \ + $(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \ + $(top_srcdir)/cf/krb-bigendian.m4 \ + $(top_srcdir)/cf/krb-func-getlogin.m4 \ + $(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \ + $(top_srcdir)/cf/krb-readline.m4 \ + $(top_srcdir)/cf/krb-struct-spwd.m4 \ + $(top_srcdir)/cf/krb-struct-winsize.m4 \ + $(top_srcdir)/cf/largefile.m4 $(top_srcdir)/cf/mips-abi.m4 \ + $(top_srcdir)/cf/misc.m4 $(top_srcdir)/cf/need-proto.m4 \ + $(top_srcdir)/cf/osfc2.m4 $(top_srcdir)/cf/otp.m4 \ + $(top_srcdir)/cf/proto-compat.m4 $(top_srcdir)/cf/pthreads.m4 \ + $(top_srcdir)/cf/resolv.m4 $(top_srcdir)/cf/retsigtype.m4 \ + $(top_srcdir)/cf/roken-frag.m4 \ + $(top_srcdir)/cf/socket-wrapper.m4 $(top_srcdir)/cf/sunos.m4 \ + $(top_srcdir)/cf/telnet.m4 $(top_srcdir)/cf/test-package.m4 \ + $(top_srcdir)/cf/version-script.m4 $(top_srcdir)/cf/wflags.m4 \ + $(top_srcdir)/cf/win32.m4 $(top_srcdir)/cf/with-all.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/include/config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(includedir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libcom_err_la_LIBADD = +dist_libcom_err_la_OBJECTS = libcom_err_la-error.lo \ + libcom_err_la-com_err.lo +@do_roken_rename_TRUE@nodist_libcom_err_la_OBJECTS = \ +@do_roken_rename_TRUE@ libcom_err_la-snprintf.lo \ +@do_roken_rename_TRUE@ libcom_err_la-strlcpy.lo +libcom_err_la_OBJECTS = $(dist_libcom_err_la_OBJECTS) \ + $(nodist_libcom_err_la_OBJECTS) +libcom_err_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libcom_err_la_LDFLAGS) $(LDFLAGS) -o $@ +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_compile_et_OBJECTS = compile_et.$(OBJEXT) parse.$(OBJEXT) \ + lex.$(OBJEXT) +compile_et_OBJECTS = $(am_compile_et_OBJECTS) +am__DEPENDENCIES_1 = +compile_et_DEPENDENCIES = libcom_err.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ +depcomp = +am__depfiles_maybe = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ || +LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) +LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS) +YLWRAP = $(top_srcdir)/ylwrap +@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ || +YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) +LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) +SOURCES = $(dist_libcom_err_la_SOURCES) \ + $(nodist_libcom_err_la_SOURCES) $(compile_et_SOURCES) +DIST_SOURCES = $(dist_libcom_err_la_SOURCES) $(compile_et_SOURCES) +includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(include_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CANONICAL_HOST = @CANONICAL_HOST@ +CATMAN = @CATMAN@ +CATMANEXT = @CATMANEXT@ +CC = @CC@ +CFLAGS = @CFLAGS@ +COMPILE_ET = @COMPILE_ET@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DBLIB = @DBLIB@ +DEFS = @DEFS@ +DIR_com_err = @DIR_com_err@ +DIR_hcrypto = @DIR_hcrypto@ +DIR_hdbdir = @DIR_hdbdir@ +DIR_roken = @DIR_roken@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +GROFF = @GROFF@ +INCLUDES_roken = @INCLUDES_roken@ +INCLUDE_hcrypto = @INCLUDE_hcrypto@ +INCLUDE_hesiod = @INCLUDE_hesiod@ +INCLUDE_krb4 = @INCLUDE_krb4@ +INCLUDE_openldap = @INCLUDE_openldap@ +INCLUDE_readline = @INCLUDE_readline@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_VERSION_SCRIPT = @LDFLAGS_VERSION_SCRIPT@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBADD_roken = @LIBADD_roken@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@ +LIB_NDBM = @LIB_NDBM@ +LIB_XauFileName = @LIB_XauFileName@ +LIB_XauReadAuth = @LIB_XauReadAuth@ +LIB_XauWriteAuth = @LIB_XauWriteAuth@ +LIB_bswap16 = @LIB_bswap16@ +LIB_bswap32 = @LIB_bswap32@ +LIB_com_err = @LIB_com_err@ +LIB_com_err_a = @LIB_com_err_a@ +LIB_com_err_so = @LIB_com_err_so@ +LIB_crypt = @LIB_crypt@ +LIB_db_create = @LIB_db_create@ +LIB_dbm_firstkey = @LIB_dbm_firstkey@ +LIB_dbopen = @LIB_dbopen@ +LIB_dlopen = @LIB_dlopen@ +LIB_dn_expand = @LIB_dn_expand@ +LIB_door_create = @LIB_door_create@ +LIB_el_init = @LIB_el_init@ +LIB_freeaddrinfo = @LIB_freeaddrinfo@ +LIB_gai_strerror = @LIB_gai_strerror@ +LIB_getaddrinfo = @LIB_getaddrinfo@ +LIB_gethostbyname = @LIB_gethostbyname@ +LIB_gethostbyname2 = @LIB_gethostbyname2@ +LIB_getnameinfo = @LIB_getnameinfo@ +LIB_getpwnam_r = @LIB_getpwnam_r@ +LIB_getsockopt = @LIB_getsockopt@ +LIB_hcrypto = @LIB_hcrypto@ +LIB_hcrypto_a = @LIB_hcrypto_a@ +LIB_hcrypto_appl = @LIB_hcrypto_appl@ +LIB_hcrypto_so = @LIB_hcrypto_so@ +LIB_hesiod = @LIB_hesiod@ +LIB_hstrerror = @LIB_hstrerror@ +LIB_kdb = @LIB_kdb@ +LIB_krb4 = @LIB_krb4@ +LIB_loadquery = @LIB_loadquery@ +LIB_logout = @LIB_logout@ +LIB_logwtmp = @LIB_logwtmp@ +LIB_openldap = @LIB_openldap@ +LIB_openpty = @LIB_openpty@ +LIB_otp = @LIB_otp@ +LIB_pidfile = @LIB_pidfile@ +LIB_readline = @LIB_readline@ +LIB_res_ndestroy = @LIB_res_ndestroy@ +LIB_res_nsearch = @LIB_res_nsearch@ +LIB_res_search = @LIB_res_search@ +LIB_roken = @LIB_roken@ +LIB_security = @LIB_security@ +LIB_setsockopt = @LIB_setsockopt@ +LIB_socket = @LIB_socket@ +LIB_syslog = @LIB_syslog@ +LIB_tgetent = @LIB_tgetent@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NROFF = @NROFF@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PTHREADS_CFLAGS = @PTHREADS_CFLAGS@ +PTHREADS_LIBS = @PTHREADS_LIBS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +VERSIONING = @VERSIONING@ +VOID_RETSIGTYPE = @VOID_RETSIGTYPE@ +WFLAGS = @WFLAGS@ +WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@ +WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +YACC = @YACC@ +YFLAGS = -d +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dpagaix_cflags = @dpagaix_cflags@ +dpagaix_ldadd = @dpagaix_ldadd@ +dpagaix_ldflags = @dpagaix_ldflags@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUFFIXES = .et .h .x .z .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 +AM_CPPFLAGS = -I$(top_builddir)/include $(INCLUDES_roken) +@do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME +AM_CFLAGS = $(WFLAGS) +CP = cp +buildinclude = $(top_builddir)/include +LIB_getattr = @LIB_getattr@ +LIB_getpwent_r = @LIB_getpwent_r@ +LIB_odm_initialize = @LIB_odm_initialize@ +LIB_setpcred = @LIB_setpcred@ +HESIODLIB = @HESIODLIB@ +HESIODINCLUDE = @HESIODINCLUDE@ +NROFF_MAN = groff -mandoc -Tascii +LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS) +@KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \ +@KRB5_TRUE@ $(top_builddir)/lib/asn1/libasn1.la + +@KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la +@KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la +@DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la +lib_LTLIBRARIES = libcom_err.la +libcom_err_la_LDFLAGS = -version-info 2:3:1 $(am__append_1) +include_HEADERS = com_err.h com_right.h +compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l lex.h +libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) +dist_libcom_err_la_SOURCES = error.c com_err.c roken_rename.h +@do_roken_rename_TRUE@nodist_libcom_err_la_SOURCES = snprintf.c strlcpy.c +compile_et_LDADD = \ + libcom_err.la \ + $(LIB_roken) \ + $(LEXLIB) + +EXTRA_DIST = version-script.map +all: all-am + +.SUFFIXES: +.SUFFIXES: .et .h .x .z .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .l .lo .o .obj .y +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps lib/com_err/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign --ignore-deps lib/com_err/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libcom_err.la: $(libcom_err_la_OBJECTS) $(libcom_err_la_DEPENDENCIES) + $(libcom_err_la_LINK) -rpath $(libdir) $(libcom_err_la_OBJECTS) $(libcom_err_la_LIBADD) $(LIBS) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +parse.h: parse.c + @if test ! -f $@; then \ + rm -f parse.c; \ + $(MAKE) $(AM_MAKEFLAGS) parse.c; \ + else :; fi +compile_et$(EXEEXT): $(compile_et_OBJECTS) $(compile_et_DEPENDENCIES) + @rm -f compile_et$(EXEEXT) + $(LINK) $(compile_et_OBJECTS) $(compile_et_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(COMPILE) -c $< + +.c.obj: + $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + $(LTCOMPILE) -c -o $@ $< + +libcom_err_la-error.lo: error.c + $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcom_err_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcom_err_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c + +libcom_err_la-com_err.lo: com_err.c + $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcom_err_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcom_err_la-com_err.lo `test -f 'com_err.c' || echo '$(srcdir)/'`com_err.c + +libcom_err_la-snprintf.lo: snprintf.c + $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcom_err_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcom_err_la-snprintf.lo `test -f 'snprintf.c' || echo '$(srcdir)/'`snprintf.c + +libcom_err_la-strlcpy.lo: strlcpy.c + $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcom_err_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcom_err_la-strlcpy.lo `test -f 'strlcpy.c' || echo '$(srcdir)/'`strlcpy.c + +.l.c: + $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) + +.y.c: + $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ + $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(includedir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +install-binPROGRAMS: install-libLTLIBRARIES + +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -rm -f lex.c + -rm -f parse.c + -rm -f parse.h +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-includeHEADERS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +install-dvi: install-dvi-am + +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ + uninstall-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + +.MAKE: install-am install-data-am install-exec-am install-strip \ + uninstall-am + +.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ + clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 06:58:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AF451065674; Thu, 6 Oct 2011 06:58:54 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF4298FC23; Thu, 6 Oct 2011 06:58:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p966wr66047268; Thu, 6 Oct 2011 06:58:53 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p966wrMi047267; Thu, 6 Oct 2011 06:58:53 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110060658.p966wrMi047267@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 6 Oct 2011 06:58:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226050 - vendor/com_err/dist X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 06:58:54 -0000 Author: stas Date: Thu Oct 6 06:58:53 2011 New Revision: 226050 URL: http://svn.freebsd.org/changeset/base/226050 Log: - Disable SVN keyword expansion. Modified: Directory Properties: vendor/com_err/dist/ChangeLog (props changed) vendor/com_err/dist/Makefile.am (props changed) vendor/com_err/dist/Makefile.in (props changed) vendor/com_err/dist/com_err.c (props changed) vendor/com_err/dist/com_err.h (props changed) vendor/com_err/dist/com_right.h (props changed) vendor/com_err/dist/compile_et.c (props changed) vendor/com_err/dist/compile_et.h (props changed) vendor/com_err/dist/error.c (props changed) vendor/com_err/dist/lex.c (props changed) vendor/com_err/dist/lex.h (props changed) vendor/com_err/dist/lex.l (props changed) vendor/com_err/dist/parse.c (props changed) vendor/com_err/dist/parse.h (props changed) vendor/com_err/dist/parse.y (props changed) vendor/com_err/dist/roken_rename.h (props changed) vendor/com_err/dist/version-script.map (props changed) From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 07:07:10 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C335106566C; Thu, 6 Oct 2011 07:07:10 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 22E318FC16; Thu, 6 Oct 2011 07:07:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9677AT5047599; Thu, 6 Oct 2011 07:07:10 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9677AIF047598; Thu, 6 Oct 2011 07:07:10 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110060707.p9677AIF047598@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 6 Oct 2011 07:07:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226051 - head/contrib/com_err X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 07:07:10 -0000 Author: stas Date: Thu Oct 6 07:07:09 2011 New Revision: 226051 URL: http://svn.freebsd.org/changeset/base/226051 Log: - Bootstrap merge history for contrib/com_err. Modified: Directory Properties: head/contrib/com_err/ (props changed) From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 07:54:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A32391065672; Thu, 6 Oct 2011 07:54:28 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 912368FC19; Thu, 6 Oct 2011 07:54:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p967sSPg049107; Thu, 6 Oct 2011 07:54:28 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p967sSKa049096; Thu, 6 Oct 2011 07:54:28 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110060754.p967sSKa049096@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 6 Oct 2011 07:54:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226052 - vendor/com_err/dist X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 07:54:28 -0000 Author: stas Date: Thu Oct 6 07:54:28 2011 New Revision: 226052 URL: http://svn.freebsd.org/changeset/base/226052 Log: - Import com_err from heimdal 1.5.1 distribution. I used sources from GIT as we don't need autogenerated files, and for some reason the actual distribution tarball is missing the com_err.3 manpage. Added: vendor/com_err/dist/NTMakefile vendor/com_err/dist/com_err.3 vendor/com_err/dist/compile_et-version.rc vendor/com_err/dist/libcom_err-exports.def vendor/com_err/dist/libcom_err-version.rc Deleted: vendor/com_err/dist/Makefile.in vendor/com_err/dist/lex.c vendor/com_err/dist/parse.c vendor/com_err/dist/parse.h Modified: vendor/com_err/dist/ChangeLog (contents, props changed) vendor/com_err/dist/Makefile.am vendor/com_err/dist/com_err.c (contents, props changed) vendor/com_err/dist/com_err.h (contents, props changed) vendor/com_err/dist/com_right.h (contents, props changed) vendor/com_err/dist/compile_et.c (contents, props changed) vendor/com_err/dist/compile_et.h (contents, props changed) vendor/com_err/dist/error.c (contents, props changed) vendor/com_err/dist/lex.h (contents, props changed) vendor/com_err/dist/lex.l vendor/com_err/dist/parse.y vendor/com_err/dist/roken_rename.h (contents, props changed) vendor/com_err/dist/version-script.map Modified: vendor/com_err/dist/ChangeLog ============================================================================== --- vendor/com_err/dist/ChangeLog Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/ChangeLog Thu Oct 6 07:54:28 2011 (r226052) @@ -1,34 +1,34 @@ -2007-07-17 Love Hörnquist Åstrand +2007-07-17 Love Hörnquist Ã…strand * Makefile.am: split source files in dist and nodist. -2007-07-16 Love Hörnquist Åstrand +2007-07-16 Love Hörnquist Ã…strand * Makefile.am: Only do roken rename for the library. -2007-07-15 Love Hörnquist Åstrand +2007-07-15 Love Hörnquist Ã…strand * Makefile.am: use version script. * version-script.map: use version script. -2007-07-10 Love Hörnquist Åstrand +2007-07-10 Love Hörnquist Ã…strand * Makefile.am: New library version. -2006-10-19 Love Hörnquist Åstrand +2006-10-19 Love Hörnquist Ã…strand * Makefile.am (compile_et_SOURCES): add lex.h -2005-12-12 Love Hörnquist Åstrand +2005-12-12 Love Hörnquist Ã…strand * com_err.3: Document the _r functions. -2005-07-07 Love Hörnquist Åstrand +2005-07-07 Love Hörnquist Ã…strand * com_err.h: Include for va_list to help AIX 5.2. -2005-06-16 Love Hörnquist Åstrand +2005-06-16 Love Hörnquist Ã…strand * parse.y: rename base to base_id since flex defines a function with the argument base @@ -43,7 +43,7 @@ * compile_et.c: rename optind to optidx -2005-05-16 Love Hörnquist Åstrand +2005-05-16 Love Hörnquist Ã…strand * parse.y: check allocation errors @@ -57,11 +57,11 @@ * Makefile.am (LDADD): Add libcom_err.la -2005-04-24 Love Hörnquist Åstrand +2005-04-24 Love Hörnquist Ã…strand * include strlcpy and *printf and use them -2005-02-03 Love Hörnquist Åstrand +2005-02-03 Love Hörnquist Ã…strand * com_right.h: de-__P Modified: vendor/com_err/dist/Makefile.am ============================================================================== --- vendor/com_err/dist/Makefile.am Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/Makefile.am Thu Oct 6 07:54:28 2011 (r226052) @@ -1,4 +1,4 @@ -# $Id: Makefile.am 21619 2007-07-17 07:34:00Z lha $ +# $Id$ include $(top_srcdir)/Makefile.am.common @@ -11,19 +11,23 @@ if versionscript libcom_err_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map endif +libcom_err_la_LIBADD = $(LIB_libintl) + bin_PROGRAMS = compile_et include_HEADERS = com_err.h com_right.h compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l lex.h -libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) +libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) $(INCLUDE_libintl) dist_libcom_err_la_SOURCES = error.c com_err.c roken_rename.h if do_roken_rename nodist_libcom_err_la_SOURCES = snprintf.c strlcpy.c endif +libcom_err_la_DEPENDENCIES = version-script.map + $(compile_et_OBJECTS): parse.h parse.c ## XXX broken automake 1.4s compile_et_LDADD = \ @@ -36,4 +40,9 @@ snprintf.c: strlcpy.c: $(LN_S) $(srcdir)/../roken/strlcpy.c . -EXTRA_DIST = version-script.map +EXTRA_DIST = \ + NTMakefile \ + compile_et-version.rc \ + libcom_err-version.rc \ + libcom_err-exports.def \ + version-script.map Added: vendor/com_err/dist/NTMakefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/com_err/dist/NTMakefile Thu Oct 6 07:54:28 2011 (r226052) @@ -0,0 +1,91 @@ +######################################################################## +# +# Copyright (c) 2009, Secure Endpoints Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +RELDIR = lib\com_err + +intcflags=-DBUILD_KRB5_LIB + +!include ../../windows/NTMakefile.w32 + +INCFILES=$(INCDIR)\com_err.h $(INCDIR)\com_right.h + +libcomerr_OBJs=$(OBJ)\error.obj $(OBJ)\com_err.obj + +COMERRDLL=$(BINDIR)\com_err.dll + +!ifdef STATICLIBS + +$(LIBCOMERR): $(libcomerr_OBJs) + $(LIBCON) + +!else + +$(LIBCOMERR): $(COMERRDLL) + +$(COMERRDLL): $(libcomerr_OBJs) $(OBJ)\libcom_err-version.res + $(DLLGUILINK_C) -out:$(COMERRDLL) -implib:$(LIBCOMERR) $** \ + $(LIBROKEN) \ + -def:libcom_err-exports.def + $(DLLPREP_NODIST) + +!endif + +$(BINDIR)\compile_et.exe: $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj $(OBJ)\compile_et-version.res + $(EXECONLINK) $(LIBROKEN) $(LIBVERS) + $(EXEPREP_NOHEIM) + +$(OBJ)\parse.obj: $(OBJ)\parse.c + $(C2OBJ) -I$(SRC)\$(RELDIR) + +$(OBJ)\lex.obj: $(OBJ)\lex.c + $(C2OBJ) -I$(SRC)\$(RELDIR) -DYY_NO_UNISTD_H + +$(OBJ)\compile_et.obj: compile_et.c + $(C2OBJ) -I$(OBJ) + +$(OBJ)\parse.c: parse.y + $(YACC) -o $@ --defines=$(OBJ)\parse.h parse.y + +$(OBJ)\lex.c: lex.l + $(LEX) -o$@ lex.l + +all:: $(INCFILES) $(LIBCOMERR) $(BINDIR)\compile_et.exe + +clean:: + -$(RM) $(LIBCOMERR) + -$(RM) $(INCFILES) + -$(RM) $(COMERRDLL:.dll=.*) + -$(RM) $(BINDIR)\compile_et.* + +test-exports: + $(PERL) ..\..\cf\w32-check-exported-symbols.pl --vs version-script.map --def libcom_err-exports.def + +test:: test-exports Added: vendor/com_err/dist/com_err.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/com_err/dist/com_err.3 Thu Oct 6 07:54:28 2011 (r226052) @@ -0,0 +1,245 @@ +.\" Copyright (c) 2005 Kungliga Tekniska Högskolan +.\" (Royal Institute of Technology, Stockholm, Sweden). +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" 3. Neither the name of the Institute nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id$ +.\" +.\" This manpage was contributed by Gregory McGarry. +.\" +.Dd July 7, 2005 +.Dt COM_ERR 3 +.Os +.Sh NAME +.Nm com_err , +.Nm com_err_va , +.Nm error_message , +.Nm error_table_name , +.Nm init_error_table , +.Nm set_com_err_hook , +.Nm reset_com_err_hook , +.Nm add_to_error_table , +.Nm initialize_error_table_r +.Nm free_error_table , +.Nm com_right +.Nd common error display library +.Sh LIBRARY +Common Error Library (libcom_err, -lcom_err) +.Sh SYNOPSIS +.Fd #include +.Fd #include +.Fd #include +.Fd #include \&"XXX_err.h\&" +.Pp +typedef void (*errf)(const char *, long, const char *, ...); +.Ft void +.Fn com_err "const char *whoami" "long code" "const char *format" "..." +.Ft void +.Fn com_err_va "const char *whoami" "long code" "const char *format" "..." +.Ft const char * +.Fn error_message "long code" +.Ft const char * +.Fn error_table_name "int num" +.Ft int +.Fn init_error_table "const char **msgs" "long base" "int count" +.Ft errf +.Fn set_com_err_hook "errf func" +.Ft errf +.Fn reset_com_err_hook "" +.Ft void +.Fn add_to_error_table "struct et_list *new_table" +.Ft void +.Fn initialize_error_table_r "struct et_list **et_list" "const char **msgs" "int base" "long count" +.Ft void +.Fn free_error_table "struct et_list *" +.Ft const char * +.Fn com_right "struct et_list *list" long code" +.Sh DESCRIPTION +The +.Nm +library provides a common error-reporting mechanism for defining and +accessing error codes and descriptions for application software +packages. Error descriptions are defined in a table and error codes +are used to index the table. The error table, the descriptions and +the error codes are generated using +.Xr compile_et 1 . +.Pp +The error table is registered with the +.Nm +library by calling its initialisation function defined in its header +file. The initialisation function is generally defined as +.Fn initialize__error_table , +where +.Em name +is the name of the error table. +.Pp +If a thread-safe version of the library is needed +.Fn initialize__error_table_r +that internally calls +.Fn initialize_error_table_r +instead be used. +.Pp +Any variable which is to contain an error code should be declared +.Em _error_number +where +.Em name +is the name of the error table. +.Sh FUNCTIONS +The following functions are available to the application developer: +.Bl -tag -width compact +.It Fn com_err "whoami" "code" "format" "..." +Displays an error message on standard error composed of the +.Fa whoami +string, which should specify the program name, followed by an error +message generated from +.Fa code , +and a string produced using the +.Xr printf 3 +.Fa format +string and any following arguments. If +.Fa format +is NULL, the formatted message will not be +printed. The argument +.Fa format +may not be omitted. +.It Fn com_err_va "whoami" "code" "format" "va_list args" +This routine provides an interface, equivalent to +.Fn com_err , +which may be used by higher-level variadic functions (functions which +accept variable numbers of arguments). +.It Fn error_message "code" +Returns the character string error message associate with +.Fa code . +If +.Fa code is associated with an unknown error table, or if +.Fa code +is associated with a known error table but is not in the table, a +string of the form `Unknown code XXXX NN' is returned, where XXXX is +the error table name produced by reversing the compaction performed on +the error table number implied by that error code, and NN is the +offset from that base value. +.Pp +Although this routine is available for use when needed, its use should +be left to circumstances which render +.Fn com_err +unusable. +.Pp +.Fn com_right +returns the error string just like +.Fa com_err +but in a thread-safe way. +.Pp +.It Fn error_table_name "num" +Convert a machine-independent error table number +.Fa num +into an error table name. +.It Fn init_error_table "msgs" "base" "count" +Initialise the internal error table with the array of character string +error messages in +.Fa msgs +of length +.Fa count . +The error codes are assigned incrementally from +.Fa base . +This function is useful for using the error-reporting mechanism with +custom error tables that have not been generated with +.Xr compile_et 1 . +Although this routine is available for use when needed, its use should +be restricted. +.Pp +.Fn initialize_error_table_r +initialize the +.Fa et_list +in the same way as +.Fn init_error_table , +but in a thread-safe way. +.Pp +.It Fn set_com_err_hook "func" +Provides a hook into the +.Nm +library to allow the routine +.Fa func +to be dynamically substituted for +.Fn com_err . +After +.Fn set_com_err_hook + has been called, calls to +.Fn com_err +will turn into calls to the new hook routine. This function is +intended to be used in daemons to use a routine which calls +.Xr syslog 3 , +or in a window system application to pop up a dialogue box. +.It Fn reset_com_err_hook "" +Turns off the hook set in +.Fn set_com_err_hook . +.It Fn add_to_error_table "new_table" +Add the error table, its messages strings and error codes in +.Fa new_table +to the internal error table. +.El +.Sh EXAMPLES +The following is an example using the table defined in +.Xr compile_et 1 : +.Pp +.Bd -literal + #include + #include + #include + + #include "test_err.h" + + void + hook(const char *whoami, long code, + const char *format, va_list args) + { + char buffer[BUFSIZ]; + static int initialized = 0; + + if (!initialized) { + openlog(whoami, LOG_NOWAIT, LOG_DAEMON); + initialized = 1; + } + vsprintf(buffer, format, args); + syslog(LOG_ERR, "%s %s", error_message(code), buffer); + } + + int + main(int argc, char *argv[]) + { + char *whoami = argv[0]; + + initialize_test_error_table(); + com_err(whoami, TEST_INVAL, "before hook"); + set_com_err_hook(hook); + com_err(whoami, TEST_IO, "after hook"); + return (0); + } +.Ed +.Sh SEE ALSO +.Xr compile_et 1 Modified: vendor/com_err/dist/com_err.c ============================================================================== --- vendor/com_err/dist/com_err.c Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/com_err.c Thu Oct 6 07:54:28 2011 (r226052) @@ -1,40 +1,39 @@ /* - * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. + * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. + * 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. + * 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. * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H + #include -RCSID("$Id: com_err.c 14930 2005-04-24 19:43:06Z lha $"); -#endif + #include #include #include @@ -44,7 +43,7 @@ RCSID("$Id: com_err.c 14930 2005-04-24 1 struct et_list *_et_list = NULL; -const char * +KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL error_message (long code) { static char msg[128]; @@ -57,23 +56,23 @@ error_message (long code) } if (p != NULL && *p != '\0') { strlcpy(msg, p, sizeof(msg)); - } else + } else snprintf(msg, sizeof(msg), "Unknown error %ld", code); return msg; } -int +KRB5_LIB_FUNCTION int KRB5_LIB_CALL init_error_table(const char **msgs, long base, int count) { initialize_error_table_r(&_et_list, msgs, count, base); return 0; } -static void +static void KRB5_CALLCONV default_proc (const char *whoami, long code, const char *fmt, va_list args) __attribute__((__format__(__printf__, 3, 0))); - -static void + +static void KRB5_CALLCONV default_proc (const char *whoami, long code, const char *fmt, va_list args) { if (whoami) @@ -87,19 +86,19 @@ default_proc (const char *whoami, long c static errf com_err_hook = default_proc; -void -com_err_va (const char *whoami, - long code, - const char *fmt, +KRB5_LIB_FUNCTION void KRB5_LIB_CALL +com_err_va (const char *whoami, + long code, + const char *fmt, va_list args) { (*com_err_hook) (whoami, code, fmt, args); } -void +KRB5_LIB_FUNCTION void KRB5_LIB_CALL com_err (const char *whoami, long code, - const char *fmt, + const char *fmt, ...) { va_list ap; @@ -108,7 +107,7 @@ com_err (const char *whoami, va_end(ap); } -errf +KRB5_LIB_FUNCTION errf KRB5_LIB_CALL set_com_err_hook (errf new) { errf old = com_err_hook; @@ -117,12 +116,12 @@ set_com_err_hook (errf new) com_err_hook = new; else com_err_hook = default_proc; - + return old; } -errf -reset_com_err_hook (void) +KRB5_LIB_FUNCTION errf KRB5_LIB_CALL +reset_com_err_hook (void) { return set_com_err_hook(NULL); } @@ -135,7 +134,7 @@ static const char char_set[] = static char buf[6]; -const char * +KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL error_table_name(int num) { int ch; @@ -157,7 +156,7 @@ error_table_name(int num) return(buf); } -void +KRB5_LIB_FUNCTION void KRB5_LIB_CALL add_to_error_table(struct et_list *new_table) { struct et_list *et; Modified: vendor/com_err/dist/com_err.h ============================================================================== --- vendor/com_err/dist/com_err.h Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/com_err.h Thu Oct 6 07:54:28 2011 (r226052) @@ -1,37 +1,37 @@ /* - * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. + * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. + * 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. + * 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. * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ -/* $Id: com_err.h 15566 2005-07-07 14:58:07Z lha $ */ +/* $Id$ */ /* MIT compatible com_err library */ @@ -45,22 +45,32 @@ #define __attribute__(X) #endif -typedef void (*errf) (const char *, long, const char *, va_list); +typedef void (KRB5_CALLCONV *errf) (const char *, long, const char *, va_list); -const char * error_message (long); -int init_error_table (const char**, long, int); +KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL +error_message (long); -void com_err_va (const char *, long, const char *, va_list) +KRB5_LIB_FUNCTION int KRB5_LIB_CALL +init_error_table (const char**, long, int); + +KRB5_LIB_FUNCTION void KRB5_LIB_CALL +com_err_va (const char *, long, const char *, va_list) __attribute__((format(printf, 3, 0))); -void com_err (const char *, long, const char *, ...) +KRB5_LIB_FUNCTION void KRB5_LIB_CALL +com_err (const char *, long, const char *, ...) __attribute__((format(printf, 3, 4))); -errf set_com_err_hook (errf); -errf reset_com_err_hook (void); +KRB5_LIB_FUNCTION errf KRB5_LIB_CALL +set_com_err_hook (errf); + +KRB5_LIB_FUNCTION errf KRB5_LIB_CALL +reset_com_err_hook (void); -const char *error_table_name (int num); +KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL +error_table_name (int num); -void add_to_error_table (struct et_list *new_table); +KRB5_LIB_FUNCTION void KRB5_LIB_CALL +add_to_error_table (struct et_list *new_table); #endif /* __COM_ERR_H__ */ Modified: vendor/com_err/dist/com_right.h ============================================================================== --- vendor/com_err/dist/com_right.h Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/com_right.h Thu Oct 6 07:54:28 2011 (r226052) @@ -1,41 +1,61 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. + * 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. + * 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. * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ -/* $Id: com_right.h 14551 2005-02-03 08:45:13Z lha $ */ +/* $Id$ */ #ifndef __COM_RIGHT_H__ #define __COM_RIGHT_H__ +#ifndef KRB5_LIB +#ifndef KRB5_LIB_FUNCTION +#if defined(_WIN32) +#define KRB5_LIB_FUNCTION __declspec(dllimport) +#define KRB5_LIB_CALL __stdcall +#define KRB5_LIB_VARIABLE __declspec(dllimport) +#else +#define KRB5_LIB_FUNCTION +#define KRB5_LIB_CALL +#define KRB5_LIB_VARIABLE +#endif +#endif +#endif + +#ifdef _WIN32 +#define KRB5_CALLCONV __stdcall +#else +#define KRB5_CALLCONV +#endif + #ifdef __STDC__ #include #endif @@ -51,8 +71,16 @@ struct et_list { }; extern struct et_list *_et_list; -const char *com_right (struct et_list *list, long code); -void initialize_error_table_r (struct et_list **, const char **, int, long); -void free_error_table (struct et_list *); +KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL +com_right (struct et_list *list, long code); + +KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL +com_right_r (struct et_list *list, long code, char *, size_t); + +KRB5_LIB_FUNCTION void KRB5_LIB_CALL +initialize_error_table_r (struct et_list **, const char **, int, long); + +KRB5_LIB_FUNCTION void KRB5_LIB_CALL +free_error_table (struct et_list *); #endif /* __COM_RIGHT_H__ */ Added: vendor/com_err/dist/compile_et-version.rc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/com_err/dist/compile_et-version.rc Thu Oct 6 07:54:28 2011 (r226052) @@ -0,0 +1,36 @@ +/*********************************************************************** + * Copyright (c) 2010, Secure Endpoints Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + **********************************************************************/ + +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Error Table Compiler" +#define RC_FILE_ORIG_0409 "compile_et.exe" + +#include "../../windows/version.rc" Modified: vendor/com_err/dist/compile_et.c ============================================================================== --- vendor/com_err/dist/compile_et.c Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/compile_et.c Thu Oct 6 07:54:28 2011 (r226052) @@ -1,42 +1,43 @@ /* - * Copyright (c) 1998-2002 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. + * Copyright (c) 1998-2002 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. + * 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. + * 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. * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #undef ROKEN_RENAME + +#include "config.h" + #include "compile_et.h" #include -RCSID("$Id: compile_et.c 15426 2005-06-16 19:21:42Z lha $"); - #include #include #include "parse.h" @@ -75,13 +76,15 @@ generate_c(void) return 1; fprintf(c_file, "/* Generated from %s */\n", filename); - if(id_str) + if(id_str) fprintf(c_file, "/* %s */\n", id_str); fprintf(c_file, "\n"); fprintf(c_file, "#include \n"); fprintf(c_file, "#include \n"); fprintf(c_file, "#include \"%s\"\n", hfn); fprintf(c_file, "\n"); + fprintf(c_file, "#define N_(x) (x)\n"); + fprintf(c_file, "\n"); fprintf(c_file, "static const char *%s_error_strings[] = {\n", name); @@ -90,9 +93,10 @@ generate_c(void) fprintf(c_file, "\t/* %03d */ \"Reserved %s error (%d)\",\n", n, name, n); n++; - + } - fprintf(c_file, "\t/* %03d */ \"%s\",\n", ec->number, ec->string); + fprintf(c_file, "\t/* %03d */ N_(\"%s\"),\n", + ec->number, ec->string); } fprintf(c_file, "\tNULL\n"); @@ -100,11 +104,11 @@ generate_c(void) fprintf(c_file, "\n"); fprintf(c_file, "#define num_errors %d\n", number); fprintf(c_file, "\n"); - fprintf(c_file, - "void initialize_%s_error_table_r(struct et_list **list)\n", + fprintf(c_file, + "void initialize_%s_error_table_r(struct et_list **list)\n", name); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 07:56:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEF3D1065672; Thu, 6 Oct 2011 07:56:18 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9590D8FC0A; Thu, 6 Oct 2011 07:56:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p967uIdW049214; Thu, 6 Oct 2011 07:56:18 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p967uIpr049213; Thu, 6 Oct 2011 07:56:18 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110060756.p967uIpr049213@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 6 Oct 2011 07:56:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226053 - vendor/com_err/1.5.1 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 07:56:18 -0000 Author: stas Date: Thu Oct 6 07:56:18 2011 New Revision: 226053 URL: http://svn.freebsd.org/changeset/base/226053 Log: - Add tag for Heimdal com_err 1.5.1 version. Added: vendor/com_err/1.5.1/ - copied from r226052, vendor/com_err/dist/ From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 11:01:31 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C97FA1065670; Thu, 6 Oct 2011 11:01:31 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7F218FC12; Thu, 6 Oct 2011 11:01:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96B1VqT057631; Thu, 6 Oct 2011 11:01:31 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96B1Vnq057627; Thu, 6 Oct 2011 11:01:31 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110061101.p96B1Vnq057627@svn.freebsd.org> From: Marius Strobl Date: Thu, 6 Oct 2011 11:01:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226054 - in head/sys/sparc64: include sparc64 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 11:01:31 -0000 Author: marius Date: Thu Oct 6 11:01:31 2011 New Revision: 226054 URL: http://svn.freebsd.org/changeset/base/226054 Log: - Use atomic operations rather than sched_lock for safely assigning pm_active and pc_pmap for SMP. This is key to allowing adding support for SCHED_ULE. Thanks go to Peter Jeremy for additional testing. - Add support for SCHED_ULE to cpu_switch(). Committed from: 201110DevSummit Modified: head/sys/sparc64/include/asmacros.h head/sys/sparc64/sparc64/pmap.c head/sys/sparc64/sparc64/swtch.S Modified: head/sys/sparc64/include/asmacros.h ============================================================================== --- head/sys/sparc64/include/asmacros.h Thu Oct 6 07:56:18 2011 (r226053) +++ head/sys/sparc64/include/asmacros.h Thu Oct 6 11:01:31 2011 (r226054) @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Jake Burkholder. + * Copyright (c) 2011 Marius Strobl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -98,9 +99,67 @@ 9: andn r2, bits, r3 ; \ casxa [r1] ASI_N, r2, r3 ; \ cmp r2, r3 ; \ + bne,pn %xcc, 9b ; \ + mov r3, r2 + +/* + * Atomically load an integer from memory. + */ +#define ATOMIC_LOAD_INT(r1, val) \ + clr val ; \ + casa [r1] ASI_N, %g0, val + +/* + * Atomically load a long from memory. + */ +#define ATOMIC_LOAD_LONG(r1, val) \ + clr val ; \ + casxa [r1] ASI_N, %g0, val + +/* + * Atomically set a number of bits of an integer in memory. + */ +#define ATOMIC_SET_INT(r1, r2, r3, bits) \ + lduw [r1], r2 ; \ +9: or r2, bits, r3 ; \ + casa [r1] ASI_N, r2, r3 ; \ + cmp r2, r3 ; \ + bne,pn %icc, 9b ; \ + mov r3, r2 + +/* + * Atomically set a number of bits of a long in memory. + */ +#define ATOMIC_SET_LONG(r1, r2, r3, bits) \ + ldx [r1], r2 ; \ +9: or r2, bits, r3 ; \ + casxa [r1] ASI_N, r2, r3 ; \ + cmp r2, r3 ; \ + bne,pn %xcc, 9b ; \ + mov r3, r2 + +/* + * Atomically store an integer in memory. + */ +#define ATOMIC_STORE_INT(r1, r2, r3, val) \ + lduw [r1], r2 ; \ +9: mov val, r3 ; \ + casa [r1] ASI_N, r2, r3 ; \ + cmp r2, r3 ; \ bne,pn %icc, 9b ; \ mov r3, r2 +/* + * Atomically store a long in memory. + */ +#define ATOMIC_STORE_LONG(r1, r2, r3, val) \ + ldx [r1], r2 ; \ +9: mov val, r3 ; \ + casxa [r1] ASI_N, r2, r3 ; \ + cmp r2, r3 ; \ + bne,pn %xcc, 9b ; \ + mov r3, r2 + #define PCPU(member) PCPU_REG + PC_ ## member #define PCPU_ADDR(member, reg) \ add PCPU_REG, PC_ ## member, reg Modified: head/sys/sparc64/sparc64/pmap.c ============================================================================== --- head/sys/sparc64/sparc64/pmap.c Thu Oct 6 07:56:18 2011 (r226053) +++ head/sys/sparc64/sparc64/pmap.c Thu Oct 6 11:01:31 2011 (r226054) @@ -100,13 +100,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* XXX */ -#include "opt_sched.h" -#ifndef SCHED_4BSD -#error "sparc64 only works with SCHED_4BSD which uses a global scheduler lock." -#endif -extern struct mtx sched_lock; - /* * Virtual address of message buffer */ @@ -1232,11 +1225,9 @@ pmap_pinit(pmap_t pm) if (pm->pm_tsb_obj == NULL) pm->pm_tsb_obj = vm_object_allocate(OBJT_PHYS, TSB_PAGES); - mtx_lock_spin(&sched_lock); for (i = 0; i < MAXCPU; i++) pm->pm_context[i] = -1; CPU_ZERO(&pm->pm_active); - mtx_unlock_spin(&sched_lock); VM_OBJECT_LOCK(pm->pm_tsb_obj); for (i = 0; i < TSB_PAGES; i++) { @@ -1263,7 +1254,9 @@ pmap_release(pmap_t pm) { vm_object_t obj; vm_page_t m; +#ifdef SMP struct pcpu *pc; +#endif CTR2(KTR_PMAP, "pmap_release: ctx=%#x tsb=%p", pm->pm_context[curcpu], pm->pm_tsb); @@ -1283,11 +1276,18 @@ pmap_release(pmap_t pm) * - A process that referenced this pmap ran on a CPU, but we switched * to a kernel thread, leaving the pmap pointer unchanged. */ - mtx_lock_spin(&sched_lock); +#ifdef SMP + sched_pin(); STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) - if (pc->pc_pmap == pm) - pc->pc_pmap = NULL; - mtx_unlock_spin(&sched_lock); + atomic_cmpset_rel_ptr((uintptr_t *)&pc->pc_pmap, + (uintptr_t)pm, (uintptr_t)NULL); + sched_unpin(); +#else + critical_enter(); + if (PCPU_GET(pmap) == pm) + PCPU_SET(pmap, NULL); + critical_exit(); +#endif pmap_qremove((vm_offset_t)pm->pm_tsb, TSB_PAGES); obj = pm->pm_tsb_obj; @@ -2232,11 +2232,14 @@ pmap_activate(struct thread *td) } PCPU_SET(tlb_ctx, context + 1); - mtx_lock_spin(&sched_lock); pm->pm_context[curcpu] = context; +#ifdef SMP + CPU_SET_ATOMIC(PCPU_GET(cpuid), &pm->pm_active); + atomic_store_ptr((uintptr_t *)PCPU_PTR(pmap), (uintptr_t)pm); +#else CPU_SET(PCPU_GET(cpuid), &pm->pm_active); PCPU_SET(pmap, pm); - mtx_unlock_spin(&sched_lock); +#endif stxa(AA_DMMU_TSB, ASI_DMMU, pm->pm_tsb); stxa(AA_IMMU_TSB, ASI_IMMU, pm->pm_tsb); Modified: head/sys/sparc64/sparc64/swtch.S ============================================================================== --- head/sys/sparc64/sparc64/swtch.S Thu Oct 6 07:56:18 2011 (r226053) +++ head/sys/sparc64/sparc64/swtch.S Thu Oct 6 11:01:31 2011 (r226054) @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Jake Burkholder. + * Copyright (c) 2011 Marius Strobl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include "assym.s" +#include "opt_sched.h" .register %g2, #ignore .register %g3, #ignore @@ -66,7 +68,7 @@ ENTRY(cpu_switch) nop call savefpctx add PCB_REG, PCB_KFP, %o0 - ba,a %xcc, 2f + ba,a,pt %xcc, 2f nop /* @@ -148,7 +150,7 @@ ENTRY(cpu_switch) * If they are the same we are done. */ cmp %l2, %l1 - be,a,pn %xcc, 7f + be,a,pn %xcc, 8f nop /* @@ -157,7 +159,7 @@ ENTRY(cpu_switch) */ SET(vmspace0, %i4, %i3) cmp %i5, %i3 - be,a,pn %xcc, 7f + be,a,pn %xcc, 8f nop /* @@ -180,9 +182,15 @@ ENTRY(cpu_switch) sub %l3, %l5, %l5 mov 1, %l6 sllx %l6, %l5, %l5 +#ifdef SMP + add %l2, %l4, %l4 + membar #LoadStore | #StoreStore + ATOMIC_CLEAR_LONG(%l4, %l6, %l7, %l5) +#else ldx [%l2 + %l4], %l6 andn %l6, %l5, %l6 stx %l6, [%l2 + %l4] +#endif /* * Take away its context number. @@ -194,14 +202,20 @@ ENTRY(cpu_switch) 3: cmp %i2, %g0 be,pn %xcc, 4f - lduw [PCPU(TLB_CTX_MAX)], %i4 - stx %i2, [%i0 + TD_LOCK] + add %i0, TD_LOCK, %l4 +#if defined(SCHED_ULE) && defined(SMP) + membar #LoadStore | #StoreStore + ATOMIC_STORE_LONG(%l4, %l6, %l7, %i2) +#else + stx %i2, [%l4] +#endif /* * Find a new TLB context. If we've run out we have to flush all * user mappings from the TLB and reset the context numbers. */ 4: lduw [PCPU(TLB_CTX)], %i3 + lduw [PCPU(TLB_CTX_MAX)], %i4 cmp %i3, %i4 bne,a,pt %xcc, 5f nop @@ -237,14 +251,24 @@ ENTRY(cpu_switch) sub %l3, %l5, %l5 mov 1, %l6 sllx %l6, %l5, %l5 +#ifdef SMP + add %l1, %l4, %l4 + ATOMIC_SET_LONG(%l4, %l6, %l7, %l5) +#else ldx [%l1 + %l4], %l6 or %l6, %l5, %l6 stx %l6, [%l1 + %l4] +#endif /* * Make note of the change in pmap. */ +#ifdef SMP + PCPU_ADDR(PMAP, %l4) + ATOMIC_STORE_LONG(%l4, %l5, %l6, %l1) +#else stx %l1, [PCPU(PMAP)] +#endif /* * Fiddle the hardware bits. Set the TSB registers and install the @@ -264,19 +288,35 @@ ENTRY(cpu_switch) stxa %i3, [%i5] ASI_DMMU flush %i4 +6: +#if defined(SCHED_ULE) && defined(SMP) + SET(blocked_lock, %l2, %l1) + add %i1, TD_LOCK, %l2 +7: + ATOMIC_LOAD_LONG(%l2, %l3) + cmp %l1, %l3 + be,a,pn %xcc, 7b + nop +#endif + /* * Done, return and load the new process's window from the stack. */ - -6: ret + ret restore -7: cmp %i2, %g0 - be,a,pn %xcc, 6b +8: cmp %i2, %g0 + be,pn %xcc, 6b + add %i0, TD_LOCK, %l4 +#if defined(SCHED_ULE) && defined(SMP) + membar #LoadStore | #StoreStore + ATOMIC_STORE_LONG(%l4, %l6, %l7, %i2) + ba,pt %xcc, 6b nop - stx %i2, [%i0 + TD_LOCK] - ret - restore +#else + ba,pt %xcc, 6b + stx %i2, [%l4] +#endif END(cpu_switch) ENTRY(savectx) From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 11:48:14 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 149EA106564A; Thu, 6 Oct 2011 11:48:14 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DF5B78FC0A; Thu, 6 Oct 2011 11:48:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96BmDUV059218; Thu, 6 Oct 2011 11:48:13 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96BmDWn059216; Thu, 6 Oct 2011 11:48:13 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110061148.p96BmDWn059216@svn.freebsd.org> From: Marius Strobl Date: Thu, 6 Oct 2011 11:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226057 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 11:48:14 -0000 Author: marius Date: Thu Oct 6 11:48:13 2011 New Revision: 226057 URL: http://svn.freebsd.org/changeset/base/226057 Log: - Currently, sched_balance_pair() may cause a CPU to send an IPI_PREEMPT to itself, which sparc64 hardware doesn't support. One way to solve this would be to directly call sched_preempt() instead of issuing a self-IPI. However, quoting jhb@: "On the other hand, you can probably just skip the IPI entirely if we are going to send it to the current CPU. Presumably, once this routine finishes, the current CPU will exit softlock (or will do so "soon") and will then pick the next thread to run based on the adjustments made in this routine, so there's no need to IPI the CPU running this routine anyway. I think this is the better solution. Right now what is probably happening on other platforms is as soon as this routine finishes the CPU processes its self-IPI and causes mi_switch() which will just switch back to the softclock thread it is already running." - With r226054 and the the above change in place, sparc64 now no longer is incompatible with ULE and vice versa. However, powerpc/E500 still is. Submitted by: jhb Reviewed by: jeff Modified: head/sys/kern/sched_ule.c Modified: head/sys/kern/sched_ule.c ============================================================================== --- head/sys/kern/sched_ule.c Thu Oct 6 11:20:21 2011 (r226056) +++ head/sys/kern/sched_ule.c Thu Oct 6 11:48:13 2011 (r226057) @@ -76,7 +76,7 @@ dtrace_vtime_switch_func_t dtrace_vtime_ #include #include -#if defined(__sparc64__) +#if defined(__powerpc__) && defined(E500) #error "This architecture is not currently compatible with ULE" #endif @@ -839,6 +839,7 @@ sched_balance_pair(struct tdq *high, str int low_load; int moved; int move; + int cpu; int diff; int i; @@ -860,10 +861,14 @@ sched_balance_pair(struct tdq *high, str for (i = 0; i < move; i++) moved += tdq_move(high, low); /* - * IPI the target cpu to force it to reschedule with the new - * workload. + * In case the target isn't the current cpu IPI it to force a + * reschedule with the new workload. */ - ipi_cpu(TDQ_ID(low), IPI_PREEMPT); + cpu = TDQ_ID(low); + sched_pin(); + if (cpu != PCPU_GET(cpuid)) + ipi_cpu(cpu, IPI_PREEMPT); + sched_unpin(); } tdq_unlock_pair(high, low); return (moved); From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 14:22:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C221A1065674; Thu, 6 Oct 2011 14:22:38 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B1E028FC18; Thu, 6 Oct 2011 14:22:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96EMcRJ064247; Thu, 6 Oct 2011 14:22:38 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96EMc6L064245; Thu, 6 Oct 2011 14:22:38 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110061422.p96EMc6L064245@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 6 Oct 2011 14:22:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226058 - head/usr.sbin/bsdinstall/scripts X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 14:22:38 -0000 Author: nwhitehorn Date: Thu Oct 6 14:22:38 2011 New Revision: 226058 URL: http://svn.freebsd.org/changeset/base/226058 Log: Ask if you want to set the keymap before invoking kdbmap to prevent confusion. PR: bin/160913 MFC after: 3 days Modified: head/usr.sbin/bsdinstall/scripts/keymap Modified: head/usr.sbin/bsdinstall/scripts/keymap ============================================================================== --- head/usr.sbin/bsdinstall/scripts/keymap Thu Oct 6 11:48:13 2011 (r226057) +++ head/usr.sbin/bsdinstall/scripts/keymap Thu Oct 6 14:22:38 2011 (r226058) @@ -28,6 +28,8 @@ kbdcontrol -d >/dev/null 2>&1 if [ $? -eq 0 ]; then + dialog --backtitle "FreeBSD Installer" --title "Keymap Selection" \ + --yesno "Would you like to set a non-default key mapping for your keyboard?" 0 0 || exit 0 exec 3>&1 kbdmap 2>&1 1>&3 | grep 'keymap=' > $BSDINSTALL_TMPETC/rc.conf.keymap fi From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 14:24:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEB2B106564A; Thu, 6 Oct 2011 14:24:37 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE7C58FC14; Thu, 6 Oct 2011 14:24:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96EObDN064343; Thu, 6 Oct 2011 14:24:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96EOb6W064341; Thu, 6 Oct 2011 14:24:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110061424.p96EOb6W064341@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 6 Oct 2011 14:24:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226059 - head/usr.sbin/bsdinstall/scripts X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 14:24:38 -0000 Author: nwhitehorn Date: Thu Oct 6 14:24:37 2011 New Revision: 226059 URL: http://svn.freebsd.org/changeset/base/226059 Log: Move "Exit" to the first entry in the list, so that it is the default choice. PR: bin/160913 MFC after: 3 days Modified: head/usr.sbin/bsdinstall/scripts/auto Modified: head/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- head/usr.sbin/bsdinstall/scripts/auto Thu Oct 6 14:22:38 2011 (r226058) +++ head/usr.sbin/bsdinstall/scripts/auto Thu Oct 6 14:24:37 2011 (r226059) @@ -158,6 +158,7 @@ finalconfig() { REVISIT=$(dialog --backtitle "FreeBSD Installer" \ --title "Final Configuration" --no-cancel --menu \ "Setup of your FreeBSD system is nearly complete. You can now modify your configuration choices or apply more complex changes using a shell." 0 0 0 \ + "Exit" "Apply configuration and exit installer" "Add User" "Add a user to the system" \ "Root Password" "Change root password" \ "Hostname" "Set system hostname" \ @@ -165,8 +166,7 @@ finalconfig() { "Services" "Set daemons to run on startup" \ "Time Zone" "Set system timezone" \ "Handbook" "Install FreeBSD Handbook (requires network)" \ - "Shell" "Open a shell in the new system" \ - "Exit" "Apply configuration and exit installer" 2>&1 1>&3) + "Shell" "Open a shell in the new system" 2>&1 1>&3) exec 3>&- case "$REVISIT" in From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 14:29:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F127C106566B; Thu, 6 Oct 2011 14:29:38 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E137F8FC13; Thu, 6 Oct 2011 14:29:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96ETcwc064535; Thu, 6 Oct 2011 14:29:38 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96ETcDY064533; Thu, 6 Oct 2011 14:29:38 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201110061429.p96ETcDY064533@svn.freebsd.org> From: Attilio Rao Date: Thu, 6 Oct 2011 14:29:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226060 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 14:29:39 -0000 Author: attilio Date: Thu Oct 6 14:29:38 2011 New Revision: 226060 URL: http://svn.freebsd.org/changeset/base/226060 Log: For the INP_TIMEWAIT case, there is no valid tcpcb object tied to the inpcb object. Skip the TCP_SIGNATURE check in that case as it is consistent with the output path (no TCP_SIGNATURE for outcoming packets in TIMEWAIT state) and also because for TIMEWAIT state the verify may be less effective. Sponsored by: Sandvine Incorporated Reported by: rwatson No objections by: rwatson MFC after: 3 days Modified: head/sys/netinet/tcp_input.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Thu Oct 6 14:24:37 2011 (r226059) +++ head/sys/netinet/tcp_input.c Thu Oct 6 14:29:38 2011 (r226060) @@ -948,24 +948,8 @@ relocked: } INP_INFO_WLOCK_ASSERT(&V_tcbinfo); -#ifdef TCP_SIGNATURE - tcp_dooptions(&to, optp, optlen, - (thflags & TH_SYN) ? TO_SYN : 0); - if (sig_checked == 0) { - tp = intotcpcb(inp); - if (tp == NULL || tp->t_state == TCPS_CLOSED) { - rstreason = BANDLIM_RST_CLOSEDPORT; - goto dropwithreset; - } - if (!tcp_signature_verify_input(m, off0, tlen, optlen, - &to, th, tp->t_flags)) - goto dropunlock; - sig_checked = 1; - } -#else if (thflags & TH_SYN) tcp_dooptions(&to, optp, optlen, TO_SYN); -#endif /* * NB: tcp_twcheck unlocks the INP and frees the mbuf. */ From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 14:33:33 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51A541065679; Thu, 6 Oct 2011 14:33:33 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 413398FC0C; Thu, 6 Oct 2011 14:33:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96EXX51064731; Thu, 6 Oct 2011 14:33:33 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96EXXgc064729; Thu, 6 Oct 2011 14:33:33 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201110061433.p96EXXgc064729@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 6 Oct 2011 14:33:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226061 - stable/9/sys/dev/puc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 14:33:33 -0000 Author: ae Date: Thu Oct 6 14:33:32 2011 New Revision: 226061 URL: http://svn.freebsd.org/changeset/base/226061 Log: MFC r225878: Add Oxford Semiconductor OXPCIe952 (0x1c38) 1 port serial card. PR: kern/160895 Submitted by: Konstantin V. Krotov Approved by: re (kib) Modified: stable/9/sys/dev/puc/pucdata.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/puc/pucdata.c ============================================================================== --- stable/9/sys/dev/puc/pucdata.c Thu Oct 6 14:29:38 2011 (r226060) +++ stable/9/sys/dev/puc/pucdata.c Thu Oct 6 14:33:32 2011 (r226061) @@ -733,6 +733,13 @@ const struct puc_cfg puc_pci_devices[] = * */ + { 0x1415, 0xc138, 0xffff, 0, + "Oxford Semiconductor OXPCIe952 UARTs", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + { 0x1415, 0xc158, 0xffff, 0, "Oxford Semiconductor OXPCIe952 UARTs", DEFAULT_RCLK * 0x22, From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 14:35:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD1B2106566B; Thu, 6 Oct 2011 14:35:09 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C83F8FC12; Thu, 6 Oct 2011 14:35:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96EZ9hQ064822; Thu, 6 Oct 2011 14:35:09 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96EZ9Lm064820; Thu, 6 Oct 2011 14:35:09 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201110061435.p96EZ9Lm064820@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 6 Oct 2011 14:35:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226062 - stable/8/sys/dev/puc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 14:35:09 -0000 Author: ae Date: Thu Oct 6 14:35:09 2011 New Revision: 226062 URL: http://svn.freebsd.org/changeset/base/226062 Log: MFC r225878: Add Oxford Semiconductor OXPCIe952 (0xc138) 1 port serial card. PR: kern/160895 Submitted by: Konstantin V. Krotov Modified: stable/8/sys/dev/puc/pucdata.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/puc/pucdata.c ============================================================================== --- stable/8/sys/dev/puc/pucdata.c Thu Oct 6 14:33:32 2011 (r226061) +++ stable/8/sys/dev/puc/pucdata.c Thu Oct 6 14:35:09 2011 (r226062) @@ -733,6 +733,13 @@ const struct puc_cfg puc_pci_devices[] = * */ + { 0x1415, 0xc138, 0xffff, 0, + "Oxford Semiconductor OXPCIe952 UARTs", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + { 0x1415, 0xc158, 0xffff, 0, "Oxford Semiconductor OXPCIe952 UARTs", DEFAULT_RCLK * 0x22, From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 15:10:48 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65FCD106564A; Thu, 6 Oct 2011 15:10:48 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 55DCE8FC15; Thu, 6 Oct 2011 15:10:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96FAmBq065971; Thu, 6 Oct 2011 15:10:48 GMT (envelope-from melifaro@svn.freebsd.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96FAmBH065969; Thu, 6 Oct 2011 15:10:48 GMT (envelope-from melifaro@svn.freebsd.org) Message-Id: <201110061510.p96FAmBH065969@svn.freebsd.org> From: "Alexander V. Chernikov" Date: Thu, 6 Oct 2011 15:10:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226063 - head/share/misc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 15:10:48 -0000 Author: melifaro Date: Thu Oct 6 15:10:48 2011 New Revision: 226063 URL: http://svn.freebsd.org/changeset/base/226063 Log: Add myself. Approved by: kib (mentor) Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot ============================================================================== --- head/share/misc/committers-src.dot Thu Oct 6 14:35:09 2011 (r226062) +++ head/share/misc/committers-src.dot Thu Oct 6 15:10:48 2011 (r226063) @@ -185,6 +185,7 @@ mav [label="Alexander Motin\nmav@FreeBSD maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002/02/07"] mdf [label="Matthew Fleming\nmdf@FreeBSD.org\n2010/06/04"] mdodd [label="Matthew N. Dodd\nmdodd@FreeBSD.org\n1999/07/27"] +melifaro [label="Alexander V. Chernikov\nmelifaro@FreeBSD.org\n2011/10/04"] mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"] mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] @@ -273,6 +274,8 @@ day1 -> dg adrian -> ray adrian -> rmh +ae -> melifaro + andre -> qingli anholt -> jkim @@ -438,6 +441,7 @@ kan -> kib kib -> ae kib -> dchagin kib -> lulf +kib -> melifaro kib -> pho kib -> pluknet kib -> rdivacky From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 16:13:47 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1493106566B; Thu, 6 Oct 2011 16:13:47 +0000 (UTC) (envelope-from wxs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E18F98FC12; Thu, 6 Oct 2011 16:13:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96GDltn068021; Thu, 6 Oct 2011 16:13:47 GMT (envelope-from wxs@svn.freebsd.org) Received: (from wxs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96GDlZk068019; Thu, 6 Oct 2011 16:13:47 GMT (envelope-from wxs@svn.freebsd.org) Message-Id: <201110061613.p96GDlZk068019@svn.freebsd.org> From: Wesley Shields Date: Thu, 6 Oct 2011 16:13:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226064 - head/sys/dev/ata X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 16:13:48 -0000 Author: wxs (ports committer) Date: Thu Oct 6 16:13:47 2011 New Revision: 226064 URL: http://svn.freebsd.org/changeset/base/226064 Log: Fix a typo in a comment. Approved by: kib@ Modified: head/sys/dev/ata/ata-all.c Modified: head/sys/dev/ata/ata-all.c ============================================================================== --- head/sys/dev/ata/ata-all.c Thu Oct 6 15:10:48 2011 (r226063) +++ head/sys/dev/ata/ata-all.c Thu Oct 6 16:13:47 2011 (r226064) @@ -837,7 +837,7 @@ ata_boot_attach(void) mtx_lock(&Giant); /* newbus suckage it needs Giant */ - /* kick of probe and attach on all channels */ + /* kick off probe and attach on all channels */ for (ctlr = 0; ctlr < devclass_get_maxunit(ata_devclass); ctlr++) { if ((ch = devclass_get_softc(ata_devclass, ctlr))) { ata_identify(ch->dev); From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 17:34:43 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BE801065670; Thu, 6 Oct 2011 17:34:43 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6AC9E8FC08; Thu, 6 Oct 2011 17:34:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96HYh4j070553; Thu, 6 Oct 2011 17:34:43 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96HYhlx070548; Thu, 6 Oct 2011 17:34:43 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110061734.p96HYhlx070548@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 6 Oct 2011 17:34:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226065 - in head/sys/mips: include mips X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 17:34:43 -0000 Author: kib Date: Thu Oct 6 17:34:43 2011 New Revision: 226065 URL: http://svn.freebsd.org/changeset/base/226065 Log: Convert MIPS to the syscallenter/syscallret system call sequence handlers. This was the last architecture used custom syscall entry sequence. Reviewed, debugged, tested and approved by: jchandra MFC after: 1 month Modified: head/sys/mips/include/proc.h head/sys/mips/mips/elf64_machdep.c head/sys/mips/mips/elf_machdep.c head/sys/mips/mips/trap.c Modified: head/sys/mips/include/proc.h ============================================================================== --- head/sys/mips/include/proc.h Thu Oct 6 16:13:47 2011 (r226064) +++ head/sys/mips/include/proc.h Thu Oct 6 17:34:43 2011 (r226065) @@ -67,11 +67,22 @@ struct mdproc { /* empty */ }; +#ifdef _KERNEL struct thread; void mips_cpu_switch(struct thread *, struct thread *, struct mtx *); void mips_cpu_throw(struct thread *, struct thread *); +struct syscall_args { + u_int code; + struct sysent *callp; + register_t args[8]; + int narg; + struct trapframe *trapframe; +}; +#define HAVE_SYSCALL_ARGS_DEF 1 +#endif + #ifdef __mips_n64 #define KINFO_PROC_SIZE 1088 #else Modified: head/sys/mips/mips/elf64_machdep.c ============================================================================== --- head/sys/mips/mips/elf64_machdep.c Thu Oct 6 16:13:47 2011 (r226064) +++ head/sys/mips/mips/elf64_machdep.c Thu Oct 6 17:34:43 2011 (r226065) @@ -80,8 +80,8 @@ struct sysentvec elf64_freebsd_sysvec = .sv_maxssiz = NULL, .sv_flags = SV_ABI_FREEBSD | SV_LP64, .sv_set_syscall_retval = cpu_set_syscall_retval, - .sv_fetch_syscall_args = NULL, /* XXXKIB */ - .sv_syscallnames = NULL, + .sv_fetch_syscall_args = cpu_fetch_syscall_args, + .sv_syscallnames = syscallnames, .sv_schedtail = NULL, }; Modified: head/sys/mips/mips/elf_machdep.c ============================================================================== --- head/sys/mips/mips/elf_machdep.c Thu Oct 6 16:13:47 2011 (r226064) +++ head/sys/mips/mips/elf_machdep.c Thu Oct 6 17:34:43 2011 (r226065) @@ -80,7 +80,7 @@ struct sysentvec elf64_freebsd_sysvec = .sv_maxssiz = NULL, .sv_flags = SV_ABI_FREEBSD | SV_LP64, .sv_set_syscall_retval = cpu_set_syscall_retval, - .sv_fetch_syscall_args = NULL, /* XXXKIB */ + .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, .sv_schedtail = NULL, }; @@ -136,7 +136,7 @@ struct sysentvec elf32_freebsd_sysvec = .sv_maxssiz = NULL, .sv_flags = SV_ABI_FREEBSD | SV_ILP32, .sv_set_syscall_retval = cpu_set_syscall_retval, - .sv_fetch_syscall_args = NULL, /* XXXKIB */ + .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, .sv_schedtail = NULL, }; Modified: head/sys/mips/mips/trap.c ============================================================================== --- head/sys/mips/mips/trap.c Thu Oct 6 16:13:47 2011 (r226064) +++ head/sys/mips/mips/trap.c Thu Oct 6 17:34:43 2011 (r226065) @@ -261,6 +261,133 @@ static int emulate_unaligned_access(stru extern void fswintrberr(void); /* XXX */ +int +cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa) +{ + struct trapframe *locr0 = td->td_frame; + struct sysentvec *se; + int error, nsaved; + + bzero(sa->args, sizeof(sa->args)); + + /* compute next PC after syscall instruction */ + td->td_pcb->pcb_tpc = sa->trapframe->pc; /* Remember if restart */ + if (DELAYBRANCH(sa->trapframe->cause)) /* Check BD bit */ + locr0->pc = MipsEmulateBranch(locr0, sa->trapframe->pc, 0, 0); + else + locr0->pc += sizeof(int); + sa->code = locr0->v0; + + switch (sa->code) { +#if defined(__mips_n32) || defined(__mips_n64) + case SYS___syscall: + /* + * Quads fit in a single register in + * new ABIs. + * + * XXX o64? + */ +#endif + case SYS_syscall: + /* + * Code is first argument, followed by + * actual args. + */ + sa->code = locr0->a0; + sa->args[0] = locr0->a1; + sa->args[1] = locr0->a2; + sa->args[2] = locr0->a3; + nsaved = 3; +#if defined(__mips_n32) || defined(__mips_n64) + sa->args[3] = locr0->t4; + sa->args[4] = locr0->t5; + sa->args[5] = locr0->t6; + sa->args[6] = locr0->t7; + nsaved += 4; +#endif + break; + +#if defined(__mips_o32) + case SYS___syscall: + /* + * Like syscall, but code is a quad, so as + * to maintain quad alignment for the rest + * of the arguments. + */ + if (_QUAD_LOWWORD == 0) + sa->code = locr0->a0; + else + sa->code = locr0->a1; + sa->args[0] = locr0->a2; + sa->args[1] = locr0->a3; + nsaved = 2; + break; +#endif + + default: + sa->args[0] = locr0->a0; + sa->args[1] = locr0->a1; + sa->args[2] = locr0->a2; + sa->args[3] = locr0->a3; + nsaved = 4; +#if defined (__mips_n32) || defined(__mips_n64) + sa->args[4] = locr0->t4; + sa->args[5] = locr0->t5; + sa->args[6] = locr0->t6; + sa->args[7] = locr0->t7; + nsaved += 4; +#endif + break; + } +#ifdef TRAP_DEBUG + if (trap_debug) + printf("SYSCALL #%d pid:%u\n", code, p->p_pid); +#endif + + se = td->td_proc->p_sysent; + if (se->sv_mask) + sa->code &= se->sv_mask; + + if (sa->code >= se->sv_size) + sa->callp = &se->sv_table[0]; + else + sa->callp = &se->sv_table[sa->code]; + + sa->narg = sa->callp->sy_narg; + + if (sa->narg > nsaved) { +#if defined(__mips_n32) || defined(__mips_n64) + /* + * XXX + * Is this right for new ABIs? I think the 4 there + * should be 8, size there are 8 registers to skip, + * not 4, but I'm not certain. + */ + printf("SYSCALL #%u pid:%u, nargs > nsaved.\n", sa->code, + td->td_proc->p_pid); +#endif + error = copyin((caddr_t)(intptr_t)(locr0->sp + + 4 * sizeof(register_t)), (caddr_t)&sa->args[nsaved], + (u_int)(sa->narg - nsaved) * sizeof(register_t)); + if (error != 0) { + locr0->v0 = error; + locr0->a3 = 1; + } + } else + error = 0; + + if (error == 0) { + td->td_retval[0] = 0; + td->td_retval[1] = locr0->v1; + } + + return (error); +} + +#undef __FBSDID +#define __FBSDID(x) +#include "../../kern/subr_syscall.c" + /* * Handle an exception. * Called from MipsKernGenException() or MipsUserGenException() @@ -527,177 +654,19 @@ dofault: case T_SYSCALL + T_USER: { - struct trapframe *locr0 = td->td_frame; - struct sysent *callp; - unsigned int code; - int nargs, nsaved; - register_t args[8]; + struct syscall_args sa; + int error; - bzero(args, sizeof args); - - /* - * note: PCPU_LAZY_INC() can only be used if we can - * afford occassional inaccuracy in the count. - */ - PCPU_LAZY_INC(cnt.v_syscall); - if (td->td_ucred != p->p_ucred) - cred_update_thread(td); -#ifdef KSE - if (p->p_flag & P_SA) - thread_user_enter(td); -#endif - /* compute next PC after syscall instruction */ - td->td_pcb->pcb_tpc = trapframe->pc; /* Remember if restart */ - if (DELAYBRANCH(trapframe->cause)) { /* Check BD bit */ - locr0->pc = MipsEmulateBranch(locr0, trapframe->pc, 0, - 0); - } else { - locr0->pc += sizeof(int); - } - code = locr0->v0; - - switch (code) { -#if defined(__mips_n32) || defined(__mips_n64) - case SYS___syscall: - /* - * Quads fit in a single register in - * new ABIs. - * - * XXX o64? - */ -#endif - case SYS_syscall: - /* - * Code is first argument, followed by - * actual args. - */ - code = locr0->a0; - args[0] = locr0->a1; - args[1] = locr0->a2; - args[2] = locr0->a3; - nsaved = 3; -#if defined(__mips_n32) || defined(__mips_n64) - args[3] = locr0->t4; - args[4] = locr0->t5; - args[5] = locr0->t6; - args[6] = locr0->t7; - nsaved += 4; -#endif - break; - -#if defined(__mips_o32) - case SYS___syscall: - /* - * Like syscall, but code is a quad, so as - * to maintain quad alignment for the rest - * of the arguments. - */ - if (_QUAD_LOWWORD == 0) { - code = locr0->a0; - } else { - code = locr0->a1; - } - args[0] = locr0->a2; - args[1] = locr0->a3; - nsaved = 2; - break; -#endif - - default: - args[0] = locr0->a0; - args[1] = locr0->a1; - args[2] = locr0->a2; - args[3] = locr0->a3; - nsaved = 4; -#if defined (__mips_n32) || defined(__mips_n64) - args[4] = locr0->t4; - args[5] = locr0->t5; - args[6] = locr0->t6; - args[7] = locr0->t7; - nsaved += 4; -#endif - } -#ifdef TRAP_DEBUG - if (trap_debug) { - printf("SYSCALL #%d pid:%u\n", code, p->p_pid); - } -#endif - - 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]; - - nargs = callp->sy_narg; - - if (nargs > nsaved) { -#if defined(__mips_n32) || defined(__mips_n64) - /* - * XXX - * Is this right for new ABIs? I think the 4 there - * should be 8, size there are 8 registers to skip, - * not 4, but I'm not certain. - */ - printf("SYSCALL #%u pid:%u, nargs > nsaved.\n", code, p->p_pid); -#endif - i = copyin((caddr_t)(intptr_t)(locr0->sp + - 4 * sizeof(register_t)), (caddr_t)&args[nsaved], - (u_int)(nargs - nsaved) * sizeof(register_t)); - if (i) { - locr0->v0 = i; - locr0->a3 = 1; -#ifdef KTRACE - if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(code, nargs, args); -#endif - goto done; - } - } -#ifdef TRAP_DEBUG - if (trap_debug) { - for (i = 0; i < nargs; i++) { - printf("args[%d] = %#jx\n", i, (intmax_t)args[i]); - } - } -#endif -#ifdef SYSCALL_TRACING - printf("%s(", syscallnames[code]); - for (i = 0; i < nargs; i++) { - printf("%s%#jx", i == 0 ? "" : ", ", (intmax_t)args[i]); - } - printf(")\n"); -#endif -#ifdef KTRACE - if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(code, nargs, args); -#endif - td->td_retval[0] = 0; - td->td_retval[1] = locr0->v1; + sa.trapframe = trapframe; + error = syscallenter(td, &sa); #if !defined(SMP) && (defined(DDB) || defined(DEBUG)) if (trp == trapdebug) - trapdebug[TRAPSIZE - 1].code = code; + trapdebug[TRAPSIZE - 1].code = sa.code; else - trp[-1].code = code; + trp[-1].code = sa.code; #endif - STOPEVENT(p, S_SCE, nargs); - - PTRACESTOP_SC(p, td, S_PT_SCE); - i = (*callp->sy_call) (td, args); -#if 0 - /* - * Reinitialize proc pointer `p' as it may be - * different if this is a child returning from fork - * syscall. - */ - td = curthread; - locr0 = td->td_frame; -#endif - trapdebug_enter(locr0, -code); - cpu_set_syscall_retval(td, i); + trapdebug_enter(td->td_frame, -sa.code); /* * The sync'ing of I & D caches for SYS_ptrace() is @@ -705,38 +674,7 @@ dofault: * instead of being done here under a special check * for SYS_ptrace(). */ - done: - /* - * Check for misbehavior. - */ - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? - syscallnames[code] : "???"); - KASSERT(td->td_critnest == 0, - ("System call %s returning in a critical section", - (code >= 0 && code < SYS_MAXSYSCALL) ? - syscallnames[code] : "???")); - KASSERT(td->td_locks == 0, - ("System call %s returning with %d locks held", - (code >= 0 && code < SYS_MAXSYSCALL) ? - syscallnames[code] : "???", - td->td_locks)); - userret(td, trapframe); -#ifdef KTRACE - if (KTRPOINT(td, KTR_SYSRET)) - ktrsysret(code, i, td->td_retval[0]); -#endif - /* - * This works because errno is findable through the - * register set. If we ever support an emulation - * where this is not the case, this code will need - * to be revisited. - */ - STOPEVENT(p, S_SCX, code); - - PTRACESTOP_SC(p, td, S_PT_SCX); - - mtx_assert(&Giant, MA_NOTOWNED); + syscallret(td, error, &sa); return (trapframe->pc); } From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 17:35:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FF261065673; Thu, 6 Oct 2011 17:35:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7044A8FC0A; Thu, 6 Oct 2011 17:35:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96HZcn2070620; Thu, 6 Oct 2011 17:35:38 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96HZcJt070618; Thu, 6 Oct 2011 17:35:38 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110061735.p96HZcJt070618@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 6 Oct 2011 17:35:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226066 - head/lib/libc/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 17:35:38 -0000 Author: kib Date: Thu Oct 6 17:35:38 2011 New Revision: 226066 URL: http://svn.freebsd.org/changeset/base/226066 Log: Remove no longer needed BUGS section. MFC after: 1 month Modified: head/lib/libc/sys/ptrace.2 Modified: head/lib/libc/sys/ptrace.2 ============================================================================== --- head/lib/libc/sys/ptrace.2 Thu Oct 6 17:34:43 2011 (r226065) +++ head/lib/libc/sys/ptrace.2 Thu Oct 6 17:35:38 2011 (r226066) @@ -2,7 +2,7 @@ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. -.Dd October 3, 2011 +.Dd October 5, 2011 .Dt PTRACE 2 .Os .Sh NAME @@ -599,11 +599,3 @@ The .Fn ptrace function appeared in .At v7 . -.Sh BUGS -The -.Dv PL_FLAG_FORKED , -.Dv PL_FLAG_SCE , -.Dv PL_FLAG_SCX -and -.Dv PL_FLAG_EXEC -are not implemented for MIPS architecture. From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 19:15:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9603106566C; Thu, 6 Oct 2011 19:15:51 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D49EB8FC12; Thu, 6 Oct 2011 19:15:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96JFpAX074081; Thu, 6 Oct 2011 19:15:51 GMT (envelope-from ken@svn.freebsd.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96JFpBW074072; Thu, 6 Oct 2011 19:15:51 GMT (envelope-from ken@svn.freebsd.org) Message-Id: <201110061915.p96JFpBW074072@svn.freebsd.org> From: "Kenneth D. Merry" Date: Thu, 6 Oct 2011 19:15:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226067 - in stable/9: sbin/camcontrol share/examples/scsi_target share/misc sys/cam sys/cam/scsi sys/dev/ciss sys/dev/firewire sys/dev/iir sys/dev/iscsi/initiator sys/dev/isp sys/dev/m... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 19:15:52 -0000 Author: ken Date: Thu Oct 6 19:15:51 2011 New Revision: 226067 URL: http://svn.freebsd.org/changeset/base/226067 Log: MFC r225950: Add descriptor sense support to CAM, and honor sense residuals properly in CAM. Desriptor sense is a new sense data format that originated in SPC-3. Among other things, it allows for an 8-byte info field, which is necessary to pass back block numbers larger than 4 bytes. This change adds a number of new functions to scsi_all.c (and therefore libcam) that abstract out most access to sense data. This includes a bump of CAM_VERSION, because the CCB ABI has changed. Userland programs that use the CAM pass(4) driver will need to be recompiled. camcontrol.c: Change uses of scsi_extract_sense() to use scsi_extract_sense_len(). Use scsi_get_sks() instead of accessing sense key specific data directly. scsi_modes: Update the control mode page to the latest version (SPC-4). scsi_cmds.c, scsi_target.c: Change references to struct scsi_sense_data to struct scsi_sense_data_fixed. This should be changed to allow the user to specify fixed or descriptor sense, and then use scsi_set_sense_data() to build the sense data. ps3cdrom.c: Use scsi_set_sense_data() instead of setting sense data manually. cam_periph.c: Use scsi_extract_sense_len() instead of using scsi_extract_sense() or accessing sense data directly. cam_ccb.h: Bump the CAM_VERSION from 0x15 to 0x16. The change of struct scsi_sense_data from 32 to 252 bytes changes the size of struct ccb_scsiio, but not the size of union ccb. So the version must be bumped to prevent structure mis-matches. scsi_all.h: Lots of updated SCSI sense data and other structures. Add function prototypes for the new sense data functions. Take out the inline implementation of scsi_extract_sense(). It is now too large to put in a header file. Add macros to calculate whether fields are present and filled in fixed and descriptor sense data scsi_all.c: In scsi_op_desc(), allow the user to pass in NULL inquiry data, and we'll assume a direct access device in that case. Changed the SCSI RESERVED sense key name and description to COMPLETED, as it is now defined in the spec. Change the error recovery action for a number of read errors to prevent lots of retries when the drive has said that the block isn't accessible. This speeds up reconstruction of the block by any RAID software running on top of the drive (e.g. ZFS). In scsi_sense_desc(), allow for invalid sense key numbers. This allows calling this routine without checking the input values first. Change scsi_error_action() to use scsi_extract_sense_len(), and handle things when invalid asc/ascq values are encountered. Add a new routine, scsi_desc_iterate(), that will call the supplied function for every descriptor in descriptor format sense data. Add scsi_set_sense_data(), and scsi_set_sense_data_va(), which build descriptor and fixed format sense data. They currently default to fixed format sense data. Add a number of scsi_get_*() functions, which get different types of sense data fields from either fixed or descriptor format sense data, if the data is present. Add a number of scsi_*_sbuf() functions, which print formatted versions of various sense data fields. These functions work for either fixed or descriptor sense. Add a number of scsi_sense_*_sbuf() functions, which have a standard calling interface and print the indicated field. These functions take descriptors only. Add scsi_sense_desc_sbuf(), which will print a formatted version of the given sense descriptor. Pull out a majority of the scsi_sense_sbuf() function and put it into scsi_sense_only_sbuf(). This allows callers that don't use struct ccb_scsiio to easily utilize the printing routines. Revamp that function to handle descriptor sense and use the new sense fetching and printing routines. Move scsi_extract_sense() into scsi_all.c, and implement it in terms of the new function, scsi_extract_sense_len(). The _len() version takes a length (which should be the sense length - residual) and can indicate which fields are present and valid in the sense data. Add a couple of new scsi_get_*() routines to get the sense key, asc, and ascq only. mly.c: Rename struct scsi_sense_data to struct scsi_sense_data_fixed. sbp_targ.c: Use the new sense fetching routines to get sense data instead of accessing it directly. sbp.c: Change the firewire/SCSI sense data transformation code to use struct scsi_sense_data_fixed instead of struct scsi_sense_data. This should be changed later to use scsi_set_sense_data(). ciss.c: Calculate the sense residual properly. Use scsi_get_sense_key() to fetch the sense key. mps_sas.c, mpt_cam.c: Set the sense residual properly. iir.c: Use scsi_set_sense_data() instead of building sense data by hand. iscsi_subr.c: Use scsi_extract_sense_len() instead of grabbing sense data directly. umass.c: Use scsi_set_sense_data() to build sense data. Grab the sense key using scsi_get_sense_key(). Calculate the sense residual properly. isp_freebsd.h: Use scsi_get_*() routines to grab asc, ascq, and sense key values. Calculate and set the sense residual. Approved by: re (kib) Sponsored by: Spectra Logic Corporation Modified: stable/9/sbin/camcontrol/camcontrol.c stable/9/share/examples/scsi_target/scsi_cmds.c stable/9/share/examples/scsi_target/scsi_target.c stable/9/share/misc/scsi_modes stable/9/sys/cam/cam_ccb.h stable/9/sys/cam/cam_periph.c stable/9/sys/cam/scsi/scsi_all.c stable/9/sys/cam/scsi/scsi_all.h stable/9/sys/cam/scsi/scsi_cd.c stable/9/sys/cam/scsi/scsi_da.c stable/9/sys/cam/scsi/scsi_low.c stable/9/sys/cam/scsi/scsi_sa.c stable/9/sys/cam/scsi/scsi_targ_bh.c stable/9/sys/dev/ciss/ciss.c stable/9/sys/dev/firewire/sbp.c stable/9/sys/dev/firewire/sbp_targ.c stable/9/sys/dev/iir/iir.c stable/9/sys/dev/iscsi/initiator/iscsi_subr.c stable/9/sys/dev/isp/isp_freebsd.h stable/9/sys/dev/mly/mly.c stable/9/sys/dev/mps/mps_sas.c stable/9/sys/dev/mpt/mpt_cam.c stable/9/sys/dev/usb/storage/umass.c stable/9/sys/powerpc/ps3/ps3cdrom.c Directory Properties: stable/9/sbin/camcontrol/ (props changed) stable/9/share/examples/ (props changed) stable/9/share/misc/ (props changed) stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sbin/camcontrol/camcontrol.c ============================================================================== --- stable/9/sbin/camcontrol/camcontrol.c Thu Oct 6 17:35:38 2011 (r226066) +++ stable/9/sbin/camcontrol/camcontrol.c Thu Oct 6 19:15:51 2011 (r226067) @@ -1907,7 +1907,9 @@ readdefects(struct cam_device *device, i int error_code, sense_key, asc, ascq; sense = &ccb->csio.sense_data; - scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); + scsi_extract_sense_len(sense, ccb->csio.sense_len - + ccb->csio.sense_resid, &error_code, &sense_key, &asc, + &ascq, /*show_errors*/ 1); /* * According to the SCSI spec, if the disk doesn't support @@ -3798,8 +3800,9 @@ doreport: int error_code, sense_key, asc, ascq; sense = &ccb->csio.sense_data; - scsi_extract_sense(sense, &error_code, &sense_key, - &asc, &ascq); + scsi_extract_sense_len(sense, ccb->csio.sense_len - + ccb->csio.sense_resid, &error_code, &sense_key, + &asc, &ascq, /*show_errors*/ 1); /* * According to the SCSI-2 and SCSI-3 specs, a @@ -3810,15 +3813,15 @@ doreport: */ if ((sense_key == SSD_KEY_NOT_READY) && (asc == 0x04) && (ascq == 0x04)) { - if ((sense->extra_len >= 10) - && ((sense->sense_key_spec[0] & - SSD_SCS_VALID) != 0) + uint8_t sks[3]; + + if ((scsi_get_sks(sense, ccb->csio.sense_len - + ccb->csio.sense_resid, sks) == 0) && (quiet == 0)) { int val; u_int64_t percentage; - val = scsi_2btoul( - &sense->sense_key_spec[1]); + val = scsi_2btoul(&sks[1]); percentage = 10000 * val; fprintf(stdout, Modified: stable/9/share/examples/scsi_target/scsi_cmds.c ============================================================================== --- stable/9/share/examples/scsi_target/scsi_cmds.c Thu Oct 6 17:35:38 2011 (r226066) +++ stable/9/share/examples/scsi_target/scsi_cmds.c Thu Oct 6 19:15:51 2011 (r226067) @@ -242,22 +242,22 @@ tcmd_sense(u_int init_id, struct ccb_scs u_int8_t asc, u_int8_t ascq) { struct initiator_state *istate; - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; /* Set our initiator's istate */ istate = tcmd_get_istate(init_id); if (istate == NULL) return; istate->pending_ca |= CA_CMD_SENSE; /* XXX set instead of or? */ - sense = &istate->sense_data; + sense = (struct scsi_sense_data_fixed *)&istate->sense_data; bzero(sense, sizeof(*sense)); sense->error_code = SSD_CURRENT_ERROR; sense->flags = flags; sense->add_sense_code = asc; sense->add_sense_code_qual = ascq; sense->extra_len = - offsetof(struct scsi_sense_data, sense_key_spec[2]) - - offsetof(struct scsi_sense_data, extra_len); + offsetof(struct scsi_sense_data_fixed, sense_key_spec[2]) - + offsetof(struct scsi_sense_data_fixed, extra_len); /* Fill out the supplied CTIO */ if (ctio != NULL) { @@ -298,7 +298,7 @@ tcmd_inquiry(struct ccb_accept_tio *atio struct scsi_inquiry *inq; struct atio_descr *a_descr; struct initiator_state *istate; - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; a_descr = (struct atio_descr *)atio->ccb_h.targ_descr; inq = (struct scsi_inquiry *)a_descr->cdb; @@ -310,7 +310,7 @@ tcmd_inquiry(struct ccb_accept_tio *atio * complain if EVPD or CMDDT is set. */ istate = tcmd_get_istate(ctio->init_id); - sense = &istate->sense_data; + sense = (struct scsi_sense_data_fixed *)&istate->sense_data; if ((inq->byte2 & SI_EVPD) != 0) { tcmd_illegal_req(atio, ctio); sense->sense_key_spec[0] = SSD_SCS_VALID | SSD_FIELDPTR_CMD | @@ -376,7 +376,7 @@ static int tcmd_req_sense(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio) { struct scsi_request_sense *rsense; - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; struct initiator_state *istate; size_t dlen; struct atio_descr *a_descr; @@ -385,7 +385,7 @@ tcmd_req_sense(struct ccb_accept_tio *at rsense = (struct scsi_request_sense *)a_descr->cdb; istate = tcmd_get_istate(ctio->init_id); - sense = &istate->sense_data; + sense = (struct scsi_sense_data_fixed *)&istate->sense_data; if (debug) { cdb_debug(a_descr->cdb, "REQ SENSE from %u: ", atio->init_id); @@ -400,7 +400,7 @@ tcmd_req_sense(struct ccb_accept_tio *at } bcopy(sense, ctio->data_ptr, sizeof(struct scsi_sense_data)); - dlen = offsetof(struct scsi_sense_data, extra_len) + + dlen = offsetof(struct scsi_sense_data_fixed, extra_len) + sense->extra_len + 1; ctio->dxfer_len = min(dlen, SCSI_CDB6_LEN(rsense->length)); ctio->ccb_h.flags |= CAM_DIR_IN | CAM_SEND_STATUS; @@ -482,7 +482,7 @@ tcmd_rdwr(struct ccb_accept_tio *atio, s c_descr = (struct ctio_descr *)ctio->ccb_h.targ_descr; /* Command needs to be decoded */ - if ((a_descr->flags & CAM_DIR_MASK) == CAM_DIR_RESV) { + if ((a_descr->flags & CAM_DIR_MASK) == CAM_DIR_BOTH) { if (debug) warnx("Calling rdwr_decode"); ret = tcmd_rdwr_decode(atio, ctio); Modified: stable/9/share/examples/scsi_target/scsi_target.c ============================================================================== --- stable/9/share/examples/scsi_target/scsi_target.c Thu Oct 6 17:35:38 2011 (r226066) +++ stable/9/share/examples/scsi_target/scsi_target.c Thu Oct 6 19:15:51 2011 (r226067) @@ -651,7 +651,7 @@ work_atio(struct ccb_accept_tio *atio) * receiving this ATIO. */ if (atio->sense_len != 0) { - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; if (debug) { warnx("ATIO with %u bytes sense received", @@ -825,9 +825,9 @@ work_inot(struct ccb_immed_notify *inot) /* If there is sense data, use it */ if (sense != 0) { - struct scsi_sense_data *sense; + struct scsi_sense_data_fixed *sense; - sense = &inot->sense_data; + sense = (struct scsi_sense_data_fixed *)&inot->sense_data; tcmd_sense(inot->initiator_id, NULL, sense->flags, sense->add_sense_code, sense->add_sense_code_qual); if (debug) Modified: stable/9/share/misc/scsi_modes ============================================================================== --- stable/9/share/misc/scsi_modes Thu Oct 6 17:35:38 2011 (r226066) +++ stable/9/share/misc/scsi_modes Thu Oct 6 19:15:51 2011 (r226067) @@ -50,19 +50,32 @@ # ALL DEVICE TYPES 0x0a "Control Mode Page" { - {Reserved} *t7 + {TST} t3 + {TMF_ONLY} t1 + {DPICZ} t1 + {D_SENSE} t1 + {GLTSD} t1 {RLEC} t1 {Queue Algorithm Modifier} t4 - {Reserved} *t2 - {QErr} t1 + {NUAR} t1 + {QErr} t2 {DQue} t1 {EECA} t1 - {Reserved} *t4 + {RAC} t1 + {UA_INTLCK_CTRL} t2 + {SWP} t1 {RAENP} t1 {UAAENP} t1 {EAENP} t1 - {Reserved} *i1 + {ATO} t1 + {TAS} t1 + {ATMPE} t1 + {RWWP} t1 + {Reserved} *t1 + {Autoload Mode} t3 {Ready AEN Holdoff Period} i2 + {Busy Timeout Period} i2 + {Extended Self-Test Completion Time} i2 } 0x02 "Disconnect-Reconnect Page" { Modified: stable/9/sys/cam/cam_ccb.h ============================================================================== --- stable/9/sys/cam/cam_ccb.h Thu Oct 6 17:35:38 2011 (r226066) +++ stable/9/sys/cam/cam_ccb.h Thu Oct 6 19:15:51 2011 (r226067) @@ -539,7 +539,7 @@ struct ccb_dev_match { /* * Definitions for the path inquiry CCB fields. */ -#define CAM_VERSION 0x15 /* Hex value for current version */ +#define CAM_VERSION 0x16 /* Hex value for current version */ typedef enum { PI_MDP_ABLE = 0x80, /* Supports MDP message */ Modified: stable/9/sys/cam/cam_periph.c ============================================================================== --- stable/9/sys/cam/cam_periph.c Thu Oct 6 17:35:38 2011 (r226066) +++ stable/9/sys/cam/cam_periph.c Thu Oct 6 19:15:51 2011 (r226067) @@ -1085,7 +1085,6 @@ camperiphsensedone(struct cam_periph *pe union ccb *saved_ccb = (union ccb *)done_ccb->ccb_h.saved_ccb_ptr; cam_status status; int frozen = 0; - u_int sense_key; int depth = done_ccb->ccb_h.recovery_depth; status = done_ccb->ccb_h.status; @@ -1101,22 +1100,25 @@ camperiphsensedone(struct cam_periph *pe switch (status) { case CAM_REQ_CMP: { + int error_code, sense_key, asc, ascq; + + scsi_extract_sense_len(&saved_ccb->csio.sense_data, + saved_ccb->csio.sense_len - + saved_ccb->csio.sense_resid, + &error_code, &sense_key, &asc, &ascq, + /*show_errors*/ 1); /* * If we manually retrieved sense into a CCB and got * something other than "NO SENSE" send the updated CCB * back to the client via xpt_done() to be processed via * the error recovery code again. */ - sense_key = saved_ccb->csio.sense_data.flags; - sense_key &= SSD_KEY; - if (sense_key != SSD_KEY_NO_SENSE) { - saved_ccb->ccb_h.status |= - CAM_AUTOSNS_VALID; + if ((sense_key != -1) + && (sense_key != SSD_KEY_NO_SENSE)) { + saved_ccb->ccb_h.status |= CAM_AUTOSNS_VALID; } else { - saved_ccb->ccb_h.status &= - ~CAM_STATUS_MASK; - saved_ccb->ccb_h.status |= - CAM_AUTOSENSE_FAIL; + saved_ccb->ccb_h.status &= ~CAM_STATUS_MASK; + saved_ccb->ccb_h.status |= CAM_AUTOSENSE_FAIL; } saved_ccb->csio.sense_resid = done_ccb->csio.resid; bcopy(saved_ccb, done_ccb, sizeof(union ccb)); @@ -1198,12 +1200,15 @@ camperiphdone(struct cam_periph *periph, if (status & CAM_AUTOSNS_VALID) { struct ccb_getdev cgd; struct scsi_sense_data *sense; - int error_code, sense_key, asc, ascq; + int error_code, sense_key, asc, ascq, sense_len; scsi_sense_action err_action; sense = &done_ccb->csio.sense_data; - scsi_extract_sense(sense, &error_code, - &sense_key, &asc, &ascq); + sense_len = done_ccb->csio.sense_len - + done_ccb->csio.sense_resid; + scsi_extract_sense_len(sense, sense_len, &error_code, + &sense_key, &asc, &ascq, + /*show_errors*/ 1); /* * Grab the inquiry data for this device. */ Modified: stable/9/sys/cam/scsi/scsi_all.c ============================================================================== --- stable/9/sys/cam/scsi/scsi_all.c Thu Oct 6 17:35:38 2011 (r226066) +++ stable/9/sys/cam/scsi/scsi_all.c Thu Oct 6 19:15:51 2011 (r226067) @@ -31,6 +31,8 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #ifdef _KERNEL #include @@ -54,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #ifndef _KERNEL #include +#include #ifndef FALSE #define FALSE 0 @@ -608,14 +611,24 @@ scsi_op_desc(u_int16_t opcode, struct sc struct op_table_entry *table[2]; int num_tables; - pd_type = SID_TYPE(inq_data); + /* + * If we've got inquiry data, use it to determine what type of + * device we're dealing with here. Otherwise, assume direct + * access. + */ + if (inq_data == NULL) { + pd_type = T_DIRECT; + match = NULL; + } else { + pd_type = SID_TYPE(inq_data); - match = cam_quirkmatch((caddr_t)inq_data, - (caddr_t)scsi_op_quirk_table, - sizeof(scsi_op_quirk_table)/ - sizeof(*scsi_op_quirk_table), - sizeof(*scsi_op_quirk_table), - scsi_inquiry_match); + match = cam_quirkmatch((caddr_t)inq_data, + (caddr_t)scsi_op_quirk_table, + sizeof(scsi_op_quirk_table)/ + sizeof(*scsi_op_quirk_table), + sizeof(*scsi_op_quirk_table), + scsi_inquiry_match); + } if (match != NULL) { table[0] = ((struct scsi_op_quirk_entry *)match)->op_table; @@ -699,7 +712,7 @@ const struct sense_key_table_entry sense { SSD_KEY_EQUAL, SS_NOP, "EQUAL" }, { SSD_KEY_VOLUME_OVERFLOW, SS_FATAL|EIO, "VOLUME OVERFLOW" }, { SSD_KEY_MISCOMPARE, SS_NOP, "MISCOMPARE" }, - { SSD_KEY_RESERVED, SS_FATAL|EIO, "RESERVED" } + { SSD_KEY_COMPLETED, SS_NOP, "COMPLETED" } }; const int sense_key_table_size = @@ -1062,25 +1075,25 @@ static struct asc_table_entry asc_table[ { SST(0x10, 0x03, SS_RDEF, /* XXX TBD */ "Logical block reference tag check failed") }, /* DT WRO BK */ - { SST(0x11, 0x00, SS_RDEF, + { SST(0x11, 0x00, SS_FATAL|EIO, "Unrecovered read error") }, /* DT WRO BK */ - { SST(0x11, 0x01, SS_RDEF, + { SST(0x11, 0x01, SS_FATAL|EIO, "Read retries exhausted") }, /* DT WRO BK */ - { SST(0x11, 0x02, SS_RDEF, + { SST(0x11, 0x02, SS_FATAL|EIO, "Error too long to correct") }, /* DT W O BK */ - { SST(0x11, 0x03, SS_RDEF, + { SST(0x11, 0x03, SS_FATAL|EIO, "Multiple read errors") }, /* D W O BK */ - { SST(0x11, 0x04, SS_RDEF, + { SST(0x11, 0x04, SS_FATAL|EIO, "Unrecovered read error - auto reallocate failed") }, /* WRO B */ - { SST(0x11, 0x05, SS_RDEF, + { SST(0x11, 0x05, SS_FATAL|EIO, "L-EC uncorrectable error") }, /* WRO B */ - { SST(0x11, 0x06, SS_RDEF, + { SST(0x11, 0x06, SS_FATAL|EIO, "CIRC unrecovered error") }, /* W O B */ { SST(0x11, 0x07, SS_RDEF, @@ -1095,10 +1108,10 @@ static struct asc_table_entry asc_table[ { SST(0x11, 0x0A, SS_RDEF, "Miscorrected error") }, /* D W O BK */ - { SST(0x11, 0x0B, SS_RDEF, + { SST(0x11, 0x0B, SS_FATAL|EIO, "Unrecovered read error - recommend reassignment") }, /* D W O BK */ - { SST(0x11, 0x0C, SS_RDEF, + { SST(0x11, 0x0C, SS_FATAL|EIO, "Unrecovered read error - recommend rewrite the data") }, /* DT WRO B */ { SST(0x11, 0x0D, SS_RDEF, @@ -2790,7 +2803,10 @@ scsi_sense_desc(int sense_key, int asc, &sense_entry, &asc_entry); - *sense_key_desc = sense_entry->desc; + if (sense_entry != NULL) + *sense_key_desc = sense_entry->desc; + else + *sense_key_desc = "Invalid Sense Key"; if (asc_entry != NULL) *asc_desc = asc_entry->desc; @@ -2816,10 +2832,12 @@ scsi_error_action(struct ccb_scsiio *csi int error_code, sense_key, asc, ascq; scsi_sense_action action; - scsi_extract_sense(&csio->sense_data, &error_code, - &sense_key, &asc, &ascq); + scsi_extract_sense_len(&csio->sense_data, csio->sense_len - + csio->sense_resid, &error_code, + &sense_key, &asc, &ascq, /*show_errors*/ 1); - if (error_code == SSD_DEFERRED_ERROR) { + if ((error_code == SSD_DEFERRED_ERROR) + || (error_code == SSD_DESC_DEFERRED_ERROR)) { /* * XXX dufault@FreeBSD.org * This error doesn't relate to the command associated @@ -2857,8 +2875,10 @@ scsi_error_action(struct ccb_scsiio *csi if (asc_entry != NULL && (asc != 0 || ascq != 0)) action = asc_entry->action; - else + else if (sense_entry != NULL) action = sense_entry->action; + else + action = SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE; if (sense_key == SSD_KEY_RECOVERED_ERROR) { /* @@ -3040,308 +3060,1530 @@ scsi_command_string(struct cam_device *d return(0); } - /* - * scsi_sense_sbuf() returns 0 for success and -1 for failure. + * Iterate over sense descriptors. Each descriptor is passed into iter_func(). + * If iter_func() returns 0, list traversal continues. If iter_func() + * returns non-zero, list traversal is stopped. */ -#ifdef _KERNEL -int -scsi_sense_sbuf(struct ccb_scsiio *csio, struct sbuf *sb, - scsi_sense_string_flags flags) -#else /* !_KERNEL */ -int -scsi_sense_sbuf(struct cam_device *device, struct ccb_scsiio *csio, - struct sbuf *sb, scsi_sense_string_flags flags) -#endif /* _KERNEL/!_KERNEL */ +void +scsi_desc_iterate(struct scsi_sense_data_desc *sense, u_int sense_len, + int (*iter_func)(struct scsi_sense_data_desc *sense, + u_int, struct scsi_sense_desc_header *, + void *), void *arg) { - struct scsi_sense_data *sense; - struct scsi_inquiry_data *inq_data; -#ifdef _KERNEL - struct ccb_getdev *cgd; -#endif /* _KERNEL */ - u_int32_t info; - int error_code; - int sense_key; - int asc, ascq; - char path_str[64]; - -#ifndef _KERNEL - if (device == NULL) - return(-1); -#endif /* !_KERNEL */ - if ((csio == NULL) || (sb == NULL)) - return(-1); + int cur_pos; + int desc_len; /* - * If the CDB is a physical address, we can't deal with it.. + * First make sure the extra length field is present. */ - if ((csio->ccb_h.flags & CAM_CDB_PHYS) != 0) - flags &= ~SSS_FLAG_PRINT_COMMAND; + if (SSD_DESC_IS_PRESENT(sense, sense_len, extra_len) == 0) + return; -#ifdef _KERNEL - xpt_path_string(csio->ccb_h.path, path_str, sizeof(path_str)); -#else /* !_KERNEL */ - cam_path_string(device, path_str, sizeof(path_str)); -#endif /* _KERNEL/!_KERNEL */ + /* + * The length of data actually returned may be different than the + * extra_len recorded in the sturcture. + */ + desc_len = sense_len -offsetof(struct scsi_sense_data_desc, sense_desc); -#ifdef _KERNEL - if ((cgd = (struct ccb_getdev*)xpt_alloc_ccb_nowait()) == NULL) - return(-1); /* - * Get the device information. + * Limit this further by the extra length reported, and the maximum + * allowed extra length. */ - xpt_setup_ccb(&cgd->ccb_h, - csio->ccb_h.path, - CAM_PRIORITY_NORMAL); - cgd->ccb_h.func_code = XPT_GDEV_TYPE; - xpt_action((union ccb *)cgd); + desc_len = MIN(desc_len, MIN(sense->extra_len, SSD_EXTRA_MAX)); /* - * If the device is unconfigured, just pretend that it is a hard - * drive. scsi_op_desc() needs this. + * Subtract the size of the header from the descriptor length. + * This is to ensure that we have at least the header left, so we + * don't have to check that inside the loop. This can wind up + * being a negative value. */ - if (cgd->ccb_h.status == CAM_DEV_NOT_THERE) - cgd->inq_data.device = T_DIRECT; + desc_len -= sizeof(struct scsi_sense_desc_header); - inq_data = &cgd->inq_data; + for (cur_pos = 0; cur_pos < desc_len;) { + struct scsi_sense_desc_header *header; -#else /* !_KERNEL */ + header = (struct scsi_sense_desc_header *) + &sense->sense_desc[cur_pos]; - inq_data = &device->inq_data; + /* + * Check to make sure we have the entire descriptor. We + * don't call iter_func() unless we do. + * + * Note that although cur_pos is at the beginning of the + * descriptor, desc_len already has the header length + * subtracted. So the comparison of the length in the + * header (which does not include the header itself) to + * desc_len - cur_pos is correct. + */ + if (header->length > (desc_len - cur_pos)) + break; -#endif /* _KERNEL/!_KERNEL */ + if (iter_func(sense, sense_len, header, arg) != 0) + break; - sense = NULL; + cur_pos += sizeof(*header) + header->length; + } +} - if (flags & SSS_FLAG_PRINT_COMMAND) { +struct scsi_find_desc_info { + uint8_t desc_type; + struct scsi_sense_desc_header *header; +}; - sbuf_cat(sb, path_str); +static int +scsi_find_desc_func(struct scsi_sense_data_desc *sense, u_int sense_len, + struct scsi_sense_desc_header *header, void *arg) +{ + struct scsi_find_desc_info *desc_info; -#ifdef _KERNEL - scsi_command_string(csio, sb); -#else /* !_KERNEL */ - scsi_command_string(device, csio, sb); -#endif /* _KERNEL/!_KERNEL */ - sbuf_printf(sb, "\n"); - } + desc_info = (struct scsi_find_desc_info *)arg; + + if (header->desc_type == desc_info->desc_type) { + desc_info->header = header; + + /* We found the descriptor, tell the iterator to stop. */ + return (1); + } else + return (0); +} + +/* + * Given a descriptor type, return a pointer to it if it is in the sense + * data and not truncated. Avoiding truncating sense data will simplify + * things significantly for the caller. + */ +uint8_t * +scsi_find_desc(struct scsi_sense_data_desc *sense, u_int sense_len, + uint8_t desc_type) +{ + struct scsi_find_desc_info desc_info; + + desc_info.desc_type = desc_type; + desc_info.header = NULL; + + scsi_desc_iterate(sense, sense_len, scsi_find_desc_func, &desc_info); + + return ((uint8_t *)desc_info.header); +} + +/* + * Fill in SCSI sense data with the specified parameters. This routine can + * fill in either fixed or descriptor type sense data. + */ +void +scsi_set_sense_data_va(struct scsi_sense_data *sense_data, + scsi_sense_data_type sense_format, int current_error, + int sense_key, int asc, int ascq, va_list ap) +{ + int descriptor_sense; + scsi_sense_elem_type elem_type; /* - * If the sense data is a physical pointer, forget it. + * Determine whether to return fixed or descriptor format sense + * data. If the user specifies SSD_TYPE_NONE for some reason, + * they'll just get fixed sense data. */ - if (csio->ccb_h.flags & CAM_SENSE_PTR) { - if (csio->ccb_h.flags & CAM_SENSE_PHYS) { -#ifdef _KERNEL - xpt_free_ccb((union ccb*)cgd); -#endif /* _KERNEL/!_KERNEL */ - return(-1); - } else { - /* - * bcopy the pointer to avoid unaligned access - * errors on finicky architectures. We don't - * ensure that the sense data is pointer aligned. - */ - bcopy(&csio->sense_data, &sense, - sizeof(struct scsi_sense_data *)); - } - } else { + if (sense_format == SSD_TYPE_DESC) + descriptor_sense = 1; + else + descriptor_sense = 0; + + /* + * Zero the sense data, so that we don't pass back any garbage data + * to the user. + */ + memset(sense_data, 0, sizeof(*sense_data)); + + if (descriptor_sense != 0) { + struct scsi_sense_data_desc *sense; + + sense = (struct scsi_sense_data_desc *)sense_data; /* - * If the physical sense flag is set, but the sense pointer - * is not also set, we assume that the user is an idiot and - * return. (Well, okay, it could be that somehow, the - * entire csio is physical, but we would have probably core - * dumped on one of the bogus pointer deferences above - * already.) + * The descriptor sense format eliminates the use of the + * valid bit. */ - if (csio->ccb_h.flags & CAM_SENSE_PHYS) { -#ifdef _KERNEL - xpt_free_ccb((union ccb*)cgd); -#endif /* _KERNEL/!_KERNEL */ - return(-1); - } else - sense = &csio->sense_data; - } - + if (current_error != 0) + sense->error_code = SSD_DESC_CURRENT_ERROR; + else + sense->error_code = SSD_DESC_DEFERRED_ERROR; + sense->sense_key = sense_key; + sense->add_sense_code = asc; + sense->add_sense_code_qual = ascq; + /* + * Start off with no extra length, since the above data + * fits in the standard descriptor sense information. + */ + sense->extra_len = 0; + while ((elem_type = (scsi_sense_elem_type)va_arg(ap, + scsi_sense_elem_type)) != SSD_ELEM_NONE) { + int sense_len, len_to_copy; + uint8_t *data; + + if (elem_type >= SSD_ELEM_MAX) { + printf("%s: invalid sense type %d\n", __func__, + elem_type); + break; + } - sbuf_cat(sb, path_str); + sense_len = (int)va_arg(ap, int); + len_to_copy = MIN(sense_len, SSD_EXTRA_MAX - + sense->extra_len); + data = (uint8_t *)va_arg(ap, uint8_t *); - error_code = sense->error_code & SSD_ERRCODE; - sense_key = sense->flags & SSD_KEY; + /* + * We've already consumed the arguments for this one. + */ + if (elem_type == SSD_ELEM_SKIP) + continue; - sbuf_printf(sb, "SCSI sense: "); - switch (error_code) { - case SSD_DEFERRED_ERROR: - sbuf_printf(sb, "Deferred error: "); + switch (elem_type) { + case SSD_ELEM_DESC: { - /* FALLTHROUGH */ - case SSD_CURRENT_ERROR: - { - const char *sense_key_desc; - const char *asc_desc; + /* + * This is a straight descriptor. All we + * need to do is copy the data in. + */ + bcopy(data, &sense->sense_desc[ + sense->extra_len], len_to_copy); + sense->extra_len += len_to_copy; + break; + } + case SSD_ELEM_SKS: { + struct scsi_sense_sks sks; - asc = (sense->extra_len >= 5) ? sense->add_sense_code : 0; - ascq = (sense->extra_len >= 6) ? sense->add_sense_code_qual : 0; - scsi_sense_desc(sense_key, asc, ascq, inq_data, - &sense_key_desc, &asc_desc); - sbuf_cat(sb, sense_key_desc); + bzero(&sks, sizeof(sks)); - info = scsi_4btoul(sense->info); - - if (sense->error_code & SSD_ERRCODE_VALID) { + /* + * This is already-formatted sense key + * specific data. We just need to fill out + * the header and copy everything in. + */ + bcopy(data, &sks.sense_key_spec, + MIN(len_to_copy, + sizeof(sks.sense_key_spec))); + + sks.desc_type = SSD_DESC_SKS; + sks.length = sizeof(sks) - + offsetof(struct scsi_sense_sks, reserved1); + bcopy(&sks,&sense->sense_desc[sense->extra_len], + sizeof(sks)); + sense->extra_len += sizeof(sks); + break; + } + case SSD_ELEM_INFO: + case SSD_ELEM_COMMAND: { + struct scsi_sense_command cmd; + struct scsi_sense_info info; + uint8_t *data_dest; + uint8_t *descriptor; + int descriptor_size, i, copy_len; + + bzero(&cmd, sizeof(cmd)); + bzero(&info, sizeof(info)); + + /* + * Command or information data. The + * operate in pretty much the same way. + */ + if (elem_type == SSD_ELEM_COMMAND) { + len_to_copy = MIN(len_to_copy, + sizeof(cmd.command_info)); + descriptor = (uint8_t *)&cmd; + descriptor_size = sizeof(cmd); + data_dest =(uint8_t *)&cmd.command_info; + cmd.desc_type = SSD_DESC_COMMAND; + cmd.length = sizeof(cmd) - + offsetof(struct scsi_sense_command, + reserved); + } else { + len_to_copy = MIN(len_to_copy, + sizeof(info.info)); + descriptor = (uint8_t *)&info; + descriptor_size = sizeof(cmd); + data_dest = (uint8_t *)&info.info; + info.desc_type = SSD_DESC_INFO; + info.byte2 = SSD_INFO_VALID; + info.length = sizeof(info) - + offsetof(struct scsi_sense_info, + byte2); + } - switch (sense_key) { - case SSD_KEY_NOT_READY: - case SSD_KEY_ILLEGAL_REQUEST: - case SSD_KEY_UNIT_ATTENTION: - case SSD_KEY_DATA_PROTECT: + /* + * Copy this in reverse because the spec + * (SPC-4) says that when 4 byte quantities + * are stored in this 8 byte field, the + * first four bytes shall be 0. + * + * So we fill the bytes in from the end, and + * if we have less than 8 bytes to copy, + * the initial, most significant bytes will + * be 0. + */ + for (i = sense_len - 1; i >= 0 && + len_to_copy > 0; i--, len_to_copy--) + data_dest[len_to_copy - 1] = data[i]; + + /* + * This calculation looks much like the + * initial len_to_copy calculation, but + * we have to do it again here, because + * we're looking at a larger amount that + * may or may not fit. It's not only the + * data the user passed in, but also the + * rest of the descriptor. + */ + copy_len = MIN(descriptor_size, + SSD_EXTRA_MAX - sense->extra_len); + bcopy(descriptor, &sense->sense_desc[ + sense->extra_len], copy_len); + sense->extra_len += copy_len; + break; + } + case SSD_ELEM_FRU: { + struct scsi_sense_fru fru; + int copy_len; + + bzero(&fru, sizeof(fru)); + + fru.desc_type = SSD_DESC_FRU; + fru.length = sizeof(fru) - + offsetof(struct scsi_sense_fru, reserved); + fru.fru = *data; + + copy_len = MIN(sizeof(fru), SSD_EXTRA_MAX - + sense->extra_len); + bcopy(&fru, &sense->sense_desc[ + sense->extra_len], copy_len); + sense->extra_len += copy_len; break; - case SSD_KEY_BLANK_CHECK: - sbuf_printf(sb, " req sz: %d (decimal)", info); + } + case SSD_ELEM_STREAM: { + struct scsi_sense_stream stream_sense; + int copy_len; + + bzero(&stream_sense, sizeof(stream_sense)); + stream_sense.desc_type = SSD_DESC_STREAM; + stream_sense.length = sizeof(stream_sense) - + offsetof(struct scsi_sense_stream, reserved); + stream_sense.byte3 = *data; + + copy_len = MIN(sizeof(stream_sense), + SSD_EXTRA_MAX - sense->extra_len); + bcopy(&stream_sense, &sense->sense_desc[ + sense->extra_len], copy_len); + sense->extra_len += copy_len; break; + } default: - if (info) { - if (sense->flags & SSD_ILI) { - sbuf_printf(sb, " ILI (length " - "mismatch): %d", info); - - } else { - sbuf_printf(sb, " info:%x", - info); - } - } + /* + * We shouldn't get here, but if we do, do + * nothing. We've already consumed the + * arguments above. + */ + break; } - } else if (info) { - sbuf_printf(sb, " info?:%x", info); } + } else { + struct scsi_sense_data_fixed *sense; - if (sense->extra_len >= 4) { - if (bcmp(sense->cmd_spec_info, "\0\0\0\0", 4)) { - sbuf_printf(sb, " csi:%x,%x,%x,%x", - sense->cmd_spec_info[0], - sense->cmd_spec_info[1], - sense->cmd_spec_info[2], - sense->cmd_spec_info[3]); - } - } + sense = (struct scsi_sense_data_fixed *)sense_data; - sbuf_printf(sb, " asc:%x,%x (%s)", asc, ascq, asc_desc); + if (current_error != 0) + sense->error_code = SSD_CURRENT_ERROR; + else + sense->error_code = SSD_DEFERRED_ERROR; - if (sense->extra_len >= 7 && sense->fru) { - sbuf_printf(sb, " field replaceable unit: %x", - sense->fru); - } + sense->flags = sense_key; + sense->add_sense_code = asc; + sense->add_sense_code_qual = ascq; + /* + * We've set the ASC and ASCQ, so we have 6 more bytes of + * valid data. If we wind up setting any of the other + * fields, we'll bump this to 10 extra bytes. + */ + sense->extra_len = 6; - if ((sense->extra_len >= 10) - && (sense->sense_key_spec[0] & SSD_SCS_VALID) != 0) { - switch(sense_key) { - case SSD_KEY_ILLEGAL_REQUEST: { - int bad_command; - char tmpstr2[40]; - - if (sense->sense_key_spec[0] & 0x40) - bad_command = 1; - else - bad_command = 0; - - tmpstr2[0] = '\0'; - - /* Bit pointer is valid */ - if (sense->sense_key_spec[0] & 0x08) - snprintf(tmpstr2, sizeof(tmpstr2), - "bit %d ", - sense->sense_key_spec[0] & 0x7); - sbuf_printf(sb, ": %s byte %d %sis invalid", - bad_command ? "Command" : "Data", - scsi_2btoul( - &sense->sense_key_spec[1]), - tmpstr2); + while ((elem_type = (scsi_sense_elem_type)va_arg(ap, + scsi_sense_elem_type)) != SSD_ELEM_NONE) { + int sense_len, len_to_copy; + uint8_t *data; + + if (elem_type >= SSD_ELEM_MAX) { + printf("%s: invalid sense type %d\n", __func__, + elem_type); break; } - case SSD_KEY_RECOVERED_ERROR: - case SSD_KEY_HARDWARE_ERROR: - case SSD_KEY_MEDIUM_ERROR: - sbuf_printf(sb, " actual retry count: %d", - scsi_2btoul( - &sense->sense_key_spec[1])); + /* + * If we get in here, just bump the extra length to + * 10 bytes. That will encompass anything we're + * going to set here. + */ + sense->extra_len = 10; + sense_len = (int)va_arg(ap, int); + len_to_copy = MIN(sense_len, SSD_EXTRA_MAX - + sense->extra_len); + data = (uint8_t *)va_arg(ap, uint8_t *); + + switch (elem_type) { + case SSD_ELEM_SKS: + /* + * The user passed in pre-formatted sense + * key specific data. + */ + bcopy(data, &sense->sense_key_spec[0], + MIN(sizeof(sense->sense_key_spec), + sense_len)); break; - default: - sbuf_printf(sb, " sks:%#x,%#x", - sense->sense_key_spec[0], - scsi_2btoul( - &sense->sense_key_spec[1])); + case SSD_ELEM_INFO: + case SSD_ELEM_COMMAND: { + uint8_t *data_dest; + int i; + + if (elem_type == SSD_ELEM_COMMAND) + data_dest = &sense->cmd_spec_info[0]; + else { + data_dest = &sense->info[0]; + /* + * We're setting the info field, so + * set the valid bit. + */ + sense->error_code |= SSD_ERRCODE_VALID; + } + + /* + * Copy this in reverse so that if we have + * less than 4 bytes to fill, the least + * significant bytes will be at the end. + * If we have more than 4 bytes, only the + * least significant bytes will be included. + */ + for (i = sense_len - 1; i >= 0 && + len_to_copy > 0; i--, len_to_copy--) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 19:59:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25A49106564A; Thu, 6 Oct 2011 19:59:15 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 160228FC0C; Thu, 6 Oct 2011 19:59:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96JxEE8075379; Thu, 6 Oct 2011 19:59:14 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96JxE7j075377; Thu, 6 Oct 2011 19:59:14 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110061959.p96JxE7j075377@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 19:59:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226068 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 19:59:15 -0000 Author: jkim Date: Thu Oct 6 19:59:14 2011 New Revision: 226068 URL: http://svn.freebsd.org/changeset/base/226068 Log: Unroll inlined strnlen(9) and make it easier to read. No functional change. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 19:15:51 2011 (r226067) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 19:59:14 2011 (r226068) @@ -99,12 +99,11 @@ do_sa_get(struct sockaddr **sap, const s int error=0, bdom; struct sockaddr *sa; struct osockaddr *kosa; - int alloclen; #ifdef INET6 int oldv6size; struct sockaddr_in6 *sin6; #endif - int namelen; + int alloclen, hdrlen, namelen; if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -167,14 +166,11 @@ do_sa_get(struct sockaddr **sap, const s } } - if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { - for (namelen = 0; - namelen < *osalen - offsetof(struct sockaddr_un, sun_path); - namelen++) - if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) - break; - if (namelen + offsetof(struct sockaddr_un, sun_path) > - sizeof(struct sockaddr_un)) { + if (bdom == AF_LOCAL && *osalen > sizeof(struct sockaddr_un)) { + hdrlen = offsetof(struct sockaddr_un, sun_path); + namelen = strnlen(((struct sockaddr_un *)kosa)->sun_path, + *osalen - hdrlen); + if (hdrlen + namelen > sizeof(struct sockaddr_un)) { error = EINVAL; goto out; } From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 20:20:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4CE0106564A; Thu, 6 Oct 2011 20:20:30 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7BBF98FC15; Thu, 6 Oct 2011 20:20:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96KKUPg076137; Thu, 6 Oct 2011 20:20:30 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96KKU2a076135; Thu, 6 Oct 2011 20:20:30 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062020.p96KKU2a076135@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 20:20:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226069 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 20:20:30 -0000 Author: jkim Date: Thu Oct 6 20:20:30 2011 New Revision: 226069 URL: http://svn.freebsd.org/changeset/base/226069 Log: Inline do_sa_get() function and remove an unused return value. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 19:59:14 2011 (r226068) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 20:20:30 2011 (r226069) @@ -72,29 +72,16 @@ __FBSDID("$FreeBSD$"); #include #include -static int do_sa_get(struct sockaddr **, const struct osockaddr *, int *, - struct malloc_type *); static int linux_to_bsd_domain(int); /* * Reads a linux sockaddr and does any necessary translation. * Linux sockaddrs don't have a length field, only a family. - */ -static int -linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int len) -{ - int osalen = len; - - return (do_sa_get(sap, osa, &osalen, M_SONAME)); -} - -/* * Copy the osockaddr structure pointed to by osa to kernel, adjust * family and convert to sockaddr. */ static int -do_sa_get(struct sockaddr **sap, const struct osockaddr *osa, int *osalen, - struct malloc_type *mtype) +linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int osalen) { int error=0, bdom; struct sockaddr *sa; @@ -105,10 +92,10 @@ do_sa_get(struct sockaddr **sap, const s #endif int alloclen, hdrlen, namelen; - if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) + if (osalen < 2 || osalen > UCHAR_MAX || !osa) return (EINVAL); - alloclen = *osalen; + alloclen = osalen; #ifdef INET6 oldv6size = 0; /* @@ -122,9 +109,9 @@ do_sa_get(struct sockaddr **sap, const s } #endif - kosa = malloc(alloclen, mtype, M_WAITOK); + kosa = malloc(alloclen, M_SONAME, M_WAITOK); - if ((error = copyin(osa, kosa, *osalen))) + if ((error = copyin(osa, kosa, osalen))) goto out; bdom = linux_to_bsd_domain(kosa->sa_family); @@ -160,16 +147,16 @@ do_sa_get(struct sockaddr **sap, const s #endif if (bdom == AF_INET) { alloclen = sizeof(struct sockaddr_in); - if (*osalen < alloclen) { + if (osalen < alloclen) { error = EINVAL; goto out; } } - if (bdom == AF_LOCAL && *osalen > sizeof(struct sockaddr_un)) { + if (bdom == AF_LOCAL && osalen > sizeof(struct sockaddr_un)) { hdrlen = offsetof(struct sockaddr_un, sun_path); namelen = strnlen(((struct sockaddr_un *)kosa)->sun_path, - *osalen - hdrlen); + osalen - hdrlen); if (hdrlen + namelen > sizeof(struct sockaddr_un)) { error = EINVAL; goto out; @@ -182,11 +169,10 @@ do_sa_get(struct sockaddr **sap, const s sa->sa_len = alloclen; *sap = sa; - *osalen = alloclen; return (0); out: - free(kosa, mtype); + free(kosa, M_SONAME); return (error); } From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 20:25:36 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 244621065673; Thu, 6 Oct 2011 20:25:36 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 13CB88FC0C; Thu, 6 Oct 2011 20:25:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96KPZuF076346; Thu, 6 Oct 2011 20:25:35 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96KPZV3076344; Thu, 6 Oct 2011 20:25:35 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201110062025.p96KPZV3076344@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 6 Oct 2011 20:25:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226070 - stable/9/share/man/man9 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 20:25:36 -0000 Author: pluknet Date: Thu Oct 6 20:25:35 2011 New Revision: 226070 URL: http://svn.freebsd.org/changeset/base/226070 Log: MFC r225776: Fix typo in OSIOCGIFADDR. Approved by: re (kib) Modified: stable/9/share/man/man9/ifnet.9 Directory Properties: stable/9/share/man/man9/ (props changed) Modified: stable/9/share/man/man9/ifnet.9 ============================================================================== --- stable/9/share/man/man9/ifnet.9 Thu Oct 6 20:20:30 2011 (r226069) +++ stable/9/share/man/man9/ifnet.9 Thu Oct 6 20:25:35 2011 (r226070) @@ -1252,7 +1252,7 @@ function is called to perform the operat The socket's protocol control routine is called to implement the requested action. .Pp -.It Dv OSIOGIFADDR +.It Dv OSIOCGIFADDR .It Dv OSIOCGIFDSTADDR .It Dv OSIOCGIFBRDADDR .It Dv OSIOCGIFNETMASK From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 20:28:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B675F106564A; Thu, 6 Oct 2011 20:28:08 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6EEE8FC1F; Thu, 6 Oct 2011 20:28:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96KS8Rg076452; Thu, 6 Oct 2011 20:28:08 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96KS8R3076450; Thu, 6 Oct 2011 20:28:08 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062028.p96KS8R3076450@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 20:28:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226071 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 20:28:08 -0000 Author: jkim Date: Thu Oct 6 20:28:08 2011 New Revision: 226071 URL: http://svn.freebsd.org/changeset/base/226071 Log: Retern more appropriate errno when Linux path name is too long. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 20:25:35 2011 (r226070) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 20:28:08 2011 (r226071) @@ -158,7 +158,7 @@ linux_getsockaddr(struct sockaddr **sap, namelen = strnlen(((struct sockaddr_un *)kosa)->sun_path, osalen - hdrlen); if (hdrlen + namelen > sizeof(struct sockaddr_un)) { - error = EINVAL; + error = ENAMETOOLONG; goto out; } alloclen = sizeof(struct sockaddr_un); From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 20:48:23 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A42F1065673; Thu, 6 Oct 2011 20:48:23 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A3708FC14; Thu, 6 Oct 2011 20:48:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96KmNd5077100; Thu, 6 Oct 2011 20:48:23 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96KmNFp077098; Thu, 6 Oct 2011 20:48:23 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062048.p96KmNFp077098@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 20:48:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226072 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 20:48:23 -0000 Author: jkim Date: Thu Oct 6 20:48:23 2011 New Revision: 226072 URL: http://svn.freebsd.org/changeset/base/226072 Log: Restore the original socket address length if it was not really AF_INET6. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 20:28:08 2011 (r226071) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 20:48:23 2011 (r226072) @@ -128,22 +128,25 @@ linux_getsockaddr(struct sockaddr **sap, * * Still accept addresses for which the scope id is not used. */ - if (oldv6size && bdom == AF_INET6) { - sin6 = (struct sockaddr_in6 *)kosa; - if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr) || - (!IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) && - !IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr) && - !IN6_IS_ADDR_V4COMPAT(&sin6->sin6_addr) && - !IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) && - !IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))) { - sin6->sin6_scope_id = 0; - } else { - log(LOG_DEBUG, - "obsolete pre-RFC2553 sockaddr_in6 rejected\n"); - error = EINVAL; - goto out; - } - } else + if (oldv6size) { + if (bdom == AF_INET6) { + sin6 = (struct sockaddr_in6 *)kosa; + if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr) || + (!IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) && + !IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr) && + !IN6_IS_ADDR_V4COMPAT(&sin6->sin6_addr) && + !IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) && + !IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))) { + sin6->sin6_scope_id = 0; + } else { + log(LOG_DEBUG, + "obsolete pre-RFC2553 sockaddr_in6 rejected\n"); + error = EINVAL; + goto out; + } + } else + alloclen -= sizeof(u_int32_t); + } #endif if (bdom == AF_INET) { alloclen = sizeof(struct sockaddr_in); From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 21:09:29 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41376106566C; Thu, 6 Oct 2011 21:09:29 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 319D48FC17; Thu, 6 Oct 2011 21:09:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96L9TLD077787; Thu, 6 Oct 2011 21:09:29 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96L9TSU077785; Thu, 6 Oct 2011 21:09:29 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062109.p96L9TSU077785@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 21:09:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226073 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 21:09:29 -0000 Author: jkim Date: Thu Oct 6 21:09:28 2011 New Revision: 226073 URL: http://svn.freebsd.org/changeset/base/226073 Log: Make sure to ignore the leading NULL byte from Linux abstract namespace. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 20:48:23 2011 (r226072) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 21:09:28 2011 (r226073) @@ -90,6 +90,7 @@ linux_getsockaddr(struct sockaddr **sap, int oldv6size; struct sockaddr_in6 *sin6; #endif + char *name; int alloclen, hdrlen, namelen; if (osalen < 2 || osalen > UCHAR_MAX || !osa) @@ -158,8 +159,15 @@ linux_getsockaddr(struct sockaddr **sap, if (bdom == AF_LOCAL && osalen > sizeof(struct sockaddr_un)) { hdrlen = offsetof(struct sockaddr_un, sun_path); - namelen = strnlen(((struct sockaddr_un *)kosa)->sun_path, - osalen - hdrlen); + name = ((struct sockaddr_un *)kosa)->sun_path; + if (*name == '\0') { + /* + * Linux abstract namespace starts with a NULL byte. + * XXX We do not support abstract namespace yet. + */ + namelen = strnlen(name + 1, osalen - hdrlen - 1) + 1; + } else + namelen = strnlen(name, osalen - hdrlen); if (hdrlen + namelen > sizeof(struct sockaddr_un)) { error = ENAMETOOLONG; goto out; From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 21:17:46 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1843106564A; Thu, 6 Oct 2011 21:17:46 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9862D8FC08; Thu, 6 Oct 2011 21:17:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96LHkP9078081; Thu, 6 Oct 2011 21:17:46 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96LHkgu078079; Thu, 6 Oct 2011 21:17:46 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062117.p96LHkgu078079@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 21:17:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226074 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 21:17:46 -0000 Author: jkim Date: Thu Oct 6 21:17:46 2011 New Revision: 226074 URL: http://svn.freebsd.org/changeset/base/226074 Log: Use uint32_t instead of u_int32_t. Fix style(9) nits. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 21:09:28 2011 (r226073) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 21:17:46 2011 (r226074) @@ -83,15 +83,14 @@ static int linux_to_bsd_domain(int); static int linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int osalen) { - int error=0, bdom; struct sockaddr *sa; struct osockaddr *kosa; #ifdef INET6 - int oldv6size; struct sockaddr_in6 *sin6; + int oldv6size; #endif char *name; - int alloclen, hdrlen, namelen; + int alloclen, bdom, error, hdrlen, namelen; if (osalen < 2 || osalen > UCHAR_MAX || !osa) return (EINVAL); @@ -104,8 +103,8 @@ linux_getsockaddr(struct sockaddr **sap, * if it's a v4-mapped address, so reserve the proper space * for it. */ - if (alloclen == sizeof (struct sockaddr_in6) - sizeof (u_int32_t)) { - alloclen = sizeof (struct sockaddr_in6); + if (alloclen == sizeof(struct sockaddr_in6) - sizeof(uint32_t)) { + alloclen = sizeof(struct sockaddr_in6); oldv6size = 1; } #endif @@ -146,7 +145,7 @@ linux_getsockaddr(struct sockaddr **sap, goto out; } } else - alloclen -= sizeof(u_int32_t); + alloclen -= sizeof(uint32_t); } #endif if (bdom == AF_INET) { @@ -175,7 +174,7 @@ linux_getsockaddr(struct sockaddr **sap, alloclen = sizeof(struct sockaddr_un); } - sa = (struct sockaddr *) kosa; + sa = (struct sockaddr *)kosa; sa->sa_family = bdom; sa->sa_len = alloclen; @@ -1232,9 +1231,9 @@ linux_sendmsg(struct thread *td, struct cmsg->cmsg_len = CMSG_LEN(datalen); error = ENOBUFS; - if (!m_append(control, CMSG_HDRSZ, (c_caddr_t) cmsg)) + if (!m_append(control, CMSG_HDRSZ, (c_caddr_t)cmsg)) goto bad; - if (!m_append(control, datalen, (c_caddr_t) data)) + if (!m_append(control, datalen, (c_caddr_t)data)) goto bad; } while ((ptr_cmsg = LINUX_CMSG_NXTHDR(&linux_msg, ptr_cmsg))); @@ -1373,7 +1372,7 @@ linux_recvmsg(struct thread *td, struct * effect for Linux so no need to worry * about sockcred */ - if (datalen != sizeof (*cmcred)) { + if (datalen != sizeof(*cmcred)) { error = EMSGSIZE; goto bad; } From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 21:40:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B56D9106564A; Thu, 6 Oct 2011 21:40:08 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9B4568FC0C; Thu, 6 Oct 2011 21:40:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96Le8Pp078903; Thu, 6 Oct 2011 21:40:08 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96Le80C078901; Thu, 6 Oct 2011 21:40:08 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062140.p96Le80C078901@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 21:40:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226078 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 21:40:08 -0000 Author: jkim Date: Thu Oct 6 21:40:08 2011 New Revision: 226078 URL: http://svn.freebsd.org/changeset/base/226078 Log: Remove a now-defunct variable. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 21:31:21 2011 (r226077) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 21:40:08 2011 (r226078) @@ -81,7 +81,7 @@ static int linux_to_bsd_domain(int); * family and convert to sockaddr. */ static int -linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int osalen) +linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int salen) { struct sockaddr *sa; struct osockaddr *kosa; @@ -90,12 +90,11 @@ linux_getsockaddr(struct sockaddr **sap, int oldv6size; #endif char *name; - int alloclen, bdom, error, hdrlen, namelen; + int bdom, error, hdrlen, namelen; - if (osalen < 2 || osalen > UCHAR_MAX || !osa) + if (salen < 2 || salen > UCHAR_MAX || !osa) return (EINVAL); - alloclen = osalen; #ifdef INET6 oldv6size = 0; /* @@ -103,15 +102,15 @@ linux_getsockaddr(struct sockaddr **sap, * if it's a v4-mapped address, so reserve the proper space * for it. */ - if (alloclen == sizeof(struct sockaddr_in6) - sizeof(uint32_t)) { - alloclen = sizeof(struct sockaddr_in6); + if (salen == sizeof(struct sockaddr_in6) - sizeof(uint32_t)) { + salen += sizeof(uint32_t); oldv6size = 1; } #endif - kosa = malloc(alloclen, M_SONAME, M_WAITOK); + kosa = malloc(salen, M_SONAME, M_WAITOK); - if ((error = copyin(osa, kosa, osalen))) + if ((error = copyin(osa, kosa, salen))) goto out; bdom = linux_to_bsd_domain(kosa->sa_family); @@ -145,18 +144,18 @@ linux_getsockaddr(struct sockaddr **sap, goto out; } } else - alloclen -= sizeof(uint32_t); + salen -= sizeof(uint32_t); } #endif if (bdom == AF_INET) { - alloclen = sizeof(struct sockaddr_in); - if (osalen < alloclen) { + if (salen < sizeof(struct sockaddr_in)) { error = EINVAL; goto out; } + salen = sizeof(struct sockaddr_in); } - if (bdom == AF_LOCAL && osalen > sizeof(struct sockaddr_un)) { + if (bdom == AF_LOCAL && salen > sizeof(struct sockaddr_un)) { hdrlen = offsetof(struct sockaddr_un, sun_path); name = ((struct sockaddr_un *)kosa)->sun_path; if (*name == '\0') { @@ -164,19 +163,19 @@ linux_getsockaddr(struct sockaddr **sap, * Linux abstract namespace starts with a NULL byte. * XXX We do not support abstract namespace yet. */ - namelen = strnlen(name + 1, osalen - hdrlen - 1) + 1; + namelen = strnlen(name + 1, salen - hdrlen - 1) + 1; } else - namelen = strnlen(name, osalen - hdrlen); + namelen = strnlen(name, salen - hdrlen); if (hdrlen + namelen > sizeof(struct sockaddr_un)) { error = ENAMETOOLONG; goto out; } - alloclen = sizeof(struct sockaddr_un); + salen = sizeof(struct sockaddr_un); } sa = (struct sockaddr *)kosa; sa->sa_family = bdom; - sa->sa_len = alloclen; + sa->sa_len = salen; *sap = sa; return (0); From owner-svn-src-all@FreeBSD.ORG Thu Oct 6 21:55:05 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A67B8106564A; Thu, 6 Oct 2011 21:55:05 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8CDB18FC0C; Thu, 6 Oct 2011 21:55:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96Lt5tZ079406; Thu, 6 Oct 2011 21:55:05 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96Lt5bd079404; Thu, 6 Oct 2011 21:55:05 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062155.p96Lt5bd079404@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 21:55:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226079 - head/sys/compat/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 21:55:05 -0000 Author: jkim Date: Thu Oct 6 21:55:05 2011 New Revision: 226079 URL: http://svn.freebsd.org/changeset/base/226079 Log: Use the caculated length instead of maximum length. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 21:40:08 2011 (r226078) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 21:55:05 2011 (r226079) @@ -166,11 +166,11 @@ linux_getsockaddr(struct sockaddr **sap, namelen = strnlen(name + 1, salen - hdrlen - 1) + 1; } else namelen = strnlen(name, salen - hdrlen); - if (hdrlen + namelen > sizeof(struct sockaddr_un)) { + salen = hdrlen + namelen; + if (salen > sizeof(struct sockaddr_un)) { error = ENAMETOOLONG; goto out; } - salen = sizeof(struct sockaddr_un); } sa = (struct sockaddr *)kosa; From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 01:15:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76B62106564A; Fri, 7 Oct 2011 01:15:04 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 577238FC0A; Fri, 7 Oct 2011 01:15:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p971F4en085536; Fri, 7 Oct 2011 01:15:04 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p971F4In085534; Fri, 7 Oct 2011 01:15:04 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201110070115.p971F4In085534@svn.freebsd.org> From: Rick Macklem Date: Fri, 7 Oct 2011 01:15:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226081 - head/sys/rpc/rpcsec_gss X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 01:15:04 -0000 Author: rmacklem Date: Fri Oct 7 01:15:04 2011 New Revision: 226081 URL: http://svn.freebsd.org/changeset/base/226081 Log: A crash reported on freebsd-fs@ on Sep. 23, 2011 under the subject heading "kernel panics with RPCSEC_GSS" appears to be caused by a corrupted tailq list for the client structure. Looking at the code, calls to the function svc_rpc_gss_forget_client() were done in an SMP unsafe manner, with the svc_rpc_gss_lock only being acquired in the function and not before it. As such, when multiple threads called svc_rpc_gss_forget_client() concurrently, it could try and remove the same client structure from the tailq lists multiple times. The patch fixes this by moving the critical code into a separate function called svc_rpc_gss_forget_client_locked(), which must be called with the lock held. For the one case where the caller would have no interest in the lock, svc_rpc_gss_forget_client() was retained, but a loop was added to check that the client structure is still in the tailq lists before removing it, to make it safe for multiple concurrent calls. Tested by: clinton.adams at gmail.com (earlier version) Reviewed by: zkirsch MFC after: 3 days Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c ============================================================================== --- head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Fri Oct 7 00:20:07 2011 (r226080) +++ head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Fri Oct 7 01:15:04 2011 (r226081) @@ -609,27 +609,52 @@ svc_rpc_gss_release_client(struct svc_rp } /* - * Remove a client from our global lists and free it if we can. + * Remove a client from our global lists. + * Must be called with svc_rpc_gss_lock held. */ static void -svc_rpc_gss_forget_client(struct svc_rpc_gss_client *client) +svc_rpc_gss_forget_client_locked(struct svc_rpc_gss_client *client) { struct svc_rpc_gss_client_list *list; + sx_assert(&svc_rpc_gss_lock, SX_XLOCKED); list = &svc_rpc_gss_client_hash[client->cl_id.ci_id % CLIENT_HASH_SIZE]; - sx_xlock(&svc_rpc_gss_lock); TAILQ_REMOVE(list, client, cl_link); TAILQ_REMOVE(&svc_rpc_gss_clients, client, cl_alllink); svc_rpc_gss_client_count--; +} + +/* + * Remove a client from our global lists and free it if we can. + */ +static void +svc_rpc_gss_forget_client(struct svc_rpc_gss_client *client) +{ + struct svc_rpc_gss_client_list *list; + struct svc_rpc_gss_client *tclient; + + list = &svc_rpc_gss_client_hash[client->cl_id.ci_id % CLIENT_HASH_SIZE]; + sx_xlock(&svc_rpc_gss_lock); + TAILQ_FOREACH(tclient, list, cl_link) { + /* + * Make sure this client has not already been removed + * from the lists by svc_rpc_gss_forget_client() or + * svc_rpc_gss_forget_client_locked() already. + */ + if (client == tclient) { + svc_rpc_gss_forget_client_locked(client); + sx_xunlock(&svc_rpc_gss_lock); + svc_rpc_gss_release_client(client); + return; + } + } sx_xunlock(&svc_rpc_gss_lock); - svc_rpc_gss_release_client(client); } static void svc_rpc_gss_timeout_clients(void) { struct svc_rpc_gss_client *client; - struct svc_rpc_gss_client *nclient; time_t now = time_uptime; rpc_gss_log_debug("in svc_rpc_gss_timeout_clients()"); @@ -638,16 +663,29 @@ svc_rpc_gss_timeout_clients(void) * First enforce the max client limit. We keep * svc_rpc_gss_clients in LRU order. */ - while (svc_rpc_gss_client_count > CLIENT_MAX) - svc_rpc_gss_forget_client(TAILQ_LAST(&svc_rpc_gss_clients, - svc_rpc_gss_client_list)); - TAILQ_FOREACH_SAFE(client, &svc_rpc_gss_clients, cl_alllink, nclient) { + sx_xlock(&svc_rpc_gss_lock); + client = TAILQ_LAST(&svc_rpc_gss_clients, svc_rpc_gss_client_list); + while (svc_rpc_gss_client_count > CLIENT_MAX && client != NULL) { + svc_rpc_gss_forget_client_locked(client); + sx_xunlock(&svc_rpc_gss_lock); + svc_rpc_gss_release_client(client); + sx_xlock(&svc_rpc_gss_lock); + client = TAILQ_LAST(&svc_rpc_gss_clients, + svc_rpc_gss_client_list); + } +again: + TAILQ_FOREACH(client, &svc_rpc_gss_clients, cl_alllink) { if (client->cl_state == CLIENT_STALE || now > client->cl_expiration) { + svc_rpc_gss_forget_client_locked(client); + sx_xunlock(&svc_rpc_gss_lock); rpc_gss_log_debug("expiring client %p", client); - svc_rpc_gss_forget_client(client); + svc_rpc_gss_release_client(client); + sx_xlock(&svc_rpc_gss_lock); + goto again; } } + sx_xunlock(&svc_rpc_gss_lock); } #ifdef DEBUG From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 01:37:58 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3297106564A; Fri, 7 Oct 2011 01:37:58 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B990F8FC14; Fri, 7 Oct 2011 01:37:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p971bwLH086236; Fri, 7 Oct 2011 01:37:58 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p971bwnn086234; Fri, 7 Oct 2011 01:37:58 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201110070137.p971bwnn086234@svn.freebsd.org> From: Xin LI Date: Fri, 7 Oct 2011 01:37:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226082 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 01:37:59 -0000 Author: delphij Date: Fri Oct 7 01:37:58 2011 New Revision: 226082 URL: http://svn.freebsd.org/changeset/base/226082 Log: Return proper errno when we hit error when doing sanity check. This fixes dtrace crashes when module is not compiled with CTF data. Submitted by: Paul Ambrose ambrosehua at gmail.com MFC after: 1 week Modified: head/sys/kern/kern_ctf.c Modified: head/sys/kern/kern_ctf.c ============================================================================== --- head/sys/kern/kern_ctf.c Fri Oct 7 01:15:04 2011 (r226081) +++ head/sys/kern/kern_ctf.c Fri Oct 7 01:37:58 2011 (r226082) @@ -164,8 +164,13 @@ link_elf_ctf_get(linker_file_t lf, linke * section names aren't present, then we can't locate the * .SUNW_ctf section containing the CTF data. */ - if (hdr->e_shstrndx == 0 || shdr[hdr->e_shstrndx].sh_type != SHT_STRTAB) + if (hdr->e_shstrndx == 0 || shdr[hdr->e_shstrndx].sh_type != SHT_STRTAB) { + printf("%s(%d): module %s e_shstrndx is %d, sh_type is %d\n", + __func__, __LINE__, lf->pathname, hdr->e_shstrndx, + shdr[hdr->e_shstrndx].sh_type); + error = EFTYPE; goto out; + } /* Allocate memory to buffer the section header strings. */ if ((shstrtab = malloc(shdr[hdr->e_shstrndx].sh_size, M_LINKER, @@ -187,8 +192,12 @@ link_elf_ctf_get(linker_file_t lf, linke break; /* Check if the CTF section wasn't found. */ - if (i >= hdr->e_shnum) + if (i >= hdr->e_shnum) { + printf("%s(%d): module %s has no .SUNW_ctf section\n", + __func__, __LINE__, lf->pathname); + error = EFTYPE; goto out; + } /* Read the CTF header. */ if ((error = vn_rdwr(UIO_READ, nd.ni_vp, ctf_hdr, sizeof(ctf_hdr), @@ -197,12 +206,21 @@ link_elf_ctf_get(linker_file_t lf, linke goto out; /* Check the CTF magic number. (XXX check for big endian!) */ - if (ctf_hdr[0] != 0xf1 || ctf_hdr[1] != 0xcf) + if (ctf_hdr[0] != 0xf1 || ctf_hdr[1] != 0xcf) { + printf("%s(%d): module %s has invalid format\n", + __func__, __LINE__, lf->pathname); + error = EFTYPE; goto out; + } /* Check if version 2. */ - if (ctf_hdr[2] != 2) + if (ctf_hdr[2] != 2) { + printf("%s(%d): module %s CTF format version is %d " + "(2 expected)\n", + __func__, __LINE__, lf->pathname, ctf_hdr[2]); + error = EFTYPE; goto out; + } /* Check if the data is compressed. */ if ((ctf_hdr[3] & 0x1) != 0) { From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 01:40:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4A8D106566B; Fri, 7 Oct 2011 01:40:30 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B307C8FC0A; Fri, 7 Oct 2011 01:40:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p971eUOR086351; Fri, 7 Oct 2011 01:40:30 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p971eU7k086346; Fri, 7 Oct 2011 01:40:30 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110070140.p971eU7k086346@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 7 Oct 2011 01:40:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226083 - head/usr.sbin/bsdinstall/partedit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 01:40:30 -0000 Author: nwhitehorn Date: Fri Oct 7 01:40:30 2011 New Revision: 226083 URL: http://svn.freebsd.org/changeset/base/226083 Log: Work around some behavior of gpart that I absolutely do not understand in order to make every operation of the partition editor fully revertable. Under *no circumstances* will it any longer touch the disks until the user presses Finish and confirms it. MFC after: 3 days Modified: head/usr.sbin/bsdinstall/partedit/diskeditor.c head/usr.sbin/bsdinstall/partedit/gpart_ops.c head/usr.sbin/bsdinstall/partedit/part_wizard.c head/usr.sbin/bsdinstall/partedit/partedit.h Modified: head/usr.sbin/bsdinstall/partedit/diskeditor.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/diskeditor.c Fri Oct 7 01:37:58 2011 (r226082) +++ head/usr.sbin/bsdinstall/partedit/diskeditor.c Fri Oct 7 01:40:30 2011 (r226083) @@ -44,8 +44,8 @@ print_partedit_item(WINDOW *partitions, wattrset(partitions, selected ? item_selected_attr : item_attr); wmove(partitions, y, MARGIN + items[item].indentation*2); - dlg_print_text(partitions, items[item].name, 8, &attr); - wmove(partitions, y, 15); + dlg_print_text(partitions, items[item].name, 10, &attr); + wmove(partitions, y, 17); wattrset(partitions, item_attr); humanize_number(sizetext, 7, items[item].size, "B", HN_AUTOSCALE, Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Fri Oct 7 01:37:58 2011 (r226082) +++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Fri Oct 7 01:40:30 2011 (r226083) @@ -365,39 +365,37 @@ gpart_partcode(struct gprovider *pp) } void -gpart_destroy(struct ggeom *lg_geom, int force) +gpart_destroy(struct ggeom *lg_geom) { - struct gprovider *pp; struct gctl_req *r; + struct gprovider *pp; const char *errstr; + int force = 1; - /* Begin with the hosing: delete all partitions */ + /* Delete all child metadata */ LIST_FOREACH(pp, &lg_geom->lg_provider, lg_provider) gpart_delete(pp); + /* Revert any local changes to get this geom into a pristine state */ + r = gctl_get_handle(); + gctl_ro_param(r, "class", -1, "PART"); + gctl_ro_param(r, "arg0", -1, lg_geom->lg_name); + gctl_ro_param(r, "verb", -1, "undo"); + gctl_issue(r); /* Ignore errors -- these are non-fatal */ + gctl_free(r); + /* Now destroy the geom itself */ r = gctl_get_handle(); gctl_ro_param(r, "class", -1, "PART"); gctl_ro_param(r, "arg0", -1, lg_geom->lg_name); gctl_ro_param(r, "flags", -1, GPART_FLAGS); + gctl_ro_param(r, "force", sizeof(force), &force); gctl_ro_param(r, "verb", -1, "destroy"); errstr = gctl_issue(r); if (errstr != NULL && errstr[0] != '\0') gpart_show_error("Error", NULL, errstr); gctl_free(r); - /* If asked, commit the change */ - if (force) { - r = gctl_get_handle(); - gctl_ro_param(r, "class", -1, "PART"); - gctl_ro_param(r, "arg0", -1, lg_geom->lg_name); - gctl_ro_param(r, "verb", -1, "commit"); - errstr = gctl_issue(r); - if (errstr != NULL && errstr[0] != '\0') - gpart_show_error("Error", NULL, errstr); - gctl_free(r); - } - /* And any metadata associated with the partition scheme itself */ delete_part_metadata(lg_geom->lg_name); } @@ -439,28 +437,21 @@ gpart_edit(struct gprovider *pp) geom = NULL; LIST_FOREACH(cp, &pp->lg_consumers, lg_consumers) if (strcmp(cp->lg_geom->lg_class->lg_name, "PART") == 0) { - char message[512]; - /* - * The PART object is a consumer, so the user wants to - * edit the partition table. gpart doesn't really - * support this, so we have to hose the whole table - * first. - */ - - sprintf(message, "Changing the partition scheme on " - "this disk (%s) requires deleting all existing " - "partitions on this drive. This will PERMANENTLY " - "ERASE any data stored here. Are you sure you want " - "to proceed?", cp->lg_geom->lg_name); - dialog_vars.defaultno = TRUE; - choice = dialog_yesno("Warning", message, 0, 0); - dialog_vars.defaultno = FALSE; - - if (choice == 1) /* cancel */ + /* Check for zombie geoms, treating them as blank */ + scheme = NULL; + LIST_FOREACH(gc, &cp->lg_geom->lg_config, lg_config) { + if (strcmp(gc->lg_name, "scheme") == 0) { + scheme = gc->lg_val; + break; + } + } + if (scheme == NULL || strcmp(scheme, "(none)") == 0) { + gpart_partition(cp->lg_geom->lg_name, NULL); return; + } /* Destroy the geom and all sub-partitions */ - gpart_destroy(cp->lg_geom, 0); + gpart_destroy(cp->lg_geom); /* Now re-partition and return */ gpart_partition(cp->lg_geom->lg_name, NULL); @@ -1004,7 +995,7 @@ gpart_delete(struct gprovider *pp) struct gctl_req *r; const char *errstr; intmax_t idx; - int choice, is_partition; + int is_partition; /* Is it a partition? */ is_partition = (strcmp(pp->lg_geom->lg_class->lg_name, "PART") == 0); @@ -1017,32 +1008,21 @@ gpart_delete(struct gprovider *pp) break; } - /* Destroy all consumers */ + /* If so, destroy all children */ if (geom != NULL) { - if (is_partition) { - char message[512]; - /* - * We have to actually really delete the sub-partition - * tree so that the consumers will go away and the - * partition can be deleted. Warn the user. - */ - - sprintf(message, "Deleting this partition (%s) " - "requires deleting all existing sub-partitions. " - "This will PERMANENTLY ERASE any data stored here " - "and CANNOT BE REVERTED. Are you sure you want to " - "proceed?", cp->lg_geom->lg_name); - dialog_vars.defaultno = TRUE; - choice = dialog_yesno("Warning", message, 0, 0); - dialog_vars.defaultno = FALSE; + gpart_destroy(geom); - if (choice == 1) /* cancel */ - return; + /* If this is a partition, revert it, so it can be deleted */ + if (is_partition) { + r = gctl_get_handle(); + gctl_ro_param(r, "class", -1, "PART"); + gctl_ro_param(r, "arg0", -1, geom->lg_name); + gctl_ro_param(r, "verb", -1, "undo"); + gctl_issue(r); /* Ignore non-fatal errors */ + gctl_free(r); } - - gpart_destroy(geom, is_partition); } - + /* * If this is not a partition, see if that is a problem, complain if * necessary, and return always, since we need not do anything further, Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/part_wizard.c Fri Oct 7 01:37:58 2011 (r226082) +++ head/usr.sbin/bsdinstall/partedit/part_wizard.c Fri Oct 7 01:40:30 2011 (r226083) @@ -254,7 +254,7 @@ query: if (subchoice != 0) goto query; - gpart_destroy(gpart, 1); + gpart_destroy(gpart); gpart_partition(disk, default_scheme()); scheme = default_scheme(); } @@ -267,7 +267,7 @@ query: if (choice != 0) goto query; - gpart_destroy(gpart, 1); + gpart_destroy(gpart); } gpart_partition(disk, default_scheme()); Modified: head/usr.sbin/bsdinstall/partedit/partedit.h ============================================================================== --- head/usr.sbin/bsdinstall/partedit/partedit.h Fri Oct 7 01:37:58 2011 (r226082) +++ head/usr.sbin/bsdinstall/partedit/partedit.h Fri Oct 7 01:40:30 2011 (r226083) @@ -58,7 +58,7 @@ int part_wizard(void); /* gpart operations */ void gpart_delete(struct gprovider *pp); -void gpart_destroy(struct ggeom *lg_geom, int force); +void gpart_destroy(struct ggeom *lg_geom); void gpart_edit(struct gprovider *pp); void gpart_create(struct gprovider *pp, char *default_type, char *default_size, char *default_mountpoint, char **output, int interactive); From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 05:47:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C99F1065673; Fri, 7 Oct 2011 05:47:30 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 520A28FC12; Fri, 7 Oct 2011 05:47:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p975lUEe095272; Fri, 7 Oct 2011 05:47:30 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p975lUIJ095269; Fri, 7 Oct 2011 05:47:30 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201110070547.p975lUIJ095269@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 7 Oct 2011 05:47:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226089 - in head: share/man/man7 sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 05:47:30 -0000 Author: obrien Date: Fri Oct 7 05:47:30 2011 New Revision: 226089 URL: http://svn.freebsd.org/changeset/base/226089 Log: Disallow various debug.kdb sysctl's when securelevel is raised. PR: 161350 Modified: head/share/man/man7/security.7 head/sys/kern/subr_kdb.c Modified: head/share/man/man7/security.7 ============================================================================== --- head/share/man/man7/security.7 Fri Oct 7 05:45:38 2011 (r226088) +++ head/share/man/man7/security.7 Fri Oct 7 05:47:30 2011 (r226089) @@ -544,6 +544,12 @@ may not be opened for writing; kernel modules (see .Xr kld 4 ) may not be loaded or unloaded. +The kernel debugger may not be entered using the +.Va debug.kdb.enter +sysctl. +A panic or trap cannot be forced using the +.Va debug.kdb.panic +and other sysctl's. .It Ic 2 Highly secure mode \- same as secure mode, plus disks may not be opened for writing (except by Modified: head/sys/kern/subr_kdb.c ============================================================================== --- head/sys/kern/subr_kdb.c Fri Oct 7 05:45:38 2011 (r226088) +++ head/sys/kern/subr_kdb.c Fri Oct 7 05:47:30 2011 (r226089) @@ -90,25 +90,30 @@ SYSCTL_PROC(_debug_kdb, OID_AUTO, availa SYSCTL_PROC(_debug_kdb, OID_AUTO, current, CTLTYPE_STRING | CTLFLAG_RW, NULL, 0, kdb_sysctl_current, "A", "currently selected KDB backend"); -SYSCTL_PROC(_debug_kdb, OID_AUTO, enter, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, +SYSCTL_PROC(_debug_kdb, OID_AUTO, enter, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE, NULL, 0, kdb_sysctl_enter, "I", "set to enter the debugger"); -SYSCTL_PROC(_debug_kdb, OID_AUTO, panic, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, +SYSCTL_PROC(_debug_kdb, OID_AUTO, panic, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE, NULL, 0, kdb_sysctl_panic, "I", "set to panic the kernel"); -SYSCTL_PROC(_debug_kdb, OID_AUTO, trap, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, +SYSCTL_PROC(_debug_kdb, OID_AUTO, trap, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE, NULL, 0, kdb_sysctl_trap, "I", "set to cause a page fault via data access"); -SYSCTL_PROC(_debug_kdb, OID_AUTO, trap_code, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, +SYSCTL_PROC(_debug_kdb, OID_AUTO, trap_code, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE, NULL, 0, kdb_sysctl_trap_code, "I", "set to cause a page fault via code access"); -SYSCTL_INT(_debug_kdb, OID_AUTO, break_to_debugger, CTLTYPE_INT | CTLFLAG_RW | - CTLFLAG_TUN, &kdb_break_to_debugger, 0, "Enable break to debugger"); +SYSCTL_INT(_debug_kdb, OID_AUTO, break_to_debugger, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_TUN | CTLFLAG_SECURE, + &kdb_break_to_debugger, 0, "Enable break to debugger"); TUNABLE_INT("debug.kdb.break_to_debugger", &kdb_break_to_debugger); -SYSCTL_INT(_debug_kdb, OID_AUTO, alt_break_to_debugger, CTLTYPE_INT | - CTLFLAG_RW | CTLFLAG_TUN, &kdb_alt_break_to_debugger, 0, - "Enable alternative break to debugger"); +SYSCTL_INT(_debug_kdb, OID_AUTO, alt_break_to_debugger, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_TUN | CTLFLAG_SECURE, + &kdb_alt_break_to_debugger, 0, "Enable alternative break to debugger"); TUNABLE_INT("debug.kdb.alt_break_to_debugger", &kdb_alt_break_to_debugger); /* From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 06:00:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F2541065670; Fri, 7 Oct 2011 06:00:00 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A34B8FC13; Fri, 7 Oct 2011 06:00:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97600eQ095711; Fri, 7 Oct 2011 06:00:00 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97600Ut095709; Fri, 7 Oct 2011 06:00:00 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201110070600.p97600Ut095709@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 7 Oct 2011 06:00:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226090 - head/sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 06:00:00 -0000 Author: obrien Date: Fri Oct 7 06:00:00 2011 New Revision: 226090 URL: http://svn.freebsd.org/changeset/base/226090 Log: Increase MSGBUF_SIZE. The previous size lead to truncated /var/run/dmesg.boot when booted with "-v". Modified: head/sys/sys/msgbuf.h Modified: head/sys/sys/msgbuf.h ============================================================================== --- head/sys/sys/msgbuf.h Fri Oct 7 05:47:30 2011 (r226089) +++ head/sys/sys/msgbuf.h Fri Oct 7 06:00:00 2011 (r226090) @@ -77,7 +77,7 @@ int msgbuf_peekbytes(struct msgbuf *mbp, void msgbuf_reinit(struct msgbuf *mbp, void *ptr, int size); #ifndef MSGBUF_SIZE -#define MSGBUF_SIZE (32768 * 2) +#define MSGBUF_SIZE (32768 * 3) #endif #endif /* KERNEL */ From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 06:13:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 012EB106566C; Fri, 7 Oct 2011 06:13:39 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E55E08FC17; Fri, 7 Oct 2011 06:13:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p976DcVI096178; Fri, 7 Oct 2011 06:13:38 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p976DcIh096176; Fri, 7 Oct 2011 06:13:38 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110070613.p976DcIh096176@svn.freebsd.org> From: Adrian Chadd Date: Fri, 7 Oct 2011 06:13:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226091 - head/sys/dev/hwpmc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 06:13:39 -0000 Author: adrian Date: Fri Oct 7 06:13:38 2011 New Revision: 226091 URL: http://svn.freebsd.org/changeset/base/226091 Log: Begin implementing correct MIPS24K sampling mode behaviour. * Add the interrupt bit in the configuration register * Correctly set the counter register for the sampling overflow interrupt. The interrupt is asserted when bit 31 is set. So set the overflow value at 0x80000000 and subtract the programmed value as appropriate. Modified: head/sys/dev/hwpmc/hwpmc_mips24k.h Modified: head/sys/dev/hwpmc/hwpmc_mips24k.h ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mips24k.h Fri Oct 7 06:00:00 2011 (r226090) +++ head/sys/dev/hwpmc/hwpmc_mips24k.h Fri Oct 7 06:13:38 2011 (r226091) @@ -35,7 +35,7 @@ PMC_CAP_WRITE | PMC_CAP_INVERT | \ PMC_CAP_QUALIFIER) - +#define MIPS24K_PMC_INTERRUPT_ENABLE 0x10 /* Enable interrupts */ #define MIPS24K_PMC_USER_ENABLE 0x08 /* Count in USER mode */ #define MIPS24K_PMC_SUPER_ENABLE 0x04 /* Count in SUPERVISOR mode */ #define MIPS24K_PMC_KERNEL_ENABLE 0x02 /* Count in KERNEL mode */ @@ -43,9 +43,12 @@ MIPS24K_PMC_SUPER_ENABLE | \ MIPS24K_PMC_KERNEL_ENABLE) - -#define MIPS24K_RELOAD_COUNT_TO_PERFCTR_VALUE(R) (-(R)) -#define MIPS24K_PERFCTR_VALUE_TO_RELOAD_COUNT(P) (-(P)) +/* + * Interrupts are posted when bit 31 of the relevant + * counter is set. + */ +#define MIPS24K_RELOAD_COUNT_TO_PERFCTR_VALUE(R) (0x80000000 - (R)) +#define MIPS24K_PERFCTR_VALUE_TO_RELOAD_COUNT(P) ((P) - 0x80000000) #define MIPS24K_PMC_SELECT 0x4 /* Which bit position the event starts at. */ #define MIPS24K_PMC_OFFSET 2 /* Control registers are 0, 2, 4, etc. */ From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 06:46:46 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D91301065672; Fri, 7 Oct 2011 06:46:46 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C734C8FC15; Fri, 7 Oct 2011 06:46:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p976kkQW097321; Fri, 7 Oct 2011 06:46:46 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p976kkm4097316; Fri, 7 Oct 2011 06:46:46 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201110070646.p976kkm4097316@svn.freebsd.org> From: Edward Tomasz Napierala Date: Fri, 7 Oct 2011 06:46:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226092 - in stable/9/sys: kern sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 06:46:47 -0000 Author: trasz Date: Fri Oct 7 06:46:46 2011 New Revision: 226092 URL: http://svn.freebsd.org/changeset/base/226092 Log: MFC r225938: Fix bug introduced in r225641, which would cause panic if racct_proc_fork() returned error -- the racct_destroy_locked() would get called twice. MFC r225940: Fix another bug introduced in r225641, which caused rctl to access certain fields in 'struct proc' before they got initialized in do_fork(). MFC r225944: Move some code inside the racct_proc_fork(); it spares a few lock operations and it's more logical this way. MFC r225981: Actually enforce limit for inheritable resources on fork. Approved by: re (kib) Modified: stable/9/sys/kern/kern_fork.c stable/9/sys/kern/kern_racct.c stable/9/sys/kern/kern_rctl.c stable/9/sys/sys/racct.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/kern/kern_fork.c ============================================================================== --- stable/9/sys/kern/kern_fork.c Fri Oct 7 06:13:38 2011 (r226091) +++ stable/9/sys/kern/kern_fork.c Fri Oct 7 06:46:46 2011 (r226092) @@ -879,17 +879,6 @@ fork1(struct thread *td, int flags, int goto fail1; } -#ifdef RACCT - PROC_LOCK(newproc); - error = racct_add(newproc, RACCT_NPROC, 1); - error += racct_add(newproc, RACCT_NTHR, 1); - PROC_UNLOCK(newproc); - if (error != 0) { - error = EAGAIN; - goto fail1; - } -#endif - #ifdef MAC mac_proc_init(newproc); #endif @@ -939,6 +928,7 @@ fork1(struct thread *td, int flags, int if (flags & RFPROCDESC) procdesc_finit(newproc->p_procdesc, fp_procdesc); #endif + racct_proc_fork_done(newproc); return (0); } Modified: stable/9/sys/kern/kern_racct.c ============================================================================== --- stable/9/sys/kern/kern_racct.c Fri Oct 7 06:13:38 2011 (r226091) +++ stable/9/sys/kern/kern_racct.c Fri Oct 7 06:46:46 2011 (r226092) @@ -261,12 +261,8 @@ racct_alloc_resource(struct racct *racct } } -/* - * Increase allocation of 'resource' by 'amount' for process 'p'. - * Return 0 if it's below limits, or errno, if it's not. - */ -int -racct_add(struct proc *p, int resource, uint64_t amount) +static int +racct_add_locked(struct proc *p, int resource, uint64_t amount) { #ifdef RCTL int error; @@ -282,23 +278,35 @@ racct_add(struct proc *p, int resource, */ PROC_LOCK_ASSERT(p, MA_OWNED); - mtx_lock(&racct_lock); #ifdef RCTL error = rctl_enforce(p, resource, amount); if (error && RACCT_IS_DENIABLE(resource)) { SDT_PROBE(racct, kernel, rusage, add_failure, p, resource, amount, 0, 0); - mtx_unlock(&racct_lock); return (error); } #endif racct_alloc_resource(p->p_racct, resource, amount); racct_add_cred_locked(p->p_ucred, resource, amount); - mtx_unlock(&racct_lock); return (0); } +/* + * Increase allocation of 'resource' by 'amount' for process 'p'. + * Return 0 if it's below limits, or errno, if it's not. + */ +int +racct_add(struct proc *p, int resource, uint64_t amount) +{ + int error; + + mtx_lock(&racct_lock); + error = racct_add_locked(p, resource, amount); + mtx_unlock(&racct_lock); + return (error); +} + static void racct_add_cred_locked(struct ucred *cred, int resource, uint64_t amount) { @@ -559,6 +567,12 @@ racct_proc_fork(struct proc *parent, str PROC_LOCK(child); mtx_lock(&racct_lock); +#ifdef RCTL + error = rctl_proc_fork(parent, child); + if (error != 0) + goto out; +#endif + /* * Inherit resource usage. */ @@ -569,32 +583,14 @@ racct_proc_fork(struct proc *parent, str error = racct_set_locked(child, i, parent->p_racct->r_resources[i]); - if (error != 0) { - /* - * XXX: The only purpose of these two lines is - * to prevent from tripping checks in racct_destroy(). - */ - for (i = 0; i <= RACCT_MAX; i++) - racct_set_locked(child, i, 0); + if (error != 0) goto out; - } } -#ifdef RCTL - error = rctl_proc_fork(parent, child); - if (error != 0) { - /* - * XXX: The only purpose of these two lines is to prevent from - * tripping checks in racct_destroy(). - */ - for (i = 0; i <= RACCT_MAX; i++) - racct_set_locked(child, i, 0); - } -#endif + error = racct_add_locked(child, RACCT_NPROC, 1); + error += racct_add_locked(child, RACCT_NTHR, 1); out: - if (error != 0) - racct_destroy_locked(&child->p_racct); mtx_unlock(&racct_lock); PROC_UNLOCK(child); PROC_UNLOCK(parent); @@ -602,6 +598,24 @@ out: return (error); } +/* + * Called at the end of fork1(), to handle rules that require the process + * to be fully initialized. + */ +void +racct_proc_fork_done(struct proc *child) +{ + +#ifdef RCTL + PROC_LOCK(child); + mtx_lock(&racct_lock); + rctl_enforce(child, RACCT_NPROC, 0); + rctl_enforce(child, RACCT_NTHR, 0); + mtx_unlock(&racct_lock); + PROC_UNLOCK(child); +#endif +} + void racct_proc_exit(struct proc *p) { @@ -827,6 +841,11 @@ racct_proc_fork(struct proc *parent, str } void +racct_proc_fork_done(struct proc *child) +{ +} + +void racct_proc_exit(struct proc *p) { } Modified: stable/9/sys/kern/kern_rctl.c ============================================================================== --- stable/9/sys/kern/kern_rctl.c Fri Oct 7 06:13:38 2011 (r226091) +++ stable/9/sys/kern/kern_rctl.c Fri Oct 7 06:46:46 2011 (r226092) @@ -312,6 +312,16 @@ rctl_enforce(struct proc *p, int resourc if (link->rrl_exceeded != 0) continue; + /* + * If the process state is not fully initialized yet, + * we can't access most of the required fields, e.g. + * p->p_comm. This happens when called from fork1(). + * Ignore this rule for now; it will be processed just + * after fork, when called from racct_proc_fork_done(). + */ + if (p->p_state != PRS_NORMAL) + continue; + if (!ppsratecheck(&lasttime, &curtime, 10)) continue; @@ -335,6 +345,9 @@ rctl_enforce(struct proc *p, int resourc if (link->rrl_exceeded != 0) continue; + if (p->p_state != PRS_NORMAL) + continue; + buf = malloc(RCTL_LOG_BUFSIZE, M_RCTL, M_NOWAIT); if (buf == NULL) { printf("rctl_enforce: out of memory\n"); @@ -357,23 +370,15 @@ rctl_enforce(struct proc *p, int resourc if (link->rrl_exceeded != 0) continue; + if (p->p_state != PRS_NORMAL) + continue; + KASSERT(rule->rr_action > 0 && rule->rr_action <= RCTL_ACTION_SIGNAL_MAX, ("rctl_enforce: unknown action %d", rule->rr_action)); /* - * We're supposed to send a signal, but the process - * is not fully initialized yet, probably because we - * got called from fork1(). For now just deny the - * allocation instead. - */ - if (p->p_state != PRS_NORMAL) { - should_deny = 1; - continue; - } - - /* * We're using the fact that RCTL_ACTION_SIG* values * are equal to their counterparts from sys/signal.h. */ Modified: stable/9/sys/sys/racct.h ============================================================================== --- stable/9/sys/sys/racct.h Fri Oct 7 06:13:38 2011 (r226091) +++ stable/9/sys/sys/racct.h Fri Oct 7 06:46:46 2011 (r226092) @@ -137,6 +137,7 @@ void racct_create(struct racct **racctp) void racct_destroy(struct racct **racctp); int racct_proc_fork(struct proc *parent, struct proc *child); +void racct_proc_fork_done(struct proc *child); void racct_proc_exit(struct proc *p); void racct_proc_ucred_changed(struct proc *p, struct ucred *oldcred, From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 08:59:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF20A1065670; Fri, 7 Oct 2011 08:59:54 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8465D8FC0C; Fri, 7 Oct 2011 08:59:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p978xs1R001630; Fri, 7 Oct 2011 08:59:54 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p978xsu9001627; Fri, 7 Oct 2011 08:59:54 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110070859.p978xsu9001627@svn.freebsd.org> From: Marius Strobl Date: Fri, 7 Oct 2011 08:59:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226095 - in head/sys/dev: esp sym X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 08:59:54 -0000 Author: marius Date: Fri Oct 7 08:59:54 2011 New Revision: 226095 URL: http://svn.freebsd.org/changeset/base/226095 Log: Merge from r225950: Set the sense residual properly. Reviewed by: ken Modified: head/sys/dev/esp/ncr53c9x.c head/sys/dev/sym/sym_hipd.c Modified: head/sys/dev/esp/ncr53c9x.c ============================================================================== --- head/sys/dev/esp/ncr53c9x.c Fri Oct 7 08:56:51 2011 (r226094) +++ head/sys/dev/esp/ncr53c9x.c Fri Oct 7 08:59:54 2011 (r226095) @@ -1367,7 +1367,8 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc ss->byte2 = ccb->ccb_h.target_lun << SCSI_CMD_LUN_SHIFT; ss->length = sizeof(struct scsi_sense_data); ecb->clen = sizeof(*ss); - ecb->daddr = (char *)&ecb->ccb->csio.sense_data; + memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data)); + ecb->daddr = (char *)&ccb->csio.sense_data; ecb->dleft = sizeof(struct scsi_sense_data); ecb->flags |= ECB_SENSE; ecb->timeout = NCR_SENSE_TIMEOUT; @@ -1397,7 +1398,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc, union ccb *ccb = ecb->ccb; struct ncr53c9x_linfo *li; struct ncr53c9x_tinfo *ti; - int lun; + int lun, sense_returned; NCR_LOCK_ASSERT(sc, MA_OWNED); @@ -1426,6 +1427,13 @@ ncr53c9x_done(struct ncr53c9x_softc *sc, ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR | CAM_AUTOSNS_VALID; + sense_returned = sizeof(ccb->csio.sense_data) - + ecb->dleft; + if (sense_returned < ccb->csio.sense_len) + ccb->csio.sense_resid = ccb->csio.sense_len - + sense_returned; + else + ccb->csio.sense_resid = 0; } else if (ecb->stat == SCSI_STATUS_CHECK_COND) { if ((ecb->flags & ECB_SENSE) != 0) ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; Modified: head/sys/dev/sym/sym_hipd.c ============================================================================== --- head/sys/dev/sym/sym_hipd.c Fri Oct 7 08:56:51 2011 (r226094) +++ head/sys/dev/sym/sym_hipd.c Fri Oct 7 08:59:54 2011 (r226095) @@ -7154,7 +7154,7 @@ static void sym_complete_error (hcb_p np { struct ccb_scsiio *csio; u_int cam_status; - int i; + int i, sense_returned; SYM_LOCK_ASSERT(MA_OWNED); @@ -7214,11 +7214,15 @@ static void sym_complete_error (hcb_p np * Bounce back the sense data to user and * fix the residual. */ - bzero(&csio->sense_data, csio->sense_len); + bzero(&csio->sense_data, sizeof(csio->sense_data)); + sense_returned = SYM_SNS_BBUF_LEN - csio->sense_resid; + if (sense_returned < csio->sense_len) + csio->sense_resid = csio->sense_len - + sense_returned; + else + csio->sense_resid = 0; bcopy(cp->sns_bbuf, &csio->sense_data, - MIN(csio->sense_len, SYM_SNS_BBUF_LEN)); - csio->sense_resid += csio->sense_len; - csio->sense_resid -= SYM_SNS_BBUF_LEN; + MIN(csio->sense_len, sense_returned)); #if 0 /* * If the device reports a UNIT ATTENTION condition From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 09:51:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E1ED1065674; Fri, 7 Oct 2011 09:51:13 +0000 (UTC) (envelope-from jonathan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1DA598FC0C; Fri, 7 Oct 2011 09:51:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p979pDR9003414; Fri, 7 Oct 2011 09:51:13 GMT (envelope-from jonathan@svn.freebsd.org) Received: (from jonathan@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p979pCVf003412; Fri, 7 Oct 2011 09:51:12 GMT (envelope-from jonathan@svn.freebsd.org) Message-Id: <201110070951.p979pCVf003412@svn.freebsd.org> From: Jonathan Anderson Date: Fri, 7 Oct 2011 09:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226098 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 09:51:13 -0000 Author: jonathan Date: Fri Oct 7 09:51:12 2011 New Revision: 226098 URL: http://svn.freebsd.org/changeset/base/226098 Log: Change one printf() to log(). As noted in kern/159780, printf() is not very jail-friendly, since it can't be easily monitored by jail management tools. This patch reports an error via log() instead, which, if nobody is watching the log file, still prints to the console. Approved by: mentor (rwatson) Submitted by: Eugene Grosbein MFC after: 5 days Modified: head/sys/kern/vfs_subr.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Fri Oct 7 09:35:17 2011 (r226097) +++ head/sys/kern/vfs_subr.c Fri Oct 7 09:51:12 2011 (r226098) @@ -3054,7 +3054,7 @@ vfs_sysctl(SYSCTL_HANDLER_ARGS) struct vfsconf *vfsp; struct xvfsconf xvfsp; - printf("WARNING: userland calling deprecated sysctl, " + log(LOG_WARNING, "userland calling deprecated sysctl, " "please rebuild world\n"); #if 1 || defined(COMPAT_PRELITE2) From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 11:30:53 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACEA1106566B; Fri, 7 Oct 2011 11:30:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 529EA8FC13; Fri, 7 Oct 2011 11:30:52 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id OAA19625; Fri, 07 Oct 2011 14:14:09 +0300 (EEST) (envelope-from avg@FreeBSD.org) Message-ID: <4E8EDF00.2030309@FreeBSD.org> Date: Fri, 07 Oct 2011 14:14:08 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111003 Thunderbird/7.0.1 MIME-Version: 1.0 To: "David E. O'Brien" References: <201110070547.p975lUIJ095269@svn.freebsd.org> In-Reply-To: <201110070547.p975lUIJ095269@svn.freebsd.org> X-Enigmail-Version: undefined Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r226089 - in head: share/man/man7 sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 11:30:53 -0000 on 07/10/2011 08:47 David E. O'Brien said the following: > Author: obrien > Date: Fri Oct 7 05:47:30 2011 > New Revision: 226089 > URL: http://svn.freebsd.org/changeset/base/226089 > > Log: > Disallow various debug.kdb sysctl's when securelevel is raised. > > PR: 161350 Maybe the same would also be a good idea for sysctls defined at the top of sys/kern/kern_shutdown.c? Thank you! -- Andriy Gapon From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 11:30:55 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAA26106566C; Fri, 7 Oct 2011 11:30:55 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 89DEF8FC08; Fri, 7 Oct 2011 11:30:54 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id OAA19631; Fri, 07 Oct 2011 14:14:47 +0300 (EEST) (envelope-from avg@FreeBSD.org) Message-ID: <4E8EDF26.6040409@FreeBSD.org> Date: Fri, 07 Oct 2011 14:14:46 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111003 Thunderbird/7.0.1 MIME-Version: 1.0 To: "David E. O'Brien" References: <201110070600.p97600Ut095709@svn.freebsd.org> In-Reply-To: <201110070600.p97600Ut095709@svn.freebsd.org> X-Enigmail-Version: undefined Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r226090 - head/sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 11:30:55 -0000 on 07/10/2011 09:00 David E. O'Brien said the following: > Author: obrien > Date: Fri Oct 7 06:00:00 2011 > New Revision: 226090 > URL: http://svn.freebsd.org/changeset/base/226090 > > Log: > Increase MSGBUF_SIZE. > The previous size lead to truncated /var/run/dmesg.boot when booted with "-v". > > Modified: > head/sys/sys/msgbuf.h > > Modified: head/sys/sys/msgbuf.h > ============================================================================== > --- head/sys/sys/msgbuf.h Fri Oct 7 05:47:30 2011 (r226089) > +++ head/sys/sys/msgbuf.h Fri Oct 7 06:00:00 2011 (r226090) > @@ -77,7 +77,7 @@ int msgbuf_peekbytes(struct msgbuf *mbp, > void msgbuf_reinit(struct msgbuf *mbp, void *ptr, int size); > > #ifndef MSGBUF_SIZE > -#define MSGBUF_SIZE (32768 * 2) > +#define MSGBUF_SIZE (32768 * 3) Heck, I am going to five! :-) > #endif > #endif /* KERNEL */ > -- Andriy Gapon From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 12:21:50 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5903106564A; Fri, 7 Oct 2011 12:21:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5C088FC08; Fri, 7 Oct 2011 12:21:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97CLo3j010389; Fri, 7 Oct 2011 12:21:50 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97CLo6o010387; Fri, 7 Oct 2011 12:21:50 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201110071221.p97CLo6o010387@svn.freebsd.org> From: Ed Schouten Date: Fri, 7 Oct 2011 12:21:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226099 - head/sys/teken X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 12:21:51 -0000 Author: ed Date: Fri Oct 7 12:21:50 2011 New Revision: 226099 URL: http://svn.freebsd.org/changeset/base/226099 Log: Tab should not blank cells. It seems I was under the impression that a tab differs from a single forward tabulation, namely that it blanks the underlying cells. This seems not to be the case. They are identical. This should fix applications like jove(1) that use tabs instead of explicit cursor position setting. Reported by: Brett Glass MFC after: 3 days, after it's tested Modified: head/sys/teken/teken_subr.h Modified: head/sys/teken/teken_subr.h ============================================================================== --- head/sys/teken/teken_subr.h Fri Oct 7 09:51:12 2011 (r226098) +++ head/sys/teken/teken_subr.h Fri Oct 7 12:21:50 2011 (r226099) @@ -595,20 +595,7 @@ static void teken_subr_horizontal_tab(teken_t *t) { - if (t->t_stateflags & TS_CONS25) { - teken_subr_cursor_forward_tabulation(t, 1); - } else { - teken_rect_t tr; - - tr.tr_begin = t->t_cursor; - teken_subr_cursor_forward_tabulation(t, 1); - tr.tr_end.tp_row = tr.tr_begin.tp_row + 1; - tr.tr_end.tp_col = t->t_cursor.tp_col; - - /* Blank region that we skipped. */ - if (tr.tr_end.tp_col > tr.tr_begin.tp_col) - teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); - } + teken_subr_cursor_forward_tabulation(t, 1); } static void From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 12:42:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B08E61065674; Fri, 7 Oct 2011 12:42:03 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A09798FC08; Fri, 7 Oct 2011 12:42:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97Cg36E011054; Fri, 7 Oct 2011 12:42:03 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97Cg3u5011052; Fri, 7 Oct 2011 12:42:03 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201110071242.p97Cg3u5011052@svn.freebsd.org> From: Ed Schouten Date: Fri, 7 Oct 2011 12:42:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226100 - head/sys/teken/stress X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 12:42:03 -0000 Author: ed Date: Fri Oct 7 12:42:03 2011 New Revision: 226100 URL: http://svn.freebsd.org/changeset/base/226100 Log: Simply let teken_stress use arc4random. This makes it run quite a bit faster, since it makes system calls less often. Modified: head/sys/teken/stress/teken_stress.c Modified: head/sys/teken/stress/teken_stress.c ============================================================================== --- head/sys/teken/stress/teken_stress.c Fri Oct 7 12:21:50 2011 (r226099) +++ head/sys/teken/stress/teken_stress.c Fri Oct 7 12:42:03 2011 (r226100) @@ -99,24 +99,14 @@ int main(int argc __unused, char *argv[] __unused) { teken_t t; - int rnd; unsigned int i, iteration = 0; unsigned char buf[2048]; - rnd = open("/dev/urandom", O_RDONLY); - if (rnd < 0) { - perror("/dev/urandom"); - exit(1); - } teken_init(&t, &tf, NULL); for (;;) { - if (read(rnd, buf, sizeof buf) != sizeof buf) { - perror("read"); - exit(1); - } - + arc4random_buf(buf, sizeof buf); for (i = 0; i < sizeof buf; i++) { if (buf[i] >= 0x80) buf[i] = From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 12:55:51 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53EC21065674; Fri, 7 Oct 2011 12:55:51 +0000 (UTC) (envelope-from ache@vniz.net) Received: from vniz.net (vniz.net [194.87.13.69]) by mx1.freebsd.org (Postfix) with ESMTP id C93468FC12; Fri, 7 Oct 2011 12:55:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by vniz.net (8.14.5/8.14.5) with ESMTP id p97CtkYk028010; Fri, 7 Oct 2011 16:55:46 +0400 (MSK) (envelope-from ache@vniz.net) Received: (from ache@localhost) by localhost (8.14.5/8.14.5/Submit) id p97CtjbU028006; Fri, 7 Oct 2011 16:55:45 +0400 (MSK) (envelope-from ache) Date: Fri, 7 Oct 2011 16:55:45 +0400 From: Andrey Chernov To: Ed Schouten Message-ID: <20111007125544.GA26576@vniz.net> Mail-Followup-To: Andrey Chernov , Ed Schouten , src-committers@FreeBSD.ORG, svn-src-all@FreeBSD.ORG, svn-src-head@FreeBSD.ORG References: <201110071242.p97Cg3u5011052@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110071242.p97Cg3u5011052@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.ORG, svn-src-all@FreeBSD.ORG, src-committers@FreeBSD.ORG Subject: Re: svn commit: r226100 - head/sys/teken/stress X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 12:55:51 -0000 On Fri, Oct 07, 2011 at 12:42:03PM +0000, Ed Schouten wrote: > Author: ed > Date: Fri Oct 7 12:42:03 2011 > New Revision: 226100 > URL: http://svn.freebsd.org/changeset/base/226100 > > Log: > Simply let teken_stress use arc4random. > > This makes it run quite a bit faster, since it makes system calls less > often. It is because we still have in some sense incorrect (father&son the same sequence after fork) arc4random() implementation with the patch stucking in the so-called "FreeBSD Security Team" review already several years. OpenBSD version have at least one syscall per arc4random() call - getpid(). -- http://ache.vniz.net/ From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 12:58:34 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 076F1106566B; Fri, 7 Oct 2011 12:58:34 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D1E4A8FC13; Fri, 7 Oct 2011 12:58:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97CwXLq011665; Fri, 7 Oct 2011 12:58:33 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97CwXwH011662; Fri, 7 Oct 2011 12:58:33 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110071258.p97CwXwH011662@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 7 Oct 2011 12:58:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226101 - head/lib/libpam/modules/pam_ssh X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 12:58:34 -0000 Author: des Date: Fri Oct 7 12:58:33 2011 New Revision: 226101 URL: http://svn.freebsd.org/changeset/base/226101 Log: Load the ECDSA key if there is one. MFC after: 1 week Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.8 head/lib/libpam/modules/pam_ssh/pam_ssh.c Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.8 ============================================================================== --- head/lib/libpam/modules/pam_ssh/pam_ssh.8 Fri Oct 7 12:42:03 2011 (r226100) +++ head/lib/libpam/modules/pam_ssh/pam_ssh.8 Fri Oct 7 12:58:33 2011 (r226101) @@ -1,6 +1,6 @@ .\" Copyright (c) 2001 Mark R V Murray -.\" All rights reserved. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. +.\" Copyright (c) 2004-2011 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 26, 2001 +.Dd October 7, 2011 .Dt PAM_SSH 8 .Os .Sh NAME @@ -135,6 +135,8 @@ SSH1 RSA key SSH2 RSA key .It Pa $HOME/.ssh/id_dsa SSH2 DSA key +.It Pa $HOME/.ssh/id_ecdsa +SSH2 ECDSA key .El .Sh SEE ALSO .Xr ssh-agent 1 , Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.c ============================================================================== --- head/lib/libpam/modules/pam_ssh/pam_ssh.c Fri Oct 7 12:42:03 2011 (r226100) +++ head/lib/libpam/modules/pam_ssh/pam_ssh.c Fri Oct 7 12:58:33 2011 (r226101) @@ -1,5 +1,6 @@ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. + * Copyright (c) 2004-2011 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -78,6 +79,7 @@ static const char *pam_ssh_keyfiles[] = ".ssh/identity", /* SSH1 RSA key */ ".ssh/id_rsa", /* SSH2 RSA key */ ".ssh/id_dsa", /* SSH2 DSA key */ + ".ssh/id_ecdsa", /* SSH2 ECDSA key */ NULL }; @@ -324,6 +326,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t * /* get a connection to the agent */ if ((ac = ssh_get_authentication_connection()) == NULL) { + openpam_log(PAM_LOG_DEBUG, "failed to connect to the agent"); pam_err = PAM_SYSTEM_ERR; goto end; } From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 13:10:16 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C955C1065677; Fri, 7 Oct 2011 13:10:16 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B8E288FC0C; Fri, 7 Oct 2011 13:10:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97DAGRN012115; Fri, 7 Oct 2011 13:10:16 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97DAGMh012112; Fri, 7 Oct 2011 13:10:16 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110071310.p97DAGMh012112@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 7 Oct 2011 13:10:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226103 - head/crypto/openssh X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 13:10:17 -0000 Author: des Date: Fri Oct 7 13:10:16 2011 New Revision: 226103 URL: http://svn.freebsd.org/changeset/base/226103 Log: Add a -x option that causes ssh-agent(1) to exit when all clients have disconnected. MFC after: 1 week Modified: head/crypto/openssh/ssh-agent.1 head/crypto/openssh/ssh-agent.c Modified: head/crypto/openssh/ssh-agent.1 ============================================================================== --- head/crypto/openssh/ssh-agent.1 Fri Oct 7 12:59:04 2011 (r226102) +++ head/crypto/openssh/ssh-agent.1 Fri Oct 7 13:10:16 2011 (r226103) @@ -44,7 +44,7 @@ .Sh SYNOPSIS .Nm ssh-agent .Op Fl c | s -.Op Fl d +.Op Fl dx .Op Fl a Ar bind_address .Op Fl t Ar life .Op Ar command Op Ar arg ... @@ -103,6 +103,8 @@ A lifetime specified for an identity wit .Xr ssh-add 1 overrides this value. Without this option the default maximum lifetime is forever. +.It Fl x +Exit after the last client has disconnected. .El .Pp If a commandline is given, this is executed as a subprocess of the agent. Modified: head/crypto/openssh/ssh-agent.c ============================================================================== --- head/crypto/openssh/ssh-agent.c Fri Oct 7 12:59:04 2011 (r226102) +++ head/crypto/openssh/ssh-agent.c Fri Oct 7 13:10:16 2011 (r226103) @@ -138,15 +138,34 @@ extern char *__progname; /* Default lifetime (0 == forever) */ static int lifetime = 0; +/* + * Client connection count; incremented in new_socket() and decremented in + * close_socket(). When it reaches 0, ssh-agent will exit. Since it is + * normally initialized to 1, it will never reach 0. However, if the -x + * option is specified, it is initialized to 0 in main(); in that case, + * ssh-agent will exit as soon as it has had at least one client but no + * longer has any. + */ +static int xcount = 1; + static void close_socket(SocketEntry *e) { + int last = 0; + + if (e->type == AUTH_CONNECTION) { + debug("xcount %d -> %d", xcount, xcount - 1); + if (--xcount == 0) + last = 1; + } close(e->fd); e->fd = -1; e->type = AUTH_UNUSED; buffer_free(&e->input); buffer_free(&e->output); buffer_free(&e->request); + if (last) + cleanup_exit(0); } static void @@ -901,6 +920,10 @@ new_socket(sock_type type, int fd) { u_int i, old_alloc, new_alloc; + if (type == AUTH_CONNECTION) { + debug("xcount %d -> %d", xcount, xcount + 1); + ++xcount; + } set_nonblock(fd); if (fd > max_fd) @@ -1121,6 +1144,7 @@ usage(void) fprintf(stderr, " -d Debug mode.\n"); fprintf(stderr, " -a socket Bind agent socket to given name.\n"); fprintf(stderr, " -t life Default identity lifetime (seconds).\n"); + fprintf(stderr, " -x Exit when the last client disconnects.\n"); exit(1); } @@ -1162,7 +1186,7 @@ main(int ac, char **av) __progname = ssh_get_progname(av[0]); seed_rng(); - while ((ch = getopt(ac, av, "cdksa:t:")) != -1) { + while ((ch = getopt(ac, av, "cdksa:t:x")) != -1) { switch (ch) { case 'c': if (s_flag) @@ -1191,6 +1215,9 @@ main(int ac, char **av) usage(); } break; + case 'x': + xcount = 0; + break; default: usage(); } @@ -1350,8 +1377,7 @@ skip: if (ac > 0) parent_alive_interval = 10; idtab_init(); - if (!d_flag) - signal(SIGINT, SIG_IGN); + signal(SIGINT, d_flag ? cleanup_handler : SIG_IGN); signal(SIGPIPE, SIG_IGN); signal(SIGHUP, cleanup_handler); signal(SIGTERM, cleanup_handler); From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 13:16:22 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 369CA1065675; Fri, 7 Oct 2011 13:16:22 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 265E78FC0C; Fri, 7 Oct 2011 13:16:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97DGMEt012357; Fri, 7 Oct 2011 13:16:22 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97DGMlA012355; Fri, 7 Oct 2011 13:16:22 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201110071316.p97DGMlA012355@svn.freebsd.org> From: Rick Macklem Date: Fri, 7 Oct 2011 13:16:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226104 - head/sys/rpc/rpcsec_gss X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 13:16:22 -0000 Author: rmacklem Date: Fri Oct 7 13:16:21 2011 New Revision: 226104 URL: http://svn.freebsd.org/changeset/base/226104 Log: Remove an extraneous "already" from a comment introduced by r226081. Submitted by: bf1783 at googlemail.com MFC after: 3 days Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c ============================================================================== --- head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Fri Oct 7 13:10:16 2011 (r226103) +++ head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Fri Oct 7 13:16:21 2011 (r226104) @@ -639,7 +639,7 @@ svc_rpc_gss_forget_client(struct svc_rpc /* * Make sure this client has not already been removed * from the lists by svc_rpc_gss_forget_client() or - * svc_rpc_gss_forget_client_locked() already. + * svc_rpc_gss_forget_client_locked(). */ if (client == tclient) { svc_rpc_gss_forget_client_locked(client); From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 13:43:01 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0FD1106564A; Fri, 7 Oct 2011 13:43:01 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C0FF58FC0C; Fri, 7 Oct 2011 13:43:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97Dh17h013230; Fri, 7 Oct 2011 13:43:01 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97Dh1c9013228; Fri, 7 Oct 2011 13:43:01 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201110071343.p97Dh1c9013228@svn.freebsd.org> From: Andre Oppermann Date: Fri, 7 Oct 2011 13:43:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226105 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 13:43:01 -0000 Author: andre Date: Fri Oct 7 13:43:01 2011 New Revision: 226105 URL: http://svn.freebsd.org/changeset/base/226105 Log: Add back the IP header length to the total packet length field on raw IP sockets. It was deducted in ip_input() in preparation for protocols interested only in the payload. On raw sockets the IP header should be delivered as it at came in from the network except for the byte order swaps in some fields. This brings us in line with all other OS'es that provide raw IP sockets. Reported by: Matthew Cini Sarreo MFC after: 3 days Modified: head/sys/netinet/raw_ip.c Modified: head/sys/netinet/raw_ip.c ============================================================================== --- head/sys/netinet/raw_ip.c Fri Oct 7 13:16:21 2011 (r226104) +++ head/sys/netinet/raw_ip.c Fri Oct 7 13:43:01 2011 (r226105) @@ -289,6 +289,13 @@ rip_input(struct mbuf *m, int off) last = NULL; ifp = m->m_pkthdr.rcvif; + /* + * Add back the IP header length which was + * removed by ip_input(). Raw sockets do + * not modify the packet except for some + * byte order swaps. + */ + ip->ip_len += off; hash = INP_PCBHASH_RAW(proto, ip->ip_src.s_addr, ip->ip_dst.s_addr, V_ripcbinfo.ipi_hashmask); From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 14:00:13 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8F891065673; Fri, 7 Oct 2011 14:00:12 +0000 (UTC) (envelope-from fullermd@over-yonder.net) Received: from thyme.infocus-llc.com (server.infocus-llc.com [206.156.254.44]) by mx1.freebsd.org (Postfix) with ESMTP id 6E0808FC14; Fri, 7 Oct 2011 14:00:12 +0000 (UTC) Received: from draco.over-yonder.net (c-174-50-4-38.hsd1.ms.comcast.net [174.50.4.38]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by thyme.infocus-llc.com (Postfix) with ESMTPSA id 513F037B56C; Fri, 7 Oct 2011 08:43:56 -0500 (CDT) Received: by draco.over-yonder.net (Postfix, from userid 100) id 9CF09178FD; Fri, 7 Oct 2011 08:43:55 -0500 (CDT) Date: Fri, 7 Oct 2011 08:43:55 -0500 From: "Matthew D. Fuller" To: Andriy Gapon Message-ID: <20111007134355.GP37732@over-yonder.net> References: <201110070600.p97600Ut095709@svn.freebsd.org> <4E8EDF26.6040409@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4E8EDF26.6040409@FreeBSD.org> X-Editor: vi X-OS: FreeBSD User-Agent: Mutt/1.5.21-fullermd.4 (2010-09-15) X-Virus-Scanned: clamav-milter 0.97.2 at thyme.infocus-llc.com X-Virus-Status: Clean Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, "David E. O'Brien" Subject: Re: svn commit: r226090 - head/sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 14:00:13 -0000 On Fri, Oct 07, 2011 at 02:14:46PM +0300 I heard the voice of Andriy Gapon, and lo! it spake thus: > on 07/10/2011 09:00 David E. O'Brien said the following: > > -#define MSGBUF_SIZE (32768 * 2) > > +#define MSGBUF_SIZE (32768 * 3) > > Heck, I am going to five! :-) I've also had options MSGBUF_SIZE=163840 (which is * 5) in my kernel config for years. At least back to 2008, which is as far back as I have VCS history on it, and I'm pretty sure I had it around for some time prior. -- Matthew Fuller (MF4839) | fullermd@over-yonder.net Systems/Network Administrator | http://www.over-yonder.net/~fullermd/ On the Internet, nobody can hear you scream. From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 14:05:15 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2CD5106566B; Fri, 7 Oct 2011 14:05:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id AF90B8FC13; Fri, 7 Oct 2011 14:05:13 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id RAA21710; Fri, 07 Oct 2011 17:05:10 +0300 (EEST) (envelope-from avg@FreeBSD.org) Message-ID: <4E8F0715.6010002@FreeBSD.org> Date: Fri, 07 Oct 2011 17:05:09 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111003 Thunderbird/7.0.1 MIME-Version: 1.0 To: "Matthew D. Fuller" References: <201110070600.p97600Ut095709@svn.freebsd.org> <4E8EDF26.6040409@FreeBSD.org> <20111007134355.GP37732@over-yonder.net> In-Reply-To: <20111007134355.GP37732@over-yonder.net> X-Enigmail-Version: undefined Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, "David E. O'Brien" Subject: Re: svn commit: r226090 - head/sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 14:05:15 -0000 on 07/10/2011 16:43 Matthew D. Fuller said the following: > On Fri, Oct 07, 2011 at 02:14:46PM +0300 I heard the voice of > Andriy Gapon, and lo! it spake thus: >> on 07/10/2011 09:00 David E. O'Brien said the following: >>> -#define MSGBUF_SIZE (32768 * 2) >>> +#define MSGBUF_SIZE (32768 * 3) >> >> Heck, I am going to five! :-) > > I've also had > > options MSGBUF_SIZE=163840 > > (which is * 5) in my kernel config for years. At least back to 2008, > which is as far back as I have VCS history on it, and I'm pretty sure > I had it around for some time prior. Just in case: http://www.theonion.com/articles/fuck-everything-were-doing-five-blades,11056/ -- Andriy Gapon From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 14:27:20 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F6D3106567F; Fri, 7 Oct 2011 14:27:20 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E44B8FC08; Fri, 7 Oct 2011 14:27:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97ERKrF014742; Fri, 7 Oct 2011 14:27:20 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97ERK5U014740; Fri, 7 Oct 2011 14:27:20 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201110071427.p97ERK5U014740@svn.freebsd.org> From: Jaakko Heinonen Date: Fri, 7 Oct 2011 14:27:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226106 - stable/7/usr.bin/rs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 14:27:20 -0000 Author: jh Date: Fri Oct 7 14:27:20 2011 New Revision: 226106 URL: http://svn.freebsd.org/changeset/base/226106 Log: MFC r218410: Handle EOF when skipping lines. Modified: stable/7/usr.bin/rs/rs.c Directory Properties: stable/7/usr.bin/rs/ (props changed) Modified: stable/7/usr.bin/rs/rs.c ============================================================================== --- stable/7/usr.bin/rs/rs.c Fri Oct 7 13:43:01 2011 (r226105) +++ stable/7/usr.bin/rs/rs.c Fri Oct 7 14:27:20 2011 (r226106) @@ -130,14 +130,17 @@ getfile(void) char *p; char *endp; char **ep; + int c; int multisep = (flags & ONEISEPONLY ? 0 : 1); int nullpad = flags & NULLPAD; char **padto; while (skip--) { - getline(); + c = getline(); if (flags & SKIPPRINT) puts(curline); + if (c == EOF) + return; } getline(); if (flags & NOARGS && curlen < owidth) From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 14:29:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DC5F1065676; Fri, 7 Oct 2011 14:29:15 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 64EA88FC20; Fri, 7 Oct 2011 14:29:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97ETFAU014845; Fri, 7 Oct 2011 14:29:15 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97ETFaO014843; Fri, 7 Oct 2011 14:29:15 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201110071429.p97ETFaO014843@svn.freebsd.org> From: Jaakko Heinonen Date: Fri, 7 Oct 2011 14:29:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226107 - stable/7/usr.bin/rs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 14:29:15 -0000 Author: jh Date: Fri Oct 7 14:29:15 2011 New Revision: 226107 URL: http://svn.freebsd.org/changeset/base/226107 Log: MFC r218411: - Use LINE_MAX from limits.h as the maximum line length instead of BUFSIZ. Use LINE_MAX * 2 as the buffer size (BSIZE). - Error out if we encounter a line longer than LINE_MAX. The previous behavior was to silently split long lines and produce corrupted output. PR: bin/151384 Modified: stable/7/usr.bin/rs/rs.c Directory Properties: stable/7/usr.bin/rs/ (props changed) Modified: stable/7/usr.bin/rs/rs.c ============================================================================== --- stable/7/usr.bin/rs/rs.c Fri Oct 7 14:27:20 2011 (r226106) +++ stable/7/usr.bin/rs/rs.c Fri Oct 7 14:29:15 2011 (r226107) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -333,8 +334,8 @@ prepfile(void) warnx("%d is colwidths, nelem %d", colwidths[i], nelem);*/ } -#define BSIZE 2048 -char ibuf[BSIZE]; /* two screenfuls should do */ +#define BSIZE (LINE_MAX * 2) +char ibuf[BSIZE]; int getline(void) /* get line; maintain curline, curlen; manage storage */ @@ -355,7 +356,7 @@ getline(void) /* get line; maintain curl curline = ibuf; } } - if (!putlength && endblock - curline < BUFSIZ) { /* need storage */ + if (!putlength && endblock - curline < LINE_MAX + 1) { /* need storage */ /*ww = endblock-curline; tt += ww;*/ /*printf("#wasted %d total %d\n",ww,tt);*/ if (!(curline = (char *) malloc(BSIZE))) @@ -363,11 +364,16 @@ getline(void) /* get line; maintain curl endblock = curline + BSIZE; /*printf("#endb %d curline %d\n",endblock,curline);*/ } - for (p = curline, i = 1; i < BUFSIZ; *p++ = c, i++) - if ((c = getchar()) == EOF || c == '\n') + for (p = curline, i = 0;; *p++ = c, i++) { + if ((c = getchar()) == EOF) break; + if (i >= LINE_MAX) + errx(1, "maximum line length (%d) exceeded", LINE_MAX); + if (c == '\n') + break; + } *p = '\0'; - curlen = i - 1; + curlen = i; return(c); } From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 14:30:45 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4F26106568B; Fri, 7 Oct 2011 14:30:45 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C43288FC0C; Fri, 7 Oct 2011 14:30:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97EUjqc014946; Fri, 7 Oct 2011 14:30:45 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97EUj7l014944; Fri, 7 Oct 2011 14:30:45 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201110071430.p97EUj7l014944@svn.freebsd.org> From: Jaakko Heinonen Date: Fri, 7 Oct 2011 14:30:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226108 - stable/7/usr.bin/rs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 14:30:45 -0000 Author: jh Date: Fri Oct 7 14:30:45 2011 New Revision: 226108 URL: http://svn.freebsd.org/changeset/base/226108 Log: MFC r219038: Document the input line length limit. Modified: stable/7/usr.bin/rs/rs.1 Directory Properties: stable/7/usr.bin/rs/ (props changed) Modified: stable/7/usr.bin/rs/rs.1 ============================================================================== --- stable/7/usr.bin/rs/rs.1 Fri Oct 7 14:29:15 2011 (r226107) +++ stable/7/usr.bin/rs/rs.1 Fri Oct 7 14:30:45 2011 (r226108) @@ -32,7 +32,7 @@ .\" @(#)rs.1 8.2 (Berkeley) 12/30/93 .\" $FreeBSD$ .\" -.Dd July 30, 2004 +.Dd February 25, 2011 .Dt RS 1 .Os .Sh NAME @@ -241,4 +241,9 @@ Re-ordering of columns is not yet possib There are too many options. .It Multibyte characters are not recognized. +.It +Lines longer than +.Dv LINE_MAX +(2048) bytes are not processed and result in immediate termination of +.Nm . .El From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 15:05:24 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2340106564A; Fri, 7 Oct 2011 15:05:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 904BA8FC0A; Fri, 7 Oct 2011 15:05:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97F5OH5016148; Fri, 7 Oct 2011 15:05:24 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97F5ORd016140; Fri, 7 Oct 2011 15:05:24 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201110071505.p97F5ORd016140@svn.freebsd.org> From: Ed Schouten Date: Fri, 7 Oct 2011 15:05:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226111 - in head: lib/libc/mips lib/libc/net lib/libc/sparc64 lib/libgssapi lib/libmp lib/libulog sys/teken/libteken X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 15:05:24 -0000 Author: ed Date: Fri Oct 7 15:05:24 2011 New Revision: 226111 URL: http://svn.freebsd.org/changeset/base/226111 Log: Fix whitespace inconsistencies found in homegrown Symbol.maps. Modified: head/lib/libc/mips/Symbol.map head/lib/libc/net/Symbol.map head/lib/libc/sparc64/Symbol.map head/lib/libgssapi/Symbol.map head/lib/libmp/Symbol.map head/lib/libulog/Symbol.map head/sys/teken/libteken/Symbol.map Modified: head/lib/libc/mips/Symbol.map ============================================================================== --- head/lib/libc/mips/Symbol.map Fri Oct 7 14:52:30 2011 (r226110) +++ head/lib/libc/mips/Symbol.map Fri Oct 7 15:05:24 2011 (r226111) @@ -1,5 +1,5 @@ -/* - * $FreeBSD$ +/* + * $FreeBSD$ */ /* Modified: head/lib/libc/net/Symbol.map ============================================================================== --- head/lib/libc/net/Symbol.map Fri Oct 7 14:52:30 2011 (r226110) +++ head/lib/libc/net/Symbol.map Fri Oct 7 15:05:24 2011 (r226111) @@ -155,14 +155,14 @@ FBSDprivate_1.0 { __ivaliduser_sa; __check_rhosts_file; __rcmd_errstr; - __nss_compat_getgrnam_r; - __nss_compat_getgrgid_r; - __nss_compat_getgrent_r; - __nss_compat_setgrent; - __nss_compat_endgrent; - __nss_compat_getpwnam_r; - __nss_compat_getpwuid_r; - __nss_compat_getpwent_r; - __nss_compat_setpwent; - __nss_compat_endpwent; + __nss_compat_getgrnam_r; + __nss_compat_getgrgid_r; + __nss_compat_getgrent_r; + __nss_compat_setgrent; + __nss_compat_endgrent; + __nss_compat_getpwnam_r; + __nss_compat_getpwuid_r; + __nss_compat_getpwent_r; + __nss_compat_setpwent; + __nss_compat_endpwent; }; Modified: head/lib/libc/sparc64/Symbol.map ============================================================================== --- head/lib/libc/sparc64/Symbol.map Fri Oct 7 14:52:30 2011 (r226110) +++ head/lib/libc/sparc64/Symbol.map Fri Oct 7 15:05:24 2011 (r226111) @@ -6,7 +6,7 @@ * This only needs to contain symbols that are not listed in * symbol maps from other parts of libc (i.e., not found in * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...). - */ + */ FBSD_1.0 { /* PSEUDO syscalls */ _exit; Modified: head/lib/libgssapi/Symbol.map ============================================================================== --- head/lib/libgssapi/Symbol.map Fri Oct 7 14:52:30 2011 (r226110) +++ head/lib/libgssapi/Symbol.map Fri Oct 7 15:05:24 2011 (r226111) @@ -1,6 +1,6 @@ /* * $FreeBSD$ - */ + */ FBSD_1.1 { GSS_C_NT_ANONYMOUS; Modified: head/lib/libmp/Symbol.map ============================================================================== --- head/lib/libmp/Symbol.map Fri Oct 7 14:52:30 2011 (r226110) +++ head/lib/libmp/Symbol.map Fri Oct 7 15:05:24 2011 (r226111) @@ -1,6 +1,6 @@ /* * $FreeBSD$ - */ + */ FBSD_1.1 { mp_gcd; Modified: head/lib/libulog/Symbol.map ============================================================================== --- head/lib/libulog/Symbol.map Fri Oct 7 14:52:30 2011 (r226110) +++ head/lib/libulog/Symbol.map Fri Oct 7 15:05:24 2011 (r226111) @@ -1,6 +1,6 @@ /* * $FreeBSD$ - */ + */ FBSD_1.2 { ulog_login; Modified: head/sys/teken/libteken/Symbol.map ============================================================================== --- head/sys/teken/libteken/Symbol.map Fri Oct 7 14:52:30 2011 (r226110) +++ head/sys/teken/libteken/Symbol.map Fri Oct 7 15:05:24 2011 (r226111) @@ -1,6 +1,6 @@ /* * $FreeBSD$ - */ + */ FBSD_1.2 { teken_256to8; From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 16:09:44 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C95B91065670; Fri, 7 Oct 2011 16:09:44 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE78B8FC12; Fri, 7 Oct 2011 16:09:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97G9iMK018207; Fri, 7 Oct 2011 16:09:44 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97G9icP018199; Fri, 7 Oct 2011 16:09:44 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110071609.p97G9icP018199@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 7 Oct 2011 16:09:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226112 - in head/sys: amd64/include arm/include i386/include ia64/include mips/include powerpc/include sparc64/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 16:09:45 -0000 Author: kib Date: Fri Oct 7 16:09:44 2011 New Revision: 226112 URL: http://svn.freebsd.org/changeset/base/226112 Log: Remove unused define. MFC after: 1 month Modified: head/sys/amd64/include/proc.h head/sys/arm/include/proc.h head/sys/i386/include/proc.h head/sys/ia64/include/proc.h head/sys/mips/include/proc.h head/sys/powerpc/include/proc.h head/sys/sparc64/include/proc.h Modified: head/sys/amd64/include/proc.h ============================================================================== --- head/sys/amd64/include/proc.h Fri Oct 7 15:05:24 2011 (r226111) +++ head/sys/amd64/include/proc.h Fri Oct 7 16:09:44 2011 (r226112) @@ -85,8 +85,6 @@ struct syscall_args { register_t args[8]; int narg; }; -#define HAVE_SYSCALL_ARGS_DEF 1 - #endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ Modified: head/sys/arm/include/proc.h ============================================================================== --- head/sys/arm/include/proc.h Fri Oct 7 15:05:24 2011 (r226111) +++ head/sys/arm/include/proc.h Fri Oct 7 16:09:44 2011 (r226112) @@ -71,6 +71,5 @@ struct syscall_args { u_int nap; u_int32_t insn; }; -#define HAVE_SYSCALL_ARGS_DEF 1 #endif /* !_MACHINE_PROC_H_ */ Modified: head/sys/i386/include/proc.h ============================================================================== --- head/sys/i386/include/proc.h Fri Oct 7 15:05:24 2011 (r226111) +++ head/sys/i386/include/proc.h Fri Oct 7 16:09:44 2011 (r226112) @@ -83,8 +83,6 @@ struct syscall_args { register_t args[8]; int narg; }; -#define HAVE_SYSCALL_ARGS_DEF 1 - #endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ Modified: head/sys/ia64/include/proc.h ============================================================================== --- head/sys/ia64/include/proc.h Fri Oct 7 15:05:24 2011 (r226111) +++ head/sys/ia64/include/proc.h Fri Oct 7 16:09:44 2011 (r226112) @@ -49,7 +49,6 @@ struct syscall_args { register_t args32[8]; int narg; }; -#define HAVE_SYSCALL_ARGS_DEF 1 #endif #endif /* !_MACHINE_PROC_H_ */ Modified: head/sys/mips/include/proc.h ============================================================================== --- head/sys/mips/include/proc.h Fri Oct 7 15:05:24 2011 (r226111) +++ head/sys/mips/include/proc.h Fri Oct 7 16:09:44 2011 (r226112) @@ -80,7 +80,6 @@ struct syscall_args { int narg; struct trapframe *trapframe; }; -#define HAVE_SYSCALL_ARGS_DEF 1 #endif #ifdef __mips_n64 Modified: head/sys/powerpc/include/proc.h ============================================================================== --- head/sys/powerpc/include/proc.h Fri Oct 7 15:05:24 2011 (r226111) +++ head/sys/powerpc/include/proc.h Fri Oct 7 16:09:44 2011 (r226112) @@ -60,7 +60,6 @@ struct syscall_args { register_t args[10]; int narg; }; -#define HAVE_SYSCALL_ARGS_DEF 1 #endif #endif /* !_MACHINE_PROC_H_ */ Modified: head/sys/sparc64/include/proc.h ============================================================================== --- head/sys/sparc64/include/proc.h Fri Oct 7 15:05:24 2011 (r226111) +++ head/sys/sparc64/include/proc.h Fri Oct 7 16:09:44 2011 (r226112) @@ -61,7 +61,6 @@ struct syscall_args { register_t args[8]; int narg; }; -#define HAVE_SYSCALL_ARGS_DEF 1 #endif From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 16:39:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E084106566C; Fri, 7 Oct 2011 16:39:03 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 83D898FC18; Fri, 7 Oct 2011 16:39:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97Gd3VP019130; Fri, 7 Oct 2011 16:39:03 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97Gd3t4019128; Fri, 7 Oct 2011 16:39:03 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201110071639.p97Gd3t4019128@svn.freebsd.org> From: Andre Oppermann Date: Fri, 7 Oct 2011 16:39:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226113 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 16:39:03 -0000 Author: andre Date: Fri Oct 7 16:39:03 2011 New Revision: 226113 URL: http://svn.freebsd.org/changeset/base/226113 Log: Prevent TCP sessions from stalling indefinitely in reassembly when reaching the zone limit of reassembly queue entries. When the zone limit was reached not even the missing segment that would complete the sequence space could be processed preventing the TCP session forever from making any further progress. Solve this deadlock by using a temporary on-stack queue entry for the missing segment followed by an immediate dequeue again by delivering the contiguous sequence space to the socket. Add logging under net.inet.tcp.log_debug for reassembly queue issues. Reviewed by: lsteward (previous version) Tested by: Steven Hartland MFC after: 3 days Modified: head/sys/netinet/tcp_reass.c Modified: head/sys/netinet/tcp_reass.c ============================================================================== --- head/sys/netinet/tcp_reass.c Fri Oct 7 16:09:44 2011 (r226112) +++ head/sys/netinet/tcp_reass.c Fri Oct 7 16:39:03 2011 (r226113) @@ -177,7 +177,9 @@ tcp_reass(struct tcpcb *tp, struct tcphd struct tseg_qent *nq; struct tseg_qent *te = NULL; struct socket *so = tp->t_inpcb->inp_socket; + char *s = NULL; int flags; + struct tseg_qent tqs; INP_WLOCK_ASSERT(tp->t_inpcb); @@ -215,19 +217,40 @@ tcp_reass(struct tcpcb *tp, struct tcphd TCPSTAT_INC(tcps_rcvmemdrop); m_freem(m); *tlenp = 0; + if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) { + log(LOG_DEBUG, "%s; %s: queue limit reached, " + "segment dropped\n", s, __func__); + free(s, M_TCPLOG); + } return (0); } /* * Allocate a new queue entry. If we can't, or hit the zone limit * just drop the pkt. + * + * Use a temporary structure on the stack for the missing segment + * when the zone is exhausted. Otherwise we may get stuck. */ te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); - if (te == NULL) { + if (te == NULL && th->th_seq != tp->rcv_nxt) { TCPSTAT_INC(tcps_rcvmemdrop); m_freem(m); *tlenp = 0; + if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) { + log(LOG_DEBUG, "%s; %s: global zone limit reached, " + "segment dropped\n", s, __func__); + free(s, M_TCPLOG); + } return (0); + } else if (th->th_seq == tp->rcv_nxt) { + bzero(&tqs, sizeof(struct tseg_qent)); + te = &tqs; + if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) { + log(LOG_DEBUG, "%s; %s: global zone limit reached, " + "using stack for missing segment\n", s, __func__); + free(s, M_TCPLOG); + } } tp->t_segqlen++; @@ -304,6 +327,8 @@ tcp_reass(struct tcpcb *tp, struct tcphd if (p == NULL) { LIST_INSERT_HEAD(&tp->t_segq, te, tqe_q); } else { + KASSERT(te != &tqs, ("%s: temporary stack based entry not " + "first element in queue", __func__)); LIST_INSERT_AFTER(p, te, tqe_q); } @@ -327,7 +352,8 @@ present: m_freem(q->tqe_m); else sbappendstream_locked(&so->so_rcv, q->tqe_m); - uma_zfree(V_tcp_reass_zone, q); + if (q != &tqs) + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; q = nq; } while (q && q->tqe_th->th_seq == tp->rcv_nxt); From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 18:01:34 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3308106564A; Fri, 7 Oct 2011 18:01:34 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 933FF8FC08; Fri, 7 Oct 2011 18:01:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97I1YdJ021796; Fri, 7 Oct 2011 18:01:34 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97I1YYq021794; Fri, 7 Oct 2011 18:01:34 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <201110071801.p97I1YYq021794@svn.freebsd.org> From: Qing Li Date: Fri, 7 Oct 2011 18:01:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226114 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 18:01:34 -0000 Author: qingli Date: Fri Oct 7 18:01:34 2011 New Revision: 226114 URL: http://svn.freebsd.org/changeset/base/226114 Log: Remove the reference held on the loopback route when the interface address is being deleted. Only the last reference holder deletes the loopback route. All other delete operations just clear the IFA_RTSELF flag. PR: kern/159601 Submitted by: pluknet Reviewed by: discussed on net@ MFC after: 3 days Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Fri Oct 7 16:39:03 2011 (r226113) +++ head/sys/netinet/in.c Fri Oct 7 18:01:34 2011 (r226114) @@ -1126,8 +1126,10 @@ in_scrubprefix(struct in_ifaddr *target, RT_LOCK(ia_ro.ro_rt); if (ia_ro.ro_rt->rt_refcnt <= 1) freeit = 1; - else + else if (flags & LLE_STATIC) { RT_REMREF(ia_ro.ro_rt); + target->ia_flags &= ~IFA_RTSELF; + } RTFREE_LOCKED(ia_ro.ro_rt); } if (freeit && (flags & LLE_STATIC)) { From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 20:40:45 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E80AD1065731; Fri, 7 Oct 2011 20:40:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D3D3E8FC0A; Fri, 7 Oct 2011 20:40:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97Kejum026804; Fri, 7 Oct 2011 20:40:45 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97KejXU026797; Fri, 7 Oct 2011 20:40:45 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201110072040.p97KejXU026797@svn.freebsd.org> From: Xin LI Date: Fri, 7 Oct 2011 20:40:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226115 - in stable/9: share/man/man4 sys/amd64/conf sys/conf sys/dev/tws sys/i386/conf sys/modules sys/modules/tws X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 20:40:46 -0000 Author: delphij Date: Fri Oct 7 20:40:45 2011 New Revision: 226115 URL: http://svn.freebsd.org/changeset/base/226115 Log: MFC r226026: Add the 9750 SATA+SAS 6Gb/s RAID controller card driver, tws(4). Many thanks for their contiued support to FreeBSD. This is version 10.80.00.003 from codeset 10.2.1 [1] Obtained from: LSI http://kb.lsi.com/Download16574.aspx [1] Approved by: re (kib) Added: stable/9/share/man/man4/tws.4 - copied unchanged from r226026, head/share/man/man4/tws.4 stable/9/sys/dev/tws/ - copied from r226026, head/sys/dev/tws/ stable/9/sys/modules/tws/ - copied from r226026, head/sys/modules/tws/ Modified: stable/9/share/man/man4/Makefile stable/9/sys/amd64/conf/GENERIC stable/9/sys/conf/files stable/9/sys/i386/conf/GENERIC stable/9/sys/modules/Makefile Directory Properties: stable/9/share/man/man4/ (props changed) stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/share/man/man4/Makefile ============================================================================== --- stable/9/share/man/man4/Makefile Fri Oct 7 18:01:34 2011 (r226114) +++ stable/9/share/man/man4/Makefile Fri Oct 7 20:40:45 2011 (r226115) @@ -447,6 +447,7 @@ MAN= aac.4 \ tun.4 \ twa.4 \ twe.4 \ + tws.4 \ tx.4 \ txp.4 \ u3g.4 \ Copied: stable/9/share/man/man4/tws.4 (from r226026, head/share/man/man4/tws.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/share/man/man4/tws.4 Fri Oct 7 20:40:45 2011 (r226115, copy of r226026, head/share/man/man4/tws.4) @@ -0,0 +1,118 @@ +.\" +.\"Copyright (c) 2010, 2011 iXsystems, Inc. +.\"All rights reserved. +.\" written by: Xin LI +.\" +.\"Redistribution and use in source and binary forms, with or without +.\"modification, are permitted provided that the following conditions +.\"are met: +.\"1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\"2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\"THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\"ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\"ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\"OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\"HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\"SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 4, 2011 +.Dt TWS 4 +.Os +.Sh NAME +.Nm tws +.Nd 3ware 9750 SATA+SAS 6Gb/s RAID controller card driver +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" +.Cd "device tws" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +tws_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for LSI's 3ware 9750 SATA+SAS 6Gb/s RAID controller cards. +.Pp +These controllers feature the LSISAS2108 6Gb/s SAS RAID-on-Chip (ROC) +and are available in 4- and 8-port configurations, supports RAID levels +0, 1, 5, 6, 10, 50 and single disk, with 96 SATA and/or SAS hard drives and SSDs. +.Pp +For further hardware information, see +.Pa http://www.lsi.com/. +.Sh HARDWARE +The +.Nm +driver supports the following SATA/SAS RAID controller: +.Pp +.Bl -bullet -compact +.It +LSI's 3ware SAS 9750 series +.El +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width "hw.tws.use_32bit_sgls" +.It Va hw.tws.cam_depth +The maximium queued CAM SIM requests for one controller. +The default value is 256. +.It Va hw.tws.enable_msi +This tunable enables MSI support on the controller if set to a non-zero value. +The default value is 0. +.It Va hw.tws.queue_depth +The maximium queued requests for one controller. +.It Va hw.tws.use_32bit_sgls +Limit the driver to use only 32-bit SG elements regardless whether the operating +system is running in 64-bit mode. +The default value is 0. +.El +.Sh FILES +.Bl -tag -width ".Pa /dev/tws?" -compact +.It Pa /dev/da? +array/logical disk interface +.It Pa /dev/tws? +management interface +.El +.Sh DIAGNOSTICS +Whenever the driver encounters a command failure, it prints out an error code in +the format: +.Qq Li "ERROR: (: ):" , +followed by a text description of the error. +There are other error messages and warnings that the +driver prints out, depending on the kinds of errors that it encounters. +If the driver is compiled with +.Dv TWS_DEBUG +defined, it prints out a whole bunch of debug +messages. +.Sh SEE ALSO +.Xr da 4 , +.Xr scsi 4 +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Manjunath Ranganathaiah +for LSI and this manual page was written by +.An Xin LI Aq delphij@FreeBSD.org +for iXsystems, Inc. Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Fri Oct 7 18:01:34 2011 (r226114) +++ stable/9/sys/amd64/conf/GENERIC Fri Oct 7 20:40:45 2011 (r226115) @@ -151,6 +151,7 @@ device mlx # Mylex DAC960 family #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID +device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller Modified: stable/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Fri Oct 7 18:01:34 2011 (r226114) +++ stable/9/sys/conf/files Fri Oct 7 20:40:45 2011 (r226115) @@ -1833,6 +1833,11 @@ dev/twa/tw_osl_freebsd.c optional twa \ compile-with "${NORMAL_C} -I$S/dev/twa" dev/twe/twe.c optional twe dev/twe/twe_freebsd.c optional twe +dev/tws/tws.c optional tws +dev/tws/tws_cam.c optional tws +dev/tws/tws_hdm.c optional tws +dev/tws/tws_services.c optional tws +dev/tws/tws_user.c optional tws dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp dev/uart/uart_bus_acpi.c optional uart acpi Modified: stable/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Fri Oct 7 18:01:34 2011 (r226114) +++ stable/9/sys/i386/conf/GENERIC Fri Oct 7 20:40:45 2011 (r226115) @@ -147,6 +147,7 @@ device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID device twa # 3ware 9000 series PATA/SATA RAID +device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller # RAID controllers device aac # Adaptec FSA RAID Modified: stable/9/sys/modules/Makefile ============================================================================== --- stable/9/sys/modules/Makefile Fri Oct 7 18:01:34 2011 (r226114) +++ stable/9/sys/modules/Makefile Fri Oct 7 20:40:45 2011 (r226115) @@ -302,6 +302,7 @@ SUBDIR= ${_3dfx} \ trm \ ${_twa} \ twe \ + tws \ tx \ txp \ uart \ From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 20:54:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80D49106564A; Fri, 7 Oct 2011 20:54:12 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 706EF8FC12; Fri, 7 Oct 2011 20:54:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97KsClR027256; Fri, 7 Oct 2011 20:54:12 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97KsCNV027254; Fri, 7 Oct 2011 20:54:12 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201110072054.p97KsCNV027254@svn.freebsd.org> From: Christian Brueffer Date: Fri, 7 Oct 2011 20:54:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226116 - head/sys/dev/ppbus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 20:54:12 -0000 Author: brueffer Date: Fri Oct 7 20:54:12 2011 New Revision: 226116 URL: http://svn.freebsd.org/changeset/base/226116 Log: Add missing va_end() to clean up after va_start(). CID: 4725 Found with: Coverity Prevent(tm) MFC after: 1 week Modified: head/sys/dev/ppbus/ppb_msq.c Modified: head/sys/dev/ppbus/ppb_msq.c ============================================================================== --- head/sys/dev/ppbus/ppb_msq.c Fri Oct 7 20:40:45 2011 (r226115) +++ head/sys/dev/ppbus/ppb_msq.c Fri Oct 7 20:54:12 2011 (r226116) @@ -244,6 +244,7 @@ ppb_MS_init_msq(struct ppb_microseq *msq } } + va_end(p_list); return (0); } From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 21:00:26 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D68DC106564A; Fri, 7 Oct 2011 21:00:26 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C647D8FC0A; Fri, 7 Oct 2011 21:00:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97L0QEh027496; Fri, 7 Oct 2011 21:00:26 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97L0QQF027494; Fri, 7 Oct 2011 21:00:26 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201110072100.p97L0QQF027494@svn.freebsd.org> From: Christian Brueffer Date: Fri, 7 Oct 2011 21:00:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226117 - head/sys/netipsec X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 21:00:26 -0000 Author: brueffer Date: Fri Oct 7 21:00:26 2011 New Revision: 226117 URL: http://svn.freebsd.org/changeset/base/226117 Log: Add missing va_end() in an error case to clean up after va_start() (already done in the non-error case). CID: 4726 Found with: Coverity Prevent(tm) MFC after: 1 week Modified: head/sys/netipsec/key.c Modified: head/sys/netipsec/key.c ============================================================================== --- head/sys/netipsec/key.c Fri Oct 7 20:54:12 2011 (r226116) +++ head/sys/netipsec/key.c Fri Oct 7 21:00:26 2011 (r226117) @@ -1764,6 +1764,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va fail: m_freem(result); + va_end(ap); return NULL; } From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 21:23:43 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C499106566C; Fri, 7 Oct 2011 21:23:43 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E6C568FC13; Fri, 7 Oct 2011 21:23:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97LNgie028237; Fri, 7 Oct 2011 21:23:42 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97LNgRr028233; Fri, 7 Oct 2011 21:23:42 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110072123.p97LNgRr028233@svn.freebsd.org> From: Marius Strobl Date: Fri, 7 Oct 2011 21:23:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226118 - in head/sys/dev: isp mps mpt X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 21:23:43 -0000 Author: marius Date: Fri Oct 7 21:23:42 2011 New Revision: 226118 URL: http://svn.freebsd.org/changeset/base/226118 Log: Sync with ahc(4)/ahd(4)/sym(4) etc: Zero any sense not transferred by the device as the SCSI specification mandates that any untransferred data should be assumed to be zero. Reviewed by: ken Modified: head/sys/dev/isp/isp_freebsd.h head/sys/dev/mps/mps_sas.c head/sys/dev/mpt/mpt_cam.c Modified: head/sys/dev/isp/isp_freebsd.h ============================================================================== --- head/sys/dev/isp/isp_freebsd.h Fri Oct 7 21:00:26 2011 (r226117) +++ head/sys/dev/isp/isp_freebsd.h Fri Oct 7 21:23:42 2011 (r226118) @@ -486,6 +486,7 @@ default: \ #define XS_SAVE_SENSE(xs, sense_ptr, slen) do { \ (xs)->ccb_h.status |= CAM_AUTOSNS_VALID; \ + memset(&(xs)->sense_data, 0, sizeof(&(xs)->sense_data));\ memcpy(&(xs)->sense_data, sense_ptr, imin(XS_SNSLEN(xs),\ slen)); \ if (slen < (xs)->sense_len) \ Modified: head/sys/dev/mps/mps_sas.c ============================================================================== --- head/sys/dev/mps/mps_sas.c Fri Oct 7 21:00:26 2011 (r226117) +++ head/sys/dev/mps/mps_sas.c Fri Oct 7 21:23:42 2011 (r226118) @@ -1675,6 +1675,7 @@ mpssas_scsiio_complete(struct mps_softc sense_len = min(rep->SenseCount, ccb->csio.sense_len - ccb->csio.sense_resid); + bzero(&ccb->csio.sense_data, sizeof(&ccb->csio.sense_data)); bcopy(cm->cm_sense, &ccb->csio.sense_data, sense_len); ccb->ccb_h.status |= CAM_AUTOSNS_VALID; } Modified: head/sys/dev/mpt/mpt_cam.c ============================================================================== --- head/sys/dev/mpt/mpt_cam.c Fri Oct 7 21:00:26 2011 (r226117) +++ head/sys/dev/mpt/mpt_cam.c Fri Oct 7 21:23:42 2011 (r226118) @@ -3178,6 +3178,7 @@ mpt_scsi_reply_frame_handler(struct mpt_ else ccb->csio.sense_resid = 0; + bzero(&ccb->csio.sense_data, sizeof(&ccb->csio.sense_data)); bcopy(req->sense_vbuf, &ccb->csio.sense_data, min(ccb->csio.sense_len, sense_returned)); } From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 21:59:47 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB9171065672; Fri, 7 Oct 2011 21:59:47 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by mx1.freebsd.org (Postfix) with ESMTP id 752778FC17; Fri, 7 Oct 2011 21:59:47 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id p97Lxjt5093231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 7 Oct 2011 23:59:46 +0200 (CEST) (envelope-from uqs@FreeBSD.org) Date: Fri, 7 Oct 2011 23:59:45 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Nathan Whitehorn Message-ID: <20111007215945.GP26743@acme.spoerlein.net> Mail-Followup-To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= , Nathan Whitehorn , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org References: <201110032046.p93Kkah0027160@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110032046.p93Kkah0027160@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r225951 - head X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 21:59:48 -0000 On Mon, 2011-10-03 at 20:46:36 +0000, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Mon Oct 3 20:46:36 2011 > New Revision: 225951 > URL: http://svn.freebsd.org/changeset/base/225951 > > Log: > Fix a number of platform problems in this file (mostly assuming that only > amd64 has lib32). > > Modified: > head/ObsoleteFiles.inc > > Modified: head/ObsoleteFiles.inc > ============================================================================== > --- head/ObsoleteFiles.inc Mon Oct 3 20:32:55 2011 (r225950) > +++ head/ObsoleteFiles.inc Mon Oct 3 20:46:36 2011 (r225951) > @@ -56,7 +56,7 @@ OLD_LIBS+=usr/lib/libdwarf.so.2 > OLD_LIBS+=usr/lib/libopie.so.6 > OLD_LIBS+=usr/lib/librtld_db.so.1 > OLD_LIBS+=usr/lib/libtacplus.so.4 > -.if ${TARGET_ARCH} == "amd64" > +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" > OLD_LIBS+=usr/lib32/libcam.so.5 > OLD_LIBS+=usr/lib32/libpcap.so.7 > OLD_LIBS+=usr/lib32/libufs.so.5 These conditionals should all be removed. 99% of them are not needed. The rm(1) should only be conditional on TARGET != arch1 iff arch1 is still using the file in question. It doesn't matter that arch2 never ever had that file. It's just one more rm(1) to a non-existing file. Uli From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 22:14:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF697106566C; Fri, 7 Oct 2011 22:14:18 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A62438FC14; Fri, 7 Oct 2011 22:14:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MEI28029906; Fri, 7 Oct 2011 22:14:18 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97MEIBr029903; Fri, 7 Oct 2011 22:14:18 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110072214.p97MEIBr029903@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 7 Oct 2011 22:14:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226119 - head/share/man/man9 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:14:18 -0000 Author: des Date: Fri Oct 7 22:14:18 2011 New Revision: 226119 URL: http://svn.freebsd.org/changeset/base/226119 Log: Mention tdsignal(9). MFC after: 1 week Modified: head/share/man/man9/Makefile head/share/man/man9/psignal.9 Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Fri Oct 7 21:23:42 2011 (r226118) +++ head/share/man/man9/Makefile Fri Oct 7 22:14:18 2011 (r226119) @@ -972,7 +972,8 @@ MLINKS+=printf.9 log.9 \ MLINKS+=priv.9 priv_check.9 \ priv.9 priv_check_cred.9 MLINKS+=psignal.9 gsignal.9 \ - psignal.9 pgsignal.9 + psignal.9 pgsignal.9 \ + psignal.9 tdsignal.9 MLINKS+=random.9 arc4rand.9 \ random.9 arc4random.9 \ random.9 read_random.9 \ Modified: head/share/man/man9/psignal.9 ============================================================================== --- head/share/man/man9/psignal.9 Fri Oct 7 21:23:42 2011 (r226118) +++ head/share/man/man9/psignal.9 Fri Oct 7 22:14:18 2011 (r226119) @@ -28,14 +28,15 @@ .\" $NetBSD: psignal.9,v 1.1 1996/06/22 22:57:35 pk Exp $ .\" $FreeBSD$ .\" -.Dd June 22, 1996 +.Dd October 8, 2011 .Dt PSIGNAL 9 .Os .Sh NAME .Nm psignal , .Nm pgsignal , -.Nm gsignal -.Nd post signal to a process or process group +.Nm gsignal , +.Nm tdsignal +.Nd post signal to a thread, process, or process group .Sh SYNOPSIS .In sys/types.h .In sys/signalvar.h @@ -45,8 +46,10 @@ .Fn pgsignal "struct pgrp *pgrp" "int signum" "int checkctty" .Ft void .Fn gsignal "int pgid" "int signum" +.Ft void +.Fn tdsignal "struct thread *td" "int signum" .Sh DESCRIPTION -These functions post a signal to one or more processes. +These functions post a signal to a thread or one or more processes. The argument .Fa signum common to all three functions should be in the range @@ -135,6 +138,13 @@ set to zero. If .Fa pgid is zero no action is taken. +.Pp +The +.Fn tdsignal +function posts signal number +.Fa signum +to the thread represented by the thread structure +.Fa td . .Sh SEE ALSO .Xr sigaction 2 , .Xr signal 9 , From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 22:22:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 926121065672; Fri, 7 Oct 2011 22:22:19 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 82C9C8FC0C; Fri, 7 Oct 2011 22:22:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MMJt9030232; Fri, 7 Oct 2011 22:22:19 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97MMJ93030230; Fri, 7 Oct 2011 22:22:19 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <201110072222.p97MMJ93030230@svn.freebsd.org> From: Qing Li Date: Fri, 7 Oct 2011 22:22:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226120 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:22:19 -0000 Author: qingli Date: Fri Oct 7 22:22:19 2011 New Revision: 226120 URL: http://svn.freebsd.org/changeset/base/226120 Log: Do not try removing an ARP entry associated with a given interface address if that interface does not support ARP. Otherwise the system will generate error messages unnecessarily due to the missing entry. PR: kern/159602 Submitted by: pluknet MFC after: 3 days Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Fri Oct 7 22:14:18 2011 (r226119) +++ head/sys/netinet/in.c Fri Oct 7 22:22:19 2011 (r226120) @@ -1138,7 +1138,8 @@ in_scrubprefix(struct in_ifaddr *target, if (error == 0) target->ia_flags &= ~IFA_RTSELF; } - if (flags & LLE_STATIC) + if ((flags & LLE_STATIC) && + !(target->ia_ifp->if_flags & IFF_NOARP)) /* remove arp cache */ arp_ifscrub(target->ia_ifp, IA_SIN(target)->sin_addr.s_addr); } From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 23:12:33 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1F74106566B; Fri, 7 Oct 2011 23:12:33 +0000 (UTC) (envelope-from jceel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 781F18FC16; Fri, 7 Oct 2011 23:12:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97NCX1o031844; Fri, 7 Oct 2011 23:12:33 GMT (envelope-from jceel@svn.freebsd.org) Received: (from jceel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97NCXHV031841; Fri, 7 Oct 2011 23:12:33 GMT (envelope-from jceel@svn.freebsd.org) Message-Id: <201110072312.p97NCXHV031841@svn.freebsd.org> From: Jakub Wojciech Klama Date: Fri, 7 Oct 2011 23:12:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226121 - in head: share/misc usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 23:12:33 -0000 Author: jceel Date: Fri Oct 7 23:12:33 2011 New Revision: 226121 URL: http://svn.freebsd.org/changeset/base/226121 Log: Add myself. Approved by: wkoszek (mentor) Modified: head/share/misc/committers-src.dot head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/share/misc/committers-src.dot ============================================================================== --- head/share/misc/committers-src.dot Fri Oct 7 22:22:19 2011 (r226120) +++ head/share/misc/committers-src.dot Fri Oct 7 23:12:33 2011 (r226121) @@ -153,6 +153,7 @@ iedowse [label="Ian Dowse\niedowse@FreeB imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"] ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"] jamie [label="Jamie Gritton\njamie@FreeBSD.org\n2009/01/28"] +jceel [label="Jakub Klama\njceel@FreeBSD.org\n2011/09/25"] jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"] jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"] jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"] @@ -306,6 +307,7 @@ bz -> anchie bz -> jamie bz -> syrinx +cognet -> jceel cognet -> kevlo cperciva -> flz @@ -573,6 +575,8 @@ ume -> tshiozak wes -> scf +wkoszek -> jceel + wollman -> gad zml -> mdf Modified: head/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- head/usr.bin/calendar/calendars/calendar.freebsd Fri Oct 7 22:22:19 2011 (r226120) +++ head/usr.bin/calendar/calendars/calendar.freebsd Fri Oct 7 23:12:33 2011 (r226121) @@ -127,6 +127,7 @@ 04/17 Dryice Liu born in Jinan, Shandong, China, 1975 04/22 Joerg Wunsch born in Dresden, Sachsen, Germany, 1962 04/22 Jun Kuriyama born in Matsue, Shimane, Japan, 1973 +04/22 Jakub Klama born in Blachownia, Silesia, Poland, 1989 04/26 Rene Ladan born in Geldrop, the Netherlands, 1980 04/29 Adam Weinberger born in Berkeley, California, United States, 1980 04/29 Eric Anholt born in Portland, Oregon, United States, 1983 From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 23:43:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5F891065670; Fri, 7 Oct 2011 23:43:51 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C6AA38FC17; Fri, 7 Oct 2011 23:43:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97NhpEW032808; Fri, 7 Oct 2011 23:43:51 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97NhpFK032806; Fri, 7 Oct 2011 23:43:51 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110072343.p97NhpFK032806@svn.freebsd.org> From: Stanislav Sedov Date: Fri, 7 Oct 2011 23:43:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226122 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 23:43:51 -0000 Author: stas Date: Fri Oct 7 23:43:51 2011 New Revision: 226122 URL: http://svn.freebsd.org/changeset/base/226122 Log: - ${WRKSRC} might be missing when the autotools fixup is running. Account for this. Reported by: Mykola Dzham Modified: head/share/mk/bsd.port.mk Modified: head/share/mk/bsd.port.mk ============================================================================== --- head/share/mk/bsd.port.mk Fri Oct 7 23:12:33 2011 (r226121) +++ head/share/mk/bsd.port.mk Fri Oct 7 23:43:51 2011 (r226122) @@ -18,10 +18,10 @@ _WITHOUT_SRCCONF= .if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK) # Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. run-autotools-fixup: - find ${WRKSRC} -type f \( -name config.libpath -o \ + test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \ -name config.rpath -o -name configure -o -name libtool.m4 \) \ -exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \ - -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + + -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + || /usr/bin/true .ORDER: run-autotools run-autotools-fixup do-configure do-configure: run-autotools-fixup From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 00:00:55 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05CFF106564A; Sat, 8 Oct 2011 00:00:55 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E08598FC0A; Sat, 8 Oct 2011 00:00:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9800s38033408; Sat, 8 Oct 2011 00:00:54 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9800s90033405; Sat, 8 Oct 2011 00:00:54 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201110080000.p9800s90033405@svn.freebsd.org> From: Pyun YongHyeon Date: Sat, 8 Oct 2011 00:00:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226123 - head/sys/dev/bce X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 00:00:55 -0000 Author: yongari Date: Sat Oct 8 00:00:54 2011 New Revision: 226123 URL: http://svn.freebsd.org/changeset/base/226123 Log: BCE_MISC_ID register of BCM5716 returns the same id of BCM5709 so remove explicit checks for BCM5716. The BCM5709 and BCM5716 chips are virtually indistinguishable by software except for the PCI device ID. The two chips differ in that BCM5709 supports TCP/IP and iSCSI offload in Windows while the BCM5716 doesn't. While I'm here remove now unused definition of BCE_CHIP_NUM_5716 and BCE_CHIP_ID_5716_C0. Reported by: sbruno Reviewed by: davidch Tested by: davidch Modified: head/sys/dev/bce/if_bce.c head/sys/dev/bce/if_bcereg.h Modified: head/sys/dev/bce/if_bce.c ============================================================================== --- head/sys/dev/bce/if_bce.c Fri Oct 7 23:43:51 2011 (r226122) +++ head/sys/dev/bce/if_bce.c Sat Oct 8 00:00:54 2011 (r226123) @@ -1112,8 +1112,7 @@ bce_attach(device_t dev) DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI " "interrupt.\n", __FUNCTION__); sc->bce_flags |= BCE_USING_MSI_FLAG; - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG; sc->bce_irq_rid = 1; sc->bce_intr = bce_intr; @@ -1730,8 +1729,7 @@ bce_ctx_rd(struct bce_softc *sc, u32 cid offset = ctx_offset + cid_addr; - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | BCE_CTX_CTX_CTRL_READ_REQ)); @@ -1783,8 +1781,7 @@ bce_ctx_wr(struct bce_softc *sc, u32 cid BCE_PRINTF("%s(): Invalid CID address: 0x%08X.\n", __FUNCTION__, cid_addr)); - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { REG_WR(sc, BCE_CTX_CTX_DATA, ctx_val); REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | BCE_CTX_CTX_CTRL_WRITE_REQ)); @@ -2469,8 +2466,7 @@ bce_init_nvram(struct bce_softc *sc) DBENTER(BCE_VERBOSE_NVRAM); - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { sc->bce_flash_info = &flash_5709; goto bce_init_nvram_get_flash_size; } @@ -3224,8 +3220,7 @@ bce_dma_free(struct bce_softc *sc) /* Free, unmap and destroy all context memory pages. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { for (i = 0; i < sc->ctx_pages; i++ ) { if (sc->ctx_block[i] != NULL) { bus_dmamem_free( @@ -3564,8 +3559,7 @@ bce_dma_alloc(device_t dev) __FUNCTION__, (uintmax_t) sc->stats_block_paddr); /* BCM5709 uses host memory as cache for context memory. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { sc->ctx_pages = 0x2000 / BCM_PAGE_SIZE; if (sc->ctx_pages == 0) sc->ctx_pages = 1; @@ -4206,8 +4200,7 @@ bce_init_rxp_cpu(struct bce_softc *sc) cpu_reg.spad_base = BCE_RXP_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { fw.ver_major = bce_RXP_b09FwReleaseMajor; fw.ver_minor = bce_RXP_b09FwReleaseMinor; fw.ver_fix = bce_RXP_b09FwReleaseFix; @@ -4305,8 +4298,7 @@ bce_init_txp_cpu(struct bce_softc *sc) cpu_reg.spad_base = BCE_TXP_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { fw.ver_major = bce_TXP_b09FwReleaseMajor; fw.ver_minor = bce_TXP_b09FwReleaseMinor; fw.ver_fix = bce_TXP_b09FwReleaseFix; @@ -4403,8 +4395,7 @@ bce_init_tpat_cpu(struct bce_softc *sc) cpu_reg.spad_base = BCE_TPAT_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { fw.ver_major = bce_TPAT_b09FwReleaseMajor; fw.ver_minor = bce_TPAT_b09FwReleaseMinor; fw.ver_fix = bce_TPAT_b09FwReleaseFix; @@ -4501,8 +4492,7 @@ bce_init_cp_cpu(struct bce_softc *sc) cpu_reg.spad_base = BCE_CP_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { fw.ver_major = bce_CP_b09FwReleaseMajor; fw.ver_minor = bce_CP_b09FwReleaseMinor; fw.ver_fix = bce_CP_b09FwReleaseFix; @@ -4599,8 +4589,7 @@ bce_init_com_cpu(struct bce_softc *sc) cpu_reg.spad_base = BCE_COM_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { fw.ver_major = bce_COM_b09FwReleaseMajor; fw.ver_minor = bce_COM_b09FwReleaseMinor; fw.ver_fix = bce_COM_b09FwReleaseFix; @@ -4683,8 +4672,7 @@ bce_init_cpus(struct bce_softc *sc) { DBENTER(BCE_VERBOSE_RESET); - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { if ((BCE_CHIP_REV(sc) == BCE_CHIP_REV_Ax)) { bce_load_rv2p_fw(sc, bce_xi90_rv2p_proc1, @@ -4732,8 +4720,7 @@ bce_init_ctx(struct bce_softc *sc) rc = 0; DBENTER(BCE_VERBOSE_RESET | BCE_VERBOSE_CTX); - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { retry_cnt = CTX_INIT_RETRY_COUNT; DBPRINT(sc, BCE_INFO_CTX, "Initializing 5709 context.\n"); @@ -4960,8 +4947,7 @@ bce_reset(struct bce_softc *sc, u32 rese DELAY(5); /* Disable DMA */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { val = REG_RD(sc, BCE_MISC_NEW_CORE_CTL); val &= ~BCE_MISC_NEW_CORE_CTL_DMA_ENABLE; REG_WR(sc, BCE_MISC_NEW_CORE_CTL, val); @@ -4983,8 +4969,7 @@ bce_reset(struct bce_softc *sc, u32 rese val = REG_RD(sc, BCE_MISC_ID); /* Chip reset. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { REG_WR(sc, BCE_MISC_COMMAND, BCE_MISC_COMMAND_SW_RESET); REG_RD(sc, BCE_MISC_COMMAND); DELAY(5); @@ -5113,8 +5098,7 @@ bce_chipinit(struct bce_softc *sc) val |= BCE_MQ_CONFIG_KNL_BYP_BLK_SIZE_256; /* Enable bins used on the 5709. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { val |= BCE_MQ_CONFIG_BIN_MQ_MODE; if (BCE_CHIP_ID(sc) == BCE_CHIP_ID_5709_A1) val |= BCE_MQ_CONFIG_HALT_DIS; @@ -5268,8 +5252,7 @@ bce_blockinit(struct bce_softc *sc) } /* Enable DMA */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { val = REG_RD(sc, BCE_MISC_NEW_CORE_CTL); val |= BCE_MISC_NEW_CORE_CTL_DMA_ENABLE; REG_WR(sc, BCE_MISC_NEW_CORE_CTL, val); @@ -5293,8 +5276,7 @@ bce_blockinit(struct bce_softc *sc) } /* Enable all remaining blocks in the MAC. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) REG_WR(sc, BCE_MISC_ENABLE_SET_BITS, BCE_MISC_ENABLE_DEFAULT_XI); else @@ -5565,8 +5547,7 @@ bce_init_tx_context(struct bce_softc *sc DBENTER(BCE_VERBOSE_RESET | BCE_VERBOSE_SEND | BCE_VERBOSE_CTX); /* Initialize the context ID for an L2 TX chain. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { /* Set the CID type to support an L2 connection. */ val = BCE_L2CTX_TX_TYPE_TYPE_L2_XI | BCE_L2CTX_TX_TYPE_SIZE_L2_XI; @@ -5729,8 +5710,7 @@ bce_init_rx_context(struct bce_softc *sc * when pause frames can be stopped (the high * watermark). */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { u32 lo_water, hi_water; if (sc->bce_flags & BCE_USING_TX_FLOW_CONTROL) { @@ -5764,8 +5744,7 @@ bce_init_rx_context(struct bce_softc *sc CTX_WR(sc, GET_CID_ADDR(RX_CID), BCE_L2CTX_RX_CTX_TYPE, val); /* Setup the MQ BIN mapping for l2_ctx_host_bseq. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { val = REG_RD(sc, BCE_MQ_MAP_L2_5); REG_WR(sc, BCE_MQ_MAP_L2_5, val | BCE_MQ_MAP_L2_5_ARM); } @@ -5983,8 +5962,7 @@ bce_init_pg_chain(struct bce_softc *sc) } /* Setup the MQ BIN mapping for host_pg_bidx. */ - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) REG_WR(sc, BCE_MQ_MAP_L2_3, BCE_MQ_MAP_L2_3_DEFAULT); CTX_WR(sc, GET_CID_ADDR(RX_CID), BCE_L2CTX_RX_PG_BUF_SIZE, 0); @@ -9912,8 +9890,7 @@ bce_dump_ctx(struct bce_softc *sc, u16 c "consumer index\n", CTX_RD(sc, GET_CID_ADDR(cid), BCE_L2CTX_RX_NX_PG_BDIDX)); } else if (cid == TX_CID) { - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { BCE_PRINTF(" 0x%08X - (L2CTX_TX_TYPE_XI) ctx type\n", CTX_RD(sc, GET_CID_ADDR(cid), BCE_L2CTX_TX_TYPE_XI)); @@ -10175,8 +10152,7 @@ bce_dump_ftqs(struct bce_softc *sc) (BCE_HC_STAT_GEN_SEL_0_GEN_SEL_0_CPQ_VALID_CNT << 8) | (BCE_HC_STAT_GEN_SEL_0_GEN_SEL_0_MGMQ_VALID_CNT); - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) + if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) val = val | (BCE_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2PCSQ_VALID_CNT_XI << 24); @@ -10209,8 +10185,7 @@ bce_dump_ftqs(struct bce_softc *sc) BCE_PRINTF(" CS 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X\n", cmd, ctl, cur_depth, max_depth, valid_cnt); - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) || - (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) { + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { /* Input queue to the RV2P Command Scheduler */ cmd = REG_RD(sc, BCE_RV2PCSR_FTQ_CMD); ctl = REG_RD(sc, BCE_RV2PCSR_FTQ_CTL); Modified: head/sys/dev/bce/if_bcereg.h ============================================================================== --- head/sys/dev/bce/if_bcereg.h Fri Oct 7 23:43:51 2011 (r226122) +++ head/sys/dev/bce/if_bcereg.h Sat Oct 8 00:00:54 2011 (r226123) @@ -576,7 +576,6 @@ default: DBPRINT(sc, BCE_INSANE_PHY, #define BCE_CHIP_NUM_5706 0x57060000 #define BCE_CHIP_NUM_5708 0x57080000 #define BCE_CHIP_NUM_5709 0x57090000 -#define BCE_CHIP_NUM_5716 0x57160000 #define BCE_CHIP_REV(sc) (((sc)->bce_chipid) & 0x0000f000) #define BCE_CHIP_REV_Ax 0x00000000 @@ -601,7 +600,6 @@ default: DBPRINT(sc, BCE_INSANE_PHY, #define BCE_CHIP_ID_5709_B1 0x57091010 #define BCE_CHIP_ID_5709_B2 0x57091020 #define BCE_CHIP_ID_5709_C0 0x57092000 -#define BCE_CHIP_ID_5716_C0 0x57162000 #define BCE_CHIP_BOND_ID(sc) (((sc)->bce_chipid) & 0xf) From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 00:01:17 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3ED21065678; Sat, 8 Oct 2011 00:01:17 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C40918FC17; Sat, 8 Oct 2011 00:01:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9801HNj033462; Sat, 8 Oct 2011 00:01:17 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9801H3p033460; Sat, 8 Oct 2011 00:01:17 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110080001.p9801H3p033460@svn.freebsd.org> From: Stanislav Sedov Date: Sat, 8 Oct 2011 00:01:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226124 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 00:01:17 -0000 Author: stas Date: Sat Oct 8 00:01:17 2011 New Revision: 226124 URL: http://svn.freebsd.org/changeset/base/226124 Log: - Add a couple of more sed subsitutions needed to get the correct libtool.m4. With these fixes libtool will correctly indentify the system as ELF (and not a.out). - While here, change the substitutions so they're still correctly match freebsd1.x, freebsd2.x etc. Modified: head/share/mk/bsd.port.mk Modified: head/share/mk/bsd.port.mk ============================================================================== --- head/share/mk/bsd.port.mk Sat Oct 8 00:00:54 2011 (r226123) +++ head/share/mk/bsd.port.mk Sat Oct 8 00:01:17 2011 (r226124) @@ -20,8 +20,12 @@ _WITHOUT_SRCCONF= run-autotools-fixup: test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \ -name config.rpath -o -name configure -o -name libtool.m4 \) \ - -exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \ - -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + || /usr/bin/true + -exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \ + -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ + -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ + -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ + -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ + {} + || /usr/bin/true .ORDER: run-autotools run-autotools-fixup do-configure do-configure: run-autotools-fixup From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 01:13:35 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 859F0106566C; Sat, 8 Oct 2011 01:13:35 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id EF02D8FC12; Sat, 8 Oct 2011 01:13:34 +0000 (UTC) Received: from lstewart1.loshell.room52.net (ppp59-167-184-191.static.internode.on.net [59.167.184.191]) by lauren.room52.net (Postfix) with ESMTPSA id 06C507E824; Sat, 8 Oct 2011 11:56:14 +1100 (EST) Message-ID: <4E8F9FAD.7070103@freebsd.org> Date: Sat, 08 Oct 2011 11:56:13 +1100 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:6.0.2) Gecko/20110914 Thunderbird/6.0.2 MIME-Version: 1.0 To: Andre Oppermann References: <201110071639.p97Gd3t4019128@svn.freebsd.org> In-Reply-To: <201110071639.p97Gd3t4019128@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on lauren.room52.net Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, FreeBSD Release Engineering Team , John Baldwin Subject: Re: svn commit: r226113 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 01:13:35 -0000 Hi Andre and RE team, I've had a patch sitting in re@'s inbox for this problem since 15th Sep and have been waiting for their go-ahead to commit. The patch I submitted is at: http://people.freebsd.org/~lstewart/patches/misctcp/tcpreassstackfix_9.x.r225576.diff The proposed commit message was: ########## Use a backup (stack allocated) struct tseg_qent when we are unable to allocate one from the TCP reassembly UMA zone and the incoming segment is the one we've been waiting for (i.e. th_seq == rcv_nxt). This avoids TCP connections stalling when the zone limit is reached. PR: kern/155407 Reported by: Slawa Olhovchenkov and Steven Hartland Tested by: Steven Hartland Submitted by: andre Reviewed by: jhb Approved by: re (?) MFC after: 1 week ########## I feel the logging changes should have been committed separately to the fix, but other than that, what you committed achieves the same thing as the patch I proposed. I should have updated the ML thread to say it was submitted and awaiting approval, so you weren't to know. Anyhoo, I guess I'll leave it up to you and re@ to sort out how you want to proceed, but wanted to make sure everyone was on the same page as RE would have gotten confused when you requested your patch be MFCed. Cheers, Lawrence On 10/08/11 03:39, Andre Oppermann wrote: > Author: andre > Date: Fri Oct 7 16:39:03 2011 > New Revision: 226113 > URL: http://svn.freebsd.org/changeset/base/226113 > > Log: > Prevent TCP sessions from stalling indefinitely in reassembly > when reaching the zone limit of reassembly queue entries. > > When the zone limit was reached not even the missing segment > that would complete the sequence space could be processed > preventing the TCP session forever from making any further > progress. > > Solve this deadlock by using a temporary on-stack queue entry > for the missing segment followed by an immediate dequeue again > by delivering the contiguous sequence space to the socket. > > Add logging under net.inet.tcp.log_debug for reassembly queue > issues. > > Reviewed by: lsteward (previous version) > Tested by: Steven Hartland > MFC after: 3 days > > Modified: > head/sys/netinet/tcp_reass.c > > Modified: head/sys/netinet/tcp_reass.c > ============================================================================== > --- head/sys/netinet/tcp_reass.c Fri Oct 7 16:09:44 2011 (r226112) > +++ head/sys/netinet/tcp_reass.c Fri Oct 7 16:39:03 2011 (r226113) > @@ -177,7 +177,9 @@ tcp_reass(struct tcpcb *tp, struct tcphd > struct tseg_qent *nq; > struct tseg_qent *te = NULL; > struct socket *so = tp->t_inpcb->inp_socket; > + char *s = NULL; > int flags; > + struct tseg_qent tqs; > > INP_WLOCK_ASSERT(tp->t_inpcb); > > @@ -215,19 +217,40 @@ tcp_reass(struct tcpcb *tp, struct tcphd > TCPSTAT_INC(tcps_rcvmemdrop); > m_freem(m); > *tlenp = 0; > + if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) { > + log(LOG_DEBUG, "%s; %s: queue limit reached, " > + "segment dropped\n", s, __func__); > + free(s, M_TCPLOG); > + } > return (0); > } > > /* > * Allocate a new queue entry. If we can't, or hit the zone limit > * just drop the pkt. > + * > + * Use a temporary structure on the stack for the missing segment > + * when the zone is exhausted. Otherwise we may get stuck. > */ > te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); > - if (te == NULL) { > + if (te == NULL&& th->th_seq != tp->rcv_nxt) { > TCPSTAT_INC(tcps_rcvmemdrop); > m_freem(m); > *tlenp = 0; > + if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) { > + log(LOG_DEBUG, "%s; %s: global zone limit reached, " > + "segment dropped\n", s, __func__); > + free(s, M_TCPLOG); > + } > return (0); > + } else if (th->th_seq == tp->rcv_nxt) { > + bzero(&tqs, sizeof(struct tseg_qent)); > + te =&tqs; > + if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) { > + log(LOG_DEBUG, "%s; %s: global zone limit reached, " > + "using stack for missing segment\n", s, __func__); > + free(s, M_TCPLOG); > + } > } > tp->t_segqlen++; > > @@ -304,6 +327,8 @@ tcp_reass(struct tcpcb *tp, struct tcphd > if (p == NULL) { > LIST_INSERT_HEAD(&tp->t_segq, te, tqe_q); > } else { > + KASSERT(te !=&tqs, ("%s: temporary stack based entry not " > + "first element in queue", __func__)); > LIST_INSERT_AFTER(p, te, tqe_q); > } > > @@ -327,7 +352,8 @@ present: > m_freem(q->tqe_m); > else > sbappendstream_locked(&so->so_rcv, q->tqe_m); > - uma_zfree(V_tcp_reass_zone, q); > + if (q !=&tqs) > + uma_zfree(V_tcp_reass_zone, q); > tp->t_segqlen--; > q = nq; > } while (q&& q->tqe_th->th_seq == tp->rcv_nxt); From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 04:08:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75BA61065670; Sat, 8 Oct 2011 04:08:03 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4C0778FC08; Sat, 8 Oct 2011 04:08:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98483MK041545; Sat, 8 Oct 2011 04:08:03 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98483kU041543; Sat, 8 Oct 2011 04:08:03 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110080408.p98483kU041543@svn.freebsd.org> From: Stanislav Sedov Date: Sat, 8 Oct 2011 04:08:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226127 - svnadmin/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 04:08:03 -0000 Author: stas Date: Sat Oct 8 04:08:02 2011 New Revision: 226127 URL: http://svn.freebsd.org/changeset/base/226127 Log: - Add myself for heimdal 1.5.1 import. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Sat Oct 8 03:58:20 2011 (r226126) +++ svnadmin/conf/sizelimit.conf Sat Oct 8 04:08:02 2011 (r226127) @@ -33,4 +33,5 @@ obrien rpaulo rwatson sam +stas thompsa From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 04:08:46 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42E52106564A; Sat, 8 Oct 2011 04:08:46 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2D78F8FC1A; Sat, 8 Oct 2011 04:08:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9848kZH041666; Sat, 8 Oct 2011 04:08:46 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9848j9Z041598; Sat, 8 Oct 2011 04:08:45 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110080408.p9848j9Z041598@svn.freebsd.org> From: Stanislav Sedov Date: Sat, 8 Oct 2011 04:08:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226128 - in vendor-crypto/heimdal/dist: . appl/test base cf doc doc/doxyout/gssapi/html doc/doxyout/gssapi/man/man3 doc/doxyout/hcrypto/html doc/doxyout/hcrypto/man/man3 doc/doxyout/hd... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 04:08:46 -0000 Author: stas Date: Sat Oct 8 04:08:44 2011 New Revision: 226128 URL: http://svn.freebsd.org/changeset/base/226128 Log: - Update vendor tree of heimdal to 1.5.1. Added: vendor-crypto/heimdal/dist/windows/NTMakefile.version Modified: vendor-crypto/heimdal/dist/appl/test/gssapi_client.c vendor-crypto/heimdal/dist/base/array.c vendor-crypto/heimdal/dist/base/heimbase.h vendor-crypto/heimdal/dist/base/test_base.c vendor-crypto/heimdal/dist/cf/check-compile-et.m4 vendor-crypto/heimdal/dist/cf/check-getpwnam_r-posix.m4 vendor-crypto/heimdal/dist/cf/install-catman.sh vendor-crypto/heimdal/dist/cf/roken-frag.m4 vendor-crypto/heimdal/dist/configure vendor-crypto/heimdal/dist/configure.ac vendor-crypto/heimdal/dist/doc/ack.texi vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/group__gssapi.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_mechs_intro.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_services_intro.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/internalvsmechname.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/pages.html vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_mechs_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_services_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/internalvsmechname.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/example__evp__cipher_8c-example.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/examples.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__core.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__des.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__dh.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__evp.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__misc.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rand.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rsa.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_des.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_dh.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_evp.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rand.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rsa.html vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_core.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_des.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_dh.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_evp.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_misc.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rand.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rsa.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_des.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_dh.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_evp.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rand.3 vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rsa.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/annotated.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions_vars.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/struct_h_d_b.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/structhdb__entry__ex.html vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/HDB.3 vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_entry_ex.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__ca.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cert.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cms.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__crypto.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__env.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__error.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__keyset.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__lock.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__misc.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__name.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__peer.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__print.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__query.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__revoke.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__verify.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_ca.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_cert.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_cms.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_env.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_error.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_keyset.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_lock.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_name.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_peer.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_print.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/page_revoke.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/pages.html vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_ca.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_cms.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_crypto.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_env.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_error.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_keyset.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_lock.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_misc.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_peer.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_query.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_revoke.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/hx509_verify.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_ca.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_cert.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_cms.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_env.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_error.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_keyset.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_lock.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_name.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_peer.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_print.3 vendor-crypto/heimdal/dist/doc/doxyout/hx509/man/man3/page_revoke.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/annotated.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__address.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__auth.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__ccache.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__credential.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__crypto.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__deprecated.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__digest.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__error.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__keytab.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__pac.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__principal.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__storage.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__support.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__ticket.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/group__krb5__v4compat.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_ccache_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_fileformats.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_init_creds_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_introduction.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_keytab_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/krb5_principal_intro.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/pages.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/html/structkrb5__crypto__iov.html vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_address.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_auth.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ccache.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ccache_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_credential.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_crypto_iov.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_deprecated.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_digest.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_error.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_fileformats.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_init_creds_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_introduction.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytab.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_keytab_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_pac.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_principal_intro.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_storage.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_support.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_ticket.3 vendor-crypto/heimdal/dist/doc/doxyout/krb5/man/man3/krb5_v4compat.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/annotated.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/examples.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/functions.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/functions_vars.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/group__ntlm__core.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__buf.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type1.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type2.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/structntlm__type3.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/html/test__ntlm_8c-example.html vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_buf.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_core.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_type1.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_type2.3 vendor-crypto/heimdal/dist/doc/doxyout/ntlm/man/man3/ntlm_type3.3 vendor-crypto/heimdal/dist/doc/doxyout/wind/html/graph_legend.html vendor-crypto/heimdal/dist/doc/doxyout/wind/html/group__wind.html vendor-crypto/heimdal/dist/doc/doxyout/wind/html/index.html vendor-crypto/heimdal/dist/doc/doxyout/wind/html/modules.html vendor-crypto/heimdal/dist/doc/doxyout/wind/man/man3/wind.3 vendor-crypto/heimdal/dist/doc/heimdal.info vendor-crypto/heimdal/dist/doc/hx509.info vendor-crypto/heimdal/dist/doc/setup.texi vendor-crypto/heimdal/dist/doc/vars.texi vendor-crypto/heimdal/dist/include/NTMakefile vendor-crypto/heimdal/dist/include/config.h.in vendor-crypto/heimdal/dist/kuser/kswitch.c vendor-crypto/heimdal/dist/lib/asn1/gen_seq.c vendor-crypto/heimdal/dist/lib/hcrypto/test_crypto.in vendor-crypto/heimdal/dist/lib/hcrypto/validate.c vendor-crypto/heimdal/dist/lib/heimdal/NTMakefile vendor-crypto/heimdal/dist/lib/kafs/afskrb5.c vendor-crypto/heimdal/dist/lib/krb5/cache.c vendor-crypto/heimdal/dist/lib/krb5/crypto.c vendor-crypto/heimdal/dist/lib/krb5/error_string.c vendor-crypto/heimdal/dist/lib/krb5/keytab_keyfile.c vendor-crypto/heimdal/dist/lib/krb5/krb5-private.h vendor-crypto/heimdal/dist/lib/libedit/configure vendor-crypto/heimdal/dist/lib/roken/resolve-test.c vendor-crypto/heimdal/dist/lib/roken/resolve.c vendor-crypto/heimdal/dist/lib/roken/roken.h.in vendor-crypto/heimdal/dist/lib/roken/search.hin vendor-crypto/heimdal/dist/lib/roken/tsearch-test.c vendor-crypto/heimdal/dist/lib/roken/tsearch.c vendor-crypto/heimdal/dist/lib/sqlite/sqlite3.c vendor-crypto/heimdal/dist/lib/sqlite/sqlite3.h vendor-crypto/heimdal/dist/lib/sqlite/sqlite3ext.h vendor-crypto/heimdal/dist/lib/wind/bidi_table.c vendor-crypto/heimdal/dist/lib/wind/bidi_table.h vendor-crypto/heimdal/dist/lib/wind/combining_table.c vendor-crypto/heimdal/dist/lib/wind/combining_table.h vendor-crypto/heimdal/dist/lib/wind/errorlist_table.c vendor-crypto/heimdal/dist/lib/wind/errorlist_table.h vendor-crypto/heimdal/dist/lib/wind/map_table.c vendor-crypto/heimdal/dist/lib/wind/map_table.h vendor-crypto/heimdal/dist/lib/wind/normalize_table.c vendor-crypto/heimdal/dist/lib/wind/normalize_table.h vendor-crypto/heimdal/dist/lib/wind/punycode_examples.c vendor-crypto/heimdal/dist/lib/wind/punycode_examples.h vendor-crypto/heimdal/dist/packages/windows/assembly/NTMakefile vendor-crypto/heimdal/dist/packages/windows/assembly/policy.Heimdal.Kerberos.in vendor-crypto/heimdal/dist/tests/db/have-db.in vendor-crypto/heimdal/dist/tests/kdc/wait-kdc.sh vendor-crypto/heimdal/dist/windows/NTMakefile.config vendor-crypto/heimdal/dist/windows/NTMakefile.w32 Modified: vendor-crypto/heimdal/dist/appl/test/gssapi_client.c ============================================================================== --- vendor-crypto/heimdal/dist/appl/test/gssapi_client.c Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/appl/test/gssapi_client.c Sat Oct 8 04:08:44 2011 (r226128) @@ -99,7 +99,7 @@ extern char *password; static int proto (int sock, const char *hostname, const char *service) { - struct sockaddr_in remote, local; + struct sockaddr_storage remote, local; socklen_t addrlen; int context_established = 0; @@ -111,7 +111,6 @@ proto (int sock, const char *hostname, c OM_uint32 maj_stat, min_stat; gss_name_t server; gss_buffer_desc name_token; - struct gss_channel_bindings_struct input_chan_bindings; u_char init_buf[4]; u_char acct_buf[4]; gss_OID mech_oid; @@ -155,17 +154,20 @@ proto (int sock, const char *hostname, c addrlen = sizeof(local); if (getsockname (sock, (struct sockaddr *)&local, &addrlen) < 0 - || addrlen != sizeof(local)) + || addrlen > sizeof(local)) err (1, "getsockname(%s)", hostname); addrlen = sizeof(remote); if (getpeername (sock, (struct sockaddr *)&remote, &addrlen) < 0 - || addrlen != sizeof(remote)) + || addrlen > sizeof(remote)) err (1, "getpeername(%s)", hostname); input_token->length = 0; output_token->length = 0; +#if 0 + struct gss_channel_bindings_struct input_chan_bindings; + input_chan_bindings.initiator_addrtype = GSS_C_AF_INET; input_chan_bindings.initiator_address.length = 4; init_buf[0] = (local.sin_addr.s_addr >> 24) & 0xFF; @@ -182,12 +184,11 @@ proto (int sock, const char *hostname, c acct_buf[3] = (remote.sin_addr.s_addr >> 0) & 0xFF; input_chan_bindings.acceptor_address.value = acct_buf; -#if 0 input_chan_bindings.application_data.value = emalloc(4); * (unsigned short*)input_chan_bindings.application_data.value = local.sin_port; * ((unsigned short *)input_chan_bindings.application_data.value + 1) = remote.sin_port; input_chan_bindings.application_data.length = 4; -#else + input_chan_bindings.application_data.length = 0; input_chan_bindings.application_data.value = NULL; #endif @@ -199,10 +200,9 @@ proto (int sock, const char *hostname, c &context_hdl, server, mech_oid, - GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG - | GSS_C_DELEG_FLAG, + GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG, 0, - &input_chan_bindings, + NULL, input_token, NULL, output_token, Modified: vendor-crypto/heimdal/dist/base/array.c ============================================================================== --- vendor-crypto/heimdal/dist/base/array.c Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/base/array.c Sat Oct 8 04:08:44 2011 (r226128) @@ -218,7 +218,7 @@ heim_array_delete_value(heim_array_t arr */ void -heim_array_filter(heim_array_t array, bool (^block)(heim_object_t)) +heim_array_filter(heim_array_t array, int (^block)(heim_object_t)) { size_t n = 0; Modified: vendor-crypto/heimdal/dist/base/heimbase.h ============================================================================== --- vendor-crypto/heimdal/dist/base/heimbase.h Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/base/heimbase.h Sat Oct 8 04:08:44 2011 (r226128) @@ -131,7 +131,7 @@ heim_object_t heim_array_copy_value(heim_array_t, size_t); void heim_array_delete_value(heim_array_t, size_t); #ifdef __BLOCKS__ -void heim_array_filter(heim_array_t, bool (^)(heim_object_t)); +void heim_array_filter(heim_array_t, int (^)(heim_object_t)); #endif /* Modified: vendor-crypto/heimdal/dist/base/test_base.c ============================================================================== --- vendor-crypto/heimdal/dist/base/test_base.c Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/base/test_base.c Sat Oct 8 04:08:44 2011 (r226128) @@ -127,9 +127,10 @@ test_string(void) s1 = heim_string_create(string); s2 = heim_string_create(string); - if (heim_cmp(s1, s2) != 0) - errx(1, "the same string is not the same"); - + if (heim_cmp(s1, s2) != 0) { + printf("the same string is not the same\n"); + exit(1); + } heim_release(s1); heim_release(s2); Modified: vendor-crypto/heimdal/dist/cf/check-compile-et.m4 ============================================================================== --- vendor-crypto/heimdal/dist/cf/check-compile-et.m4 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/cf/check-compile-et.m4 Sat Oct 8 04:08:44 2011 (r226128) @@ -84,6 +84,7 @@ if test "${krb_cv_com_err}" = "yes"; the LIB_com_err_a="" LIB_com_err_so="" AC_MSG_NOTICE(Using the already-installed com_err) + COMPILE_ET="${ac_cv_prog_COMPILE_ET}" localcomerr=no elif test "${krb_cv_com_err}" = "cross"; then DIR_com_err="com_err" @@ -91,6 +92,7 @@ elif test "${krb_cv_com_err}" = "cross"; LIB_com_err_a="\$(top_builddir)/lib/com_err/.libs/libcom_err.a" LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so" AC_MSG_NOTICE(Using our own com_err with toolchain compile_et) + COMPILE_ET="${ac_cv_prog_COMPILE_ET}" localcomerr=yes else COMPILE_ET="\$(top_builddir)/lib/com_err/compile_et" @@ -102,6 +104,7 @@ else localcomerr=yes fi AM_CONDITIONAL(COM_ERR, test "$localcomerr" = yes)dnl +AC_SUBST(COMPILE_ET) AC_SUBST(DIR_com_err) AC_SUBST(LIB_com_err) AC_SUBST(LIB_com_err_a) Modified: vendor-crypto/heimdal/dist/cf/check-getpwnam_r-posix.m4 ============================================================================== --- vendor-crypto/heimdal/dist/cf/check-getpwnam_r-posix.m4 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/cf/check-getpwnam_r-posix.m4 Sat Oct 8 04:08:44 2011 (r226128) @@ -14,12 +14,27 @@ if test "$ac_cv_func_getpwnam_r" = yes; int main(int argc, char **argv) { struct passwd pw, *pwd; - return getpwnam_r("", &pw, NULL, 0, &pwd) < 0; + return getpwnam_r("", &pw, 0, 0, &pwd) < 0; } ]])],[ac_cv_func_getpwnam_r_posix=yes],[ac_cv_func_getpwnam_r_posix=no],[:]) LIBS="$ac_libs") + AC_CACHE_CHECK(if _POSIX_PTHREAD_SEMANTICS is needed,ac_cv_func_getpwnam_r_posix_def, + ac_libs="$LIBS" + LIBS="$LIBS $LIB_getpwnam_r" + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +int main(int argc, char **argv) +{ + struct passwd pw, *pwd; + return getpwnam_r("", &pw, 0, 0, &pwd) < 0; +} +]])],[ac_cv_func_getpwnam_r_posix_def=no],[ac_cv_func_getpwnam_r_posix_def=yes],[:]) +LIBS="$ac_libs") if test "$ac_cv_func_getpwnam_r_posix" = yes; then AC_DEFINE(POSIX_GETPWNAM_R, 1, [Define if getpwnam_r has POSIX flavour.]) fi +if test "$ac_cv_func_getpwnam_r_posix" = yes -a "$ac_cv_func_getpwnam_r_posix_def" = yes; then + AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to get POSIX getpwnam_r in some systems.]) +fi fi -]) \ No newline at end of file +]) Modified: vendor-crypto/heimdal/dist/cf/install-catman.sh ============================================================================== --- vendor-crypto/heimdal/dist/cf/install-catman.sh Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/cf/install-catman.sh Sat Oct 8 04:08:44 2011 (r226128) @@ -14,8 +14,8 @@ catinstall="${INSTALL_CATPAGES-yes}" for f in "$@"; do echo $f - base=`echo "$f" | sed 's/\([^/]*\/\)*\(.*\)\.\([^.]*\)$/\2/'` - section=`echo "$f" | sed 's/\([^/]*\/\)*\(.*\)\.\([^.]*\)$/\3/'` + base=`echo "$f" | sed 's/\.[^.]*$//'` + section=`echo "$f" | sed 's/^[^.]*\.//'` mandir="$manbase/man$section" catdir="$manbase/cat$section" c="$base.cat$section" @@ -48,10 +48,11 @@ for f in "$@"; do fi done if test "$catinstall" = yes -a -f "$srcdir/$c"; then - target="$catdir/$link.$suffix" - for lncmd in "ln -f $catdir/$base.$suffix $target" \ - "ln -fs $base.$suffix $target" \ - "cp -f $catdir/$base.$suffix $target" + eval target="$catdir/$link.$suffix" + eval source="$catdir/$base.$suffix" + for lncmd in "ln -f $source $target" \ + "ln -fs $source $target" \ + "cp -f $catdir/$source $target" do if eval "$lncmd"; then eval echo "$lncmd" Modified: vendor-crypto/heimdal/dist/cf/roken-frag.m4 ============================================================================== --- vendor-crypto/heimdal/dist/cf/roken-frag.m4 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/cf/roken-frag.m4 Sat Oct 8 04:08:44 2011 (r226128) @@ -184,13 +184,11 @@ AC_CHECK_FUNCS([ \ getprogname \ getrlimit \ getspnam \ - initstate \ issetugid \ on_exit \ poll \ random \ setprogname \ - setstate \ strsvis \ strsvisx \ strunvis \ Modified: vendor-crypto/heimdal/dist/configure ============================================================================== --- vendor-crypto/heimdal/dist/configure Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/configure Sat Oct 8 04:08:44 2011 (r226128) @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for Heimdal 1.5. +# Generated by GNU Autoconf 2.65 for Heimdal 1.5.1. # # Report bugs to . # @@ -563,8 +563,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Heimdal' PACKAGE_TARNAME='heimdal' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='Heimdal 1.5' +PACKAGE_VERSION='1.5.1' +PACKAGE_STRING='Heimdal 1.5.1' PACKAGE_BUGREPORT='heimdal-bugs@h5l.org' PACKAGE_URL='' @@ -1535,7 +1535,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Heimdal 1.5 to adapt to many kinds of systems. +\`configure' configures Heimdal 1.5.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1609,7 +1609,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Heimdal 1.5:";; + short | recursive ) echo "Configuration of Heimdal 1.5.1:";; esac cat <<\_ACEOF @@ -1798,7 +1798,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Heimdal configure 1.5 +Heimdal configure 1.5.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2252,7 +2252,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Heimdal $as_me 1.5, which was +It was created by Heimdal $as_me 1.5.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3068,7 +3068,7 @@ fi # Define the identity of the package. PACKAGE='heimdal' - VERSION='1.5' + VERSION='1.5.1' cat >>confdefs.h <<_ACEOF @@ -12850,6 +12850,9 @@ else ASN1_COMPILE_DEP= SLC_DEP= + + ac_cv_prog_COMPILE_ET=${with_cross_tools}compile_et + fi @@ -17949,13 +17952,11 @@ for ac_func in \ getprogname \ getrlimit \ getspnam \ - initstate \ issetugid \ on_exit \ poll \ random \ setprogname \ - setstate \ strsvis \ strsvisx \ strunvis \ @@ -26896,7 +26897,7 @@ else int main(int argc, char **argv) { struct passwd pw, *pwd; - return getpwnam_r("", &pw, NULL, 0, &pwd) < 0; + return getpwnam_r("", &pw, 0, 0, &pwd) < 0; } _ACEOF @@ -26913,11 +26914,50 @@ LIBS="$ac_libs" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpwnam_r_posix" >&5 $as_echo "$ac_cv_func_getpwnam_r_posix" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if _POSIX_PTHREAD_SEMANTICS is needed" >&5 +$as_echo_n "checking if _POSIX_PTHREAD_SEMANTICS is needed... " >&6; } +if test "${ac_cv_func_getpwnam_r_posix_def+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_libs="$LIBS" + LIBS="$LIBS $LIB_getpwnam_r" + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +int main(int argc, char **argv) +{ + struct passwd pw, *pwd; + return getpwnam_r("", &pw, 0, 0, &pwd) < 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_getpwnam_r_posix_def=no +else + ac_cv_func_getpwnam_r_posix_def=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +LIBS="$ac_libs" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpwnam_r_posix_def" >&5 +$as_echo "$ac_cv_func_getpwnam_r_posix_def" >&6; } if test "$ac_cv_func_getpwnam_r_posix" = yes; then $as_echo "#define POSIX_GETPWNAM_R 1" >>confdefs.h fi +if test "$ac_cv_func_getpwnam_r_posix" = yes -a "$ac_cv_func_getpwnam_r_posix_def" = yes; then + +$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + +fi fi @@ -28321,6 +28361,7 @@ if test "${krb_cv_com_err}" = "yes"; the LIB_com_err_so="" { $as_echo "$as_me:${as_lineno-$LINENO}: Using the already-installed com_err" >&5 $as_echo "$as_me: Using the already-installed com_err" >&6;} + COMPILE_ET="${ac_cv_prog_COMPILE_ET}" localcomerr=no elif test "${krb_cv_com_err}" = "cross"; then DIR_com_err="com_err" @@ -28329,6 +28370,7 @@ elif test "${krb_cv_com_err}" = "cross"; LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so" { $as_echo "$as_me:${as_lineno-$LINENO}: Using our own com_err with toolchain compile_et" >&5 $as_echo "$as_me: Using our own com_err with toolchain compile_et" >&6;} + COMPILE_ET="${ac_cv_prog_COMPILE_ET}" localcomerr=yes else COMPILE_ET="\$(top_builddir)/lib/com_err/compile_et" @@ -28355,6 +28397,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which authentication modules should be built" >&5 $as_echo_n "checking which authentication modules should be built... " >&6; } @@ -29203,7 +29246,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Heimdal $as_me 1.5, which was +This file was extended by Heimdal $as_me 1.5.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29269,7 +29312,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Heimdal config.status 1.5 +Heimdal config.status 1.5.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -31241,7 +31284,7 @@ cat > include/newversion.h.in <
-Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
+Generated on Fri Sep 30 15:26:17 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/group__gssapi.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/group__gssapi.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/group__gssapi.html Sat Oct 8 04:08:44 2011 (r226128) @@ -887,6 +887,6 @@ SSPI equivalent if this function is Quer

-Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
+Generated on Fri Sep 30 15:26:16 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_mechs_intro.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_mechs_intro.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_mechs_intro.html Sat Oct 8 04:08:44 2011 (r226128) @@ -25,6 +25,6 @@ GSS-API mechanisms
  • Kerberos 5 - GSS_KRB5_MECHANISM
  • SPNEGO - GSS_SPNEGO_MECHANISM
  • NTLM - GSS_NTLM_MECHANISM
    • -Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:16 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_services_intro.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_services_intro.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/gssapi_services_intro.html Sat Oct 8 04:08:44 2011 (r226128) @@ -38,6 +38,6 @@ Per-message services
  • conf
  • int
  • message integrity
  • replay detection
  • out of sequence
    • -Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:16 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/index.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/index.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/index.html Sat Oct 8 04:08:44 2011 (r226128) @@ -21,7 +21,7 @@

    Heimdal GSS-API Library

    -

    1.5

    Heimdal implements the following mechanisms:

    +

    1.5.1

    Heimdal implements the following mechanisms:

    • Kerberos 5
    • SPNEGO
    • NTLM

    @@ -31,6 +31,6 @@ The project web page: Introduction to GSS-API services

  • GSS-API mechanisms
  • Name forms
    • -Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:16 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/internalvsmechname.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/internalvsmechname.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/internalvsmechname.html Sat Oct 8 04:08:44 2011 (r226128) @@ -31,6 +31,6 @@ There are two forms of name in GSS-API, There is also special form of the Internal Name (IN), and that is the Mechanism Name (MN). In the mechanism name all the generic information is stripped of and only contain the information for one mechanism. In GSS-API some function return MN and some require MN as input. Each of these function is marked up as such.

    Describe relationship between import_name, canonicalize_name, export_name and friends.

    -Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:16 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/modules.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/modules.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/modules.html Sat Oct 8 04:08:44 2011 (r226128) @@ -24,6 +24,6 @@
    -Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:16 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/pages.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/pages.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/html/pages.html Sat Oct 8 04:08:44 2011 (r226128) @@ -29,6 +29,6 @@
    -Generated on Sat Jul 30 13:45:39 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:16 2011 for HeimdalGSS-APIlibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "Heimdal GSS-API functions" 3 "30 Jul 2011" "Version 1.5" "HeimdalGSS-APIlibrary" \" -*- nroff -*- +.TH "Heimdal GSS-API functions" 3 "30 Sep 2011" "Version 1.5.1" "HeimdalGSS-APIlibrary" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_mechs_intro.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_mechs_intro.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_mechs_intro.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "gssapi_mechs_intro" 3 "30 Jul 2011" "Version 1.5" "HeimdalGSS-APIlibrary" \" -*- nroff -*- +.TH "gssapi_mechs_intro" 3 "30 Sep 2011" "Version 1.5.1" "HeimdalGSS-APIlibrary" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_services_intro.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_services_intro.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/gssapi_services_intro.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "gssapi_services_intro" 3 "30 Jul 2011" "Version 1.5" "HeimdalGSS-APIlibrary" \" -*- nroff -*- +.TH "gssapi_services_intro" 3 "30 Sep 2011" "Version 1.5.1" "HeimdalGSS-APIlibrary" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/internalvsmechname.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/internalvsmechname.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/gssapi/man/man3/internalvsmechname.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "internalvsmechname" 3 "30 Jul 2011" "Version 1.5" "HeimdalGSS-APIlibrary" \" -*- nroff -*- +.TH "internalvsmechname" 3 "30 Sep 2011" "Version 1.5.1" "HeimdalGSS-APIlibrary" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/example__evp__cipher_8c-example.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/example__evp__cipher_8c-example.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/example__evp__cipher_8c-example.html Sat Oct 8 04:08:44 2011 (r226128) @@ -168,6 +168,6 @@ main(int
    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/examples.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/examples.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/examples.html Sat Oct 8 04:08:44 2011 (r226128) @@ -24,6 +24,6 @@
    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:06 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/graph_legend.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/graph_legend.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/graph_legend.html Sat Oct 8 04:08:44 2011 (r226128) @@ -83,6 +83,6 @@ A yellow dashed arrow denotes a relation
    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:06 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__core.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__core.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__core.html Sat Oct 8 04:08:44 2011 (r226128) @@ -185,6 +185,6 @@ Add all algorithms to the crypto core, b

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:05 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__des.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__des.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__des.html Sat Oct 8 04:08:44 2011 (r226128) @@ -905,6 +905,6 @@ Convert a string to a DES key. Use somet

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:05 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__dh.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__dh.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__dh.html Sat Oct 8 04:08:44 2011 (r226128) @@ -576,6 +576,6 @@ Add a reference to the DH object. The ob

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__evp.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__evp.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__evp.html Sat Oct 8 04:08:44 2011 (r226128) @@ -2361,6 +2361,6 @@ The tripple DES cipher type (Micrsoft cr

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:05 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__misc.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__misc.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__misc.html Sat Oct 8 04:08:44 2011 (r226128) @@ -101,6 +101,6 @@ As descriped in PKCS5, convert a passwor

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:05 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rand.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rand.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rand.html Sat Oct 8 04:08:44 2011 (r226128) @@ -420,6 +420,6 @@ Write of random numbers to a file to sto

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:05 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rsa.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rsa.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/group__hcrypto__rsa.html Sat Oct 8 04:08:44 2011 (r226128) @@ -273,6 +273,6 @@ Add an extra reference to the RSA object

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/index.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/index.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/index.html Sat Oct 8 04:08:44 2011 (r226128) @@ -21,7 +21,7 @@

    Heimdal crypto library

    -

    1.5

    +

    1.5.1

    Introduction

    Heimdal libhcrypto library is a implementation many crypto algorithms, among others: AES, SHA, DES, RSA, Camellia and many help function.

    hcrypto provies a OpenSSL compatible interface libcrypto interface and is licensed under a 3 clause BSD license (GPL compatible).

    @@ -42,6 +42,6 @@ History

    Eric Young implemented DES in the library libdes, that grew into libcrypto in the ssleay package. ssleay went into recession and then got picked up by the OpenSSL (htp://www.openssl.org/) project.

    libhcrypto is an independent implementation with no code decended from ssleay/openssl. Both includes some common imported code, for example the AES implementation.

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/modules.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/modules.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/modules.html Sat Oct 8 04:08:44 2011 (r226128) @@ -30,6 +30,6 @@
    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:05 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_des.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_des.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_des.html Sat Oct 8 04:08:44 2011 (r226128) @@ -40,6 +40,6 @@ There was no complete BSD licensed, fast The document that got me started for real was "Efficient Implementation of the Data Encryption Standard" by Dag Arne Osvik. I never got to the PC1 transformation was working, instead I used table-lookup was used for all key schedule setup. The document was very useful since it de-mystified other implementations for me.

    The core DES function (SBOX + P transformation) is from Richard Outerbridge public domain DES implementation. My sanity is saved thanks to his work. Thank you Richard.

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_dh.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_dh.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_dh.html Sat Oct 8 04:08:44 2011 (r226128) @@ -25,6 +25,6 @@ Include and example how to use DH_new() and friends here.

    See the library functions here: Diffie-Hellman functions

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_evp.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_evp.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_evp.html Sat Oct 8 04:08:44 2011 (r226128) @@ -25,6 +25,6 @@ EVP Cipher The use of EVP_CipherInit_ex() and EVP_Cipher() is pretty easy to understand forward, then EVP_CipherUpdate() and EVP_CipherFinal_ex() really needs an example to explain example_evp_cipher::c .
    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rand.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rand.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rand.html Sat Oct 8 04:08:44 2011 (r226128) @@ -23,6 +23,6 @@

    RAND - random number

    See the library functions here: RAND crypto functions
    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rsa.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rsa.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/html/page_rsa.html Sat Oct 8 04:08:44 2011 (r226128) @@ -26,6 +26,6 @@ Speed for RSA in seconds no key blinding name 1024 2048 4098 ================================= gmp: 0.73 6.60 44.80 tfm: 2.45 -- -- ltm: 3.79 20.74 105.41 (default in hcrypto) openssl: 4.04 11.90 82.59 cdsa: 15.89 102.89 721.40 imath: 40.62 -- --

    See the library functions here: RSA functions

    -Generated on Sat Jul 30 13:45:37 2011 for Heimdal crypto library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:03 2011 for Heimdal crypto library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_core.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_core.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_core.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "hcrypto function controlling behavior" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "hcrypto function controlling behavior" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_des.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_des.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_des.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "DES crypto functions" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "DES crypto functions" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_dh.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_dh.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_dh.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "Diffie-Hellman functions" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "Diffie-Hellman functions" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_evp.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_evp.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_evp.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "EVP generic crypto functions" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "EVP generic crypto functions" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_misc.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_misc.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_misc.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "hcrypto miscellaneous functions" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "hcrypto miscellaneous functions" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rand.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rand.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rand.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "RAND crypto functions" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "RAND crypto functions" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rsa.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rsa.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/hcrypto_rsa.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "RSA functions" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "RSA functions" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_des.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_des.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_des.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "page_des" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "page_des" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_dh.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_dh.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_dh.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "page_dh" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "page_dh" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_evp.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_evp.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_evp.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "page_evp" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "page_evp" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rand.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rand.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rand.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "page_rand" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "page_rand" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rsa.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rsa.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hcrypto/man/man3/page_rsa.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "page_rsa" 3 "30 Jul 2011" "Version 1.5" "Heimdal crypto library" \" -*- nroff -*- +.TH "page_rsa" 3 "30 Sep 2011" "Version 1.5.1" "Heimdal crypto library" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/annotated.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/annotated.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/annotated.html Sat Oct 8 04:08:44 2011 (r226128) @@ -30,6 +30,6 @@
    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalhdblibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:07 2011 for Heimdalhdblibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions.html Sat Oct 8 04:08:44 2011 (r226128) @@ -80,6 +80,6 @@ Here is a list of all documented struct
    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalhdblibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:07 2011 for Heimdalhdblibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions_vars.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions_vars.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/functions_vars.html Sat Oct 8 04:08:44 2011 (r226128) @@ -80,6 +80,6 @@
    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalhdblibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:07 2011 for Heimdalhdblibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/graph_legend.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/graph_legend.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/graph_legend.html Sat Oct 8 04:08:44 2011 (r226128) @@ -82,6 +82,6 @@ A yellow dashed arrow denotes a relation
    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalhdblibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:07 2011 for Heimdalhdblibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/index.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/index.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/index.html Sat Oct 8 04:08:44 2011 (r226128) @@ -20,7 +20,7 @@

    Heimdal database backend library

    -

    1.5

    +

    1.5.1

    Introduction

    Heimdal libhdb library provides the backend support for Heimdal kdc and kadmind. Its here where plugins for diffrent database engines can be pluged in and extend support for here Heimdal get the principal and policy data from.

    Example of Heimdal backend are:

    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalhdblibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:07 2011 for Heimdalhdblibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/struct_h_d_b.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/struct_h_d_b.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/struct_h_d_b.html Sat Oct 8 04:08:44 2011 (r226128) @@ -422,9 +422,9 @@ Check if s4u2self is allowed from this c

    The documentation for this struct was generated from the following file:
      -
    • /Users/lha/src/heimdal/heimdal-release/heimdal-1.5/lib/hdb/hdb.h
    +
  • /Users/lha/src/heimdal/heimdal-release/heimdal-1.5.1/lib/hdb/hdb.h
    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalhdblibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:07 2011 for Heimdalhdblibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/structhdb__entry__ex.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/structhdb__entry__ex.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/html/structhdb__entry__ex.html Sat Oct 8 04:08:44 2011 (r226128) @@ -31,9 +31,9 @@

    Detailed Description

    hdb_entry_ex is a wrapper structure around the hdb_entry structure that allows backends to keep a pointer to the backing store, ie in ->hdb_fetch_kvno(), so that we the kadmin/kpasswd backend gets around to ->hdb_store(), the backend doesn't need to lookup the entry again.
    The documentation for this struct was generated from the following file:
      -
    • /Users/lha/src/heimdal/heimdal-release/heimdal-1.5/lib/hdb/hdb.h
    +
  • /Users/lha/src/heimdal/heimdal-release/heimdal-1.5.1/lib/hdb/hdb.h
    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalhdblibrary by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:07 2011 for Heimdalhdblibrary by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/HDB.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/HDB.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/HDB.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "HDB" 3 "30 Jul 2011" "Version 1.5" "Heimdalhdblibrary" \" -*- nroff -*- +.TH "HDB" 3 "30 Sep 2011" "Version 1.5.1" "Heimdalhdblibrary" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_entry_ex.3 ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_entry_ex.3 Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hdb/man/man3/hdb_entry_ex.3 Sat Oct 8 04:08:44 2011 (r226128) @@ -1,4 +1,4 @@ -.TH "hdb_entry_ex" 3 "30 Jul 2011" "Version 1.5" "Heimdalhdblibrary" \" -*- nroff -*- +.TH "hdb_entry_ex" 3 "30 Sep 2011" "Version 1.5.1" "Heimdalhdblibrary" \" -*- nroff -*- .ad l .nh .SH NAME Modified: vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/graph_legend.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/graph_legend.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/graph_legend.html Sat Oct 8 04:08:44 2011 (r226128) @@ -83,6 +83,6 @@ A yellow dashed arrow denotes a relation
    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalx509library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:14 2011 for Heimdalx509library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509.html Sat Oct 8 04:08:44 2011 (r226128) @@ -84,6 +84,6 @@ Creates a hx509 context that most functi

    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalx509library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:09 2011 for Heimdalx509library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__ca.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__ca.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__ca.html Sat Oct 8 04:08:44 2011 (r226128) @@ -1174,6 +1174,6 @@ Make of template units, use to build fla

    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalx509library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:13 2011 for Heimdalx509library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cert.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cert.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cert.html Sat Oct 8 04:08:44 2011 (r226128) @@ -1420,6 +1420,6 @@ Verify that the certificate is allowed t

    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalx509library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:11 2011 for Heimdalx509library by doxygen 1.5.6 Modified: vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cms.html ============================================================================== --- vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cms.html Sat Oct 8 04:08:02 2011 (r226127) +++ vendor-crypto/heimdal/dist/doc/doxyout/hx509/html/group__hx509__cms.html Sat Oct 8 04:08:44 2011 (r226128) @@ -499,6 +499,6 @@ Wrap data and oid in a ContentInfo and e

    -Generated on Sat Jul 30 13:45:38 2011 for Heimdalx509library by doxygen 1.5.6
    +Generated on Fri Sep 30 15:26:11 2011 for Heimdalx509library by doxygen 1.5.6 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 04:09:23 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B63291065672; Sat, 8 Oct 2011 04:09:23 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8C5E38FC1E; Sat, 8 Oct 2011 04:09:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9849NZF041722; Sat, 8 Oct 2011 04:09:23 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9849NS9041721; Sat, 8 Oct 2011 04:09:23 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201110080409.p9849NS9041721@svn.freebsd.org> From: Stanislav Sedov Date: Sat, 8 Oct 2011 04:09:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226129 - vendor-crypto/heimdal/1.5.1 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 04:09:23 -0000 Author: stas Date: Sat Oct 8 04:09:23 2011 New Revision: 226129 URL: http://svn.freebsd.org/changeset/base/226129 Log: - Add tag for heimdal 1.5.1. Added: vendor-crypto/heimdal/1.5.1/ - copied from r226128, vendor-crypto/heimdal/dist/ From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 07:20:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5B3D106564A; Sat, 8 Oct 2011 07:20:12 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 957B28FC22; Sat, 8 Oct 2011 07:20:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p987KCUQ047963; Sat, 8 Oct 2011 07:20:12 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p987KCEE047961; Sat, 8 Oct 2011 07:20:12 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201110080720.p987KCEE047961@svn.freebsd.org> From: Ed Schouten Date: Sat, 8 Oct 2011 07:20:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226141 - head/usr.bin/calendar X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 07:20:12 -0000 Author: ed Date: Sat Oct 8 07:20:12 2011 New Revision: 226141 URL: http://svn.freebsd.org/changeset/base/226141 Log: Remove extraneous WARNS=7. WARNS above 6 has no use. Also, all of usr.bin is also built with WARNS=6 by default. Discussed with: edwin Modified: head/usr.bin/calendar/Makefile Modified: head/usr.bin/calendar/Makefile ============================================================================== --- head/usr.bin/calendar/Makefile Sat Oct 8 05:50:39 2011 (r226140) +++ head/usr.bin/calendar/Makefile Sat Oct 8 07:20:12 2011 (r226141) @@ -12,8 +12,6 @@ DE_LINKS= de_DE.ISO8859-15 FR_LINKS= fr_FR.ISO8859-15 TEXTMODE?= 444 -WARNS?= 7 - beforeinstall: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 07:33:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D3B31065675; Sat, 8 Oct 2011 07:33:19 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from mx0.hoeg.nl (mx0.hoeg.nl [IPv6:2a01:4f8:101:5343::aa]) by mx1.freebsd.org (Postfix) with ESMTP id 3A1AF8FC08; Sat, 8 Oct 2011 07:33:19 +0000 (UTC) Received: by mx0.hoeg.nl (Postfix, from userid 1000) id 6A56C2A28CC6; Sat, 8 Oct 2011 09:33:18 +0200 (CEST) Date: Sat, 8 Oct 2011 09:33:18 +0200 From: Ed Schouten To: Stanislav Sedov Message-ID: <20111008073318.GB91943@hoeg.nl> References: <201110072343.p97NhpFK032806@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="2CdKnS9fCwQYmJzs" Content-Disposition: inline In-Reply-To: <201110072343.p97NhpFK032806@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226122 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 07:33:19 -0000 --2CdKnS9fCwQYmJzs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, * Stanislav Sedov , 20111008 01:43: > - ${WRKSRC} might be missing when the autotools fixup is running. > Account for this. Maybe we should simplify this a bit? Index: bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- bsd.port.mk (revision 226141) +++ bsd.port.mk (working copy) @@ -18,14 +18,14 @@ .if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK) # Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. run-autotools-fixup: - test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \ + -find ${WRKSRC} -type f \( -name config.libpath -o \ -name config.rpath -o -name configure -o -name libtool.m4 \) \ -exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \ -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ - {} + || /usr/bin/true + {} + =20 .ORDER: run-autotools run-autotools-fixup do-configure do-configure: run-autotools-fixup --=20 Ed Schouten WWW: http://80386.nl/ --2CdKnS9fCwQYmJzs Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iQIcBAEBAgAGBQJOj/y+AAoJEG5e2P40kaK7y6kP/36kWN+6T1c1gY+Ggdo6d1gL QSxUhhX6GUV6MtVl8611lyJLGV2kj4x0OkDMQDtoCpeQwR66XlwYsm4RAiWH+o4e jmcYOlm/dLjLUzx4pSItG7fuzEkCVLD3MOENsskvyJdWsp+Rbm753IrQgVYI1Ad7 7h1BibVyEpB/c2HNMuKNR4D+C9VormFF03Ki9gYgaS1f6jIM/dhRl8SaQjhxEct5 smHFUfz8MkuxZ+XG7oCTNVKDwxYbDH7tsxgF2RE4bF0sfgKdKXxfWh0I9UndUEqN Nw5P1aE+VK0FNyAGVTfOPmQhhvYHuO/FQyA6xTQxVlzBAcsScK9+fTZyrQ+1aQ54 xUvGpOZjxmQHLgorq0lsN9k/+AsfbBsACDG/55KfIXSXvHTPACclDQ83M3Cgsbq5 PoTNx/IPe9W2wVoA6AQtf4C/+Z9EwI74wSAypxAsq5tLgMRx7Tf92PvdnWG5irvo 3y5M6D5opL4wZRPb2sIZKey7LlY+1tnNjD5IIEHPJVI2IivXFCnOUgIQltXatEpI PYpL2Ly9aFPbaKrw60fzy9tSIarGhR+r4389YXHWTQFO4oY5USfy8c9WPbxcshxY lM5Du/p0IsrZY5leacamRDg0YPjhHOtq4heMDE1S9HzU9SFYtVZNLfaxUU5LY4z2 KlK9I//ZECQxq/lZAnuF =i8H7 -----END PGP SIGNATURE----- --2CdKnS9fCwQYmJzs-- From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 09:02:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41963106564A; Sat, 8 Oct 2011 09:02:08 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id F174F8FC12; Sat, 8 Oct 2011 09:02:07 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id E358E1FFC33; Sat, 8 Oct 2011 09:02:06 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id CCEBC846AA; Sat, 8 Oct 2011 11:02:06 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ed Schouten References: <201110080720.p987KCEE047961@svn.freebsd.org> Date: Sat, 08 Oct 2011 11:02:06 +0200 In-Reply-To: <201110080720.p987KCEE047961@svn.freebsd.org> (Ed Schouten's message of "Sat, 8 Oct 2011 07:20:12 +0000 (UTC)") Message-ID: <86wrcfvott.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226141 - head/usr.bin/calendar X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 09:02:08 -0000 Ed Schouten writes: > Log: > Remove extraneous WARNS=3D7. >=20=20=20 > WARNS above 6 has no use. Also, all of usr.bin is also built with > WARNS=3D6 by default. This one goes to seven. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 09:14:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E5B106564A; Sat, 8 Oct 2011 09:14:19 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 01A918FC0C; Sat, 8 Oct 2011 09:14:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p989EI6g051520; Sat, 8 Oct 2011 09:14:18 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p989EIIn051518; Sat, 8 Oct 2011 09:14:18 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201110080914.p989EIIn051518@svn.freebsd.org> From: Christian Brueffer Date: Sat, 8 Oct 2011 09:14:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226143 - head/sys/security/mac_mls X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 09:14:19 -0000 Author: brueffer Date: Sat Oct 8 09:14:18 2011 New Revision: 226143 URL: http://svn.freebsd.org/changeset/base/226143 Log: Remove two dublicated assignments. CID: 9870 Found with: Coverity Prevent(tm) Confirmed by: rwatson MFC after: 1 week Modified: head/sys/security/mac_mls/mac_mls.c Modified: head/sys/security/mac_mls/mac_mls.c ============================================================================== --- head/sys/security/mac_mls/mac_mls.c Sat Oct 8 09:06:43 2011 (r226142) +++ head/sys/security/mac_mls/mac_mls.c Sat Oct 8 09:14:18 2011 (r226143) @@ -1636,9 +1636,6 @@ mls_posixshm_check_open(struct ucred *cr subj = SLOT(cred->cr_label); obj = SLOT(shmlabel); - subj = SLOT(cred->cr_label); - obj = SLOT(shmlabel); - if (accmode & (VREAD | VEXEC | VSTAT_PERMS)) { if (!mls_dominate_effective(subj, obj)) return (EACCES); From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 09:57:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E2B106564A; Sat, 8 Oct 2011 09:57:30 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 010B28FC16; Sat, 8 Oct 2011 09:57:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p989vTlQ052874; Sat, 8 Oct 2011 09:57:29 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p989vToT052870; Sat, 8 Oct 2011 09:57:29 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110080957.p989vToT052870@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 09:57:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226145 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 09:57:30 -0000 Author: des Date: Sat Oct 8 09:57:29 2011 New Revision: 226145 URL: http://svn.freebsd.org/changeset/base/226145 Log: 1) Some of the #defines or enums for which we auto-generate naming functions may be wider than int, so use intmax_t throughout. Also add missing casts in printf() calls. 2) Clean up some of the auto-generated code to improve readability. 3) Auto-generate kdump_subr.h. Note that this requires a semi-ugly hack in the Makefile to make sure it is generated before make(1) tries to build kdump.c, or preprocess it for 'make depend'. MFC after: 3 weeks Deleted: head/usr.bin/kdump/kdump_subr.h Modified: head/usr.bin/kdump/Makefile head/usr.bin/kdump/kdump.c head/usr.bin/kdump/mksubr Modified: head/usr.bin/kdump/Makefile ============================================================================== --- head/usr.bin/kdump/Makefile Sat Oct 8 09:15:04 2011 (r226144) +++ head/usr.bin/kdump/Makefile Sat Oct 8 09:57:29 2011 (r226145) @@ -9,7 +9,7 @@ SFX= 32 PROG= kdump SRCS= kdump.c ioctl.c kdump_subr.c subr.c -CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. +CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I. .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= linux_syscalls.c @@ -22,8 +22,17 @@ CLEANFILES= ioctl.c kdump_subr.c linux_s ioctl.c: mkioctls sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} -kdump_subr.c: mksubr - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET} +kdump_subr.h: mksubr + sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ + sed -n 's/^\([a-z].*)\)$$/void \1;/p' >${.TARGET} + +kdump_subr.c: mksubr kdump_subr.h + sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET} + +# kdump.c includes kdump_subr.h, which is auto-generated. Add a +# manual dependency to make sure kdump_subr.h is generated before we +# try to either compile or preprocess kdump.c. +${.CURDIR}/kdump.c: kdump_subr.h linux_syscalls.c: /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 09:15:04 2011 (r226144) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 09:57:29 2011 (r226145) @@ -100,7 +100,6 @@ void ktrsockaddr(struct sockaddr *); void ktrstat(struct stat *); void ktrstruct(char *, size_t); void usage(void); -void sockfamilyname(int); const char *ioctlname(u_long); int timestamp, decimal, fancy = 1, suppressdata, tail, threads, maxdata, Modified: head/usr.bin/kdump/mksubr ============================================================================== --- head/usr.bin/kdump/mksubr Sat Oct 8 09:15:04 2011 (r226144) +++ head/usr.bin/kdump/mksubr Sat Oct 8 09:57:29 2011 (r226145) @@ -69,10 +69,10 @@ auto_or_type () { cat <<_EOF_ /* AUTO */ void -$name (int arg) +$name(intmax_t arg) { - int or = 0; - printf("%#x<", arg); + int or = 0; + printf("%#jx<", (uintmax_t)arg); _EOF_ egrep "^#[[:space:]]*define[[:space:]]+"${grep}"[[:space:]]*" \ $include_dir/$file | \ @@ -80,11 +80,11 @@ _EOF_ if ($i ~ /define/) \ break; \ ++i; \ - printf "\tif(!((arg>0)^((%s)>0)))\n\t\tif_print_or(arg, %s, or);\n", $i, $i }' + printf "\tif (!((arg > 0) ^ ((%s) > 0)))\n\t\tif_print_or(arg, %s, or);\n", $i, $i }' cat <<_EOF_ printf(">"); if (or == 0) - (void)printf("%ld", (long)arg); + (void)printf("%jd", arg); } _EOF_ @@ -103,7 +103,7 @@ auto_switch_type () { cat <<_EOF_ /* AUTO */ void -$name (int arg) +$name(intmax_t arg) { switch (arg) { _EOF_ @@ -116,7 +116,7 @@ _EOF_ printf "\tcase %s:\n\t\t(void)printf(\"%s\");\n\t\tbreak;\n", $i, $i }' cat <<_EOF_ default: /* Should not reach */ - (void)printf("", (long)arg); + (void)printf("", arg); } } @@ -136,7 +136,7 @@ auto_if_type () { cat <<_EOF_ /* AUTO */ void -$name (int arg) +$name(intmax_t arg) { _EOF_ egrep "^#[[:space:]]*define[[:space:]]+"${grep}"[[:space:]]*" \ @@ -147,7 +147,7 @@ _EOF_ printf "if (arg == %s) \n\t\tprintf(\"%s\");\n", $2, $2 }' cat <<_EOF_ else /* Should not reach */ - (void)printf("", (long)arg); + (void)printf("", arg); } _EOF_ @@ -156,6 +156,7 @@ _EOF_ # C start cat <<_EOF_ +#include #include #include #include @@ -207,7 +208,7 @@ cat <<_EOF_ /* MANUAL */ extern char *signames[]; /* from kdump.c */ void -signame (int sig) +signame(int sig) { if (sig > 0 && sig < NSIG) (void)printf("SIG%s",signames[sig]); @@ -217,7 +218,7 @@ signame (int sig) /* MANUAL */ void -semctlname (int cmd) +semctlname(int cmd) { switch (cmd) { case GETNCNT: @@ -257,7 +258,8 @@ semctlname (int cmd) /* MANUAL */ void -shmctlname (int cmd) { +shmctlname(int cmd) +{ switch (cmd) { case IPC_RMID: (void)printf("IPC_RMID"); @@ -275,8 +277,9 @@ shmctlname (int cmd) { /* MANUAL */ void -semgetname (int flag) { - int or = 0; +semgetname(int flag) +{ + int or = 0; if_print_or(flag, IPC_CREAT, or); if_print_or(flag, IPC_EXCL, or); if_print_or(flag, SEM_R, or); @@ -294,8 +297,9 @@ semgetname (int flag) { * mode argument is unused (and often bogus and misleading). */ void -flagsandmodename (int flags, int mode, int decimal) { - flagsname (flags); +flagsandmodename(int flags, int mode, int decimal) +{ + flagsname(flags); (void)putchar(','); if ((flags & O_CREAT) == O_CREAT) { modename (mode); @@ -316,7 +320,7 @@ flagsandmodename (int flags, int mode, i * to use getprotoent(3) here. */ void -sockoptlevelname (int level, int decimal) +sockoptlevelname(int level, int decimal) { if (level == SOL_SOCKET) { (void)printf("SOL_SOCKET"); @@ -377,7 +381,7 @@ cat <<_EOF_ * grouped in fcntl.h, and this awk script grabs the first group. */ void -fcntlcmdname (int cmd, int arg, int decimal) +fcntlcmdname(int cmd, int arg, int decimal) { switch (cmd) { _EOF_ @@ -426,7 +430,7 @@ cat <<_EOF_ * make this capable of being a auto_switch_type() function. */ void -rtprioname (int func) +rtprioname(int func) { switch (func) { _EOF_ @@ -451,9 +455,9 @@ cat <<_EOF_ * detect this as "invalid", which is incorrect here. */ void -sendrecvflagsname (int flags) +sendrecvflagsname(int flags) { - int or = 0; + int or = 0; if (flags == 0) { (void)printf("0"); From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 10:50:48 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7DAE106566C; Sat, 8 Oct 2011 10:50:48 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 97C348FC12; Sat, 8 Oct 2011 10:50:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98Aom5r059328; Sat, 8 Oct 2011 10:50:48 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98AomYU059326; Sat, 8 Oct 2011 10:50:48 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201110081050.p98AomYU059326@svn.freebsd.org> From: Christian Brueffer Date: Sat, 8 Oct 2011 10:50:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226146 - head/sys/dev/bwn X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 10:50:48 -0000 Author: brueffer Date: Sat Oct 8 10:50:48 2011 New Revision: 226146 URL: http://svn.freebsd.org/changeset/base/226146 Log: Remove dead code, "error" doesn't change between this check and the previous one. CID: 3254 Found with: Coverity Prevent(tm) MFC after: 1 week Modified: head/sys/dev/bwn/if_bwn.c Modified: head/sys/dev/bwn/if_bwn.c ============================================================================== --- head/sys/dev/bwn/if_bwn.c Sat Oct 8 09:57:29 2011 (r226145) +++ head/sys/dev/bwn/if_bwn.c Sat Oct 8 10:50:48 2011 (r226146) @@ -3213,8 +3213,6 @@ bwn_core_init(struct bwn_mac *mac) bwn_pio_init(mac); else bwn_dma_init(mac); - if (error) - goto fail1; bwn_wme_init(mac); bwn_spu_setdelay(mac, 1); bwn_bt_enable(mac); @@ -3230,8 +3228,6 @@ bwn_core_init(struct bwn_mac *mac) return (error); -fail1: - bwn_chip_exit(mac); fail0: siba_powerdown(sc->sc_dev); KASSERT(mac->mac_status == BWN_MAC_STATUS_UNINIT, From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 11:39:01 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C552106566B; Sat, 8 Oct 2011 11:39:01 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B4398FC12; Sat, 8 Oct 2011 11:39:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98Bd0SR060837; Sat, 8 Oct 2011 11:39:00 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98Bd03Z060835; Sat, 8 Oct 2011 11:39:00 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081139.p98Bd03Z060835@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 11:39:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226147 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 11:39:01 -0000 Author: des Date: Sat Oct 8 11:39:00 2011 New Revision: 226147 URL: http://svn.freebsd.org/changeset/base/226147 Log: Sort and line up. Modified: head/usr.bin/kdump/mksubr Modified: head/usr.bin/kdump/mksubr ============================================================================== --- head/usr.bin/kdump/mksubr Sat Oct 8 10:50:48 2011 (r226146) +++ head/usr.bin/kdump/mksubr Sat Oct 8 11:39:00 2011 (r226147) @@ -335,44 +335,43 @@ sockoptlevelname(int level, int decimal) _EOF_ -auto_or_type "modename" "S_[A-Z]+[[:space:]]+[0-6]{7}" "sys/stat.h" -auto_or_type "flagsname" "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/fcntl.h" -auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+" "sys/unistd.h" -auto_or_type "mmapprotname" "PROT_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h" -auto_or_type "mmapflagsname" "MAP_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h" -auto_or_type "wait4optname" "W[A-Z]+[[:space:]]+[0-9]+" "sys/wait.h" -auto_or_type "getfsstatflagsname" "MNT_[A-Z]+[[:space:]]+[1-9][0-9]*" "sys/mount.h" -auto_or_type "mountflagsname" "MNT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mount.h" -auto_or_type "rebootoptname" "RB_[A-Z]+[[:space:]]+0x[0-9]+" "sys/reboot.h" -auto_or_type "flockname" "LOCK_[A-Z]+[[:space:]]+0x[0-9]+" "sys/fcntl.h" -auto_or_type "thrcreateflagsname" "THR_[A-Z]+[[:space:]]+0x[0-9]+" "sys/thr.h" -auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" -auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "sys/shm.h" -auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/unistd.h" -auto_or_type "nfssvcname" "NFSSVC_[A-Z]+[[:space:]]+0x[0-9]+" "nfsserver/nfs.h" - -auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h" -auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h" -auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h" -auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" -auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h" -auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" -auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sched.h" -auto_switch_type "kldunloadfflagsname" "LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h" -auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h" -auto_switch_type "kldsymcmdname" "KLDSYM_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h" -auto_switch_type "sendfileflagsname" "SF_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h" -auto_switch_type "acltypename" "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+" "sys/acl.h" -auto_switch_type "sigprocmaskhowname" "SIG_[A-Z]+[[:space:]]+[0-9]+" "sys/signal.h" -auto_switch_type "lio_listioname" "LIO_(NO)?WAIT[[:space:]]+[0-9]+" "aio.h" -auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h" -auto_switch_type "quotactlname" "Q_[A-Z]+[[:space:]]+0x[0-9]+" "ufs/ufs/quota.h" -auto_if_type "sockdomainname" "PF_[[:alnum:]]+[[:space:]]+" "sys/socket.h" -auto_if_type "sockfamilyname" "AF_[[:alnum:]]+[[:space:]]+" "sys/socket.h" -auto_if_type "sockipprotoname" "IPPROTO_[[:alnum:]]+[[:space:]]+" "netinet/in.h" -auto_switch_type "sockoptname" "SO_[A-Z]+[[:space:]]+0x[0-9]+" "sys/socket.h" -auto_switch_type "socktypename" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*" "sys/socket.h" -auto_switch_type "ptraceopname" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/ptrace.h" +auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+" "sys/unistd.h" +auto_switch_type "acltypename" "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+" "sys/acl.h" +auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h" +auto_or_type "flagsname" "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/fcntl.h" +auto_or_type "flockname" "LOCK_[A-Z]+[[:space:]]+0x[0-9]+" "sys/fcntl.h" +auto_or_type "getfsstatflagsname" "MNT_[A-Z]+[[:space:]]+[1-9][0-9]*" "sys/mount.h" +auto_switch_type "kldsymcmdname" "KLDSYM_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h" +auto_switch_type "kldunloadfflagsname" "LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h" +auto_switch_type "lio_listioname" "LIO_(NO)?WAIT[[:space:]]+[0-9]+" "aio.h" +auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h" +auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h" +auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" +auto_or_type "mmapflagsname" "MAP_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h" +auto_or_type "mmapprotname" "PROT_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h" +auto_or_type "modename" "S_[A-Z]+[[:space:]]+[0-6]{7}" "sys/stat.h" +auto_or_type "mountflagsname" "MNT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mount.h" +auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" +auto_or_type "nfssvcname" "NFSSVC_[A-Z]+[[:space:]]+0x[0-9]+" "nfsserver/nfs.h" +auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" +auto_switch_type "ptraceopname" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/ptrace.h" +auto_switch_type "quotactlname" "Q_[A-Z]+[[:space:]]+0x[0-9]+" "ufs/ufs/quota.h" +auto_or_type "rebootoptname" "RB_[A-Z]+[[:space:]]+0x[0-9]+" "sys/reboot.h" +auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/unistd.h" +auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h" +auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sched.h" +auto_switch_type "sendfileflagsname" "SF_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h" +auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "sys/shm.h" +auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h" +auto_switch_type "sigprocmaskhowname" "SIG_[A-Z]+[[:space:]]+[0-9]+" "sys/signal.h" +auto_if_type "sockdomainname" "PF_[[:alnum:]]+[[:space:]]+" "sys/socket.h" +auto_if_type "sockfamilyname" "AF_[[:alnum:]]+[[:space:]]+" "sys/socket.h" +auto_if_type "sockipprotoname" "IPPROTO_[[:alnum:]]+[[:space:]]+" "netinet/in.h" +auto_switch_type "sockoptname" "SO_[A-Z]+[[:space:]]+0x[0-9]+" "sys/socket.h" +auto_switch_type "socktypename" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*" "sys/socket.h" +auto_or_type "thrcreateflagsname" "THR_[A-Z]+[[:space:]]+0x[0-9]+" "sys/thr.h" +auto_or_type "wait4optname" "W[A-Z]+[[:space:]]+[0-9]+" "sys/wait.h" +auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h" cat <<_EOF_ /* From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 11:51:48 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F5121065670; Sat, 8 Oct 2011 11:51:48 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8EDDB8FC0C; Sat, 8 Oct 2011 11:51:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98Bpmd4061268; Sat, 8 Oct 2011 11:51:48 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98BpmSE061266; Sat, 8 Oct 2011 11:51:48 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081151.p98BpmSE061266@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 11:51:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226148 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 11:51:48 -0000 Author: des Date: Sat Oct 8 11:51:48 2011 New Revision: 226148 URL: http://svn.freebsd.org/changeset/base/226148 Log: C has had swicth statements for 40 years or so. It's about time we started using them. Modified: head/usr.bin/kdump/kdump.c Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 11:39:00 2011 (r226147) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 11:51:48 2011 (r226148) @@ -499,7 +499,8 @@ ktrsyscall(struct ktr_syscall *ktr, u_in char c = '('; if (fancy && (flags == 0 || (flags & SV_ABI_MASK) == SV_ABI_FREEBSD)) { - if (ktr->ktr_code == SYS_ioctl) { + switch (ktr->ktr_code) { + case SYS_ioctl: { const char *cp; print_number(ip,narg,c); if ((cp = ioctlname(*ip)) != NULL) @@ -513,80 +514,88 @@ ktrsyscall(struct ktr_syscall *ktr, u_in c = ','; ip++; narg--; - } else if (ktr->ktr_code == SYS_ptrace) { + break; + } + case SYS_ptrace: (void)putchar('('); ptraceopname ((int)*ip); c = ','; ip++; narg--; - } else if (ktr->ktr_code == SYS_access || - ktr->ktr_code == SYS_eaccess) { + break; + case SYS_access: + case SYS_eaccess: print_number(ip,narg,c); (void)putchar(','); accessmodename ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_open) { - int flags; - int mode; + break; + case SYS_open: print_number(ip,narg,c); - flags = *ip; - mode = *++ip; (void)putchar(','); - flagsandmodename (flags, mode, decimal); - ip++; - narg-=2; - } else if (ktr->ktr_code == SYS_wait4) { + flagsandmodename(ip[0], ip[1], decimal); + ip += 2; + narg -= 2; + break; + case SYS_wait4: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); wait4optname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_chmod || - ktr->ktr_code == SYS_fchmod || - ktr->ktr_code == SYS_lchmod) { + break; + case SYS_chmod: + case SYS_fchmod: + case SYS_lchmod: print_number(ip,narg,c); (void)putchar(','); modename ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mknod) { + break; + case SYS_mknod: print_number(ip,narg,c); (void)putchar(','); modename ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_getfsstat) { + break; + case SYS_getfsstat: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); getfsstatflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mount) { + break; + case SYS_mount: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); mountflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_unmount) { + break; + case SYS_unmount: print_number(ip,narg,c); (void)putchar(','); mountflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_recvmsg || - ktr->ktr_code == SYS_sendmsg) { + break; + case SYS_recvmsg: + case SYS_sendmsg: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); sendrecvflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_recvfrom || - ktr->ktr_code == SYS_sendto) { + break; + case SYS_recvfrom: + case SYS_sendto: print_number(ip,narg,c); print_number(ip,narg,c); print_number(ip,narg,c); @@ -594,39 +603,45 @@ ktrsyscall(struct ktr_syscall *ktr, u_in sendrecvflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_chflags || - ktr->ktr_code == SYS_fchflags || - ktr->ktr_code == SYS_lchflags) { + break; + case SYS_chflags: + case SYS_fchflags: + case SYS_lchflags: print_number(ip,narg,c); (void)putchar(','); modename((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_kill) { + break; + case SYS_kill: print_number(ip,narg,c); (void)putchar(','); signame((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_reboot) { + break; + case SYS_reboot: (void)putchar('('); rebootoptname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_umask) { + break; + case SYS_umask: (void)putchar('('); modename((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_msync) { + break; + case SYS_msync: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); msyncflagsname((int)*ip); ip++; narg--; + break; #ifdef SYS_freebsd6_mmap - } else if (ktr->ktr_code == SYS_freebsd6_mmap) { + case SYS_freebsd6_mmap: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); @@ -637,8 +652,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in mmapflagsname ((int)*ip); ip++; narg--; + break; #endif - } else if (ktr->ktr_code == SYS_mmap) { + case SYS_mmap: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); @@ -649,38 +665,39 @@ ktrsyscall(struct ktr_syscall *ktr, u_in mmapflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mprotect) { + break; + case SYS_mprotect: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); mmapprotname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_madvise) { + break; + case SYS_madvise: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); madvisebehavname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_setpriority) { + break; + case SYS_setpriority: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); prioname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_fcntl) { - int cmd; - int arg; + break; + case SYS_fcntl: print_number(ip,narg,c); - cmd = *ip; - arg = *++ip; (void)putchar(','); - fcntlcmdname(cmd, arg, decimal); - ip++; - narg-=2; - } else if (ktr->ktr_code == SYS_socket) { + fcntlcmdname(ip[0], ip[1], decimal); + ip += 2; + narg -= 2; + break; + case SYS_socket: { int sockdomain; (void)putchar('('); sockdomain=(int)*ip; @@ -699,8 +716,10 @@ ktrsyscall(struct ktr_syscall *ktr, u_in narg--; } c = ','; - } else if (ktr->ktr_code == SYS_setsockopt || - ktr->ktr_code == SYS_getsockopt) { + break; + } + case SYS_setsockopt: + case SYS_getsockopt: print_number(ip,narg,c); (void)putchar(','); sockoptlevelname((int)*ip, decimal); @@ -712,8 +731,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in } ip++; narg--; + break; #ifdef SYS_freebsd6_lseek - } else if (ktr->ktr_code == SYS_freebsd6_lseek) { + case SYS_freebsd6_lseek: print_number(ip,narg,c); /* Hidden 'pad' argument, not in lseek(2) */ print_number(ip,narg,c); @@ -722,8 +742,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in whencename ((int)*ip); ip++; narg--; + break; #endif - } else if (ktr->ktr_code == SYS_lseek) { + case SYS_lseek: print_number(ip,narg,c); /* Hidden 'pad' argument, not in lseek(2) */ print_number(ip,narg,c); @@ -731,27 +752,30 @@ ktrsyscall(struct ktr_syscall *ktr, u_in whencename ((int)*ip); ip++; narg--; - - } else if (ktr->ktr_code == SYS_flock) { + break; + case SYS_flock: print_number(ip,narg,c); (void)putchar(','); flockname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mkfifo || - ktr->ktr_code == SYS_mkdir) { + break; + case SYS_mkfifo: + case SYS_mkdir: print_number(ip,narg,c); (void)putchar(','); modename((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_shutdown) { + break; + case SYS_shutdown: print_number(ip,narg,c); (void)putchar(','); shutdownhowname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_socketpair) { + break; + case SYS_socketpair: (void)putchar('('); sockdomainname((int)*ip); ip++; @@ -761,102 +785,118 @@ ktrsyscall(struct ktr_syscall *ktr, u_in ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_getrlimit || - ktr->ktr_code == SYS_setrlimit) { + break; + case SYS_getrlimit: + case SYS_setrlimit: (void)putchar('('); rlimitname((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_quotactl) { + break; + case SYS_quotactl: print_number(ip,narg,c); (void)putchar(','); quotactlname((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_nfssvc) { + break; + case SYS_nfssvc: (void)putchar('('); nfssvcname((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_rtprio) { + break; + case SYS_rtprio: (void)putchar('('); rtprioname((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS___semctl) { + break; + case SYS___semctl: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); semctlname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_semget) { + break; + case SYS_semget: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); semgetname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_msgctl) { + break; + case SYS_msgctl: print_number(ip,narg,c); (void)putchar(','); shmctlname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_shmat) { + break; + case SYS_shmat: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); shmatname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_shmctl) { + break; + case SYS_shmctl: print_number(ip,narg,c); (void)putchar(','); shmctlname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_minherit) { + break; + case SYS_minherit: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); minheritname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_rfork) { + break; + case SYS_rfork: (void)putchar('('); rforkname((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_lio_listio) { + break; + case SYS_lio_listio: (void)putchar('('); lio_listioname((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_mlockall) { + break; + case SYS_mlockall: (void)putchar('('); mlockallname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sched_setscheduler) { + break; + case SYS_sched_setscheduler: print_number(ip,narg,c); (void)putchar(','); schedpolicyname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sched_get_priority_max || - ktr->ktr_code == SYS_sched_get_priority_min) { + break; + case SYS_sched_get_priority_max: + case SYS_sched_get_priority_min: (void)putchar('('); schedpolicyname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sendfile) { + break; + case SYS_sendfile: print_number(ip,narg,c); print_number(ip,narg,c); print_number(ip,narg,c); @@ -867,73 +907,83 @@ ktrsyscall(struct ktr_syscall *ktr, u_in sendfileflagsname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_kldsym) { + break; + case SYS_kldsym: print_number(ip,narg,c); (void)putchar(','); kldsymcmdname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sigprocmask) { + break; + case SYS_sigprocmask: (void)putchar('('); sigprocmaskhowname((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS___acl_get_file || - ktr->ktr_code == SYS___acl_set_file || - ktr->ktr_code == SYS___acl_get_fd || - ktr->ktr_code == SYS___acl_set_fd || - ktr->ktr_code == SYS___acl_delete_file || - ktr->ktr_code == SYS___acl_delete_fd || - ktr->ktr_code == SYS___acl_aclcheck_file || - ktr->ktr_code == SYS___acl_aclcheck_fd || - ktr->ktr_code == SYS___acl_get_link || - ktr->ktr_code == SYS___acl_set_link || - ktr->ktr_code == SYS___acl_delete_link || - ktr->ktr_code == SYS___acl_aclcheck_link) { + break; + case SYS___acl_get_file: + case SYS___acl_set_file: + case SYS___acl_get_fd: + case SYS___acl_set_fd: + case SYS___acl_delete_file: + case SYS___acl_delete_fd: + case SYS___acl_aclcheck_file: + case SYS___acl_aclcheck_fd: + case SYS___acl_get_link: + case SYS___acl_set_link: + case SYS___acl_delete_link: + case SYS___acl_aclcheck_link: print_number(ip,narg,c); (void)putchar(','); acltypename((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sigaction) { + break; + case SYS_sigaction: (void)putchar('('); signame((int)*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_extattrctl) { + break; + case SYS_extattrctl: print_number(ip,narg,c); (void)putchar(','); extattrctlname((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_nmount) { + break; + case SYS_nmount: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); mountflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_thr_create) { + break; + case SYS_thr_create: print_number(ip,narg,c); print_number(ip,narg,c); (void)putchar(','); thrcreateflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_thr_kill) { + break; + case SYS_thr_kill: print_number(ip,narg,c); (void)putchar(','); signame ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_kldunloadf) { + break; + case SYS_kldunloadf: print_number(ip,narg,c); (void)putchar(','); kldunloadfflagsname ((int)*ip); ip++; narg--; + break; } } while (narg > 0) { From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:09:58 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CE98106564A; Sat, 8 Oct 2011 12:09:58 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2CC618FC0C; Sat, 8 Oct 2011 12:09:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98C9w6I061858; Sat, 8 Oct 2011 12:09:58 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98C9wu4061856; Sat, 8 Oct 2011 12:09:58 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201110081209.p98C9wu4061856@svn.freebsd.org> From: Christian Brueffer Date: Sat, 8 Oct 2011 12:09:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226149 - head/sys/dev/siba X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:09:58 -0000 Author: brueffer Date: Sat Oct 8 12:09:57 2011 New Revision: 226149 URL: http://svn.freebsd.org/changeset/base/226149 Log: Fix an infinite loop in siba_bwn_suspend(). CID: 3536 Found with: Coverity Prevent(tm) MFC after: 1 week Modified: head/sys/dev/siba/siba_bwn.c Modified: head/sys/dev/siba/siba_bwn.c ============================================================================== --- head/sys/dev/siba/siba_bwn.c Sat Oct 8 11:51:48 2011 (r226148) +++ head/sys/dev/siba/siba_bwn.c Sat Oct 8 12:09:57 2011 (r226149) @@ -206,7 +206,7 @@ siba_bwn_suspend(device_t dev) for (i = 0 ; i < devcnt ; i++) { error = DEVICE_SUSPEND(devlistp[i]); if (error) { - for (j = 0; j < i; i++) + for (j = 0; j < i; j++) DEVICE_RESUME(devlistp[j]); return (error); } From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:10:16 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5FDB1065700; Sat, 8 Oct 2011 12:10:16 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 953158FC17; Sat, 8 Oct 2011 12:10:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98CAGHS061909; Sat, 8 Oct 2011 12:10:16 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98CAGbf061907; Sat, 8 Oct 2011 12:10:16 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081210.p98CAGbf061907@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 12:10:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226150 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:10:16 -0000 Author: des Date: Sat Oct 8 12:10:16 2011 New Revision: 226150 URL: http://svn.freebsd.org/changeset/base/226150 Log: Whitespace. Modified: head/usr.bin/kdump/kdump.c Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 12:09:57 2011 (r226149) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 12:10:16 2011 (r226150) @@ -502,7 +502,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in switch (ktr->ktr_code) { case SYS_ioctl: { const char *cp; - print_number(ip,narg,c); + print_number(ip, narg, c); if ((cp = ioctlname(*ip)) != NULL) (void)printf(",%s", cp); else { @@ -518,103 +518,103 @@ ktrsyscall(struct ktr_syscall *ktr, u_in } case SYS_ptrace: (void)putchar('('); - ptraceopname ((int)*ip); + ptraceopname((int)*ip); c = ','; ip++; narg--; break; case SYS_access: case SYS_eaccess: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); - accessmodename ((int)*ip); + accessmodename((int)*ip); ip++; narg--; break; case SYS_open: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); flagsandmodename(ip[0], ip[1], decimal); ip += 2; narg -= 2; break; case SYS_wait4: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - wait4optname ((int)*ip); + wait4optname((int)*ip); ip++; narg--; break; case SYS_chmod: case SYS_fchmod: case SYS_lchmod: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); - modename ((int)*ip); + modename((int)*ip); ip++; narg--; break; case SYS_mknod: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); - modename ((int)*ip); + modename((int)*ip); ip++; narg--; break; case SYS_getfsstat: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - getfsstatflagsname ((int)*ip); + getfsstatflagsname((int)*ip); ip++; narg--; break; case SYS_mount: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - mountflagsname ((int)*ip); + mountflagsname((int)*ip); ip++; narg--; break; case SYS_unmount: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); - mountflagsname ((int)*ip); + mountflagsname((int)*ip); ip++; narg--; break; case SYS_recvmsg: case SYS_sendmsg: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - sendrecvflagsname ((int)*ip); + sendrecvflagsname((int)*ip); ip++; narg--; break; case SYS_recvfrom: case SYS_sendto: - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - sendrecvflagsname ((int)*ip); + sendrecvflagsname((int)*ip); ip++; narg--; break; case SYS_chflags: case SYS_fchflags: case SYS_lchflags: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); modename((int)*ip); ip++; narg--; break; case SYS_kill: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); signame((int)*ip); ip++; @@ -633,8 +633,8 @@ ktrsyscall(struct ktr_syscall *ktr, u_in narg--; break; case SYS_msync: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); msyncflagsname((int)*ip); ip++; @@ -642,56 +642,56 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; #ifdef SYS_freebsd6_mmap case SYS_freebsd6_mmap: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - mmapprotname ((int)*ip); + mmapprotname((int)*ip); (void)putchar(','); ip++; narg--; - mmapflagsname ((int)*ip); + mmapflagsname((int)*ip); ip++; narg--; break; #endif case SYS_mmap: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - mmapprotname ((int)*ip); + mmapprotname((int)*ip); (void)putchar(','); ip++; narg--; - mmapflagsname ((int)*ip); + mmapflagsname((int)*ip); ip++; narg--; break; case SYS_mprotect: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - mmapprotname ((int)*ip); + mmapprotname((int)*ip); ip++; narg--; break; case SYS_madvise: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); madvisebehavname((int)*ip); ip++; narg--; break; case SYS_setpriority: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); prioname((int)*ip); ip++; narg--; break; case SYS_fcntl: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); fcntlcmdname(ip[0], ip[1], decimal); ip += 2; @@ -720,7 +720,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in } case SYS_setsockopt: case SYS_getsockopt: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); sockoptlevelname((int)*ip, decimal); if ((int)*ip == SOL_SOCKET) { @@ -734,27 +734,27 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; #ifdef SYS_freebsd6_lseek case SYS_freebsd6_lseek: - print_number(ip,narg,c); + print_number(ip, narg, c); /* Hidden 'pad' argument, not in lseek(2) */ - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - whencename ((int)*ip); + whencename((int)*ip); ip++; narg--; break; #endif case SYS_lseek: - print_number(ip,narg,c); + print_number(ip, narg, c); /* Hidden 'pad' argument, not in lseek(2) */ - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); - whencename ((int)*ip); + whencename((int)*ip); ip++; narg--; break; case SYS_flock: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); flockname((int)*ip); ip++; @@ -762,14 +762,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; case SYS_mkfifo: case SYS_mkdir: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); modename((int)*ip); ip++; narg--; break; case SYS_shutdown: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); shutdownhowname((int)*ip); ip++; @@ -795,7 +795,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in c = ','; break; case SYS_quotactl: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); quotactlname((int)*ip); ip++; @@ -817,46 +817,46 @@ ktrsyscall(struct ktr_syscall *ktr, u_in c = ','; break; case SYS___semctl: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); semctlname((int)*ip); ip++; narg--; break; case SYS_semget: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); semgetname((int)*ip); ip++; narg--; break; case SYS_msgctl: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); shmctlname((int)*ip); ip++; narg--; break; case SYS_shmat: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); shmatname((int)*ip); ip++; narg--; break; case SYS_shmctl: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); shmctlname((int)*ip); ip++; narg--; break; case SYS_minherit: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); minheritname((int)*ip); ip++; @@ -883,7 +883,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in narg--; break; case SYS_sched_setscheduler: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); schedpolicyname((int)*ip); ip++; @@ -897,19 +897,19 @@ ktrsyscall(struct ktr_syscall *ktr, u_in narg--; break; case SYS_sendfile: - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); sendfileflagsname((int)*ip); ip++; narg--; break; case SYS_kldsym: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); kldsymcmdname((int)*ip); ip++; @@ -934,7 +934,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS___acl_set_link: case SYS___acl_delete_link: case SYS___acl_aclcheck_link: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); acltypename((int)*ip); ip++; @@ -948,46 +948,46 @@ ktrsyscall(struct ktr_syscall *ktr, u_in c = ','; break; case SYS_extattrctl: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); extattrctlname((int)*ip); ip++; narg--; break; case SYS_nmount: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - mountflagsname ((int)*ip); + mountflagsname((int)*ip); ip++; narg--; break; case SYS_thr_create: - print_number(ip,narg,c); - print_number(ip,narg,c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); - thrcreateflagsname ((int)*ip); + thrcreateflagsname((int)*ip); ip++; narg--; break; case SYS_thr_kill: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); - signame ((int)*ip); + signame((int)*ip); ip++; narg--; break; case SYS_kldunloadf: - print_number(ip,narg,c); + print_number(ip, narg, c); (void)putchar(','); - kldunloadfflagsname ((int)*ip); + kldunloadfflagsname((int)*ip); ip++; narg--; break; } } while (narg > 0) { - print_number(ip,narg,c); + print_number(ip, narg, c); } (void)putchar(')'); } From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:21:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8148106564A; Sat, 8 Oct 2011 12:21:51 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9746F8FC08; Sat, 8 Oct 2011 12:21:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98CLp2n062288; Sat, 8 Oct 2011 12:21:51 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98CLpWq062285; Sat, 8 Oct 2011 12:21:51 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081221.p98CLpWq062285@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 12:21:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226151 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:21:51 -0000 Author: des Date: Sat Oct 8 12:21:51 2011 New Revision: 226151 URL: http://svn.freebsd.org/changeset/base/226151 Log: Fix casting. Modified: head/usr.bin/kdump/kdump.c head/usr.bin/kdump/mksubr Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 12:10:16 2011 (r226150) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 12:21:51 2011 (r226151) @@ -110,15 +110,16 @@ struct ktr_header ktr_header; #define TIME_FORMAT "%b %e %T %Y" #define eqs(s1, s2) (strcmp((s1), (s2)) == 0) -#define print_number(i,n,c) do { \ - if (decimal) \ - printf("%c%ld", c, (long)*i); \ - else \ - printf("%c%#lx", c, (long)*i); \ - i++; \ - n--; \ - c = ','; \ - } while (0); +#define print_number(i,n,c) \ + do { \ + if (decimal) \ + printf("%c%jd", c, (intmax_t)*i); \ + else \ + printf("%c%#jx", c, (intmax_t)*i); \ + i++; \ + n--; \ + c = ','; \ + } while (0) #if defined(__amd64__) || defined(__i386__) @@ -507,9 +508,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in (void)printf(",%s", cp); else { if (decimal) - (void)printf(",%ld", (long)*ip); + (void)printf(",%jd", (intmax_t)*ip); else - (void)printf(",%#lx ", (long)*ip); + (void)printf(",%#jx ", (intmax_t)*ip); } c = ','; ip++; @@ -518,7 +519,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in } case SYS_ptrace: (void)putchar('('); - ptraceopname((int)*ip); + ptraceopname((intmax_t)*ip); c = ','; ip++; narg--; @@ -527,14 +528,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_eaccess: print_number(ip, narg, c); (void)putchar(','); - accessmodename((int)*ip); + accessmodename((intmax_t)*ip); ip++; narg--; break; case SYS_open: print_number(ip, narg, c); (void)putchar(','); - flagsandmodename(ip[0], ip[1], decimal); + flagsandmodename((int)ip[0], (int)ip[1], decimal); ip += 2; narg -= 2; break; @@ -542,7 +543,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - wait4optname((int)*ip); + wait4optname((intmax_t)*ip); ip++; narg--; break; @@ -551,14 +552,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_lchmod: print_number(ip, narg, c); (void)putchar(','); - modename((int)*ip); + modename((intmax_t)*ip); ip++; narg--; break; case SYS_mknod: print_number(ip, narg, c); (void)putchar(','); - modename((int)*ip); + modename((intmax_t)*ip); ip++; narg--; break; @@ -566,7 +567,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - getfsstatflagsname((int)*ip); + getfsstatflagsname((intmax_t)*ip); ip++; narg--; break; @@ -574,14 +575,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - mountflagsname((int)*ip); + mountflagsname((intmax_t)*ip); ip++; narg--; break; case SYS_unmount: print_number(ip, narg, c); (void)putchar(','); - mountflagsname((int)*ip); + mountflagsname((intmax_t)*ip); ip++; narg--; break; @@ -609,7 +610,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_lchflags: print_number(ip, narg, c); (void)putchar(','); - modename((int)*ip); + modename((intmax_t)*ip); ip++; narg--; break; @@ -622,13 +623,13 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; case SYS_reboot: (void)putchar('('); - rebootoptname((int)*ip); + rebootoptname((intmax_t)*ip); ip++; narg--; break; case SYS_umask: (void)putchar('('); - modename((int)*ip); + modename((intmax_t)*ip); ip++; narg--; break; @@ -636,7 +637,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - msyncflagsname((int)*ip); + msyncflagsname((intmax_t)*ip); ip++; narg--; break; @@ -645,11 +646,11 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - mmapprotname((int)*ip); + mmapprotname((intmax_t)*ip); (void)putchar(','); ip++; narg--; - mmapflagsname((int)*ip); + mmapflagsname((intmax_t)*ip); ip++; narg--; break; @@ -658,11 +659,11 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - mmapprotname((int)*ip); + mmapprotname((intmax_t)*ip); (void)putchar(','); ip++; narg--; - mmapflagsname((int)*ip); + mmapflagsname((intmax_t)*ip); ip++; narg--; break; @@ -670,7 +671,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - mmapprotname((int)*ip); + mmapprotname((intmax_t)*ip); ip++; narg--; break; @@ -678,7 +679,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - madvisebehavname((int)*ip); + madvisebehavname((intmax_t)*ip); ip++; narg--; break; @@ -686,32 +687,32 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - prioname((int)*ip); + prioname((intmax_t)*ip); ip++; narg--; break; case SYS_fcntl: print_number(ip, narg, c); (void)putchar(','); - fcntlcmdname(ip[0], ip[1], decimal); + fcntlcmdname((int)ip[0], (int)ip[1], decimal); ip += 2; narg -= 2; break; case SYS_socket: { int sockdomain; (void)putchar('('); - sockdomain=(int)*ip; + sockdomain=(intmax_t)*ip; sockdomainname(sockdomain); ip++; narg--; (void)putchar(','); - socktypename((int)*ip); + socktypename((intmax_t)*ip); ip++; narg--; if (sockdomain == PF_INET || sockdomain == PF_INET6) { (void)putchar(','); - sockipprotoname((int)*ip); + sockipprotoname((intmax_t)*ip); ip++; narg--; } @@ -723,11 +724,11 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); (void)putchar(','); sockoptlevelname((int)*ip, decimal); - if ((int)*ip == SOL_SOCKET) { + if (*ip == SOL_SOCKET) { ip++; narg--; (void)putchar(','); - sockoptname((int)*ip); + sockoptname((intmax_t)*ip); } ip++; narg--; @@ -739,7 +740,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - whencename((int)*ip); + whencename((intmax_t)*ip); ip++; narg--; break; @@ -749,14 +750,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in /* Hidden 'pad' argument, not in lseek(2) */ print_number(ip, narg, c); (void)putchar(','); - whencename((int)*ip); + whencename((intmax_t)*ip); ip++; narg--; break; case SYS_flock: print_number(ip, narg, c); (void)putchar(','); - flockname((int)*ip); + flockname((intmax_t)*ip); ip++; narg--; break; @@ -764,24 +765,24 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_mkdir: print_number(ip, narg, c); (void)putchar(','); - modename((int)*ip); + modename((intmax_t)*ip); ip++; narg--; break; case SYS_shutdown: print_number(ip, narg, c); (void)putchar(','); - shutdownhowname((int)*ip); + shutdownhowname((intmax_t)*ip); ip++; narg--; break; case SYS_socketpair: (void)putchar('('); - sockdomainname((int)*ip); + sockdomainname((intmax_t)*ip); ip++; narg--; (void)putchar(','); - socktypename((int)*ip); + socktypename((intmax_t)*ip); ip++; narg--; c = ','; @@ -789,7 +790,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_getrlimit: case SYS_setrlimit: (void)putchar('('); - rlimitname((int)*ip); + rlimitname((intmax_t)*ip); ip++; narg--; c = ','; @@ -797,14 +798,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_quotactl: print_number(ip, narg, c); (void)putchar(','); - quotactlname((int)*ip); + quotactlname((intmax_t)*ip); ip++; narg--; c = ','; break; case SYS_nfssvc: (void)putchar('('); - nfssvcname((int)*ip); + nfssvcname((intmax_t)*ip); ip++; narg--; c = ','; @@ -843,7 +844,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - shmatname((int)*ip); + shmatname((intmax_t)*ip); ip++; narg--; break; @@ -858,41 +859,41 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - minheritname((int)*ip); + minheritname((intmax_t)*ip); ip++; narg--; break; case SYS_rfork: (void)putchar('('); - rforkname((int)*ip); + rforkname((intmax_t)*ip); ip++; narg--; c = ','; break; case SYS_lio_listio: (void)putchar('('); - lio_listioname((int)*ip); + lio_listioname((intmax_t)*ip); ip++; narg--; c = ','; break; case SYS_mlockall: (void)putchar('('); - mlockallname((int)*ip); + mlockallname((intmax_t)*ip); ip++; narg--; break; case SYS_sched_setscheduler: print_number(ip, narg, c); (void)putchar(','); - schedpolicyname((int)*ip); + schedpolicyname((intmax_t)*ip); ip++; narg--; break; case SYS_sched_get_priority_max: case SYS_sched_get_priority_min: (void)putchar('('); - schedpolicyname((int)*ip); + schedpolicyname((intmax_t)*ip); ip++; narg--; break; @@ -904,20 +905,20 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - sendfileflagsname((int)*ip); + sendfileflagsname((intmax_t)*ip); ip++; narg--; break; case SYS_kldsym: print_number(ip, narg, c); (void)putchar(','); - kldsymcmdname((int)*ip); + kldsymcmdname((intmax_t)*ip); ip++; narg--; break; case SYS_sigprocmask: (void)putchar('('); - sigprocmaskhowname((int)*ip); + sigprocmaskhowname((intmax_t)*ip); ip++; narg--; c = ','; @@ -936,7 +937,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS___acl_aclcheck_link: print_number(ip, narg, c); (void)putchar(','); - acltypename((int)*ip); + acltypename((intmax_t)*ip); ip++; narg--; break; @@ -950,7 +951,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_extattrctl: print_number(ip, narg, c); (void)putchar(','); - extattrctlname((int)*ip); + extattrctlname((intmax_t)*ip); ip++; narg--; break; @@ -958,7 +959,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - mountflagsname((int)*ip); + mountflagsname((intmax_t)*ip); ip++; narg--; break; @@ -966,7 +967,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); (void)putchar(','); - thrcreateflagsname((int)*ip); + thrcreateflagsname((intmax_t)*ip); ip++; narg--; break; @@ -980,7 +981,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_kldunloadf: print_number(ip, narg, c); (void)putchar(','); - kldunloadfflagsname((int)*ip); + kldunloadfflagsname((intmax_t)*ip); ip++; narg--; break; Modified: head/usr.bin/kdump/mksubr ============================================================================== --- head/usr.bin/kdump/mksubr Sat Oct 8 12:10:16 2011 (r226150) +++ head/usr.bin/kdump/mksubr Sat Oct 8 12:21:51 2011 (r226151) @@ -252,7 +252,7 @@ semctlname(int cmd) (void)printf("IPC_STAT"); break; default: /* Should not reach */ - (void)printf("", (long)cmd); + (void)printf("", cmd); } } @@ -271,7 +271,7 @@ shmctlname(int cmd) (void)printf("IPC_STAT"); break; default: /* Should not reach */ - (void)printf("", (long)cmd); + (void)printf("", cmd); } } @@ -305,9 +305,9 @@ flagsandmodename(int flags, int mode, in modename (mode); } else { if (decimal) { - (void)printf("%ld", (long)mode); + (void)printf("%d", mode); } else { - (void)printf("%#lx", (long)mode); + (void)printf("%#x", (unsigned int)mode); } } } @@ -326,9 +326,9 @@ sockoptlevelname(int level, int decimal) (void)printf("SOL_SOCKET"); } else { if (decimal) { - (void)printf("%ld", (long)level); + (void)printf("%d", level); } else { - (void)printf("%#lx", (long)level); + (void)printf("%#x", (unsigned int)level); } } } @@ -397,7 +397,7 @@ egrep "^#[[:space:]]*define[[:space:]]+F o = $(i+1) }' cat <<_EOF_ default: /* Should not reach */ - (void)printf("", (long)cmd); + (void)printf("", cmd); } (void)putchar(','); if (cmd == F_GETFD || cmd == F_SETFD) { @@ -407,17 +407,17 @@ cat <<_EOF_ (void)printf("0"); else { if (decimal) - (void)printf("%ld", (long)arg); + (void)printf("%d", arg); else - (void)printf("%#lx", (long)arg); + (void)printf("%#x", (unsigned int)arg); } } else if (cmd == F_SETFL) { flagsname(arg); } else { if (decimal) - (void)printf("%ld", (long)arg); + (void)printf("%d", arg); else - (void)printf("%#lx", (long)arg); + (void)printf("%#x", (unsigned int)arg); } } @@ -442,7 +442,7 @@ egrep "^#[[:space:]]*define[[:space:]]+R printf "\tcase %s:\n\t\t(void)printf(\"%s\");\n\t\tbreak;\n", $i, $i }' cat <<_EOF_ default: /* Should not reach */ - (void)printf("", (long)func); + (void)printf("", func); } } From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:28:07 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33AB81065670; Sat, 8 Oct 2011 12:28:07 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2229F8FC12; Sat, 8 Oct 2011 12:28:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98CS7d8062545; Sat, 8 Oct 2011 12:28:07 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98CS70F062542; Sat, 8 Oct 2011 12:28:07 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081228.p98CS70F062542@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 12:28:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226153 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:28:07 -0000 Author: des Date: Sat Oct 8 12:28:06 2011 New Revision: 226153 URL: http://svn.freebsd.org/changeset/base/226153 Log: I appreciate the logic behind using a (void) cast to indicate that the return value is intentionally ignored, but frankly, all it does is get in the way of the code. Also fix a few other incorrect casts, such as (void *)malloc(foo) and passing signed values to %x. Modified: head/usr.bin/kdump/kdump.c head/usr.bin/kdump/mksubr Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 12:27:12 2011 (r226152) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 12:28:06 2011 (r226153) @@ -165,10 +165,10 @@ main(int argc, char *argv[]) pid_t pid = 0; u_int sv_flags; - (void) setlocale(LC_CTYPE, ""); + setlocale(LC_CTYPE, ""); while ((ch = getopt(argc,argv,"f:dElm:np:AHRrsTt:")) != -1) - switch((char)ch) { + switch (ch) { case 'A': abiflag = 1; break; @@ -220,7 +220,7 @@ main(int argc, char *argv[]) if (argc > optind) usage(); - m = (void *)malloc(size = 1025); + m = malloc(size = 1025); if (m == NULL) errx(1, "%s", strerror(ENOMEM)); if (!freopen(tracefile, "r", stdin)) @@ -231,7 +231,7 @@ main(int argc, char *argv[]) if (ktr_header.ktr_type & KTR_DROP) { ktr_header.ktr_type &= ~KTR_DROP; if (!drop_logged && threads) { - (void)printf( + printf( "%6jd %6jd %-8.*s Events dropped.\n", (intmax_t)ktr_header.ktr_pid, ktr_header.ktr_tid > 0 ? @@ -239,7 +239,7 @@ main(int argc, char *argv[]) MAXCOMLEN, ktr_header.ktr_comm); drop_logged = 1; } else if (!drop_logged) { - (void)printf("%6jd %-8.*s Events dropped.\n", + printf("%6jd %-8.*s Events dropped.\n", (intmax_t)ktr_header.ktr_pid, MAXCOMLEN, ktr_header.ktr_comm); drop_logged = 1; @@ -251,7 +251,7 @@ main(int argc, char *argv[]) if ((ktrlen = ktr_header.ktr_len) < 0) errx(1, "bogus length 0x%x", ktrlen); if (ktrlen > size) { - m = (void *)realloc(m, ktrlen+1); + m = realloc(m, ktrlen+1); if (m == NULL) errx(1, "%s", strerror(ENOMEM)); size = ktrlen; @@ -307,7 +307,7 @@ main(int argc, char *argv[]) break; } if (tail) - (void)fflush(stdout); + fflush(stdout); } return 0; } @@ -318,7 +318,7 @@ fread_tail(void *buf, int size, int num) int i; while ((i = fread(buf, size, num, stdin)) == 0 && tail) { - (void)sleep(1); + sleep(1); clearerr(stdin); } return (i); @@ -442,7 +442,7 @@ dumpheader(struct ktr_header *kth) case KTR_PROCDTOR: return; default: - (void)sprintf(unknown, "UNKNOWN(%d)", kth->ktr_type); + sprintf(unknown, "UNKNOWN(%d)", kth->ktr_type); type = unknown; } @@ -455,11 +455,11 @@ dumpheader(struct ktr_header *kth) * negative tid's as 0. */ if (threads) - (void)printf("%6jd %6jd %-8.*s ", (intmax_t)kth->ktr_pid, + printf("%6jd %6jd %-8.*s ", (intmax_t)kth->ktr_pid, kth->ktr_tid > 0 ? (intmax_t)kth->ktr_tid : 0, MAXCOMLEN, kth->ktr_comm); else - (void)printf("%6jd %-8.*s ", (intmax_t)kth->ktr_pid, MAXCOMLEN, + printf("%6jd %-8.*s ", (intmax_t)kth->ktr_pid, MAXCOMLEN, kth->ktr_comm); if (timestamp) { if (timestamp == 3) { @@ -472,10 +472,10 @@ dumpheader(struct ktr_header *kth) timevalsub(&kth->ktr_time, &prevtime); prevtime = temp; } - (void)printf("%jd.%06ld ", (intmax_t)kth->ktr_time.tv_sec, + printf("%jd.%06ld ", (intmax_t)kth->ktr_time.tv_sec, kth->ktr_time.tv_usec); } - (void)printf("%s ", type); + printf("%s ", type); } #include @@ -492,9 +492,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in if ((flags != 0 && ((flags & SV_ABI_MASK) != SV_ABI_FREEBSD)) || (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)) - (void)printf("[%d]", ktr->ktr_code); + printf("[%d]", ktr->ktr_code); else - (void)printf("%s", syscallnames[ktr->ktr_code]); + printf("%s", syscallnames[ktr->ktr_code]); ip = &ktr->ktr_args[0]; if (narg) { char c = '('; @@ -505,12 +505,12 @@ ktrsyscall(struct ktr_syscall *ktr, u_in const char *cp; print_number(ip, narg, c); if ((cp = ioctlname(*ip)) != NULL) - (void)printf(",%s", cp); + printf(",%s", cp); else { if (decimal) - (void)printf(",%jd", (intmax_t)*ip); + printf(",%jd", (intmax_t)*ip); else - (void)printf(",%#jx ", (intmax_t)*ip); + printf(",%#jx ", (intmax_t)*ip); } c = ','; ip++; @@ -518,7 +518,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; } case SYS_ptrace: - (void)putchar('('); + putchar('('); ptraceopname((intmax_t)*ip); c = ','; ip++; @@ -527,14 +527,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_access: case SYS_eaccess: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); accessmodename((intmax_t)*ip); ip++; narg--; break; case SYS_open: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); flagsandmodename((int)ip[0], (int)ip[1], decimal); ip += 2; narg -= 2; @@ -542,7 +542,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_wait4: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); wait4optname((intmax_t)*ip); ip++; narg--; @@ -551,14 +551,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_fchmod: case SYS_lchmod: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); modename((intmax_t)*ip); ip++; narg--; break; case SYS_mknod: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); modename((intmax_t)*ip); ip++; narg--; @@ -566,7 +566,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_getfsstat: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); getfsstatflagsname((intmax_t)*ip); ip++; narg--; @@ -574,14 +574,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_mount: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); mountflagsname((intmax_t)*ip); ip++; narg--; break; case SYS_unmount: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); mountflagsname((intmax_t)*ip); ip++; narg--; @@ -590,7 +590,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_sendmsg: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); sendrecvflagsname((int)*ip); ip++; narg--; @@ -600,7 +600,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); sendrecvflagsname((int)*ip); ip++; narg--; @@ -609,26 +609,26 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_fchflags: case SYS_lchflags: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); modename((intmax_t)*ip); ip++; narg--; break; case SYS_kill: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); signame((int)*ip); ip++; narg--; break; case SYS_reboot: - (void)putchar('('); + putchar('('); rebootoptname((intmax_t)*ip); ip++; narg--; break; case SYS_umask: - (void)putchar('('); + putchar('('); modename((intmax_t)*ip); ip++; narg--; @@ -636,7 +636,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_msync: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); msyncflagsname((intmax_t)*ip); ip++; narg--; @@ -645,9 +645,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_freebsd6_mmap: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); mmapprotname((intmax_t)*ip); - (void)putchar(','); + putchar(','); ip++; narg--; mmapflagsname((intmax_t)*ip); @@ -658,9 +658,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_mmap: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); mmapprotname((intmax_t)*ip); - (void)putchar(','); + putchar(','); ip++; narg--; mmapflagsname((intmax_t)*ip); @@ -670,7 +670,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_mprotect: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); mmapprotname((intmax_t)*ip); ip++; narg--; @@ -678,7 +678,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_madvise: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); madvisebehavname((intmax_t)*ip); ip++; narg--; @@ -686,32 +686,32 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_setpriority: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); prioname((intmax_t)*ip); ip++; narg--; break; case SYS_fcntl: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); fcntlcmdname((int)ip[0], (int)ip[1], decimal); ip += 2; narg -= 2; break; case SYS_socket: { int sockdomain; - (void)putchar('('); + putchar('('); sockdomain=(intmax_t)*ip; sockdomainname(sockdomain); ip++; narg--; - (void)putchar(','); + putchar(','); socktypename((intmax_t)*ip); ip++; narg--; if (sockdomain == PF_INET || sockdomain == PF_INET6) { - (void)putchar(','); + putchar(','); sockipprotoname((intmax_t)*ip); ip++; narg--; @@ -722,12 +722,12 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_setsockopt: case SYS_getsockopt: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); sockoptlevelname((int)*ip, decimal); if (*ip == SOL_SOCKET) { ip++; narg--; - (void)putchar(','); + putchar(','); sockoptname((intmax_t)*ip); } ip++; @@ -739,7 +739,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in /* Hidden 'pad' argument, not in lseek(2) */ print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); whencename((intmax_t)*ip); ip++; narg--; @@ -749,14 +749,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); /* Hidden 'pad' argument, not in lseek(2) */ print_number(ip, narg, c); - (void)putchar(','); + putchar(','); whencename((intmax_t)*ip); ip++; narg--; break; case SYS_flock: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); flockname((intmax_t)*ip); ip++; narg--; @@ -764,24 +764,24 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_mkfifo: case SYS_mkdir: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); modename((intmax_t)*ip); ip++; narg--; break; case SYS_shutdown: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); shutdownhowname((intmax_t)*ip); ip++; narg--; break; case SYS_socketpair: - (void)putchar('('); + putchar('('); sockdomainname((intmax_t)*ip); ip++; narg--; - (void)putchar(','); + putchar(','); socktypename((intmax_t)*ip); ip++; narg--; @@ -789,7 +789,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; case SYS_getrlimit: case SYS_setrlimit: - (void)putchar('('); + putchar('('); rlimitname((intmax_t)*ip); ip++; narg--; @@ -797,21 +797,21 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; case SYS_quotactl: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); quotactlname((intmax_t)*ip); ip++; narg--; c = ','; break; case SYS_nfssvc: - (void)putchar('('); + putchar('('); nfssvcname((intmax_t)*ip); ip++; narg--; c = ','; break; case SYS_rtprio: - (void)putchar('('); + putchar('('); rtprioname((int)*ip); ip++; narg--; @@ -820,7 +820,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS___semctl: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); semctlname((int)*ip); ip++; narg--; @@ -828,14 +828,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_semget: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); semgetname((int)*ip); ip++; narg--; break; case SYS_msgctl: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); shmctlname((int)*ip); ip++; narg--; @@ -843,14 +843,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_shmat: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); shmatname((intmax_t)*ip); ip++; narg--; break; case SYS_shmctl: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); shmctlname((int)*ip); ip++; narg--; @@ -858,41 +858,41 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_minherit: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); minheritname((intmax_t)*ip); ip++; narg--; break; case SYS_rfork: - (void)putchar('('); + putchar('('); rforkname((intmax_t)*ip); ip++; narg--; c = ','; break; case SYS_lio_listio: - (void)putchar('('); + putchar('('); lio_listioname((intmax_t)*ip); ip++; narg--; c = ','; break; case SYS_mlockall: - (void)putchar('('); + putchar('('); mlockallname((intmax_t)*ip); ip++; narg--; break; case SYS_sched_setscheduler: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); schedpolicyname((intmax_t)*ip); ip++; narg--; break; case SYS_sched_get_priority_max: case SYS_sched_get_priority_min: - (void)putchar('('); + putchar('('); schedpolicyname((intmax_t)*ip); ip++; narg--; @@ -904,20 +904,20 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); sendfileflagsname((intmax_t)*ip); ip++; narg--; break; case SYS_kldsym: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); kldsymcmdname((intmax_t)*ip); ip++; narg--; break; case SYS_sigprocmask: - (void)putchar('('); + putchar('('); sigprocmaskhowname((intmax_t)*ip); ip++; narg--; @@ -936,13 +936,13 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS___acl_delete_link: case SYS___acl_aclcheck_link: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); acltypename((intmax_t)*ip); ip++; narg--; break; case SYS_sigaction: - (void)putchar('('); + putchar('('); signame((int)*ip); ip++; narg--; @@ -950,7 +950,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in break; case SYS_extattrctl: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); extattrctlname((intmax_t)*ip); ip++; narg--; @@ -958,7 +958,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_nmount: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); mountflagsname((intmax_t)*ip); ip++; narg--; @@ -966,21 +966,21 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_thr_create: print_number(ip, narg, c); print_number(ip, narg, c); - (void)putchar(','); + putchar(','); thrcreateflagsname((intmax_t)*ip); ip++; narg--; break; case SYS_thr_kill: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); signame((int)*ip); ip++; narg--; break; case SYS_kldunloadf: print_number(ip, narg, c); - (void)putchar(','); + putchar(','); kldunloadfflagsname((intmax_t)*ip); ip++; narg--; @@ -990,9 +990,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_in while (narg > 0) { print_number(ip, narg, c); } - (void)putchar(')'); + putchar(')'); } - (void)putchar('\n'); + putchar('\n'); } void @@ -1004,37 +1004,37 @@ ktrsysret(struct ktr_sysret *ktr, u_int if ((flags != 0 && ((flags & SV_ABI_MASK) != SV_ABI_FREEBSD)) || (code >= nsyscalls || code < 0)) - (void)printf("[%d] ", code); + printf("[%d] ", code); else - (void)printf("%s ", syscallnames[code]); + printf("%s ", syscallnames[code]); if (error == 0) { if (fancy) { - (void)printf("%ld", (long)ret); + printf("%ld", (long)ret); if (ret < 0 || ret > 9) - (void)printf("/%#lx", (long)ret); + printf("/%#lx", (unsigned long)ret); } else { if (decimal) - (void)printf("%ld", (long)ret); + printf("%ld", (long)ret); else - (void)printf("%#lx", (long)ret); + printf("%#lx", (unsigned long)ret); } } else if (error == ERESTART) - (void)printf("RESTART"); + printf("RESTART"); else if (error == EJUSTRETURN) - (void)printf("JUSTRETURN"); + printf("JUSTRETURN"); else { - (void)printf("-1 errno %d", ktr->ktr_error); + printf("-1 errno %d", ktr->ktr_error); if (fancy) - (void)printf(" %s", strerror(ktr->ktr_error)); + printf(" %s", strerror(ktr->ktr_error)); } - (void)putchar('\n'); + putchar('\n'); } void ktrnamei(char *cp, int len) { - (void)printf("\"%.*s\"\n", len, cp); + printf("\"%.*s\"\n", len, cp); } void @@ -1091,23 +1091,23 @@ visdump(char *dp, int datalen, int scree int width; char visbuf[5]; - (void)printf(" \""); + printf(" \""); col = 8; for (;datalen > 0; datalen--, dp++) { - (void) vis(visbuf, *dp, VIS_CSTYLE, *(dp+1)); + vis(visbuf, *dp, VIS_CSTYLE, *(dp+1)); cp = visbuf; /* * Keep track of printables and * space chars (like fold(1)). */ if (col == 0) { - (void)putchar('\t'); + putchar('\t'); col = 8; } switch(*cp) { case '\n': col = 0; - (void)putchar('\n'); + putchar('\n'); continue; case '\t': width = 8 - (col&07); @@ -1116,17 +1116,17 @@ visdump(char *dp, int datalen, int scree width = strlen(cp); } if (col + width > (screenwidth-2)) { - (void)printf("\\\n\t"); + printf("\\\n\t"); col = 8; } col += width; do { - (void)putchar(*cp++); + putchar(*cp++); } while (*cp); } if (col == 0) - (void)printf(" "); - (void)printf("\"\n"); + printf(" "); + printf("\"\n"); } void @@ -1180,13 +1180,13 @@ void ktrpsig(struct ktr_psig *psig) { if (psig->signo > 0 && psig->signo < NSIG) - (void)printf("SIG%s ", signames[psig->signo]); + printf("SIG%s ", signames[psig->signo]); else - (void)printf("SIG %d ", psig->signo); + printf("SIG %d ", psig->signo); if (psig->action == SIG_DFL) - (void)printf("SIG_DFL code=0x%x\n", psig->code); + printf("SIG_DFL code=0x%x\n", psig->code); else { - (void)printf("caught handler=0x%lx mask=0x%x code=0x%x\n", + printf("caught handler=0x%lx mask=0x%x code=0x%x\n", (u_long)psig->action, psig->mask.__bits[0], psig->code); } } @@ -1194,7 +1194,7 @@ ktrpsig(struct ktr_psig *psig) void ktrcsw(struct ktr_csw *cs) { - (void)printf("%s %s\n", cs->out ? "stop" : "resume", + printf("%s %s\n", cs->out ? "stop" : "resume", cs->user ? "user" : "kernel"); } @@ -1334,13 +1334,13 @@ ktruser(int len, unsigned char *p) return; } - (void)printf("%d ", len); + printf("%d ", len); while (len--) if (decimal) - (void)printf(" %d", *p++); + printf(" %d", *p++); else - (void)printf(" %02x", *p++); - (void)printf("\n"); + printf(" %02x", *p++); + printf("\n"); } void @@ -1459,7 +1459,7 @@ ktrstat(struct stat *statp) printf("%jd", (intmax_t)statp->st_atim.tv_sec); else { tm = localtime(&statp->st_atim.tv_sec); - (void)strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); + strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); printf("\"%s\"", timestr); } if (statp->st_atim.tv_nsec != 0) @@ -1471,7 +1471,7 @@ ktrstat(struct stat *statp) printf("%jd", (intmax_t)statp->st_mtim.tv_sec); else { tm = localtime(&statp->st_mtim.tv_sec); - (void)strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); + strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); printf("\"%s\"", timestr); } if (statp->st_mtim.tv_nsec != 0) @@ -1483,7 +1483,7 @@ ktrstat(struct stat *statp) printf("%jd", (intmax_t)statp->st_ctim.tv_sec); else { tm = localtime(&statp->st_ctim.tv_sec); - (void)strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); + strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); printf("\"%s\"", timestr); } if (statp->st_ctim.tv_nsec != 0) @@ -1495,7 +1495,7 @@ ktrstat(struct stat *statp) printf("%jd", (intmax_t)statp->st_birthtim.tv_sec); else { tm = localtime(&statp->st_birthtim.tv_sec); - (void)strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); + strftime(timestr, sizeof(timestr), TIME_FORMAT, tm); printf("\"%s\"", timestr); } if (statp->st_birthtim.tv_nsec != 0) @@ -1591,12 +1591,12 @@ linux_ktrsysret(struct ktr_sysret *ktr) if (fancy) { printf("%ld", (long)ret); if (ret < 0 || ret > 9) - printf("/%#lx", (long)ret); + printf("/%#lx", (unsigned long)ret); } else { if (decimal) printf("%ld", (long)ret); else - printf("%#lx", (long)ret); + printf("%#lx", (unsigned long)ret); } } else if (error == ERESTART) printf("RESTART"); Modified: head/usr.bin/kdump/mksubr ============================================================================== --- head/usr.bin/kdump/mksubr Sat Oct 8 12:27:12 2011 (r226152) +++ head/usr.bin/kdump/mksubr Sat Oct 8 12:28:06 2011 (r226153) @@ -84,7 +84,7 @@ _EOF_ cat <<_EOF_ printf(">"); if (or == 0) - (void)printf("%jd", arg); + printf("%jd", arg); } _EOF_ @@ -113,10 +113,10 @@ _EOF_ if ($i ~ /define/) \ break; \ ++i; \ - printf "\tcase %s:\n\t\t(void)printf(\"%s\");\n\t\tbreak;\n", $i, $i }' + printf "\tcase %s:\n\t\tprintf(\"%s\");\n\t\tbreak;\n", $i, $i }' cat <<_EOF_ default: /* Should not reach */ - (void)printf("", arg); + printf("", arg); } } @@ -147,7 +147,7 @@ _EOF_ printf "if (arg == %s) \n\t\tprintf(\"%s\");\n", $2, $2 }' cat <<_EOF_ else /* Should not reach */ - (void)printf("", arg); + printf("", arg); } _EOF_ @@ -211,9 +211,9 @@ void signame(int sig) { if (sig > 0 && sig < NSIG) - (void)printf("SIG%s",signames[sig]); + printf("SIG%s",signames[sig]); else - (void)printf("SIG %d", sig); + printf("SIG %d", sig); } /* MANUAL */ @@ -222,37 +222,37 @@ semctlname(int cmd) { switch (cmd) { case GETNCNT: - (void)printf("GETNCNT"); + printf("GETNCNT"); break; case GETPID: - (void)printf("GETPID"); + printf("GETPID"); break; case GETVAL: - (void)printf("GETVAL"); + printf("GETVAL"); break; case GETALL: - (void)printf("GETALL"); + printf("GETALL"); break; case GETZCNT: - (void)printf("GETZCNT"); + printf("GETZCNT"); break; case SETVAL: - (void)printf("SETVAL"); + printf("SETVAL"); break; case SETALL: - (void)printf("SETALL"); + printf("SETALL"); break; case IPC_RMID: - (void)printf("IPC_RMID"); + printf("IPC_RMID"); break; case IPC_SET: - (void)printf("IPC_SET"); + printf("IPC_SET"); break; case IPC_STAT: - (void)printf("IPC_STAT"); + printf("IPC_STAT"); break; default: /* Should not reach */ - (void)printf("", cmd); + printf("", cmd); } } @@ -262,16 +262,16 @@ shmctlname(int cmd) { switch (cmd) { case IPC_RMID: - (void)printf("IPC_RMID"); + printf("IPC_RMID"); break; case IPC_SET: - (void)printf("IPC_SET"); + printf("IPC_SET"); break; case IPC_STAT: - (void)printf("IPC_STAT"); + printf("IPC_STAT"); break; default: /* Should not reach */ - (void)printf("", cmd); + printf("", cmd); } } @@ -300,14 +300,14 @@ void flagsandmodename(int flags, int mode, int decimal) { flagsname(flags); - (void)putchar(','); + putchar(','); if ((flags & O_CREAT) == O_CREAT) { modename (mode); } else { if (decimal) { - (void)printf("%d", mode); + printf("%d", mode); } else { - (void)printf("%#x", (unsigned int)mode); + printf("%#x", (unsigned int)mode); } } } @@ -323,12 +323,12 @@ void sockoptlevelname(int level, int decimal) { if (level == SOL_SOCKET) { - (void)printf("SOL_SOCKET"); + printf("SOL_SOCKET"); } else { if (decimal) { - (void)printf("%d", level); + printf("%d", level); } else { - (void)printf("%#x", (unsigned int)level); + printf("%#x", (unsigned int)level); } } } @@ -391,33 +391,33 @@ egrep "^#[[:space:]]*define[[:space:]]+F break; \ ++i; \ if (o <= $(i+1)) \ - printf "\tcase %s:\n\t\t(void)printf(\"%s\");\n\t\tbreak;\n", $i, $i; \ + printf "\tcase %s:\n\t\tprintf(\"%s\");\n\t\tbreak;\n", $i, $i; \ else \ exit; \ o = $(i+1) }' cat <<_EOF_ default: /* Should not reach */ - (void)printf("", cmd); + printf("", cmd); } - (void)putchar(','); + putchar(','); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:33:10 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0C62106566B; Sat, 8 Oct 2011 12:33:10 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CE0C58FC12; Sat, 8 Oct 2011 12:33:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98CXAmT062751; Sat, 8 Oct 2011 12:33:10 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98CXAjS062740; Sat, 8 Oct 2011 12:33:10 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110081233.p98CXAjS062740@svn.freebsd.org> From: Marius Strobl Date: Sat, 8 Oct 2011 12:33:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226154 - in head/sys: conf dev/fxp dev/mii dev/usb/net dev/xl modules/fxp modules/mii modules/usb/rue modules/xl X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:33:11 -0000 Author: marius Date: Sat Oct 8 12:33:10 2011 New Revision: 226154 URL: http://svn.freebsd.org/changeset/base/226154 Log: - Follow the lead of dcphy(4) and pnphy(4) and move the reminder of the PHY drivers that only ever attach to a particular MAC driver, i.e. inphy(4), ruephy(4) and xlphy(4), to the directory where the respective MAC driver lives and only compile it into the kernel when the latter is also there, also removing it from miibus.ko and moving it into the module of the respective MAC driver. - While at it, rename exphy.c, which comes from NetBSD where the MAC driver it corresponds to also is named ex(4) instead of xl(4) but that in FreeBSD actually identifies itself as xlphy(4), and its function names accordingly for consistency. - Additionally while at it, fix some minor style issues like whitespace in the register headers and add multi-inclusion protection to inphyreg.h. Added: head/sys/dev/fxp/inphy.c - copied, changed from r226118, head/sys/dev/mii/inphy.c head/sys/dev/fxp/inphyreg.h - copied, changed from r226118, head/sys/dev/mii/inphyreg.h head/sys/dev/usb/net/ruephy.c - copied, changed from r226118, head/sys/dev/mii/ruephy.c head/sys/dev/usb/net/ruephyreg.h - copied, changed from r226118, head/sys/dev/mii/ruephyreg.h head/sys/dev/xl/xlphy.c - copied, changed from r226118, head/sys/dev/mii/exphy.c Deleted: head/sys/dev/mii/exphy.c head/sys/dev/mii/inphy.c head/sys/dev/mii/inphyreg.h head/sys/dev/mii/ruephy.c head/sys/dev/mii/ruephyreg.h Modified: head/sys/conf/files head/sys/modules/fxp/Makefile head/sys/modules/mii/Makefile head/sys/modules/usb/rue/Makefile head/sys/modules/xl/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sat Oct 8 12:28:06 2011 (r226153) +++ head/sys/conf/files Sat Oct 8 12:33:10 2011 (r226154) @@ -1092,6 +1092,7 @@ dev/firewire/sbp_targ.c optional sbp_ta dev/flash/at45d.c optional at45d dev/flash/mx25l.c optional mx25l dev/fxp/if_fxp.c optional fxp +dev/fxp/inphy.c optional fxp dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci dev/gem/if_gem_sbus.c optional gem sbus @@ -1418,12 +1419,8 @@ dev/mii/bmtphy.c optional miibus | bmtp dev/mii/brgphy.c optional miibus | brgphy dev/mii/ciphy.c optional miibus | ciphy dev/mii/e1000phy.c optional miibus | e1000phy -# XXX only xl cards? -dev/mii/exphy.c optional miibus | exphy dev/mii/gentbi.c optional miibus | gentbi dev/mii/icsphy.c optional miibus | icsphy -# XXX only fxp cards? -dev/mii/inphy.c optional miibus | inphy dev/mii/ip1000phy.c optional miibus | ip1000phy dev/mii/jmphy.c optional miibus | jmphy dev/mii/lxtphy.c optional miibus | lxtphy @@ -1440,8 +1437,6 @@ dev/mii/rdcphy.c optional miibus | rdcp dev/mii/rgephy.c optional miibus | rgephy dev/mii/rlphy.c optional miibus | rlphy dev/mii/rlswitch.c optional rlswitch -# XXX rue only? -dev/mii/ruephy.c optional miibus | ruephy dev/mii/smcphy.c optional miibus | smcphy dev/mii/tdkphy.c optional miibus | tdkphy dev/mii/tlphy.c optional miibus | tlphy @@ -1924,6 +1919,7 @@ dev/usb/net/if_mos.c optional mos dev/usb/net/if_rue.c optional rue dev/usb/net/if_udav.c optional udav dev/usb/net/if_usie.c optional usie +dev/usb/net/ruephy.c optional rue dev/usb/net/usb_ethernet.c optional aue | axe | cdce | cue | kue | mos | \ rue | udav dev/usb/net/uhso.c optional uhso @@ -2062,6 +2058,7 @@ wpi.fw optional wpifw \ dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard dev/xl/if_xl.c optional xl pci +dev/xl/xlphy.c optional xl pci fs/coda/coda_fbsd.c optional vcoda fs/coda/coda_psdev.c optional vcoda fs/coda/coda_subr.c optional vcoda Copied and modified: head/sys/dev/fxp/inphy.c (from r226118, head/sys/dev/mii/inphy.c) ============================================================================== --- head/sys/dev/mii/inphy.c Fri Oct 7 21:23:42 2011 (r226118, copy source) +++ head/sys/dev/fxp/inphy.c Sat Oct 8 12:33:10 2011 (r226154) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include "miidevs.h" -#include +#include #include "miibus_if.h" Copied and modified: head/sys/dev/fxp/inphyreg.h (from r226118, head/sys/dev/mii/inphyreg.h) ============================================================================== --- head/sys/dev/mii/inphyreg.h Fri Oct 7 21:23:42 2011 (r226118, copy source) +++ head/sys/dev/fxp/inphyreg.h Sat Oct 8 12:33:10 2011 (r226154) @@ -29,7 +29,12 @@ * $FreeBSD$ */ -#define MII_INPHY_SCR 0x10 /* status and control register */ -#define SCR_FLOWCTL 0x8000 -#define SCR_S100 0x0002 /* autonegotiated speed */ -#define SCR_FDX 0x0001 /* autonegotiated duplex */ +#ifndef _INPHYREG_H +#define _INPHYREG_H + +#define MII_INPHY_SCR 0x10 /* status and control register */ +#define SCR_FLOWCTL 0x8000 +#define SCR_S100 0x0002 /* autonegotiated speed */ +#define SCR_FDX 0x0001 /* autonegotiated duplex */ + +#endif Copied and modified: head/sys/dev/usb/net/ruephy.c (from r226118, head/sys/dev/mii/ruephy.c) ============================================================================== --- head/sys/dev/mii/ruephy.c Fri Oct 7 21:23:42 2011 (r226118, copy source) +++ head/sys/dev/usb/net/ruephy.c Sat Oct 8 12:33:10 2011 (r226154) @@ -48,8 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include "miidevs.h" -#include -#include +#include #include "miibus_if.h" Copied and modified: head/sys/dev/usb/net/ruephyreg.h (from r226118, head/sys/dev/mii/ruephyreg.h) ============================================================================== --- head/sys/dev/mii/ruephyreg.h Fri Oct 7 21:23:42 2011 (r226118, copy source) +++ head/sys/dev/usb/net/ruephyreg.h Sat Oct 8 12:33:10 2011 (r226154) @@ -27,12 +27,12 @@ */ #ifndef _RUEPHYREG_H_ -#define _RUEPHYREG_H_ +#define _RUEPHYREG_H_ -#define RUEPHY_MII_MSR 0x0137 /* B, R/W */ -#define RUEPHY_MSR_RXFCE 0x40 -#define RUEPHY_MSR_DUPLEX 0x10 -#define RUEPHY_MSR_SPEED100 0x08 -#define RUEPHY_MSR_LINK 0x04 +#define RUEPHY_MII_MSR 0x0137 /* B, R/W */ +#define RUEPHY_MSR_RXFCE 0x40 +#define RUEPHY_MSR_DUPLEX 0x10 +#define RUEPHY_MSR_SPEED100 0x08 +#define RUEPHY_MSR_LINK 0x04 #endif /* _RUEPHYREG_H_ */ Copied and modified: head/sys/dev/xl/xlphy.c (from r226118, head/sys/dev/mii/exphy.c) ============================================================================== --- head/sys/dev/mii/exphy.c Fri Oct 7 21:23:42 2011 (r226118, copy source) +++ head/sys/dev/xl/xlphy.c Sat Oct 8 12:33:10 2011 (r226154) @@ -77,30 +77,30 @@ __FBSDID("$FreeBSD$"); #include "miibus_if.h" -static int exphy_probe(device_t); -static int exphy_attach(device_t); +static int xlphy_probe(device_t); +static int xlphy_attach(device_t); -static device_method_t exphy_methods[] = { +static device_method_t xlphy_methods[] = { /* device interface */ - DEVMETHOD(device_probe, exphy_probe), - DEVMETHOD(device_attach, exphy_attach), + DEVMETHOD(device_probe, xlphy_probe), + DEVMETHOD(device_attach, xlphy_attach), DEVMETHOD(device_detach, mii_phy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), { 0, 0 } }; -static devclass_t exphy_devclass; +static devclass_t xlphy_devclass; -static driver_t exphy_driver = { +static driver_t xlphy_driver = { "xlphy", - exphy_methods, + xlphy_methods, sizeof(struct mii_softc) }; -DRIVER_MODULE(xlphy, miibus, exphy_driver, exphy_devclass, 0, 0); +DRIVER_MODULE(xlphy, miibus, xlphy_driver, xlphy_devclass, 0, 0); -static int exphy_service(struct mii_softc *, struct mii_data *, int); -static void exphy_reset(struct mii_softc *); +static int xlphy_service(struct mii_softc *, struct mii_data *, int); +static void xlphy_reset(struct mii_softc *); /* * Some 3Com internal PHYs report zero for OUI and model, others use @@ -109,42 +109,42 @@ static void exphy_reset(struct mii_softc * handled fine by ukphy(4); they can be isolated and don't require * special treatment after reset. */ -static const struct mii_phydesc exphys[] = { +static const struct mii_phydesc xlphys[] = { { 0, 0, "3Com internal media interface" }, MII_PHY_DESC(xxBROADCOM, 3C905C), MII_PHY_END }; -static const struct mii_phy_funcs exphy_funcs = { - exphy_service, +static const struct mii_phy_funcs xlphy_funcs = { + xlphy_service, ukphy_status, - exphy_reset + xlphy_reset }; static int -exphy_probe(device_t dev) +xlphy_probe(device_t dev) { if (strcmp(device_get_name(device_get_parent(device_get_parent(dev))), "xl") == 0) - return (mii_phy_dev_probe(dev, exphys, BUS_PROBE_DEFAULT)); + return (mii_phy_dev_probe(dev, xlphys, BUS_PROBE_DEFAULT)); return (ENXIO); } static int -exphy_attach(device_t dev) +xlphy_attach(device_t dev) { /* * The 3Com PHY can never be isolated. */ mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE, - &exphy_funcs, 1); + &xlphy_funcs, 1); return (0); } static int -exphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) +xlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { switch (cmd) { @@ -184,7 +184,7 @@ exphy_service(struct mii_softc *sc, stru } static void -exphy_reset(struct mii_softc *sc) +xlphy_reset(struct mii_softc *sc) { mii_phy_reset(sc); Modified: head/sys/modules/fxp/Makefile ============================================================================== --- head/sys/modules/fxp/Makefile Sat Oct 8 12:28:06 2011 (r226153) +++ head/sys/modules/fxp/Makefile Sat Oct 8 12:33:10 2011 (r226154) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/fxp KMOD= if_fxp -SRCS= if_fxp.c device_if.h bus_if.h pci_if.h miibus_if.h +SRCS= device_if.h bus_if.h if_fxp.c inphy.c miibus_if.h miidevs.h pci_if.h .include Modified: head/sys/modules/mii/Makefile ============================================================================== --- head/sys/modules/mii/Makefile Sat Oct 8 12:28:06 2011 (r226153) +++ head/sys/modules/mii/Makefile Sat Oct 8 12:33:10 2011 (r226154) @@ -5,10 +5,10 @@ KMOD= miibus SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c bus_if.h SRCS+= ciphy.c device_if.h -SRCS+= e1000phy.c exphy.c gentbi.c icsphy.c inphy.c ip1000phy.c jmphy.c +SRCS+= e1000phy.c gentbi.c icsphy.c ip1000phy.c jmphy.c SRCS+= lxtphy.c miibus_if.c miibus_if.h mii.c miidevs.h mii_physubr.c SRCS+= mlphy.c nsgphy.c nsphy.c nsphyter.c pci_if.h pnaphy.c qsphy.c -SRCS+= rdcphy.c rgephy.c rlphy.c ruephy.c tdkphy.c tlphy.c truephy.c +SRCS+= rdcphy.c rgephy.c rlphy.c tdkphy.c tlphy.c truephy.c SRCS+= ukphy.c ukphy_subr.c SRCS+= xmphy.c Modified: head/sys/modules/usb/rue/Makefile ============================================================================== --- head/sys/modules/usb/rue/Makefile Sat Oct 8 12:28:06 2011 (r226153) +++ head/sys/modules/usb/rue/Makefile Sat Oct 8 12:33:10 2011 (r226154) @@ -30,8 +30,7 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/net KMOD= if_rue -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ - miibus_if.h opt_inet.h \ - if_rue.c +SRCS= bus_if.h device_if.h miibus_if.h miidevs.h if_rue.c opt_bus.h +SRCS+= opt_inet.h opt_usb.h ruephy.c usb_if.h usbdevs.h .include Modified: head/sys/modules/xl/Makefile ============================================================================== --- head/sys/modules/xl/Makefile Sat Oct 8 12:28:06 2011 (r226153) +++ head/sys/modules/xl/Makefile Sat Oct 8 12:33:10 2011 (r226154) @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../dev/xl KMOD= if_xl -SRCS= if_xl.c device_if.h bus_if.h pci_if.h -SRCS+= miibus_if.h +SRCS= bus_if.h device_if.h if_xl.c miibus_if.h miidevs.h pci_if.h xlphy.c .include From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:39:47 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CED80106564A; Sat, 8 Oct 2011 12:39:47 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A55B58FC08; Sat, 8 Oct 2011 12:39:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98CdlbA062985; Sat, 8 Oct 2011 12:39:47 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98Cdlfx062983; Sat, 8 Oct 2011 12:39:47 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110081239.p98Cdlfx062983@svn.freebsd.org> From: Konstantin Belousov Date: Sat, 8 Oct 2011 12:39:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226155 - head/libexec/rtld-elf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:39:47 -0000 Author: kib Date: Sat Oct 8 12:39:47 2011 New Revision: 226155 URL: http://svn.freebsd.org/changeset/base/226155 Log: Setting up TLS block for the main thread must be done after the relocations are processed, since tls initialization section might be itself subject for relocations. Only set up of the block is postponed, the tls block offsets are allocated before relocation processing, since TLS-related relocations may need offsets ready. Reported by: ale PR: threads/161344 Reviewed by: kan MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sat Oct 8 12:33:10 2011 (r226154) +++ head/libexec/rtld-elf/rtld.c Sat Oct 8 12:39:47 2011 (r226155) @@ -495,8 +495,12 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ exit (0); } - /* setup TLS for main thread */ - dbg("initializing initial thread local storage"); + /* + * Processing tls relocations requires having the tls offsets + * initialized. Prepare offsets before starting initial + * relocation processing. + */ + dbg("initializing initial thread local storage offsets"); STAILQ_FOREACH(entry, &list_main, link) { /* * Allocate all the initial objects out of the static TLS @@ -504,7 +508,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ */ allocate_tls_offset(entry->obj); } - allocate_initial_tls(obj_list); if (relocate_objects(obj_main, ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1) @@ -519,6 +522,14 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ exit (0); } + /* + * Setup TLS for main thread. This must be done after the + * relocations are processed, since tls initialization section + * might be the subject for relocations. + */ + dbg("initializing initial thread local storage"); + allocate_initial_tls(obj_list); + dbg("initializing key program variables"); set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : ""); set_program_var("environ", env); From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:42:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5803F106564A; Sat, 8 Oct 2011 12:42:20 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 47FA78FC13; Sat, 8 Oct 2011 12:42:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98CgK1S063088; Sat, 8 Oct 2011 12:42:20 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98CgKcQ063086; Sat, 8 Oct 2011 12:42:20 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110081242.p98CgKcQ063086@svn.freebsd.org> From: Konstantin Belousov Date: Sat, 8 Oct 2011 12:42:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226156 - head/libexec/rtld-elf/i386 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:42:21 -0000 Author: kib Date: Sat Oct 8 12:42:19 2011 New Revision: 226156 URL: http://svn.freebsd.org/changeset/base/226156 Log: Handle the R_386_TLS_TPOFF32 relocation, which is similar to R_386_TLS_TPOFF, but with negative relocation value. Found by: mpfr test suite, pointed to by ale Reviewed by: kan MFC after: 1 week Modified: head/libexec/rtld-elf/i386/reloc.c Modified: head/libexec/rtld-elf/i386/reloc.c ============================================================================== --- head/libexec/rtld-elf/i386/reloc.c Sat Oct 8 12:39:47 2011 (r226155) +++ head/libexec/rtld-elf/i386/reloc.c Sat Oct 8 12:42:19 2011 (r226156) @@ -213,9 +213,11 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry break; case R_386_TLS_TPOFF: + case R_386_TLS_TPOFF32: { const Elf_Sym *def; const Obj_Entry *defobj; + Elf_Addr add; def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, false, cache, lockstate); @@ -237,8 +239,11 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry goto done; } } - - *where += (Elf_Addr) (def->st_value - defobj->tlsoffset); + add = (Elf_Addr) (def->st_value - defobj->tlsoffset); + if (ELF_R_TYPE(rel->r_info) == R_386_TLS_TPOFF) + *where += add; + else + *where -= add; } break; From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:47:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EB961065670; Sat, 8 Oct 2011 12:47:00 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7E7588FC13; Sat, 8 Oct 2011 12:47:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98Cl09d063340; Sat, 8 Oct 2011 12:47:00 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98Cl06s063337; Sat, 8 Oct 2011 12:47:00 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081247.p98Cl06s063337@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 12:47:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226157 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:47:00 -0000 Author: des Date: Sat Oct 8 12:47:00 2011 New Revision: 226157 URL: http://svn.freebsd.org/changeset/base/226157 Log: Bring ioctlname() in line with all the other *name() functions, which actually print the name (or the numeric value, if they can't figure out the correct name) instead of just returning a pointer to it. Also, since ioctl numbers are not and probably never will be unique, drop support for using a switch statement instead of an if/else chain. Modified: head/usr.bin/kdump/kdump.c head/usr.bin/kdump/mkioctls Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 12:42:19 2011 (r226156) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 12:47:00 2011 (r226157) @@ -100,7 +100,7 @@ void ktrsockaddr(struct sockaddr *); void ktrstat(struct stat *); void ktrstruct(char *, size_t); void usage(void); -const char *ioctlname(u_long); +void ioctlname(unsigned long, int); int timestamp, decimal, fancy = 1, suppressdata, tail, threads, maxdata, resolv = 0, abiflag = 0; @@ -504,14 +504,8 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_ioctl: { const char *cp; print_number(ip, narg, c); - if ((cp = ioctlname(*ip)) != NULL) - printf(",%s", cp); - else { - if (decimal) - printf(",%jd", (intmax_t)*ip); - else - printf(",%#jx ", (intmax_t)*ip); - } + putchar(c); + ioctlname(*ip, decimal); c = ','; ip++; narg--; Modified: head/usr.bin/kdump/mkioctls ============================================================================== --- head/usr.bin/kdump/mkioctls Sat Oct 8 12:42:19 2011 (r226156) +++ head/usr.bin/kdump/mkioctls Sat Oct 8 12:47:00 2011 (r226157) @@ -4,15 +4,8 @@ set -e -if [ "x$1" = "x-s" ]; then - use_switch=1 - shift -else - use_switch=0 -fi - if [ -z "$1" ]; then - echo "usage: sh $0 [-s] include-dir" + echo "usage: sh $0 include-dir" exit 1 fi @@ -30,7 +23,7 @@ ioctl_includes=` awk -v x="$ioctl_includes" 'BEGIN {print x}' | gcc -E -I$1 -dM -DCOMPAT_43TTY - | - awk -v ioctl_includes="$ioctl_includes" -v use_switch="$use_switch" ' + awk -v ioctl_includes="$ioctl_includes" ' BEGIN { print "/* XXX obnoxious prerequisites. */" print "#define COMPAT_43" @@ -55,16 +48,15 @@ BEGIN { print "#include " print "#include " print "" - print "const char *ioctlname(u_long val);" + print "void ioctlname(unsigned long val, int decimal);" print "" print ioctl_includes print "" - print "const char *" - print "ioctlname(u_long val)" + print "void" + print "ioctlname(unsigned long val, int decimal)" print "{" + print "\tconst char *str = NULL;" print "" - if (use_switch) - print "\tswitch(val) {" } /^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO/ { @@ -75,16 +67,20 @@ BEGIN { break; ++i; # - if (use_switch) - printf("\tcase %s:\n\t\treturn(\"%s\");\n", $i, $i); - else - printf("\tif (val == %s)\n\t\treturn(\"%s\");\n", $i, $i); - + print("\t"); + if (n++ > 0) + print("else "); + printf("if (val == %s)\n", $i); + printf("\t\tstr = \"%s\";\n", $i); } END { - if (use_switch) - print "\t}" - print "\n\treturn(NULL);" + print "\n" + print "\tif (str != NULL)\n" + print "\t\tprintf(\"%s\", str);\n" + print "\telse if (decimal)\n" + print "\t\tprintf(\"%lu\", val);\n" + print "\telse\n" + print "\t\tprintf(\"%#lx\", val);\n" print "}" } ' From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 12:59:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8DD61065672; Sat, 8 Oct 2011 12:59:41 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A8CE78FC12; Sat, 8 Oct 2011 12:59:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98CxfCP063720; Sat, 8 Oct 2011 12:59:41 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98CxfAt063718; Sat, 8 Oct 2011 12:59:41 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081259.p98CxfAt063718@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 12:59:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226158 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 12:59:41 -0000 Author: des Date: Sat Oct 8 12:59:41 2011 New Revision: 226158 URL: http://svn.freebsd.org/changeset/base/226158 Log: Fix the dependency issue properly by a) moving kdump_subr.c to the front of the SRCS list and b) listing kdump_subr.h in DPSRCS. Modified: head/usr.bin/kdump/Makefile Modified: head/usr.bin/kdump/Makefile ============================================================================== --- head/usr.bin/kdump/Makefile Sat Oct 8 12:47:00 2011 (r226157) +++ head/usr.bin/kdump/Makefile Sat Oct 8 12:59:41 2011 (r226158) @@ -8,7 +8,8 @@ SFX= 32 .PATH: ${.CURDIR}/../ktrace PROG= kdump -SRCS= kdump.c ioctl.c kdump_subr.c subr.c +SRCS= kdump_subr.c kdump.c ioctl.c subr.c +DPSRCS= kdump_subr.h CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I. .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" @@ -29,11 +30,6 @@ kdump_subr.h: mksubr kdump_subr.c: mksubr kdump_subr.h sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET} -# kdump.c includes kdump_subr.h, which is auto-generated. Add a -# manual dependency to make sure kdump_subr.h is generated before we -# try to either compile or preprocess kdump.c. -${.CURDIR}/kdump.c: kdump_subr.h - linux_syscalls.c: /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux${SFX}/syscalls.master ${.CURDIR}/linux_syscalls.conf From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 13:01:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 667E11065673; Sat, 8 Oct 2011 13:01:38 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5685D8FC12; Sat, 8 Oct 2011 13:01:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98D1cVX063850; Sat, 8 Oct 2011 13:01:38 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98D1cXW063847; Sat, 8 Oct 2011 13:01:38 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110081301.p98D1cXW063847@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 13:01:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226159 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 13:01:38 -0000 Author: des Date: Sat Oct 8 13:01:38 2011 New Revision: 226159 URL: http://svn.freebsd.org/changeset/base/226159 Log: Teach kdump(1) to decode capability bitmasks. MFC after: 3 weeks Modified: head/usr.bin/kdump/kdump.c head/usr.bin/kdump/mksubr Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 12:59:41 2011 (r226158) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 13:01:38 2011 (r226159) @@ -979,6 +979,13 @@ ktrsyscall(struct ktr_syscall *ktr, u_in ip++; narg--; break; + case SYS_cap_new: + print_number(ip, narg, c); + putchar(','); + capname((intmax_t)*ip); + ip++; + narg--; + break; } } while (narg > 0) { Modified: head/usr.bin/kdump/mksubr ============================================================================== --- head/usr.bin/kdump/mksubr Sat Oct 8 12:59:41 2011 (r226158) +++ head/usr.bin/kdump/mksubr Sat Oct 8 13:01:38 2011 (r226159) @@ -186,6 +186,7 @@ cat <<_EOF_ #include #include #include +#include #include "kdump_subr.h" @@ -337,6 +338,7 @@ _EOF_ auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+" "sys/unistd.h" auto_switch_type "acltypename" "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+" "sys/acl.h" +auto_or_type "capname" "CAP_[A-Z]+[[:space:]]+0x[01248]{16}ULL" "sys/capability.h" auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h" auto_or_type "flagsname" "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/fcntl.h" auto_or_type "flockname" "LOCK_[A-Z]+[[:space:]]+0x[0-9]+" "sys/fcntl.h" From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 14:56:56 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E878106566B; Sat, 8 Oct 2011 14:56:56 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 151538FC0A; Sat, 8 Oct 2011 14:56:55 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.5/8.14.5) with ESMTP id p98EutT1037194; Sat, 8 Oct 2011 07:56:55 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.5/8.14.4/Submit) id p98Eutof037193; Sat, 8 Oct 2011 07:56:55 -0700 (PDT) (envelope-from obrien) Date: Sat, 8 Oct 2011 07:56:55 -0700 From: "David O'Brien" To: Andriy Gapon Message-ID: <20111008145655.GA37179@dragon.NUXI.org> References: <201110070547.p975lUIJ095269@svn.freebsd.org> <4E8EDF00.2030309@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4E8EDF00.2030309@FreeBSD.org> X-Operating-System: FreeBSD 9.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.20 (2009-06-14) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r226089 - in head: share/man/man7 sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 14:56:56 -0000 On Fri, Oct 07, 2011 at 02:14:08PM +0300, Andriy Gapon wrote: > > Log: > > Disallow various debug.kdb sysctl's when securelevel is raised. .. > Maybe the same would also be a good idea for sysctls defined at the top of > sys/kern/kern_shutdown.c? Thanks for pointing those out. I'll take a look. -- -- David (obrien@FreeBSD.org) From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 14:59:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12AA9106564A; Sat, 8 Oct 2011 14:59:13 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DC7008FC12; Sat, 8 Oct 2011 14:59:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98ExCxh067398; Sat, 8 Oct 2011 14:59:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98ExCJK067396; Sat, 8 Oct 2011 14:59:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110081459.p98ExCJK067396@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 8 Oct 2011 14:59:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226160 - head/usr.sbin/bsdinstall/partedit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 14:59:13 -0000 Author: nwhitehorn Date: Sat Oct 8 14:59:12 2011 New Revision: 226160 URL: http://svn.freebsd.org/changeset/base/226160 Log: Usability enhancements: do not allow setting a mountpoint on bsdlabel container partitions, which didn't do anything anyway, and check for an existing freebsd-boot partition before bothering the user to make one. PR: bin/160931 MFC after: 3 days Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Oct 8 13:01:38 2011 (r226159) +++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Oct 8 14:59:12 2011 (r226160) @@ -892,6 +892,19 @@ addpartform: goto addpartform; } + /* + * Error if this scheme needs nested partitions, this is one, and + * a mountpoint was set. + */ + if (strcmp(items[0].text, "freebsd") == 0 && + strlen(items[2].text) > 0) { + dialog_msgbox("Error", "Partitions of type \"freebsd\" are " + "nested BSD-type partition schemes and cannot have " + "mountpoints. After creating one, select it and press " + "Create again to add the actual file systems.", 0, 0, TRUE); + goto addpartform; + } + /* If this is the root partition, check that this scheme is bootable */ if (strcmp(items[2].text, "/") == 0 && !is_scheme_bootable(scheme)) { char message[512]; @@ -909,7 +922,23 @@ addpartform: * If this is the root partition, and we need a boot partition, ask * the user to add one. */ - if (strcmp(items[2].text, "/") == 0 && bootpart_size(scheme) > 0) { + + /* Check for existing freebsd-boot partition */ + LIST_FOREACH(pp, &geom->lg_provider, lg_provider) { + struct partition_metadata *md; + md = get_part_metadata(pp->lg_name, 0); + if (md == NULL || !md->bootcode) + continue; + LIST_FOREACH(gc, &pp->lg_config, lg_config) + if (strcmp(gc->lg_name, "type") == 0) + break; + if (gc != NULL && strcmp(gc->lg_val, "freebsd-boot") == 0) + break; + } + + /* If there isn't one, and we need one, ask */ + if (strcmp(items[2].text, "/") == 0 && bootpart_size(scheme) > 0 && + pp == NULL) { if (interactive) choice = dialog_yesno("Boot Partition", "This partition scheme requires a boot partition " From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 15:00:06 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A7AC1065679; Sat, 8 Oct 2011 15:00:05 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 3DADB8FC15; Sat, 8 Oct 2011 15:00:04 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.5/8.14.5) with ESMTP id p98F047x037238; Sat, 8 Oct 2011 08:00:04 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.5/8.14.4/Submit) id p98F04I8037237; Sat, 8 Oct 2011 08:00:04 -0700 (PDT) (envelope-from obrien) Date: Sat, 8 Oct 2011 08:00:04 -0700 From: "David O'Brien" To: Andriy Gapon Message-ID: <20111008150004.GB37179@dragon.NUXI.org> References: <201110070600.p97600Ut095709@svn.freebsd.org> <4E8EDF26.6040409@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4E8EDF26.6040409@FreeBSD.org> X-Operating-System: FreeBSD 9.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.20 (2009-06-14) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r226090 - head/sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 15:00:06 -0000 On Fri, Oct 07, 2011 at 02:14:46PM +0300, Andriy Gapon wrote: > > Increase MSGBUF_SIZE. > > The previous size lead to truncated /var/run/dmesg.boot when booted with "-v". ... > Heck, I am going to five! :-) Do you know of a machine that needs "* 5"? I went with the miniumum increase that gave a full /var/run/dmesg.boog on a particlar machine. But I know this machine more probably isn't the one that produces the largest output during boot. Bump it higher than "* 3"? -- -- David (obrien@FreeBSD.org) From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 15:02:49 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B9E3106564A; Sat, 8 Oct 2011 15:02:49 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from mx0.deglitch.com (cl-414.sto-01.se.sixxs.net [IPv6:2001:16d8:ff00:19d::2]) by mx1.freebsd.org (Postfix) with ESMTP id D4AA28FC0C; Sat, 8 Oct 2011 15:02:48 +0000 (UTC) Received: from [192.168.1.56] (c-76-102-116-104.hsd1.ca.comcast.net [76.102.116.104]) by mx0.deglitch.com (Postfix) with ESMTPSA id 59C3E8FC36; Sat, 8 Oct 2011 19:02:47 +0400 (MSD) References: <201110072343.p97NhpFK032806@svn.freebsd.org> <20111008073318.GB91943@hoeg.nl> In-Reply-To: <20111008073318.GB91943@hoeg.nl> Mime-Version: 1.0 (iPad Mail 8L1) Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Message-Id: <9549F7D2-F287-40B3-82A2-86D53C5ED667@FreeBSD.org> X-Mailer: iPad Mail (8L1) From: Stanislav Sedov Date: Sat, 8 Oct 2011 08:02:43 -0700 To: Ed Schouten Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r226122 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 15:02:49 -0000 On Oct 8, 2011, at 12:33 AM, Ed Schouten wrote: > Hi, > > * Stanislav Sedov , 20111008 01:43: >> - ${WRKSRC} might be missing when the autotools fixup is running. >> Account for this. > > Maybe we should simplify this a bit? Sounds good! I didn't think about that way of ignoring the error code. -- ST4096-RIPE From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 15:23:26 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E68D106566C; Sat, 8 Oct 2011 15:23:26 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id D050B8FC0A; Sat, 8 Oct 2011 15:23:25 +0000 (UTC) Received: from alf.home (alf.kiev.zoral.com.ua [10.1.1.177]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p98FNK77063569 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 8 Oct 2011 18:23:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from alf.home (kostik@localhost [127.0.0.1]) by alf.home (8.14.5/8.14.5) with ESMTP id p98FNKQ6010911; Sat, 8 Oct 2011 18:23:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by alf.home (8.14.5/8.14.5/Submit) id p98FNK4t010910; Sat, 8 Oct 2011 18:23:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: alf.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 8 Oct 2011 18:23:20 +0300 From: Kostik Belousov To: Stanislav Sedov Message-ID: <20111008152320.GF1511@deviant.kiev.zoral.com.ua> References: <201110072343.p97NhpFK032806@svn.freebsd.org> <20111008073318.GB91943@hoeg.nl> <9549F7D2-F287-40B3-82A2-86D53C5ED667@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1ppnuVfySHd3icmU" Content-Disposition: inline In-Reply-To: <9549F7D2-F287-40B3-82A2-86D53C5ED667@FreeBSD.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: "svn-src-head@freebsd.org" , Ed Schouten , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r226122 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 15:23:26 -0000 --1ppnuVfySHd3icmU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Oct 08, 2011 at 08:02:43AM -0700, Stanislav Sedov wrote: > On Oct 8, 2011, at 12:33 AM, Ed Schouten wrote: >=20 > > Hi, > >=20 > > * Stanislav Sedov , 20111008 01:43: > >> - ${WRKSRC} might be missing when the autotools fixup is running. > >> Account for this. > >=20 > > Maybe we should simplify this a bit? >=20 > Sounds good! > I didn't think about that way of ignoring the error code. Can you, please, also add a check for uname -r being indeed 10.0-CURRENT, before applying the hack ? Also, the hack does not fix perl, I have to use the following patch. diff --git a/hints/freebsd.sh b/hints/freebsd.sh index c661fe8..caf93eb 100644 --- a/hints/freebsd.sh +++ b/hints/freebsd.sh @@ -110,11 +110,11 @@ esac case "$osvers" in 0.*|1.0*) ;; =20 -1*|2*) cccdlflags=3D'-DPIC -fpic' +1.*|2.*) cccdlflags=3D'-DPIC -fpic' lddlflags=3D"-Bshareable $lddlflags" ;; =20 -3*|4*|5*|6*) +3.*|4.*|5.*|6.*) objformat=3D`/usr/bin/objformat` if [ x$objformat =3D xaout ]; then if [ -e /usr/lib/aout ]; then @@ -140,7 +140,7 @@ case "$osvers" in esac =20 case "$osvers" in -0*|1*|2*|3*) ;; +0*|1.*|2.*|3.*) ;; =20 *) ccflags=3D"${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H" @@ -261,7 +261,7 @@ EOM esac =20 case "$osvers" in - [1-4]*) + [1-4].*) set `echo X "$libswanted "| sed -e 's/ c / c_r /'` shift libswanted=3D"$*" --1ppnuVfySHd3icmU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk6QaugACgkQC3+MBN1Mb4inXwCgvTvrj57L5Fg8LOQP75Z2vF// 2hAAmwQiAP7LnXWE8PEVl+o/SCzrGFd1 =1gNi -----END PGP SIGNATURE----- --1ppnuVfySHd3icmU-- From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 16:10:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECC2D106566C; Sat, 8 Oct 2011 16:10:38 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail01.syd.optusnet.com.au (mail01.syd.optusnet.com.au [211.29.132.182]) by mx1.freebsd.org (Postfix) with ESMTP id 702038FC15; Sat, 8 Oct 2011 16:10:38 +0000 (UTC) Received: from c122-106-165-191.carlnfd1.nsw.optusnet.com.au (c122-106-165-191.carlnfd1.nsw.optusnet.com.au [122.106.165.191]) by mail01.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p98GAZiY004083 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 9 Oct 2011 03:10:36 +1100 Date: Sun, 9 Oct 2011 03:10:35 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Dag-Erling Smorgrav In-Reply-To: <201110081228.p98CS70F062542@svn.freebsd.org> Message-ID: <20111009030101.Q1307@besplex.bde.org> References: <201110081228.p98CS70F062542@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226153 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 16:10:39 -0000 On Sat, 8 Oct 2011, Dag-Erling Smorgrav wrote: > Log: > I appreciate the logic behind using a (void) cast to indicate that the > return value is intentionally ignored, but frankly, all it does is > get in the way of the code. It would be more useful if used precisely when ignoring the return value is correct (and unusual -- never use it for printf()). For example, when printf() is voided, there must be an fflush() and error checking of that at least once in the program (much more often for interactive programs), but most programs that void printf() don't bother with that. kdump was one. It has a single fflush() at the end of main() (which is a reasonable place to put it for simple programs), but only for the -l case, and with null error checking: > Modified: head/usr.bin/kdump/kdump.c > ============================================================================== > --- head/usr.bin/kdump/kdump.c Sat Oct 8 12:27:12 2011 (r226152) > +++ head/usr.bin/kdump/kdump.c Sat Oct 8 12:28:06 2011 (r226153) > @@ -307,7 +307,7 @@ main(int argc, char *argv[]) > break; > } > if (tail) > - (void)fflush(stdout); > + fflush(stdout); > } > return 0; > } Voiding the result of fflush() is just a bug, unless there is an ferror() check, which there isn't. Now this code correctly doesn't claim that ignoring the result is correct. Bruce From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 16:45:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47BA41065674; Sat, 8 Oct 2011 16:45:04 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 27C1B8FC12; Sat, 8 Oct 2011 16:45:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98Gj40t070662; Sat, 8 Oct 2011 16:45:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98Gj4YK070661; Sat, 8 Oct 2011 16:45:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201110081645.p98Gj4YK070661@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 8 Oct 2011 16:45:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226161 - head/usr.sbin/bsdinstall/partedit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 16:45:04 -0000 Author: nwhitehorn Date: Sat Oct 8 16:45:03 2011 New Revision: 226161 URL: http://svn.freebsd.org/changeset/base/226161 Log: Avoid magicking into existence sub-partitions due to leftover blocks when creating new ones by destroying any geom that may have come into existence immediately after adding a partition. The EBR partition scheme is particularly enthusiastic about false positives in this case. MFC after: 3 days Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Oct 8 14:59:12 2011 (r226160) +++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Oct 8 16:45:03 2011 (r226161) @@ -730,7 +730,7 @@ gpart_create(struct gprovider *pp, char struct gconsumer *cp; struct ggeom *geom; const char *errstr, *scheme; - char sizestr[32], startstr[32], output[64]; + char sizestr[32], startstr[32], output[64], *newpartname; char newfs[64], options_fstype[64]; intmax_t maxsize, size, sector, firstfree, stripe; uint64_t bytes; @@ -990,29 +990,43 @@ addpartform: if (items[3].text[0] != '\0') gctl_ro_param(r, "label", -1, items[3].text); gctl_rw_param(r, "output", sizeof(output), output); - errstr = gctl_issue(r); if (errstr != NULL && errstr[0] != '\0') { gpart_show_error("Error", NULL, errstr); gctl_free(r); goto addpartform; } + newpartname = strtok(output, " "); + gctl_free(r); + + /* + * Try to destroy any geom that gpart picked up already here from + * dirty blocks. + */ + r = gctl_get_handle(); + gctl_ro_param(r, "class", -1, "PART"); + gctl_ro_param(r, "arg0", -1, newpartname); + gctl_ro_param(r, "flags", -1, GPART_FLAGS); + junk = 1; + gctl_ro_param(r, "force", sizeof(junk), &junk); + gctl_ro_param(r, "verb", -1, "destroy"); + gctl_issue(r); /* Error usually expected and non-fatal */ + gctl_free(r); if (strcmp(items[0].text, "freebsd-boot") == 0) - get_part_metadata(strtok(output, " "), 1)->bootcode = 1; + get_part_metadata(newpartname, 1)->bootcode = 1; else if (strcmp(items[0].text, "freebsd") == 0) - gpart_partition(strtok(output, " "), "BSD"); + gpart_partition(newpartname, "BSD"); else - set_default_part_metadata(strtok(output, " "), scheme, + set_default_part_metadata(newpartname, scheme, items[0].text, items[2].text, newfs); for (i = 0; i < (sizeof(items) / sizeof(items[0])); i++) if (items[i].text_free) free(items[i].text); - gctl_free(r); if (partname != NULL) - *partname = strdup(strtok(output, " ")); + *partname = strdup(newpartname); } void @@ -1097,7 +1111,6 @@ gpart_revert_all(struct gmesh *mesh) struct gconfig *gc; struct ggeom *gp; struct gctl_req *r; - const char *errstr; const char *modified; LIST_FOREACH(classp, &mesh->lg_class, lg_class) { @@ -1128,9 +1141,7 @@ gpart_revert_all(struct gmesh *mesh) gctl_ro_param(r, "arg0", -1, gp->lg_name); gctl_ro_param(r, "verb", -1, "undo"); - errstr = gctl_issue(r); - if (errstr != NULL && errstr[0] != '\0') - gpart_show_error("Error", NULL, errstr); + gctl_issue(r); gctl_free(r); } } From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 18:25:02 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6ED32106564A; Sat, 8 Oct 2011 18:25:02 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4AEAE8FC12; Sat, 8 Oct 2011 18:25:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98IP2GW073562; Sat, 8 Oct 2011 18:25:02 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98IP22D073560; Sat, 8 Oct 2011 18:25:02 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201110081825.p98IP22D073560@svn.freebsd.org> From: Chris Rees Date: Sat, 8 Oct 2011 18:25:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226162 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 18:25:02 -0000 Author: crees (ports committer) Date: Sat Oct 8 18:25:01 2011 New Revision: 226162 URL: http://svn.freebsd.org/changeset/base/226162 Log: Revert unapproved commit to bsd.port.mk. This would have had more discussion, but it was explicitly rejected at submission by portmgr: http://lists.freebsd.org/pipermail/freebsd-ports/2011-September/070591.html Modified: head/share/mk/bsd.port.mk Modified: head/share/mk/bsd.port.mk ============================================================================== --- head/share/mk/bsd.port.mk Sat Oct 8 16:45:03 2011 (r226161) +++ head/share/mk/bsd.port.mk Sat Oct 8 18:25:01 2011 (r226162) @@ -14,19 +14,3 @@ _WITHOUT_SRCCONF= .include .include "${BSDPORTMK}" - -.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK) -# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. -run-autotools-fixup: - test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \ - -name config.rpath -o -name configure -o -name libtool.m4 \) \ - -exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \ - -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ - -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ - -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ - -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ - {} + || /usr/bin/true - -.ORDER: run-autotools run-autotools-fixup do-configure -do-configure: run-autotools-fixup -.endif From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 18:29:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 949CD106566B; Sat, 8 Oct 2011 18:29:30 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8500B8FC15; Sat, 8 Oct 2011 18:29:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98ITUhM073714; Sat, 8 Oct 2011 18:29:30 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98ITUMB073712; Sat, 8 Oct 2011 18:29:30 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201110081829.p98ITUMB073712@svn.freebsd.org> From: Alan Cox Date: Sat, 8 Oct 2011 18:29:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226163 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 18:29:30 -0000 Author: alc Date: Sat Oct 8 18:29:30 2011 New Revision: 226163 URL: http://svn.freebsd.org/changeset/base/226163 Log: Fix the handling of an empty kmem map by sysctl_kmem_map_free(). In the unlikely event that sysctl_kmem_map_free() was performed on an empty kmem map, it would incorrectly report the free space as zero. Discussed with: avg MFC after: 1 week Modified: head/sys/kern/kern_malloc.c Modified: head/sys/kern/kern_malloc.c ============================================================================== --- head/sys/kern/kern_malloc.c Sat Oct 8 18:25:01 2011 (r226162) +++ head/sys/kern/kern_malloc.c Sat Oct 8 18:29:30 2011 (r226163) @@ -265,8 +265,8 @@ sysctl_kmem_map_free(SYSCTL_HANDLER_ARGS u_long size; vm_map_lock_read(kmem_map); - size = kmem_map->root != NULL ? - kmem_map->root->max_free : kmem_map->size; + size = kmem_map->root != NULL ? kmem_map->root->max_free : + kmem_map->max_offset - kmem_map->min_offset; vm_map_unlock_read(kmem_map); return (sysctl_handle_long(oidp, &size, 0, req)); } From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 19:25:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 162D6106564A; Sat, 8 Oct 2011 19:25:18 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 79071152279; Sat, 8 Oct 2011 19:25:17 +0000 (UTC) Message-ID: <4E90A39C.5040806@FreeBSD.org> Date: Sat, 08 Oct 2011 12:25:16 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1 MIME-Version: 1.0 To: Kostik Belousov References: <201110072343.p97NhpFK032806@svn.freebsd.org> <20111008073318.GB91943@hoeg.nl> <9549F7D2-F287-40B3-82A2-86D53C5ED667@FreeBSD.org> <20111008152320.GF1511@deviant.kiev.zoral.com.ua> In-Reply-To: <20111008152320.GF1511@deviant.kiev.zoral.com.ua> X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Stanislav Sedov , Ed Schouten , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r226122 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 19:25:18 -0000 On 10/08/2011 08:23, Kostik Belousov wrote: > On Sat, Oct 08, 2011 at 08:02:43AM -0700, Stanislav Sedov wrote: >> On Oct 8, 2011, at 12:33 AM, Ed Schouten wrote: >> >>> Hi, >>> >>> * Stanislav Sedov , 20111008 01:43: >>>> - ${WRKSRC} might be missing when the autotools fixup is running. >>>> Account for this. >>> >>> Maybe we should simplify this a bit? >> >> Sounds good! >> I didn't think about that way of ignoring the error code. > > Can you, please, also add a check for uname -r being indeed 10.0-CURRENT, > before applying the hack ? The change is only in HEAD, why would that be necessary? > Also, the hack does not fix perl, I have to use the following patch. That's useful, thanks! -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 19:32:48 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EF7A106566C; Sat, 8 Oct 2011 19:32:48 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id BCD268FC0A; Sat, 8 Oct 2011 19:32:47 +0000 (UTC) Received: from alf.home (alf.kiev.zoral.com.ua [10.1.1.177]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p98JWgXf079916 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 8 Oct 2011 22:32:42 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from alf.home (kostik@localhost [127.0.0.1]) by alf.home (8.14.5/8.14.5) with ESMTP id p98JWgcC011620; Sat, 8 Oct 2011 22:32:42 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by alf.home (8.14.5/8.14.5/Submit) id p98JWgNR011619; Sat, 8 Oct 2011 22:32:42 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: alf.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 8 Oct 2011 22:32:42 +0300 From: Kostik Belousov To: Doug Barton Message-ID: <20111008193242.GJ1511@deviant.kiev.zoral.com.ua> References: <201110072343.p97NhpFK032806@svn.freebsd.org> <20111008073318.GB91943@hoeg.nl> <9549F7D2-F287-40B3-82A2-86D53C5ED667@FreeBSD.org> <20111008152320.GF1511@deviant.kiev.zoral.com.ua> <4E90A39C.5040806@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OZbKyx2RhHTu2Jdh" Content-Disposition: inline In-Reply-To: <4E90A39C.5040806@FreeBSD.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: Stanislav Sedov , Ed Schouten , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r226122 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 19:32:48 -0000 --OZbKyx2RhHTu2Jdh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Oct 08, 2011 at 12:25:16PM -0700, Doug Barton wrote: > On 10/08/2011 08:23, Kostik Belousov wrote: > > On Sat, Oct 08, 2011 at 08:02:43AM -0700, Stanislav Sedov wrote: > >> On Oct 8, 2011, at 12:33 AM, Ed Schouten wrote: > >> > >>> Hi, > >>> > >>> * Stanislav Sedov , 20111008 01:43: > >>>> - ${WRKSRC} might be missing when the autotools fixup is running. > >>>> Account for this. > >>> > >>> Maybe we should simplify this a bit? > >> > >> Sounds good! > >> I didn't think about that way of ignoring the error code. > >=20 > > Can you, please, also add a check for uname -r being indeed 10.0-CURREN= T, > > before applying the hack ? >=20 > The change is only in HEAD, why would that be necessary? UNAME_r is better, i.e. the hack broke some port for me (I do not remember which, right now). Anyway, it is reverted. --OZbKyx2RhHTu2Jdh Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk6QpU8ACgkQC3+MBN1Mb4ihDQCg91UqDsUTbZgMkFQ6RQb18rgV zlEAni8fKXWxPIMhTR5ubiHrzmIJFWQ1 =h/gp -----END PGP SIGNATURE----- --OZbKyx2RhHTu2Jdh-- From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 19:35:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id A32E7106566B; Sat, 8 Oct 2011 19:35:12 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 53B741575A6; Sat, 8 Oct 2011 19:34:45 +0000 (UTC) Message-ID: <4E90A5D4.9020006@FreeBSD.org> Date: Sat, 08 Oct 2011 12:34:44 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1 MIME-Version: 1.0 To: Chris Rees References: <201110081825.p98IP22D073560@svn.freebsd.org> In-Reply-To: <201110081825.p98IP22D073560@svn.freebsd.org> X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226162 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 19:35:12 -0000 On 10/08/2011 11:25, Chris Rees wrote: > Author: crees (ports committer) > Date: Sat Oct 8 18:25:01 2011 > New Revision: 226162 > URL: http://svn.freebsd.org/changeset/base/226162 > > Log: > Revert unapproved commit to bsd.port.mk. This is completely unacceptable. We don't do "commit wars" in FreeBSD. IF it's accurate that portmgr has custody on this file (as opposed to ports/Mk/bsd.port.mk where they unquestionably do), and IF portmgr had a problem with this commit, it's up to them to deal with it. The fact that you don't think it's a good idea (for whatever reason) frankly isn't relevant. > This would have had more discussion, but it was explicitly rejected at submission by portmgr: > > http://lists.freebsd.org/pipermail/freebsd-ports/2011-September/070591.html I read that message as rejecting the idea of applying it to ports/Mk/bsd.port.mk, and I think Jilles and Ed applied a very creative solution to keeping things moving on HEAD without impacting the ports tree itself. Doug > Modified: > head/share/mk/bsd.port.mk > > Modified: head/share/mk/bsd.port.mk > ============================================================================== > --- head/share/mk/bsd.port.mk Sat Oct 8 16:45:03 2011 (r226161) > +++ head/share/mk/bsd.port.mk Sat Oct 8 18:25:01 2011 (r226162) > @@ -14,19 +14,3 @@ _WITHOUT_SRCCONF= > > .include > .include "${BSDPORTMK}" > - > -.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK) > -# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. > -run-autotools-fixup: > - test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \ > - -name config.rpath -o -name configure -o -name libtool.m4 \) \ > - -exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \ > - -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ > - -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ > - -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ > - -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ > - {} + || /usr/bin/true > - > -.ORDER: run-autotools run-autotools-fixup do-configure > -do-configure: run-autotools-fixup > -.endif > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 19:50:01 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B43F6106566B; Sat, 8 Oct 2011 19:50:01 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) by mx1.freebsd.org (Postfix) with ESMTP id 906F98FC08; Sat, 8 Oct 2011 19:50:01 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost.apl.washington.edu [127.0.0.1]) by troutmask.apl.washington.edu (8.14.5/8.14.5) with ESMTP id p98Jo1lX077469; Sat, 8 Oct 2011 12:50:01 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.5/8.14.5/Submit) id p98Jo1Mg077468; Sat, 8 Oct 2011 12:50:01 -0700 (PDT) (envelope-from sgk) Date: Sat, 8 Oct 2011 12:50:01 -0700 From: Steve Kargl To: Doug Barton Message-ID: <20111008195001.GA77379@troutmask.apl.washington.edu> References: <201110081825.p98IP22D073560@svn.freebsd.org> <4E90A5D4.9020006@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4E90A5D4.9020006@FreeBSD.org> User-Agent: Mutt/1.4.2.3i Cc: Chris Rees , svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r226162 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 19:50:01 -0000 On Sat, Oct 08, 2011 at 12:34:44PM -0700, Doug Barton wrote: > On 10/08/2011 11:25, Chris Rees wrote: > > Author: crees (ports committer) > > Date: Sat Oct 8 18:25:01 2011 > > New Revision: 226162 > > URL: http://svn.freebsd.org/changeset/base/226162 > > > > Log: > > Revert unapproved commit to bsd.port.mk. > > This is completely unacceptable. We don't do "commit wars" in FreeBSD. FWIW, I completely agree with Doug, which is a rare event. The original commit message included This commit should be reverted when there is a cleaner fix in autotools and/or ports/Mk/bsd.port.mk. Chris, it appears that you did not commit a cleaner fix. You also seem to have omitted the "Approved by", "Reviewed by", and/or "Discussed on" line in your commit message. -- Steve From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 20:07:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F2F8106564A; Sat, 8 Oct 2011 20:07:37 +0000 (UTC) (envelope-from utisoft@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4E4A58FC0C; Sat, 8 Oct 2011 20:07:37 +0000 (UTC) Received: by iaby12 with SMTP id y12so592645iab.13 for ; Sat, 08 Oct 2011 13:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=MyiGyUoDteLk30dlMxL68SeZmwuNZBPWH2S3C1SEp/E=; b=oLT1+Vjy69DUxzJAt4pBK0TDANz193+kUcyrJTjKQCz4kseR358paGZAJJwA6Zr8rb kBzgy3KGhm74cI9HA6z7KoMJONcSe8sVWxW+YMPyYJauc/xH5+GqJAJodZBxNGk/6IkI JEeY/XTniBuwxDdRFGjksNqw1OnBvmoKU/rdQ= MIME-Version: 1.0 Received: by 10.231.69.80 with SMTP id y16mr5729319ibi.34.1318103124206; Sat, 08 Oct 2011 12:45:24 -0700 (PDT) Sender: utisoft@gmail.com Received: by 10.231.35.194 with HTTP; Sat, 8 Oct 2011 12:45:24 -0700 (PDT) Received: by 10.231.35.194 with HTTP; Sat, 8 Oct 2011 12:45:24 -0700 (PDT) In-Reply-To: <4E90A5D4.9020006@FreeBSD.org> References: <201110081825.p98IP22D073560@svn.freebsd.org> <4E90A5D4.9020006@FreeBSD.org> Date: Sat, 8 Oct 2011 20:45:24 +0100 X-Google-Sender-Auth: PUZRSJi2YNAOQ5GJd5rqssYazoc Message-ID: From: Chris Rees To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226162 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 20:07:37 -0000 On 8 Oct 2011 20:35, "Doug Barton" wrote: > > On 10/08/2011 11:25, Chris Rees wrote: > > Author: crees (ports committer) > > Date: Sat Oct 8 18:25:01 2011 > > New Revision: 226162 > > URL: http://svn.freebsd.org/changeset/base/226162 > > > > Log: > > Revert unapproved commit to bsd.port.mk. > > This is completely unacceptable. We don't do "commit wars" in FreeBSD. > IF it's accurate that portmgr has custody on this file (as opposed to > ports/Mk/bsd.port.mk where they unquestionably do), and IF portmgr had a > problem with this commit, it's up to them to deal with it. The fact that > you don't think it's a good idea (for whatever reason) frankly isn't > relevant. > > > This would have had more discussion, but it was explicitly rejected at submission by portmgr: > > > > http://lists.freebsd.org/pipermail/freebsd-ports/2011-September/070591.html > > I read that message as rejecting the idea of applying it to > ports/Mk/bsd.port.mk, and I think Jilles and Ed applied a very creative > solution to keeping things moving on HEAD without impacting the ports > tree itself. > This was subverting maintainer approval, whether inadvertent or not. It has nothing to do with whether I think it's a good idea or not, but please remember that this took place behind the back of the majority of the developers it affected, including me. Wherever the file is, and however creative the solution is, and however you read Erwin's message, the answer is clear; portmgr disapproves, please don't do it, because ports@ is where the fallout will happen. When I installed CURRENT I was surprised to find the problems impossible to reproduce, and that was because this fragment was put in an obscure place. We may not do revert wars, but I have to go through the proper process of getting stuff into bsd.port.mk, and so does everyone else. Please don't let's hold multiple conversations, feel free to bring my other email before developers@. Chris From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 21:02:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D41DD106566C; Sat, 8 Oct 2011 21:02:08 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C33558FC0A; Sat, 8 Oct 2011 21:02:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98L28gf078425; Sat, 8 Oct 2011 21:02:08 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98L28gZ078423; Sat, 8 Oct 2011 21:02:08 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201110082102.p98L28gZ078423@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 8 Oct 2011 21:02:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226164 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 21:02:09 -0000 Author: des Date: Sat Oct 8 21:02:08 2011 New Revision: 226164 URL: http://svn.freebsd.org/changeset/base/226164 Log: Address some of bde@'s concerns with the new code. Modified: head/usr.bin/kdump/kdump.c Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sat Oct 8 18:29:30 2011 (r226163) +++ head/usr.bin/kdump/kdump.c Sat Oct 8 21:02:08 2011 (r226164) @@ -110,16 +110,15 @@ struct ktr_header ktr_header; #define TIME_FORMAT "%b %e %T %Y" #define eqs(s1, s2) (strcmp((s1), (s2)) == 0) -#define print_number(i,n,c) \ - do { \ - if (decimal) \ - printf("%c%jd", c, (intmax_t)*i); \ - else \ - printf("%c%#jx", c, (intmax_t)*i); \ - i++; \ - n--; \ - c = ','; \ - } while (0) +#define print_number(i,n,c) do { \ + if (decimal) \ + printf("%c%jd", c, (intmax_t)*i); \ + else \ + printf("%c%#jx", c, (intmax_t)*i); \ + i++; \ + n--; \ + c = ','; \ +} while (0) #if defined(__amd64__) || defined(__i386__) @@ -513,7 +512,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in } case SYS_ptrace: putchar('('); - ptraceopname((intmax_t)*ip); + ptraceopname(*ip); c = ','; ip++; narg--; @@ -522,14 +521,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_eaccess: print_number(ip, narg, c); putchar(','); - accessmodename((intmax_t)*ip); + accessmodename(*ip); ip++; narg--; break; case SYS_open: print_number(ip, narg, c); putchar(','); - flagsandmodename((int)ip[0], (int)ip[1], decimal); + flagsandmodename(ip[0], ip[1], decimal); ip += 2; narg -= 2; break; @@ -537,7 +536,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - wait4optname((intmax_t)*ip); + wait4optname(*ip); ip++; narg--; break; @@ -546,14 +545,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_lchmod: print_number(ip, narg, c); putchar(','); - modename((intmax_t)*ip); + modename(*ip); ip++; narg--; break; case SYS_mknod: print_number(ip, narg, c); putchar(','); - modename((intmax_t)*ip); + modename(*ip); ip++; narg--; break; @@ -561,7 +560,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - getfsstatflagsname((intmax_t)*ip); + getfsstatflagsname(*ip); ip++; narg--; break; @@ -569,14 +568,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - mountflagsname((intmax_t)*ip); + mountflagsname(*ip); ip++; narg--; break; case SYS_unmount: print_number(ip, narg, c); putchar(','); - mountflagsname((intmax_t)*ip); + mountflagsname(*ip); ip++; narg--; break; @@ -585,7 +584,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - sendrecvflagsname((int)*ip); + sendrecvflagsname(*ip); ip++; narg--; break; @@ -595,7 +594,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - sendrecvflagsname((int)*ip); + sendrecvflagsname(*ip); ip++; narg--; break; @@ -604,26 +603,26 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_lchflags: print_number(ip, narg, c); putchar(','); - modename((intmax_t)*ip); + modename(*ip); ip++; narg--; break; case SYS_kill: print_number(ip, narg, c); putchar(','); - signame((int)*ip); + signame(*ip); ip++; narg--; break; case SYS_reboot: putchar('('); - rebootoptname((intmax_t)*ip); + rebootoptname(*ip); ip++; narg--; break; case SYS_umask: putchar('('); - modename((intmax_t)*ip); + modename(*ip); ip++; narg--; break; @@ -631,7 +630,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - msyncflagsname((intmax_t)*ip); + msyncflagsname(*ip); ip++; narg--; break; @@ -640,11 +639,11 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - mmapprotname((intmax_t)*ip); + mmapprotname(*ip); putchar(','); ip++; narg--; - mmapflagsname((intmax_t)*ip); + mmapflagsname(*ip); ip++; narg--; break; @@ -653,11 +652,11 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - mmapprotname((intmax_t)*ip); + mmapprotname(*ip); putchar(','); ip++; narg--; - mmapflagsname((intmax_t)*ip); + mmapflagsname(*ip); ip++; narg--; break; @@ -665,7 +664,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - mmapprotname((intmax_t)*ip); + mmapprotname(*ip); ip++; narg--; break; @@ -673,7 +672,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - madvisebehavname((intmax_t)*ip); + madvisebehavname(*ip); ip++; narg--; break; @@ -681,32 +680,32 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - prioname((intmax_t)*ip); + prioname(*ip); ip++; narg--; break; case SYS_fcntl: print_number(ip, narg, c); putchar(','); - fcntlcmdname((int)ip[0], (int)ip[1], decimal); + fcntlcmdname(ip[0], ip[1], decimal); ip += 2; narg -= 2; break; case SYS_socket: { int sockdomain; putchar('('); - sockdomain=(intmax_t)*ip; + sockdomain = *ip; sockdomainname(sockdomain); ip++; narg--; putchar(','); - socktypename((intmax_t)*ip); + socktypename(*ip); ip++; narg--; if (sockdomain == PF_INET || sockdomain == PF_INET6) { putchar(','); - sockipprotoname((intmax_t)*ip); + sockipprotoname(*ip); ip++; narg--; } @@ -717,12 +716,12 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_getsockopt: print_number(ip, narg, c); putchar(','); - sockoptlevelname((int)*ip, decimal); + sockoptlevelname(*ip, decimal); if (*ip == SOL_SOCKET) { ip++; narg--; putchar(','); - sockoptname((intmax_t)*ip); + sockoptname(*ip); } ip++; narg--; @@ -734,7 +733,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - whencename((intmax_t)*ip); + whencename(*ip); ip++; narg--; break; @@ -744,14 +743,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in /* Hidden 'pad' argument, not in lseek(2) */ print_number(ip, narg, c); putchar(','); - whencename((intmax_t)*ip); + whencename(*ip); ip++; narg--; break; case SYS_flock: print_number(ip, narg, c); putchar(','); - flockname((intmax_t)*ip); + flockname(*ip); ip++; narg--; break; @@ -759,24 +758,24 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_mkdir: print_number(ip, narg, c); putchar(','); - modename((intmax_t)*ip); + modename(*ip); ip++; narg--; break; case SYS_shutdown: print_number(ip, narg, c); putchar(','); - shutdownhowname((intmax_t)*ip); + shutdownhowname(*ip); ip++; narg--; break; case SYS_socketpair: putchar('('); - sockdomainname((intmax_t)*ip); + sockdomainname(*ip); ip++; narg--; putchar(','); - socktypename((intmax_t)*ip); + socktypename(*ip); ip++; narg--; c = ','; @@ -784,7 +783,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_getrlimit: case SYS_setrlimit: putchar('('); - rlimitname((intmax_t)*ip); + rlimitname(*ip); ip++; narg--; c = ','; @@ -792,21 +791,21 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_quotactl: print_number(ip, narg, c); putchar(','); - quotactlname((intmax_t)*ip); + quotactlname(*ip); ip++; narg--; c = ','; break; case SYS_nfssvc: putchar('('); - nfssvcname((intmax_t)*ip); + nfssvcname(*ip); ip++; narg--; c = ','; break; case SYS_rtprio: putchar('('); - rtprioname((int)*ip); + rtprioname(*ip); ip++; narg--; c = ','; @@ -815,7 +814,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - semctlname((int)*ip); + semctlname(*ip); ip++; narg--; break; @@ -823,14 +822,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - semgetname((int)*ip); + semgetname(*ip); ip++; narg--; break; case SYS_msgctl: print_number(ip, narg, c); putchar(','); - shmctlname((int)*ip); + shmctlname(*ip); ip++; narg--; break; @@ -838,14 +837,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - shmatname((intmax_t)*ip); + shmatname(*ip); ip++; narg--; break; case SYS_shmctl: print_number(ip, narg, c); putchar(','); - shmctlname((int)*ip); + shmctlname(*ip); ip++; narg--; break; @@ -853,41 +852,41 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - minheritname((intmax_t)*ip); + minheritname(*ip); ip++; narg--; break; case SYS_rfork: putchar('('); - rforkname((intmax_t)*ip); + rforkname(*ip); ip++; narg--; c = ','; break; case SYS_lio_listio: putchar('('); - lio_listioname((intmax_t)*ip); + lio_listioname(*ip); ip++; narg--; c = ','; break; case SYS_mlockall: putchar('('); - mlockallname((intmax_t)*ip); + mlockallname(*ip); ip++; narg--; break; case SYS_sched_setscheduler: print_number(ip, narg, c); putchar(','); - schedpolicyname((intmax_t)*ip); + schedpolicyname(*ip); ip++; narg--; break; case SYS_sched_get_priority_max: case SYS_sched_get_priority_min: putchar('('); - schedpolicyname((intmax_t)*ip); + schedpolicyname(*ip); ip++; narg--; break; @@ -899,20 +898,20 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - sendfileflagsname((intmax_t)*ip); + sendfileflagsname(*ip); ip++; narg--; break; case SYS_kldsym: print_number(ip, narg, c); putchar(','); - kldsymcmdname((intmax_t)*ip); + kldsymcmdname(*ip); ip++; narg--; break; case SYS_sigprocmask: putchar('('); - sigprocmaskhowname((intmax_t)*ip); + sigprocmaskhowname(*ip); ip++; narg--; c = ','; @@ -931,13 +930,13 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS___acl_aclcheck_link: print_number(ip, narg, c); putchar(','); - acltypename((intmax_t)*ip); + acltypename(*ip); ip++; narg--; break; case SYS_sigaction: putchar('('); - signame((int)*ip); + signame(*ip); ip++; narg--; c = ','; @@ -945,7 +944,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in case SYS_extattrctl: print_number(ip, narg, c); putchar(','); - extattrctlname((intmax_t)*ip); + extattrctlname(*ip); ip++; narg--; break; @@ -953,7 +952,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - mountflagsname((intmax_t)*ip); + mountflagsname(*ip); ip++; narg--; break; @@ -961,28 +960,28 @@ ktrsyscall(struct ktr_syscall *ktr, u_in print_number(ip, narg, c); print_number(ip, narg, c); putchar(','); - thrcreateflagsname((intmax_t)*ip); + thrcreateflagsname(*ip); ip++; narg--; break; case SYS_thr_kill: print_number(ip, narg, c); putchar(','); - signame((int)*ip); + signame(*ip); ip++; narg--; break; case SYS_kldunloadf: print_number(ip, narg, c); putchar(','); - kldunloadfflagsname((intmax_t)*ip); + kldunloadfflagsname(*ip); ip++; narg--; break; case SYS_cap_new: print_number(ip, narg, c); putchar(','); - capname((intmax_t)*ip); + capname(*ip); ip++; narg--; break; From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 21:06:02 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C93106566B; Sat, 8 Oct 2011 21:06:02 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from mx0.hoeg.nl (mx0.hoeg.nl [IPv6:2a01:4f8:101:5343::aa]) by mx1.freebsd.org (Postfix) with ESMTP id A9A798FC08; Sat, 8 Oct 2011 21:06:02 +0000 (UTC) Received: by mx0.hoeg.nl (Postfix, from userid 1000) id 1A2B02A28CC9; Sat, 8 Oct 2011 23:06:02 +0200 (CEST) Date: Sat, 8 Oct 2011 23:06:02 +0200 From: Ed Schouten To: Chris Rees Message-ID: <20111008210602.GD91943@hoeg.nl> References: <201110081825.p98IP22D073560@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="vZDMF4x1t6HnyzWs" Content-Disposition: inline In-Reply-To: <201110081825.p98IP22D073560@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226162 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 21:06:03 -0000 --vZDMF4x1t6HnyzWs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Chris Rees , 20111008 20:25: > Revert unapproved commit to bsd.port.mk. You're very nice... :-) --=20 Ed Schouten WWW: http://80386.nl/ --vZDMF4x1t6HnyzWs Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iQIcBAEBAgAGBQJOkLs5AAoJEG5e2P40kaK7R0QP/1brbVVhI02DAML5f3N1ua8R LNo8zPYZ43STvmTP1J7tEBWfWziHBwGeCOVjPgfcChVaG0BR0BHBlCjrfFzHuPjv KtYxEgSY90AopkXVLx774m1br7Rsq3Fk6KZwpZBG9dU2jRxMTQjrgtMdoLfTlF6R usjoqATRUAZrhewUytN9EL6l+5CwyvKSNHLskfUZOGI1o09spGSyRiL1DqIRH6gL JvRxtw62f+wv9ocx1WXn5t1e+1mKUUBrgr40al51JYkif8v8Yq6hHYhYXclQs0+4 tmE2oqNfnA4aewLtlKeX1KAXM/v3iwpkOA57Ymh4Dndh0/4UcpfditLka/3cS30j Qmn2j3hZ9U6QV9XiY+cKMlgE15pL33ubgiCpKmhhYnPff8ApYP2++jqtpfjYhPBh XZ5ivo7rfL5GcoaTpBrBZ9vBhP6+OKalPtmjRpiSlbyUtDKtX6eD8km4IvoG2IhU 0hVKJ5+oVPtgLfSXuiRg2Q84IOIR0wYAAwZzK1XvXJB5xwx2HiI12ten2WmANGtn x50cU3Z3dKDaGa36lgzazodi3VLUhQFgWLCKo60z91ZFzSo4rtW3PtRbUQMzCb95 XsXAoTlMQRPwR9LNDMRA5W/iOZThOGmK5KuS26qs2AhB/KpGZXMRtQINdcydqTcu aeZkzl6MIB9HLajeg8r5 =Us1H -----END PGP SIGNATURE----- --vZDMF4x1t6HnyzWs-- From owner-svn-src-all@FreeBSD.ORG Sat Oct 8 21:15:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9408106566C; Sat, 8 Oct 2011 21:15:39 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B998E8FC0C; Sat, 8 Oct 2011 21:15:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98LFdC2078877; Sat, 8 Oct 2011 21:15:39 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98LFdH0078875; Sat, 8 Oct 2011 21:15:39 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110082115.p98LFdH0078875@svn.freebsd.org> From: Marius Strobl Date: Sat, 8 Oct 2011 21:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226165 - head/sys/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 21:15:39 -0000 Author: marius Date: Sat Oct 8 21:15:39 2011 New Revision: 226165 URL: http://svn.freebsd.org/changeset/base/226165 Log: Remove inphy(4), exphy(4) as well as ruephy(4) that no longer existed as a separate config option, which was missed in r226154. Modified: head/sys/conf/NOTES Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Sat Oct 8 21:02:08 2011 (r226164) +++ head/sys/conf/NOTES Sat Oct 8 21:15:39 2011 (r226165) @@ -1862,10 +1862,8 @@ device bmtphy # Broadcom BCM5201/BCM5 device brgphy # Broadcom BCM54xx/57xx 1000baseTX device ciphy # Cicada/Vitesse CS/VSC8xxx device e1000phy # Marvell 88E1000 1000/100/10-BT -device exphy # 3Com internal PHY device gentbi # Generic 10-bit 1000BASE-{LX,SX} fiber ifaces device icsphy # ICS ICS1889-1893 -device inphy # Intel 82553/82555 device ip1000phy # IC Plus IP1000A/IP1001 device jmphy # JMicron JMP211/JMP202 device lxtphy # Level One LXT-970 @@ -1879,7 +1877,6 @@ device rdcphy # RDC Semiconductor R60 device rgephy # RealTek 8169S/8110S/8211B/8211C device rlphy # RealTek 8139 device rlswitch # RealTek 8305 -device ruephy # RealTek RTL8150 device smcphy # SMSC LAN91C111 device tdkphy # TDK 89Q2120 device tlphy # Texas Instruments ThunderLAN