From owner-p4-projects@FreeBSD.ORG Wed Nov 1 22:55:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA06316A4D8; Wed, 1 Nov 2006 22:55:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9267B16A4D1 for ; Wed, 1 Nov 2006 22:55:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14CF743D98 for ; Wed, 1 Nov 2006 22:55:00 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA1MsvhB067359 for ; Wed, 1 Nov 2006 22:54:57 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA1MstsE067330 for perforce@freebsd.org; Wed, 1 Nov 2006 22:54:55 GMT (envelope-from piso@freebsd.org) Date: Wed, 1 Nov 2006 22:54:55 GMT Message-Id: <200611012254.kA1MstsE067330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 108979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2006 22:55:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=108979 Change 108979 by piso@piso_newluxor on 2006/11/01 22:54:11 IFC@108961 Affected files ... .. //depot/projects/soc2005/libalias/Makefile#9 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#12 integrate .. //depot/projects/soc2005/libalias/bin/rm/rm.1#2 integrate .. //depot/projects/soc2005/libalias/bin/rm/rm.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/soc2005/libalias/etc/snmpd.config#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/send-pr/send-pr.sh#2 integrate .. //depot/projects/soc2005/libalias/include/Makefile#5 integrate .. //depot/projects/soc2005/libalias/lib/libufs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libufs/cgread.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libufs/cgroup.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libufs/libufs.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libufs/libufs.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/dumpfs/dumpfs.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/dumpon/dumpon.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/gjournal.c#1 branch .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsdb/fsdb.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/fsdb/fsdb.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/journal/Makefile#1 branch .. //depot/projects/soc2005/libalias/sbin/geom/class/journal/geom_journal.c#1 branch .. //depot/projects/soc2005/libalias/sbin/geom/class/journal/geom_journal.h#1 branch .. //depot/projects/soc2005/libalias/sbin/geom/class/journal/geom_journal_ufs.c#1 branch .. //depot/projects/soc2005/libalias/sbin/ggate/shared/ggate.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/growfs/debug.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/soc2005/libalias/sbin/mount/mount.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/newfs.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/newfs.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/newfs.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/tunefs/tunefs.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_create.3#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#7 integrate .. //depot/projects/soc2005/libalias/share/man/man4/fdc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/acpi_sony.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/fs.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/disk.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/g_bio.9#2 integrate .. //depot/projects/soc2005/libalias/share/misc/bsd-family-tree#4 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2005/libalias/share/snmp/mibs/FREEBSD-MIB.txt#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#12 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#16 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aha/aha.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic/aic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/amd/amd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/amr/amr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/asr/asr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iir/iir.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mly/mly.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/trm/trm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/umass.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/soc2005/libalias/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom.h#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_disk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_disk.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_io.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_slice.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/soc2005/libalias/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/soc2005/libalias/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/soc2005/libalias/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/soc2005/libalias/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/NOTES#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_disk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_prf.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_cons.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_pts.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_journal/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/bridgestp.c#5 integrate .. //depot/projects/soc2005/libalias/sys/net/bridgestp.h#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#11 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/soc2005/libalias/sys/pci/ncr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/endian.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/endian.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/hypervisorvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/bio.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/cons.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/mac_policy.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/mount.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/pcpu.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/gjournal.h#1 branch .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_gjournal.c#1 branch .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/soc2005/libalias/tools/build/options/WITHOUT_CDDL#1 branch .. //depot/projects/soc2005/libalias/tools/tools/find-sb/mini_ufs.h#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/README#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/conf/bridge/tinybsd.ports#1 branch .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/conf/default/tinybsd.ports#1 branch .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/conf/firewall/tinybsd.ports#1 branch .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/conf/minimal/tinybsd.ports#1 branch .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/conf/vpn/tinybsd.ports#1 branch .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/conf/wireless/tinybsd.ports#1 branch .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/conf/wrap/tinybsd.ports#1 branch .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/tinybsd#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidcontrol/hid.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $ +# $FreeBSD: src/Makefile,v 1.337 2006/11/01 09:05:40 jb Exp $ # # The user-driven targets are: # @@ -240,7 +240,7 @@ MMAKE= ${MMAKEENV} make \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR -DNO_CTF make: .PHONY @echo ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -646,7 +646,9 @@ OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs +.if ${TARGET_ARCH} != "i386" OLD_FILES+=usr/bin/gdbserver +.endif OLD_FILES+=usr/bin/ssh-keysign OLD_FILES+=usr/sbin/gifconfig OLD_FILES+=usr/sbin/prefix ==== //depot/projects/soc2005/libalias/bin/rm/rm.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.39 2005/11/17 12:15:23 ru Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $ .\" -.Dd September 29, 2005 +.Dd October 30, 2006 .Dt RM 1 .Os .Sh NAME @@ -88,6 +88,10 @@ Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, then 0x00, and then 0xff again, before they are deleted. +Files with multiple links will not be overwritten nor deleted unless +.Fl f +is specified, a warning is generated instead. +.Pp Specifying this flag for a read only file will cause .Nm to generate an error message and exit. @@ -168,6 +172,12 @@ For example: .Dl rm /home/user/-filename .Dl rm ./-filename +.Pp +When +.Fl P +is specified with +.Fl f +the file will be overwritten and removed even if it has hard links. .Sh COMPATIBILITY The .Nm ==== //depot/projects/soc2005/libalias/bin/rm/rm.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $"); #include #include @@ -400,6 +400,11 @@ } if (!S_ISREG(sbp->st_mode)) return (1); + if (sbp->st_nlink > 1 && !fflag) { + warnx("%s (inode %u): not overwritten due to multiple links", + file, sbp->st_ino); + return (0); + } if ((fd = open(file, O_WRONLY, 0)) == -1) goto err; if (fstatfs(fd, &fsb) == -1) ==== //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ==== @@ -26,12 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ + * $Begemot: mibII.c 516 2006-10-27 15:54:02Z brandt_h $ * * Implementation of the standard interfaces and ip MIB. */ #include "mibII.h" #include "mibII_oid.h" +#include #include @@ -376,16 +377,16 @@ u_int ticks; if ((ticks = mibif_force_hc_update_interval) == 0) { - if (mibif_maxspeed <= 10000000) { + if (mibif_maxspeed <= IF_Mbps(10)) { /* at 10Mbps overflow needs 3436 seconds */ ticks = 3000 * 100; /* 50 minutes */ - } else if (mibif_maxspeed <= 100000000) { + } else if (mibif_maxspeed <= IF_Mbps(100)) { /* at 100Mbps overflow needs 343 seconds */ ticks = 300 * 100; /* 5 minutes */ - } else if (mibif_maxspeed < 650000000) { + } else if (mibif_maxspeed < IF_Mbps(622)) { /* at 622Mbps overflow needs 53 seconds */ ticks = 40 * 100; /* 40 seconds */ - } else if (mibif_maxspeed <= 1000000000) { + } else if (mibif_maxspeed <= IF_Mbps(1000)) { /* at 1Gbps overflow needs 34 seconds */ ticks = 20 * 100; /* 20 seconds */ } else { ==== //depot/projects/soc2005/libalias/contrib/bsnmp/snmpd/action.c#2 (text+ko) ==== @@ -2,6 +2,9 @@ * Copyright (c) 2001-2003 * Fraunhofer Institute for Open Communication Systems (FhG Fokus). * All rights reserved. + * Copyright (c) 2004-2006 + * Hartmut Brandt. + * All rights reserved. * * Author: Harti Brandt * @@ -26,13 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmpd/action.c,v 1.58 2004/08/06 08:47:09 brandt Exp $ + * $Begemot: action.c 517 2006-10-31 08:52:04Z brandt_h $ * * Variable access for SNMPd */ #include #include #include +#include #include #include #include @@ -48,6 +52,11 @@ static const struct asn_oid oid_begemotSnmpdModuleTable = OIDX_begemotSnmpdModuleTable; +#ifdef __FreeBSD__ +static const struct asn_oid + oid_freeBSDVersion = OIDX_freeBSDVersion; +#endif + /* * Get a string value from the KERN sysctl subtree. */ @@ -100,39 +109,57 @@ int init_actvals(void) { - char *v[4]; - u_int i; + struct utsname uts; + char *hostid; size_t len; +#ifdef __FreeBSD__ + char *rel, *p, *end; + u_long num; +#endif - if ((systemg.name = act_getkernstring(KERN_HOSTNAME)) == NULL) + if (uname(&uts) == -1) + return (-1); + + if ((systemg.name = strdup(uts.nodename)) == NULL) + return (-1); + + if ((hostid = act_getkernint(KERN_HOSTID)) == NULL) return (-1); - for (i = 0; i < 4; i++) - v[1] = NULL; + len = strlen(uts.nodename) + 1; + len += strlen(hostid) + 1; + len += strlen(uts.sysname) + 1; + len += strlen(uts.release) + 1; - if ((v[0] = act_getkernstring(KERN_HOSTNAME)) == NULL) - goto err; - if ((v[1] = act_getkernint(KERN_HOSTID)) == NULL) - goto err; - if ((v[2] = act_getkernstring(KERN_OSTYPE)) == NULL) - goto err; - if ((v[3] = act_getkernstring(KERN_OSRELEASE)) == NULL) - goto err; + if ((systemg.descr = malloc(len)) == NULL) { + free(hostid); + return (-1); + } + sprintf(systemg.descr, "%s %s %s %s", uts.nodename, hostid, uts.sysname, + uts.release); - for (i = 0, len = 0; i < 4; i++) - len += strlen(v[i]) + 1; +#ifdef __FreeBSD__ + /* + * Construct a FreeBSD oid + */ + systemg.object_id = oid_freeBSDVersion; + rel = uts.release; + while ((p = strsep(&rel, ".")) != NULL && + systemg.object_id.len < ASN_MAXOIDLEN) { + systemg.object_id.subs[systemg.object_id.len] = 0; + if (*p != '\0') { + num = strtoul(p, &end, 10); + if (end == p) + break; + systemg.object_id.subs[systemg.object_id.len] = num; + } + systemg.object_id.len++; + } +#endif - if ((systemg.descr = malloc(len)) == NULL) - goto err; - sprintf(systemg.descr, "%s %s %s %s", v[0], v[1], v[2], v[3]); + free(hostid); return (0); - - err: - for (i = 0; i < 4; i++) - if (v[i] != NULL) - free(v[i]); - return (-1); } ==== //depot/projects/soc2005/libalias/contrib/bsnmp/snmpd/tree.def#2 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Begemot: bsnmp/snmpd/tree.def,v 1.38 2004/08/06 08:47:17 brandt Exp $ +# $Begemot: tree.def 517 2006-10-31 08:52:04Z brandt_h $ # # System group and private Begemot SNMPd MIB. # @@ -64,11 +64,19 @@ (32 snmpProxyDrops COUNTER op_snmp GET) ) )) + + (4 private + (1 enterprises +# +# FreeBSD stuff # + (2238 freeBSD + (4 freeBSDVersion) + ) + +# # Private Begemot Stuff # - (4 private - (1 enterprises (12325 fokus (1 begemot ==== //depot/projects/soc2005/libalias/contrib/pf/man/pf.conf.5#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.9 2005/09/28 08:11:15 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.10 2006/10/30 15:15:37 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 7, 2005 +.Dd October 30, 2006 .Dt PF.CONF 5 .Os .Sh NAME @@ -2851,6 +2851,12 @@ for the moment. This workaround will still produce the LOR, but Giant will protect from the deadlock. +.Pp +Route labels are not supported by the +.Fx +.Xr route 4 +system. +Rules with a route label do not match any traffic. .Sh SEE ALSO .Xr altq 4 , .Xr icmp 4 , ==== //depot/projects/soc2005/libalias/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -108,6 +108,8 @@ .. gate .. + journal + .. label .. mirror ==== //depot/projects/soc2005/libalias/etc/snmpd.config#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/snmpd.config,v 1.6 2006/02/27 16:31:01 harti Exp $ +# $FreeBSD: src/etc/snmpd.config,v 1.7 2006/10/31 10:23:28 harti Exp $ # # Example configuration file for bsnmpd(1). # @@ -6,7 +6,6 @@ # # Set some common variables # -host := foobar location := "Room 200" contact := "sysmeister@example.com" system := 1 # FreeBSD @@ -43,8 +42,7 @@ begemotSnmpdCommunityDisable = 1 # open standard SNMP ports -begemotSnmpdPortStatus.[$(host)].161 = 1 -begemotSnmpdPortStatus.127.0.0.1.161 = 1 +begemotSnmpdPortStatus.0.0.0.0.161 = 1 # open a unix domain socket begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1 ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#8 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.229 2006/10/23 13:25:17 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.230 2006/10/30 12:01:57 keramida Exp $ % ======================================================================= @@ -22147,7 +22147,7 @@ There are not stars enough in heaven. % Here at the Phone Company, we serve all kinds of people; -from President's and Kings to the scum of the earth... +from Presidents and Kings to the scum of the earth... % Here comes the orator, with his flood of words and his drop of reason. % ==== //depot/projects/soc2005/libalias/gnu/usr.bin/send-pr/send-pr.sh#2 (text+ko) ==== @@ -20,7 +20,7 @@ # along with GNU GNATS; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # -# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.37 2005/10/24 01:36:16 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.38 2006/11/01 12:13:08 philip Exp $ # The version of this send-pr. VERSION=3.113 @@ -300,7 +300,7 @@ for file in $TEMP $REF ; do cat > $file << '__EOF__' SEND-PR: -*- send-pr -*- -SEND-PR: vim: syntax=send-pr (needed for vim syntax highlighting) +SEND-PR: vim: syntax=sendpr SEND-PR: SEND-PR: Lines starting with `SEND-PR' will be removed automatically, as SEND-PR: will all comments (text enclosed in `<' and `>'). ==== //depot/projects/soc2005/libalias/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.265 2006/10/31 22:22:29 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -45,8 +45,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \ - geom/nop geom/raid3 geom/shsec geom/stripe \ + geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ + geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/soc2005/libalias/lib/libufs/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libufs/Makefile,v 1.13 2005/09/26 06:23:43 keramida Exp $ +# $FreeBSD: src/lib/libufs/Makefile,v 1.14 2006/10/31 21:21:48 pjd Exp $ LIB= ufs SHLIBDIR?= /lib @@ -9,6 +9,7 @@ MAN= bread.3 cgread.3 libufs.3 sbread.3 ufs_disk_close.3 MLINKS+= bread.3 bwrite.3 MLINKS+= cgread.3 cgread1.3 +MLINKS+= cgread.3 cgwrite1.3 MLINKS+= sbread.3 sbwrite.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3 ==== //depot/projects/soc2005/libalias/lib/libufs/cgread.3#2 (text+ko) ==== @@ -4,17 +4,18 @@ .\" Manual page for libufs functions: .\" cgread(3) .\" cgread1(3) +.\" cgwrite1(3) .\" .\" This file is in the public domain. .\" -.\" $FreeBSD: src/lib/libufs/cgread.3,v 1.6 2004/07/05 06:53:34 ru Exp $ +.\" $FreeBSD: src/lib/libufs/cgread.3,v 1.7 2006/10/31 21:21:48 pjd Exp $ .\" .Dd June 4, 2003 .Dt CGREAD 3 .Os .Sh NAME -.Nm cgread , cgread1 -.Nd read cylinder groups of UFS disks +.Nm cgread , cgread1, cgwrite1 +.Nd read/write cylinder groups of UFS disks .Sh LIBRARY .Lb libufs .Sh SYNOPSIS @@ -28,6 +29,8 @@ .Fn cgread "struct uufsd *disk" .Ft int .Fn cgread1 "struct uufsd *disk" "int c" +.Ft int +.Fn cgwrite1 "struct uufsd *disk" "int c" .Sh DESCRIPTION The .Fn cgread @@ -60,6 +63,14 @@ field, and then incrementing the .Va d_ccg field. +.Pp +The +.Fn cgwrite1 +function stores cylinder group specified by +.Fa c +from +.Va d_cg +field of a userland UFS disk structure on disk. .Sh RETURN VALUES Both functions return 0 if there are no more cylinder groups to read, 1 if there are more cylinder groups, and \-1 on error. @@ -75,8 +86,16 @@ .Fn cgread1 has semantically identical failure conditions to those of .Fn cgread . +.Pp +The function +.Fn cgwrite1 +may fail and set +.Va errno +for any of the errors specified for the library function +.Xr bwrite 3 . .Sh SEE ALSO .Xr bread 3 , +.Xr bwrite 3 , .Xr libufs 3 .Sh HISTORY These functions first appeared as part of ==== //depot/projects/soc2005/libalias/lib/libufs/cgroup.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.3 2003/06/09 09:32:29 jmallett Exp $"); +__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.4 2006/10/31 21:21:48 pjd Exp $"); #include #include @@ -71,3 +71,17 @@ disk->d_lcg = c; return (1); } + +int +cgwrite1(struct uufsd *disk, int c) +{ + struct fs *fs; + + fs = &disk->d_fs; + if (bwrite(disk, fsbtodb(fs, cgtod(fs, c)), + disk->d_cgunion.d_buf, fs->fs_bsize) == -1) { + ERROR(disk, "unable to write cylinder group"); + return (-1); + } + return (0); +} ==== //depot/projects/soc2005/libalias/lib/libufs/libufs.3#2 (text+ko) ==== @@ -5,7 +5,7 @@ .\" .\" This file is in the public domain. .\" -.\" $FreeBSD: src/lib/libufs/libufs.3,v 1.8 2004/07/05 06:53:34 ru Exp $ +.\" $FreeBSD: src/lib/libufs/libufs.3,v 1.9 2006/10/31 21:21:48 pjd Exp $ .\" .Dd June 4, 2003 .Dt LIBUFS 3 @@ -57,6 +57,7 @@ .Xr bwrite 3 , .Xr cgread 3 , .Xr cgread1 3 , +.Xr cgwrite1 3 , .Xr sbread 3 , .Xr sbwrite 3 , .Xr ufs_disk_close 3 , ==== //depot/projects/soc2005/libalias/lib/libufs/libufs.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libufs/libufs.h,v 1.11 2003/06/09 09:47:38 jmallett Exp $ + * $FreeBSD: src/lib/libufs/libufs.h,v 1.12 2006/10/31 21:21:48 pjd Exp $ */ #ifndef __LIBUFS_H__ @@ -110,6 +110,7 @@ */ int cgread(struct uufsd *); int cgread1(struct uufsd *, int); +int cgwrite1(struct uufsd *, int); /* * inode.c ==== //depot/projects/soc2005/libalias/sbin/dumpfs/dumpfs.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.43 2004/04/09 19:58:27 markm Exp $"; + "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.44 2006/10/31 22:02:24 pjd Exp $"; #endif /* not lint */ #include @@ -168,8 +168,9 @@ (intmax_t)afs.fs_cstotal.cs_ndir, (intmax_t)afs.fs_cstotal.cs_nifree, (intmax_t)afs.fs_cstotal.cs_nffree); - printf("bpg\t%d\tfpg\t%d\tipg\t%d\n", - afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg); + printf("bpg\t%d\tfpg\t%d\tipg\t%d\tunrefs\t%jd\n", + afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg, + (intmax_t)afs.fs_unrefs); printf("nindir\t%d\tinopb\t%d\tmaxfilesize\t%ju\n", afs.fs_nindir, afs.fs_inopb, (uintmax_t)afs.fs_maxfilesize); @@ -228,10 +229,12 @@ printf("acls "); if (fsflags & FS_MULTILABEL) printf("multilabel "); + if (fsflags & FS_GJOURNAL) + printf("gjournal "); if (fsflags & FS_FLAGS_UPDATED) printf("fs_flags expanded "); fsflags &= ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_INDEXDIRS | - FS_ACLS | FS_MULTILABEL | FS_FLAGS_UPDATED); + FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED); if (fsflags != 0) printf("unknown flags (%#x)", fsflags); putchar('\n'); @@ -282,8 +285,9 @@ cgtime = acg.cg_time; printf("magic\t%x\ttell\t%jx\ttime\t%s", acg.cg_magic, (intmax_t)cur, ctime(&cgtime)); - printf("cgx\t%d\tndblk\t%d\tniblk\t%d\tinitiblk %d\n", - acg.cg_cgx, acg.cg_ndblk, acg.cg_niblk, acg.cg_initediblk); + printf("cgx\t%d\tndblk\t%d\tniblk\t%d\tinitiblk %d\tunrefs %d\n", + acg.cg_cgx, acg.cg_ndblk, acg.cg_niblk, acg.cg_initediblk, + acg.cg_unrefs); break; case 1: cgtime = acg.cg_old_time; ==== //depot/projects/soc2005/libalias/sbin/dumpon/dumpon.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.23 2006/04/27 19:01:54 ps Exp $"); +__FBSDID("$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.24 2006/10/31 22:36:49 jhb Exp $"); #include #include @@ -70,18 +70,17 @@ check_size(int fd, const char *fn) { int name[] = { CTL_HW, HW_PHYSMEM }; - size_t namelen = sizeof name / sizeof *name; + size_t namelen = sizeof(name) / sizeof(*name); unsigned long physmem; size_t len; off_t mediasize; int minidump; - - len = sizeof minidump; + len = sizeof(minidump); if (sysctlbyname("debug.minidump", &minidump, &len, NULL, 0) == 0 && minidump == 1) return; - len = sizeof physmem; + len = sizeof(physmem); if (sysctl(name, namelen, &physmem, &len, NULL, 0) != 0) err(EX_OSERR, "can't get memory size"); if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) != 0) ==== //depot/projects/soc2005/libalias/sbin/fsck_ffs/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.16 2004/09/01 08:26:39 scottl Exp $ +# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.17 2006/10/31 22:06:56 pjd Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 PROG= fsck_ffs @@ -7,7 +7,9 @@ MAN= fsck_ffs.8 MLINKS= fsck_ffs.8 fsck_ufs.8 fsck_ffs.8 fsck_4.2bsd.8 SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ - pass4.c pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c + pass4.c pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c gjournal.c +DPADD= ${LIBUFS} +LDADD= -lufs WARNS?= 2 CFLAGS+= -I${.CURDIR} ==== //depot/projects/soc2005/libalias/sbin/fsck_ffs/fsck.h#2 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.36 2005/03/07 08:42:49 delphij Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37 2006/10/31 22:06:56 pjd Exp $ */ #include @@ -328,9 +328,9 @@ ino_t allocino(ino_t request, int type); void blkerror(ino_t ino, const char *type, ufs2_daddr_t blk); char *blockcheck(char *name); -int bread(int fd, char *buf, ufs2_daddr_t blk, long size); +int blread(int fd, char *buf, ufs2_daddr_t blk, long size); void bufinit(void); -void bwrite(int fd, char *buf, ufs2_daddr_t blk, long size); +void blwrite(int fd, char *buf, ufs2_daddr_t blk, long size); void cacheino(union dinode *dp, ino_t inumber); void catch(int); void catchquit(int); @@ -388,3 +388,4 @@ void sblock_init(void); void setinodebuf(ino_t); int setup(char *dev); +void gjournal_check(const char *filesys); ==== //depot/projects/soc2005/libalias/sbin/fsck_ffs/fsutil.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.25 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.26 2006/10/31 22:06:56 pjd Exp $"); #include #include @@ -221,7 +221,7 @@ if (bp->b_bno != dblk) { flush(fswritefd, bp); diskreads++; - bp->b_errs = bread(fsreadfd, bp->b_un.b_buf, dblk, size); + bp->b_errs = blread(fsreadfd, bp->b_un.b_buf, dblk, size); bp->b_bno = dblk; bp->b_size = size; } @@ -244,11 +244,11 @@ (bp->b_errs == bp->b_size / dev_bsize) ? "" : "PARTIALLY ", (long long)bp->b_bno); bp->b_errs = 0; - bwrite(fd, bp->b_un.b_buf, bp->b_bno, (long)bp->b_size); + blwrite(fd, bp->b_un.b_buf, bp->b_bno, (long)bp->b_size); if (bp != &sblk) return; for (i = 0, j = 0; i < sblock.fs_cssize; i += sblock.fs_bsize, j++) { - bwrite(fswritefd, (char *)sblock.fs_csp + i, + blwrite(fswritefd, (char *)sblock.fs_csp + i, fsbtodb(&sblock, sblock.fs_csaddr + j * sblock.fs_frag), sblock.fs_cssize - i < sblock.fs_bsize ? sblock.fs_cssize - i : sblock.fs_bsize); @@ -345,7 +345,7 @@ } int -bread(int fd, char *buf, ufs2_daddr_t blk, long size) +blread(int fd, char *buf, ufs2_daddr_t blk, long size) { char *cp; int i, errs; @@ -387,7 +387,7 @@ } void -bwrite(int fd, char *buf, ufs2_daddr_t blk, long size) +blwrite(int fd, char *buf, ufs2_daddr_t blk, long size) { int i; char *cp; ==== //depot/projects/soc2005/libalias/sbin/fsck_ffs/inode.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.37 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $"); #include #include @@ -329,10 +329,10 @@ lastinum += fullcnt; } /* - * If bread returns an error, it will already have zeroed + * If blread returns an error, it will already have zeroed * out the buffer, so we do not need to do so here. */ - (void)bread(fsreadfd, inodebuf, dblk, size); + (void)blread(fsreadfd, inodebuf, dblk, size); nextinop = inodebuf; } dp = (union dinode *)nextinop; ==== //depot/projects/soc2005/libalias/sbin/fsck_ffs/main.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.44 2005/02/10 09:19:29 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.45 2006/10/31 22:06:56 pjd Exp $"); #include #include @@ -237,6 +237,29 @@ exit(7); /* Filesystem clean, report it now */ exit(0); } + if (preen && skipclean) { + /* + * If file system is gjournaled, check it here. >>> TRUNCATED FOR MAIL (1000 lines) <<<