Date: Fri, 30 Aug 2013 11:38:35 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255070 - in projects/random_number_generator: . bin/ps bin/sh cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib/libzpool cddl/usr.bin/ztest cddl/usr.sbin/zdb contrib/libexecinfo contrib/... Message-ID: <201308301138.r7UBcZGn085569@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Fri Aug 30 11:38:34 2013 New Revision: 255070 URL: http://svnweb.freebsd.org/changeset/base/255070 Log: MFC Added: projects/random_number_generator/etc/periodic/monthly/450.status-security - copied unchanged from r255069, head/etc/periodic/monthly/450.status-security projects/random_number_generator/etc/periodic/weekly/450.status-security - copied unchanged from r255069, head/etc/periodic/weekly/450.status-security projects/random_number_generator/share/man/man4/procdesc.4 - copied unchanged from r255069, head/share/man/man4/procdesc.4 projects/random_number_generator/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu - copied unchanged from r255069, head/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu projects/random_number_generator/sys/dev/xen/timer/ - copied from r255069, head/sys/dev/xen/timer/ projects/random_number_generator/sys/modules/iwnfw/iwn2000/ - copied from r255069, head/sys/modules/iwnfw/iwn2000/ projects/random_number_generator/sys/sys/_unrhdr.h - copied unchanged from r255069, head/sys/sys/_unrhdr.h projects/random_number_generator/sys/x86/xen/ - copied from r255069, head/sys/x86/xen/ projects/random_number_generator/sys/xen/evtchn/evtchnvar.h - copied unchanged from r255069, head/sys/xen/evtchn/evtchnvar.h projects/random_number_generator/sys/xen/xen-os.h - copied unchanged from r255069, head/sys/xen/xen-os.h Deleted: projects/random_number_generator/sys/dev/xen/xenpci/evtchn.c projects/random_number_generator/sys/i386/include/xen/xen_clock_util.h projects/random_number_generator/sys/i386/xen/xen_clock_util.c projects/random_number_generator/sys/i386/xen/xen_rtc.c projects/random_number_generator/sys/xen/evtchn/evtchn.c projects/random_number_generator/tools/build/options/WITH_BSDCONFIG projects/random_number_generator/tools/build/options/WITH_GNU_PATCH Modified: projects/random_number_generator/Makefile.inc1 projects/random_number_generator/ObsoleteFiles.inc projects/random_number_generator/UPDATING projects/random_number_generator/bin/ps/keyword.c projects/random_number_generator/bin/ps/ps.1 projects/random_number_generator/bin/sh/parser.c projects/random_number_generator/bin/sh/parser.h projects/random_number_generator/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/random_number_generator/cddl/lib/libzpool/Makefile projects/random_number_generator/cddl/usr.bin/ztest/Makefile projects/random_number_generator/cddl/usr.sbin/zdb/Makefile projects/random_number_generator/contrib/libexecinfo/backtrace.3 projects/random_number_generator/contrib/libexecinfo/backtrace.c projects/random_number_generator/contrib/libexecinfo/symtab.c projects/random_number_generator/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c projects/random_number_generator/etc/defaults/periodic.conf projects/random_number_generator/etc/mtree/BSD.usr.dist projects/random_number_generator/etc/periodic/monthly/Makefile projects/random_number_generator/etc/periodic/security/100.chksetuid projects/random_number_generator/etc/periodic/security/110.neggrpperm projects/random_number_generator/etc/periodic/security/200.chkmounts projects/random_number_generator/etc/periodic/security/300.chkuid0 projects/random_number_generator/etc/periodic/security/400.passwdless projects/random_number_generator/etc/periodic/security/410.logincheck projects/random_number_generator/etc/periodic/security/460.chkportsum projects/random_number_generator/etc/periodic/security/500.ipfwdenied projects/random_number_generator/etc/periodic/security/510.ipfdenied projects/random_number_generator/etc/periodic/security/520.pfdenied projects/random_number_generator/etc/periodic/security/550.ipfwlimit projects/random_number_generator/etc/periodic/security/610.ipf6denied projects/random_number_generator/etc/periodic/security/700.kernelmsg projects/random_number_generator/etc/periodic/security/800.loginfail projects/random_number_generator/etc/periodic/security/900.tcpwrap projects/random_number_generator/etc/periodic/security/security.functions projects/random_number_generator/etc/periodic/weekly/Makefile projects/random_number_generator/etc/rc.d/savecore projects/random_number_generator/gnu/usr.bin/patch/Makefile projects/random_number_generator/lib/libc/gen/wordexp.c projects/random_number_generator/lib/libc/sys/pdfork.2 projects/random_number_generator/lib/libpam/modules/pam_passwdqc/Makefile projects/random_number_generator/lib/libutil/expand_number.c projects/random_number_generator/lib/libutil/login_auth.c projects/random_number_generator/lib/libutil/login_cap.c projects/random_number_generator/lib/libutil/pidfile.c projects/random_number_generator/lib/libutil/quotafile.c projects/random_number_generator/lib/libutil/uucplock.c projects/random_number_generator/lib/msun/src/s_erf.c projects/random_number_generator/lib/msun/src/s_erff.c projects/random_number_generator/release/scripts/mm-mtree.sh projects/random_number_generator/sbin/camcontrol/camcontrol.c projects/random_number_generator/sbin/etherswitchcfg/etherswitchcfg.8 projects/random_number_generator/share/man/man4/Makefile projects/random_number_generator/share/man/man4/capsicum.4 projects/random_number_generator/share/man/man4/cd.4 projects/random_number_generator/share/man/man4/sysmouse.4 projects/random_number_generator/share/man/man4/vmx.4 projects/random_number_generator/share/man/man5/periodic.conf.5 projects/random_number_generator/share/man/man5/src.conf.5 projects/random_number_generator/share/mk/bsd.own.mk projects/random_number_generator/share/mk/sys.mk projects/random_number_generator/sys/amd64/amd64/apic_vector.S projects/random_number_generator/sys/amd64/amd64/cpu_switch.S projects/random_number_generator/sys/amd64/amd64/genassym.c projects/random_number_generator/sys/amd64/amd64/machdep.c projects/random_number_generator/sys/amd64/amd64/mp_machdep.c projects/random_number_generator/sys/amd64/amd64/pmap.c projects/random_number_generator/sys/amd64/amd64/vm_machdep.c projects/random_number_generator/sys/amd64/include/apicvar.h projects/random_number_generator/sys/amd64/include/cpufunc.h projects/random_number_generator/sys/amd64/include/intr_machdep.h projects/random_number_generator/sys/amd64/include/pcpu.h projects/random_number_generator/sys/amd64/include/pmap.h projects/random_number_generator/sys/amd64/include/smp.h projects/random_number_generator/sys/amd64/include/xen/hypercall.h projects/random_number_generator/sys/amd64/include/xen/xen-os.h projects/random_number_generator/sys/amd64/vmm/vmm_instruction_emul.c projects/random_number_generator/sys/arm/arm/pmap-v6.c projects/random_number_generator/sys/arm/arm/pmap.c projects/random_number_generator/sys/boot/forth/beastie.4th projects/random_number_generator/sys/boot/forth/version.4th projects/random_number_generator/sys/boot/forth/version.4th.8 projects/random_number_generator/sys/cam/scsi/scsi_all.c projects/random_number_generator/sys/cam/scsi/scsi_ch.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/random_number_generator/sys/compat/freebsd32/freebsd32.h projects/random_number_generator/sys/conf/Makefile.amd64 projects/random_number_generator/sys/conf/files projects/random_number_generator/sys/conf/files.amd64 projects/random_number_generator/sys/conf/files.i386 projects/random_number_generator/sys/dev/ahci/ahci.c projects/random_number_generator/sys/dev/ath/if_ath.c projects/random_number_generator/sys/dev/cxgbe/adapter.h projects/random_number_generator/sys/dev/cxgbe/offload.h projects/random_number_generator/sys/dev/cxgbe/osdep.h projects/random_number_generator/sys/dev/cxgbe/t4_main.c projects/random_number_generator/sys/dev/cxgbe/t4_sge.c projects/random_number_generator/sys/dev/cxgbe/t4_tracer.c projects/random_number_generator/sys/dev/cxgbe/tom/t4_cpl_io.c projects/random_number_generator/sys/dev/cxgbe/tom/t4_tom.c projects/random_number_generator/sys/dev/drm2/drmP.h projects/random_number_generator/sys/dev/drm2/drm_atomic.h projects/random_number_generator/sys/dev/drm2/drm_context.c projects/random_number_generator/sys/dev/drm2/drm_irq.c projects/random_number_generator/sys/dev/drm2/drm_sysctl.c projects/random_number_generator/sys/dev/drm2/i915/i915_gem.c projects/random_number_generator/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/random_number_generator/sys/dev/drm2/i915/intel_display.c projects/random_number_generator/sys/dev/drm2/ttm/ttm_bo.c projects/random_number_generator/sys/dev/drm2/ttm/ttm_bo_util.c projects/random_number_generator/sys/dev/drm2/ttm/ttm_bo_vm.c projects/random_number_generator/sys/dev/fb/vesa.c projects/random_number_generator/sys/dev/fdc/fdc.c projects/random_number_generator/sys/dev/flash/mx25l.c projects/random_number_generator/sys/dev/gpio/gpiobus.c projects/random_number_generator/sys/dev/hwpmc/pmc_events.h projects/random_number_generator/sys/dev/iwn/if_iwn.c projects/random_number_generator/sys/dev/qlxgbe/ql_misc.c projects/random_number_generator/sys/dev/qlxgbe/ql_os.c projects/random_number_generator/sys/dev/uart/uart_dev_ns8250.c projects/random_number_generator/sys/dev/vmware/vmxnet3/if_vmx.c projects/random_number_generator/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/random_number_generator/sys/dev/xen/balloon/balloon.c projects/random_number_generator/sys/dev/xen/blkback/blkback.c projects/random_number_generator/sys/dev/xen/blkfront/blkfront.c projects/random_number_generator/sys/dev/xen/blkfront/block.h projects/random_number_generator/sys/dev/xen/console/console.c projects/random_number_generator/sys/dev/xen/console/xencons_ring.c projects/random_number_generator/sys/dev/xen/control/control.c projects/random_number_generator/sys/dev/xen/netback/netback.c projects/random_number_generator/sys/dev/xen/netfront/netfront.c projects/random_number_generator/sys/dev/xen/xenpci/xenpci.c projects/random_number_generator/sys/dev/xen/xenpci/xenpcivar.h projects/random_number_generator/sys/fs/nfs/nfs.h projects/random_number_generator/sys/fs/tmpfs/tmpfs_subr.c projects/random_number_generator/sys/geom/zero/g_zero.c projects/random_number_generator/sys/i386/i386/apic_vector.s projects/random_number_generator/sys/i386/i386/machdep.c projects/random_number_generator/sys/i386/i386/mp_machdep.c projects/random_number_generator/sys/i386/i386/pmap.c projects/random_number_generator/sys/i386/include/apicvar.h projects/random_number_generator/sys/i386/include/intr_machdep.h projects/random_number_generator/sys/i386/include/pcpu.h projects/random_number_generator/sys/i386/include/pmap.h projects/random_number_generator/sys/i386/include/xen/xen-os.h projects/random_number_generator/sys/i386/include/xen/xenfunc.h projects/random_number_generator/sys/i386/include/xen/xenvar.h projects/random_number_generator/sys/i386/isa/npx.c projects/random_number_generator/sys/i386/xen/clock.c projects/random_number_generator/sys/i386/xen/exception.s projects/random_number_generator/sys/i386/xen/mp_machdep.c projects/random_number_generator/sys/i386/xen/mptable.c projects/random_number_generator/sys/i386/xen/pmap.c projects/random_number_generator/sys/i386/xen/xen_machdep.c projects/random_number_generator/sys/ia64/ia64/pmap.c projects/random_number_generator/sys/kern/kern_event.c projects/random_number_generator/sys/kern/kern_physio.c projects/random_number_generator/sys/kern/kern_proc.c projects/random_number_generator/sys/kern/kern_synch.c projects/random_number_generator/sys/kern/subr_unit.c projects/random_number_generator/sys/kern/uipc_mbuf.c projects/random_number_generator/sys/kern/uipc_socket.c projects/random_number_generator/sys/kern/vfs_cluster.c projects/random_number_generator/sys/mips/atheros/ar71xx_spi.c projects/random_number_generator/sys/mips/atheros/if_arge.c projects/random_number_generator/sys/mips/conf/ROUTERSTATION.hints projects/random_number_generator/sys/mips/malta/gt_pci.c projects/random_number_generator/sys/mips/malta/yamon.c projects/random_number_generator/sys/mips/mips/pmap.c projects/random_number_generator/sys/modules/ip6_mroute_mod/Makefile projects/random_number_generator/sys/modules/linux/Makefile projects/random_number_generator/sys/net/if_lagg.c projects/random_number_generator/sys/net/if_lagg.h projects/random_number_generator/sys/net/if_llatbl.h projects/random_number_generator/sys/net/if_pfsync.h projects/random_number_generator/sys/net80211/ieee80211_output.c projects/random_number_generator/sys/net80211/ieee80211_proto.h projects/random_number_generator/sys/netinet/icmp_var.h projects/random_number_generator/sys/netinet/igmp_var.h projects/random_number_generator/sys/netinet/in.h projects/random_number_generator/sys/netinet/pim_var.h projects/random_number_generator/sys/netinet/tcp_lro.c projects/random_number_generator/sys/netinet/tcp_lro.h projects/random_number_generator/sys/netinet/tcp_var.h projects/random_number_generator/sys/netinet/udp_var.h projects/random_number_generator/sys/netinet6/pim6_var.h projects/random_number_generator/sys/netipsec/ipsec.h projects/random_number_generator/sys/netipsec/key_var.h projects/random_number_generator/sys/powerpc/powerpc/mmu_if.m projects/random_number_generator/sys/powerpc/powerpc/pmap_dispatch.c projects/random_number_generator/sys/sparc64/sparc64/pmap.c projects/random_number_generator/sys/sys/bitset.h projects/random_number_generator/sys/sys/cpuset.h projects/random_number_generator/sys/sys/kernel.h projects/random_number_generator/sys/sys/mbuf.h projects/random_number_generator/sys/sys/socket.h projects/random_number_generator/sys/sys/sysctl.h projects/random_number_generator/sys/sys/systm.h projects/random_number_generator/sys/sys/user.h projects/random_number_generator/sys/ufs/ffs/ffs_alloc.c projects/random_number_generator/sys/ufs/ufs/ufs_dirhash.c projects/random_number_generator/sys/vm/pmap.h projects/random_number_generator/sys/vm/vm_map.c projects/random_number_generator/sys/vm/vm_page.c projects/random_number_generator/sys/x86/include/segments.h projects/random_number_generator/sys/x86/x86/local_apic.c projects/random_number_generator/sys/xen/evtchn.h projects/random_number_generator/sys/xen/evtchn/evtchn_dev.c projects/random_number_generator/sys/xen/features.c projects/random_number_generator/sys/xen/gnttab.c projects/random_number_generator/sys/xen/gnttab.h projects/random_number_generator/sys/xen/hvm.h projects/random_number_generator/sys/xen/interface/event_channel.h projects/random_number_generator/sys/xen/xen_intr.h projects/random_number_generator/sys/xen/xenbus/xenbus.c projects/random_number_generator/sys/xen/xenbus/xenbus_if.m projects/random_number_generator/sys/xen/xenbus/xenbusb_front.c projects/random_number_generator/sys/xen/xenbus/xenbusvar.h projects/random_number_generator/sys/xen/xenstore/xenstore.c projects/random_number_generator/sys/xen/xenstore/xenstore_dev.c projects/random_number_generator/sys/xen/xenstore/xenstorevar.h projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc projects/random_number_generator/usr.bin/brandelf/brandelf.1 projects/random_number_generator/usr.bin/dig/Makefile projects/random_number_generator/usr.bin/host/Makefile projects/random_number_generator/usr.bin/nslookup/Makefile projects/random_number_generator/usr.bin/patch/Makefile projects/random_number_generator/usr.sbin/bhyve/pci_emul.c projects/random_number_generator/usr.sbin/bhyve/pci_virtio_block.c projects/random_number_generator/usr.sbin/crashinfo/crashinfo.sh projects/random_number_generator/usr.sbin/rtadvd/config.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/cddl/ (props changed) projects/random_number_generator/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/contrib/libexecinfo/ (props changed) projects/random_number_generator/lib/libc/ (props changed) projects/random_number_generator/lib/libutil/ (props changed) projects/random_number_generator/sbin/ (props changed) projects/random_number_generator/share/man/man4/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/amd64/include/xen/ (props changed) projects/random_number_generator/sys/amd64/vmm/ (props changed) projects/random_number_generator/sys/boot/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/sys/conf/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) projects/random_number_generator/usr.sbin/rtadvd/ (props changed) Modified: projects/random_number_generator/Makefile.inc1 ============================================================================== --- projects/random_number_generator/Makefile.inc1 Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/Makefile.inc1 Fri Aug 30 11:38:34 2013 (r255070) @@ -265,7 +265,7 @@ WMAKEENV= ${CROSSENV} \ PATH=${TMPPATH} # make hierarchy -HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q} .if defined(NO_ROOT) HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif @@ -814,7 +814,7 @@ distributeworld installworld: installche cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ - LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs + LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -888,7 +888,7 @@ reinstall: @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE} hierarchy + LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" Modified: projects/random_number_generator/ObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/ObsoleteFiles.inc Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/ObsoleteFiles.inc Fri Aug 30 11:38:34 2013 (r255070) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20130829: bsdpatch is patch unconditionally +OLD_FILES+=usr/bin/bsdpatch +OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz # 20130822: bind 9.9.3-P2 import OLD_LIBS+=usr/lib/liblwres.so.80 # 20130814: vm_page_busy(9) Modified: projects/random_number_generator/UPDATING ============================================================================== --- projects/random_number_generator/UPDATING Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/UPDATING Fri Aug 30 11:38:34 2013 (r255070) @@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130827: + Thomas Dickey (vendor author thereof) reports that dialog(1) since + 2011/10/18 has a bug in handling --hline. Testers and I noticed the + --hline is not ignored but displayed as a NULL string, regardless of + value. This will cause confusion in some bsdconfig dialogs where the + --hline is used to inform users which keybindings to use. This will + likewise affect any other persons relying on --hline. It also looks + rather strange seeing "[]" at the bottom of dialog(1) widgets when + passing --hline "anything". Thomas said he will have a look in a few + weeks. NOTE: The "[]" brackets appear with the left-edge where it + would normally appear given the width of text to display, but the + displayed text is not there (part of the bug). + 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/random_number_generator/bin/ps/keyword.c ============================================================================== --- projects/random_number_generator/bin/ps/keyword.c Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/bin/ps/keyword.c Fri Aug 30 11:38:34 2013 (r255070) @@ -87,6 +87,7 @@ static VAR var[] = { {"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0}, {"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0}, + {"fib", "FIB", NULL, 0, kvar, KOFF(ki_fibnum), INT, "d", 0}, {"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0}, {"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0}, {"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0}, Modified: projects/random_number_generator/bin/ps/ps.1 ============================================================================== --- projects/random_number_generator/bin/ps/ps.1 Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/bin/ps/ps.1 Fri Aug 30 11:38:34 2013 (r255070) @@ -512,6 +512,9 @@ elapsed running time, format minutes:seconds. .It Cm etimes elapsed running time, in decimal integer seconds +.It Cm fib +default FIB number, see +.Xr setfib 1 .It Cm flags the process flags, in hexadecimal (alias .Cm f ) Modified: projects/random_number_generator/bin/sh/parser.c ============================================================================== --- projects/random_number_generator/bin/sh/parser.c Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/bin/sh/parser.c Fri Aug 30 11:38:34 2013 (r255070) @@ -96,7 +96,7 @@ static struct heredoc *heredoclist; /* l static int doprompt; /* if set, prompt the user */ static int needprompt; /* true if interactive and at start of line */ static int lasttoken; /* last token read */ -int tokpushback; /* last token pushed back */ +static int tokpushback; /* last token pushed back */ static char *wordtext; /* text of last word returned by readtoken */ static int checkkwd; static struct nodelist *backquotelist; Modified: projects/random_number_generator/bin/sh/parser.h ============================================================================== --- projects/random_number_generator/bin/sh/parser.h Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/bin/sh/parser.h Fri Aug 30 11:38:34 2013 (r255070) @@ -68,11 +68,9 @@ /* * NEOF is returned by parsecmd when it encounters an end of file. It - * must be distinct from NULL, so we use the address of a variable that - * happens to be handy. + * must be distinct from NULL. */ -extern int tokpushback; -#define NEOF ((union node *)&tokpushback) +#define NEOF ((union node *)-1) extern int whichprompt; /* 1 == PS1, 2 == PS2 */ extern const char *const parsekwd[]; Modified: projects/random_number_generator/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/random_number_generator/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Aug 30 11:38:34 2013 (r255070) @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * DWARF to tdata conversion * @@ -1796,6 +1794,59 @@ die_resolve(dwarf_t *dw) } while (dw->dw_nunres != 0); } +/* + * Any object containing a function or object symbol at any scope should also + * contain DWARF data. + */ +static boolean_t +should_have_dwarf(Elf *elf) +{ + Elf_Scn *scn = NULL; + Elf_Data *data = NULL; + GElf_Shdr shdr; + GElf_Sym sym; + uint32_t symdx = 0; + size_t nsyms = 0; + boolean_t found = B_FALSE; + + while ((scn = elf_nextscn(elf, scn)) != NULL) { + gelf_getshdr(scn, &shdr); + + if (shdr.sh_type == SHT_SYMTAB) { + found = B_TRUE; + break; + } + } + + if (!found) + terminate("cannot convert stripped objects\n"); + + data = elf_getdata(scn, NULL); + nsyms = shdr.sh_size / shdr.sh_entsize; + + for (symdx = 0; symdx < nsyms; symdx++) { + gelf_getsym(data, symdx, &sym); + + if ((GELF_ST_TYPE(sym.st_info) == STT_FUNC) || + (GELF_ST_TYPE(sym.st_info) == STT_TLS) || + (GELF_ST_TYPE(sym.st_info) == STT_OBJECT)) { + char *name; + + name = elf_strptr(elf, shdr.sh_link, sym.st_name); + + /* Studio emits these local symbols regardless */ + if ((strcmp(name, "Bbss.bss") != 0) && + (strcmp(name, "Ttbss.bss") != 0) && + (strcmp(name, "Ddata.data") != 0) && + (strcmp(name, "Ttdata.data") != 0) && + (strcmp(name, "Drodata.rodata") != 0)) + return (B_TRUE); + } + } + + return (B_FALSE); +} + /*ARGSUSED*/ int dw_read(tdata_t *td, Elf *elf, char *filename __unused) @@ -1820,8 +1871,12 @@ dw_read(tdata_t *td, Elf *elf, char *fil if ((rc = dwarf_elf_init(elf, DW_DLC_READ, &dw.dw_dw, &dw.dw_err)) == DW_DLV_NO_ENTRY) { - errno = ENOENT; - return (-1); + if (should_have_dwarf(elf)) { + errno = ENOENT; + return (-1); + } else { + return (0); + } } else if (rc != DW_DLV_OK) { if (dwarf_errno(&dw.dw_err) == DW_DLE_DEBUG_INFO_NULL) { /* @@ -1839,9 +1894,14 @@ dw_read(tdata_t *td, Elf *elf, char *fil &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK) terminate("rc = %d %s\n", rc, dwarf_errmsg(&dw.dw_err)); - if ((cu = die_sibling(&dw, NULL)) == NULL) + if ((cu = die_sibling(&dw, NULL)) == NULL || + (((child = die_child(&dw, cu)) == NULL) && + should_have_dwarf(elf))) { terminate("file does not contain dwarf type data " "(try compiling with -g)\n"); + } else if (child == NULL) { + return (0); + } dw.dw_maxoff = nxthdr - 1; Modified: projects/random_number_generator/cddl/lib/libzpool/Makefile ============================================================================== --- projects/random_number_generator/cddl/lib/libzpool/Makefile Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/cddl/lib/libzpool/Makefile Fri Aug 30 11:38:34 2013 (r255070) @@ -64,7 +64,9 @@ NO_PROFILE= CSTD= c99 -CFLAGS+= -DDEBUG=1 -#DEBUG_FLAGS+= -g +# Since there are many asserts in this library, it makes no sense to compile +# it without debugging. + +CFLAGS+= -g -DDEBUG=1 .include <bsd.lib.mk> Modified: projects/random_number_generator/cddl/usr.bin/ztest/Makefile ============================================================================== --- projects/random_number_generator/cddl/usr.bin/ztest/Makefile Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/cddl/usr.bin/ztest/Makefile Fri Aug 30 11:38:34 2013 (r255070) @@ -25,7 +25,8 @@ LDADD= -lgeom -lm -lnvpair -lumem -lzpoo CSTD= c99 -CFLAGS+= -DDEBUG=1 -#DEBUG_FLAGS+= -g +# Since there are many asserts in this program, it makes no sense to compile +# it without debugging. +CFLAGS+= -g -DDEBUG=1 .include <bsd.prog.mk> Modified: projects/random_number_generator/cddl/usr.sbin/zdb/Makefile ============================================================================== --- projects/random_number_generator/cddl/usr.sbin/zdb/Makefile Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/cddl/usr.sbin/zdb/Makefile Fri Aug 30 11:38:34 2013 (r255070) @@ -27,7 +27,8 @@ DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} $ ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool -CFLAGS+= -DDEBUG=1 -#DEBUG_FLAGS+= -g +# Since there are many asserts in this program, it makes no sense to compile +# it without debugging. +CFLAGS+= -g -DDEBUG=1 .include <bsd.prog.mk> Modified: projects/random_number_generator/contrib/libexecinfo/backtrace.3 ============================================================================== --- projects/random_number_generator/contrib/libexecinfo/backtrace.3 Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/contrib/libexecinfo/backtrace.3 Fri Aug 30 11:38:34 2013 (r255070) @@ -1,4 +1,4 @@ -.\" $NetBSD: backtrace.3,v 1.4 2012/06/10 00:24:36 christos Exp $ +.\" $NetBSD: backtrace.3,v 1.5 2013/08/22 17:08:43 christos Exp $ .\" $FreeBSD$ .\" .\" Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -152,10 +152,4 @@ The Linux versions of the functions (the instead of .Ft size_t arguments. -.It -The -.Fn backtrace_symbols -functions currently rely on -.Xr procfs 5 -to locate the executable. .El Modified: projects/random_number_generator/contrib/libexecinfo/backtrace.c ============================================================================== --- projects/random_number_generator/contrib/libexecinfo/backtrace.c Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/contrib/libexecinfo/backtrace.c Fri Aug 30 11:38:34 2013 (r255070) @@ -1,4 +1,4 @@ -/* $NetBSD: backtrace.c,v 1.2 2012/07/09 03:11:59 christos Exp $ */ +/* $NetBSD: backtrace.c,v 1.3 2013/08/29 14:58:56 christos Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__RCSID("$NetBSD: backtrace.c,v 1.2 2012/07/09 03:11:59 christos Exp $"); +__RCSID("$NetBSD: backtrace.c,v 1.3 2013/08/29 14:58:56 christos Exp $"); #include <sys/param.h> #include <assert.h> @@ -51,9 +51,29 @@ __RCSID("$NetBSD: backtrace.c,v 1.2 2012 #ifdef __linux__ #define SELF "/proc/self/exe" #else +#include <sys/sysctl.h> #define SELF "/proc/curproc/file" #endif +static int +open_self(int flags) +{ + const char *pathname = SELF; +#ifdef KERN_PROC_PATHNAME + static const int name[] = { + CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1, + }; + char path[MAXPATHLEN]; + size_t len; + + len = sizeof(path); + if (sysctl(name, 4, path, &len, NULL, 0) != -1) + pathname = path; +#endif + return open(pathname, flags); +} + + static int __printflike(4, 5) rasprintf(char **buf, size_t *bufsiz, size_t offs, const char *fmt, ...) { @@ -163,7 +183,7 @@ backtrace_symbols_fmt(void *const *trace symtab_t *st; int fd; - if ((fd = open(SELF, O_RDONLY)) != -1) + if ((fd = open_self(O_RDONLY)) != -1) st = symtab_create(fd, -1, STT_FUNC); else st = NULL; Modified: projects/random_number_generator/contrib/libexecinfo/symtab.c ============================================================================== --- projects/random_number_generator/contrib/libexecinfo/symtab.c Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/contrib/libexecinfo/symtab.c Fri Aug 30 11:38:34 2013 (r255070) @@ -1,4 +1,4 @@ -/* $NetBSD: symtab.c,v 1.1 2012/05/26 22:02:29 christos Exp $ */ +/* $NetBSD: symtab.c,v 1.2 2013/08/29 15:01:57 christos Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -29,12 +29,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__RCSID("$NetBSD: symtab.c,v 1.1 2012/05/26 22:02:29 christos Exp $"); +__RCSID("$NetBSD: symtab.c,v 1.2 2013/08/29 15:01:57 christos Exp $"); #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> +#include <stdint.h> #include <err.h> #include <dlfcn.h> Modified: projects/random_number_generator/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c ============================================================================== --- projects/random_number_generator/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c Fri Aug 30 11:38:34 2013 (r255070) @@ -2,9 +2,9 @@ * Copyright (c) 2000-2002 by Solar Designer. See LICENSE. */ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #define _XOPEN_SOURCE_EXTENDED -#define _XOPEN_VERSION 500 +#define _XOPEN_VERSION 600 #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -132,17 +132,19 @@ static params_t defaults = { static int converse(pam_handle_t *pamh, int style, lo_const char *text, struct pam_response **resp) { - struct pam_conv *conv; + pam_item_t item; + lo_const struct pam_conv *conv; struct pam_message msg, *pmsg; int status; - status = pam_get_item(pamh, PAM_CONV, (pam_item_t *)&conv); + status = pam_get_item(pamh, PAM_CONV, &item); if (status != PAM_SUCCESS) return status; + conv = item; pmsg = &msg; msg.msg_style = style; - msg.msg = text; + msg.msg = (char *)text; *resp = NULL; return conv->conv(1, (lo_const struct pam_message **)&pmsg, resp, @@ -294,8 +296,11 @@ static int parse(params_t *params, pam_h } if (argc) { - say(pamh, PAM_ERROR_MSG, getuid() != 0 ? - MESSAGE_MISCONFIGURED : MESSAGE_INVALID_OPTION, *argv); + if (getuid() != 0) { + say(pamh, PAM_ERROR_MSG, MESSAGE_MISCONFIGURED); + } else { + say(pamh, PAM_ERROR_MSG, MESSAGE_INVALID_OPTION, *argv); + } return PAM_ABORT; } @@ -311,7 +316,9 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand #ifdef HAVE_SHADOW struct spwd *spw; #endif - char *user, *oldpass, *newpass, *randompass; + pam_item_t item; + lo_const char *user, *oldpass, *curpass; + char *newpass, *randompass; const char *reason; int ask_oldauthtok; int randomonly, enforce, retries_left, retry_wanted; @@ -353,17 +360,19 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand if (flags & PAM_PRELIM_CHECK) return status; - status = pam_get_item(pamh, PAM_USER, (pam_item_t *)&user); + status = pam_get_item(pamh, PAM_USER, &item); if (status != PAM_SUCCESS) return status; + user = item; - status = pam_get_item(pamh, PAM_OLDAUTHTOK, (pam_item_t *)&oldpass); + status = pam_get_item(pamh, PAM_OLDAUTHTOK, &item); if (status != PAM_SUCCESS) return status; + oldpass = item; if (params.flags & F_NON_UNIX) { pw = &fake_pw; - pw->pw_name = user; + pw->pw_name = (char *)user; pw->pw_gecos = ""; } else { pw = getpwnam(user); @@ -405,13 +414,13 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand enforce = params.flags & F_ENFORCE_ROOT; if (params.flags & F_USE_AUTHTOK) { - status = pam_get_item(pamh, PAM_AUTHTOK, - (pam_item_t *)&newpass); + status = pam_get_item(pamh, PAM_AUTHTOK, &item); if (status != PAM_SUCCESS) return status; - if (!newpass || (check_max(¶ms, pamh, newpass) && enforce)) + curpass = item; + if (!curpass || (check_max(¶ms, pamh, curpass) && enforce)) return PAM_AUTHTOK_ERR; - reason = _passwdqc_check(¶ms.qc, newpass, oldpass, pw); + reason = _passwdqc_check(¶ms.qc, curpass, oldpass, pw); if (reason) { say(pamh, PAM_ERROR_MSG, MESSAGE_WEAKPASS, reason); if (enforce) @@ -487,7 +496,7 @@ retry: if (!newpass) { if (randompass) _pam_overwrite(randompass); - return PAM_AUTHTOK_ERR; + return status; } if (check_max(¶ms, pamh, newpass) && enforce) { Modified: projects/random_number_generator/etc/defaults/periodic.conf ============================================================================== --- projects/random_number_generator/etc/defaults/periodic.conf Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/defaults/periodic.conf Fri Aug 30 11:38:34 2013 (r255070) @@ -128,7 +128,9 @@ daily_status_include_submit_mailq="YES" # 450.status-security daily_status_security_enable="YES" # Security check -# See "Security options" below for more options +# See also "Security options" below for more options +daily_status_security_inline="NO" # Run inline ? +daily_status_security_output="root" # user or /file # 460.status-mail-rejects daily_status_mail_rejects_enable="YES" # Check mail rejects @@ -163,59 +165,78 @@ daily_local="/etc/daily.local" # Loca # Security options # These options are used by the security periodic(8) scripts spawned in -# 450.status-security above. -daily_status_security_inline="NO" # Run inline ? -daily_status_security_output="root" # user or /file -daily_status_security_logdir="/var/log" # Directory for logs -daily_status_security_diff_flags="-b -u" # flags for diff output +# daily and weekly 450.status-security. +security_status_logdir="/var/log" # Directory for logs +security_status_diff_flags="-b -u" # flags for diff output + +# Each of the security_status_*_enable options below can have one of the +# following values: +# - NO +# - daily: only run during the daily security status +# - weekly: only run during the weekly security status # 100.chksetuid -daily_status_security_chksetuid_enable="YES" +security_status_chksetuid_enable="YES" +security_status_chksetuid_period="daily" # 110.neggrpperm -daily_status_security_neggrpperm_enable="YES" +security_status_neggrpperm_enable="YES" +security_status_neggrpperm_period="daily" # 200.chkmounts -daily_status_security_chkmounts_enable="YES" -#daily_status_security_chkmounts_ignore="^amd:" # Don't check matching +security_status_chkmounts_enable="YES" +security_status_chkmounts_period="daily" +#security_status_chkmounts_ignore="^amd:" # Don't check matching # FS types -daily_status_security_noamd="NO" # Don't check amd mounts +security_status_noamd="NO" # Don't check amd mounts # 300.chkuid0 -daily_status_security_chkuid0_enable="YES" +security_status_chkuid0_enable="YES" +security_status_chkuid0_period="daily" # 400.passwdless -daily_status_security_passwdless_enable="YES" +security_status_passwdless_enable="YES" +security_status_passwdless_period="daily" # 410.logincheck -daily_status_security_logincheck_enable="YES" +security_status_logincheck_enable="YES" +security_status_logincheck_period="daily" # 460.chkportsum -daily_status_security_chkportsum_enable="NO" # Check ports w/ wrong checksum +security_status_chkportsum_enable="NO" # Check ports w/ wrong checksum +security_status_chkportsum_period="daily" # 500.ipfwdenied -daily_status_security_ipfwdenied_enable="YES" +security_status_ipfwdenied_enable="YES" +security_status_ipfwdenied_period="daily" # 510.ipfdenied -daily_status_security_ipfdenied_enable="YES" +security_status_ipfdenied_enable="YES" +security_status_ipfdenied_period="daily" # 520.pfdenied -daily_status_security_pfdenied_enable="YES" +security_status_pfdenied_enable="YES" +security_status_pfdenied_period="daily" # 550.ipfwlimit -daily_status_security_ipfwlimit_enable="YES" +security_status_ipfwlimit_enable="YES" +security_status_ipfwlimit_period="daily" # 610.ipf6denied -daily_status_security_ipf6denied_enable="YES" +security_status_ipf6denied_enable="YES" +security_status_ipf6denied_period="daily" # 700.kernelmsg -daily_status_security_kernelmsg_enable="YES" +security_status_kernelmsg_enable="YES" +security_status_kernelmsg_period="daily" # 800.loginfail -daily_status_security_loginfail_enable="YES" +security_status_loginfail_enable="YES" +security_status_loginfail_period="daily" # 900.tcpwrap -daily_status_security_tcpwrap_enable="YES" +security_status_tcpwrap_enable="YES" +security_status_tcpwrap_period="daily" # Weekly options @@ -248,6 +269,12 @@ weekly_status_pkg_enable="NO" # Find pkg_version=pkg_version # Use this program pkg_version_index=/usr/ports/INDEX-10 # Use this index file +# 450.status-security +weekly_status_security_enable="YES" # Security check +# See also "Security options" above for more options +weekly_status_security_inline="NO" # Run inline ? +weekly_status_security_output="root" # user or /file + # 999.local weekly_local="/etc/weekly.local" # Local scripts @@ -267,6 +294,12 @@ monthly_show_badconfig="NO" # scripts # 200.accounting monthly_accounting_enable="YES" # Login accounting +# 450.status-security +monthly_status_security_enable="YES" # Security check +# See also "Security options" above for more options +monthly_status_security_inline="NO" # Run inline ? +monthly_status_security_output="root" # user or /file + # 999.local monthly_local="/etc/monthly.local" # Local scripts @@ -276,6 +309,74 @@ monthly_local="/etc/monthly.local" # L if [ -z "${source_periodic_confs_defined}" ]; then source_periodic_confs_defined=yes + + # Compatibility with old daily variable names. + # They can be removed in stable/11. + security_daily_compat_var() { + local var=$1 dailyvar value + + dailyvar=daily_status_security${#status_security} + periodvar=${var%enable}period + eval value=\"\$$dailyvar\" + [ -z "$value" ] && return + echo "Warning: Variable \$$dailyvar is deprecated," \ + "use \$$var instead." >&2 + case "$value" in + [Yy][Ee][Ss]) + $var=YES + $periodvar=daily + ;; + *) + $var="$value" + ;; + esac + } + + check_yesno_period() { + local var="$1" periodvar value period + + eval value=\"\$$var\" + case "$value" in + [Yy][Ee][Ss]) ;; + *) return 1 ;; + esac + + periodvar=${var%enable}period + eval period=\"\$$periodvar\" + case "$PERIODIC" in + "security daily") + case "$period" in + [Dd][Aa][Ii][Ll][Yy]) return 0 ;; + *) return 1 ;; + esac + ;; + "security weekly") + case "$period" in + [Ww][Ee][Ee][Kk][Ll][Yy]) return 0 ;; + *) return 1 ;; + esac + ;; + "security monthly") + case "$period" in + [Mm][Oo][Nn][Tt][Hh][Ll][Yy]) return 0 ;; + *) return 1 ;; + esac + ;; + security) + # Run directly from crontab(5). + case "$period" in + [Nn][Oo]) return 1 ;; + *) return 0 ;; + esac + ;; + *) + echo "ASSERTION FAILED: Unexpected value for " \ + "\$PERIODIC: '$PERIODIC'" >&2 + exit 127 + ;; + esac + } + source_periodic_confs() { local i sourced_files Modified: projects/random_number_generator/etc/mtree/BSD.usr.dist ============================================================================== --- projects/random_number_generator/etc/mtree/BSD.usr.dist Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/mtree/BSD.usr.dist Fri Aug 30 11:38:34 2013 (r255070) @@ -42,6 +42,62 @@ .. .. libexec + bsdconfig + 020.docsinstall + include + .. + .. + 030.packages + include + .. + .. + 040.password + include + .. + .. + 050.diskmgmt + include + .. + .. + 070.usermgmt + include + .. + .. + 080.console + include + .. + .. + 090.timezone + include + .. + .. + 110.mouse + include + .. + .. + 120.networking + include + .. + .. + 130.security + include + .. + .. + 140.startup + include + .. + .. + 150.ttys + include + .. + .. + dot + include + .. + .. + include + .. + .. bsdinstall .. lpr @@ -62,7 +118,25 @@ share atf .. + bsdconfig + media + .. + networking + .. + packages + .. + password + .. + startup + .. + timezone + .. + usermgmt + .. + .. calendar + de_AT.ISO_8859-15 + .. de_DE.ISO8859-1 .. fr_FR.ISO8859-1 @@ -71,8 +145,14 @@ .. hu_HU.ISO8859-2 .. + pt_BR.ISO8859-1 + .. + pt_BR.UTF-8 + .. ru_RU.KOI8-R .. + ru_RU.UTF-8 + .. uk_UA.KOI8-U .. .. @@ -221,6 +301,8 @@ .. bootforth .. + bsdconfig + .. csh .. cvsup Copied: projects/random_number_generator/etc/periodic/monthly/450.status-security (from r255069, head/etc/periodic/monthly/450.status-security) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/etc/periodic/monthly/450.status-security Fri Aug 30 11:38:34 2013 (r255070, copy of r255069, head/etc/periodic/monthly/450.status-security) @@ -0,0 +1,41 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$monthly_status_security_enable" in + [Yy][Ee][Ss]) + echo "" + echo "Security check:" + + case "$monthly_status_security_inline" in + [Yy][Ee][Ss]) + monthly_status_security_output="";; + esac + + export security_output="${monthly_status_security_output}" + case "${monthly_status_security_output}" in + "") + rc=3;; + /*) + echo " (output logged separately)" + rc=0;; + *) + echo " (output mailed separately)" + rc=0;; + esac + + periodic security || rc=3;; + + *) rc=0;; +esac + +exit $rc Modified: projects/random_number_generator/etc/periodic/monthly/Makefile ============================================================================== --- projects/random_number_generator/etc/periodic/monthly/Makefile Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/periodic/monthly/Makefile Fri Aug 30 11:38:34 2013 (r255070) @@ -2,7 +2,8 @@ .include <bsd.own.mk> -FILES= 999.local +FILES= 450.status-security \ + 999.local # NB: keep these sorted by MK_* knobs Modified: projects/random_number_generator/etc/periodic/security/100.chksetuid ============================================================================== --- projects/random_number_generator/etc/periodic/security/100.chksetuid Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/periodic/security/100.chksetuid Fri Aug 30 11:38:34 2013 (r255070) @@ -37,10 +37,12 @@ fi . /etc/periodic/security/security.functions +security_daily_compat_var security_status_chksetuid_enable + rc=0 -case "$daily_status_security_chksetuid_enable" in - [Yy][Ee][Ss]) +if check_yesno_period security_status_chksetuid_enable +then echo "" echo 'Checking setuid files and devices:' MP=`mount -t ufs,zfs | awk '$0 !~ /no(suid|exec)/ { print $3 }'` @@ -49,10 +51,6 @@ case "$daily_status_security_chksetuid_e \( -perm -u+s -or -perm -g+s \) -exec ls -liTd \{\} \+ | check_diff setuid - "${host} setuid diffs:" rc=$? - ;; - *) - rc=0 - ;; -esac +fi exit $rc Modified: projects/random_number_generator/etc/periodic/security/110.neggrpperm ============================================================================== --- projects/random_number_generator/etc/periodic/security/110.neggrpperm Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/periodic/security/110.neggrpperm Fri Aug 30 11:38:34 2013 (r255070) @@ -35,10 +35,12 @@ then source_periodic_confs fi +security_daily_compat_var security_status_neggrpperm_enable + rc=0 -case "$daily_status_security_neggrpperm_enable" in - [Yy][Ee][Ss]) +if check_yesno_period security_status_neggrpperm_enable +then echo "" echo 'Checking negative group permissions:' MP=`mount -t ufs,zfs | awk '$0 !~ /no(suid|exec)/ { print $3 }'` @@ -48,7 +50,6 @@ case "$daily_status_security_neggrpperm_ \( ! -perm +040 -and -perm +004 \) \) \ -exec ls -liTd \{\} \+ | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0 - ;; -esac +fi exit $rc Modified: projects/random_number_generator/etc/periodic/security/200.chkmounts ============================================================================== --- projects/random_number_generator/etc/periodic/security/200.chkmounts Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/periodic/security/200.chkmounts Fri Aug 30 11:38:34 2013 (r255070) @@ -40,12 +40,16 @@ fi . /etc/periodic/security/security.functions -ignore="${daily_status_security_chkmounts_ignore}" +security_daily_compat_var security_status_chkmounts_enable +security_daily_compat_var security_status_chkmounts_ignore +security_daily_compat_var security_status_noamd + +ignore="${security_status_chkmounts_ignore}" rc=0 -case "$daily_status_security_chkmounts_enable" in - [Yy][Ee][Ss]) - case "$daily_status_security_noamd" in +if check_yesno_period security_status_chkmounts_enable +then + case "$security_status_noamd" in [Yy][Ee][Ss]) ignore="${ignore}|^amd:" esac @@ -55,8 +59,7 @@ case "$daily_status_security_chkmounts_e fi mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" - rc=$?;; - *) rc=0;; -esac + rc=$? +fi exit "$rc" Modified: projects/random_number_generator/etc/periodic/security/300.chkuid0 ============================================================================== --- projects/random_number_generator/etc/periodic/security/300.chkuid0 Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/periodic/security/300.chkuid0 Fri Aug 30 11:38:34 2013 (r255070) @@ -36,16 +36,19 @@ then source_periodic_confs fi -case "$daily_status_security_chkuid0_enable" in - [Yy][Ee][Ss]) +security_daily_compat_var security_status_chkuid0_enable + +rc=0 + +if check_yesno_period security_status_chkuid0_enable +then echo "" echo 'Checking for uids of 0:' n=$(awk -F: '/^#/ {next} $3==0 {print $1,$3}' /etc/master.passwd | tee /dev/stderr | sed -e '/^root 0$/d' -e '/^toor 0$/d' | wc -l) - [ $n -gt 0 ] && rc=1 || rc=0;; - *) rc=0;; -esac + [ $n -gt 0 ] && rc=1 || rc=0 +fi exit "$rc" Modified: projects/random_number_generator/etc/periodic/security/400.passwdless ============================================================================== --- projects/random_number_generator/etc/periodic/security/400.passwdless Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/periodic/security/400.passwdless Fri Aug 30 11:38:34 2013 (r255070) @@ -35,14 +35,17 @@ then source_periodic_confs fi -case "$daily_status_security_passwdless_enable" in - [Yy][Ee][Ss]) +security_daily_compat_var security_status_passwdless_enable + +rc=0 + +if check_yesno_period security_status_passwdless_enable +then echo "" echo 'Checking for passwordless accounts:' n=$(awk -F: 'NF > 1 && $1 !~ /^[#+-]/ && $2=="" {print $0}' /etc/master.passwd | tee /dev/stderr | wc -l) - [ $n -gt 0 ] && rc=1 || rc=0;; - *) rc=0;; -esac + [ $n -gt 0 ] && rc=1 || rc=0 +fi exit "$rc" Modified: projects/random_number_generator/etc/periodic/security/410.logincheck ============================================================================== --- projects/random_number_generator/etc/periodic/security/410.logincheck Fri Aug 30 11:21:52 2013 (r255069) +++ projects/random_number_generator/etc/periodic/security/410.logincheck Fri Aug 30 11:38:34 2013 (r255070) @@ -35,8 +35,12 @@ then source_periodic_confs fi -case "$daily_status_security_logincheck_enable" in - [Yy][Ee][Ss]) +security_daily_compat_var security_status_logincheck_enable *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308301138.r7UBcZGn085569>