PERFORCE change 174139 for review

Alexander Motin mav at FreeBSD.org
Tue Feb 2 10:56:42 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=174139

Change 174139 by mav at mav_mavbook on 2010/02/02 10:56:03

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/contrib/csup/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/csup/TODO#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/csup/auth.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/csup/auth.h#1 branch
.. //depot/projects/scottl-camlock/src/contrib/csup/config.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/csup/cpasswd.1#1 branch
.. //depot/projects/scottl-camlock/src/contrib/csup/cpasswd.sh#1 branch
.. //depot/projects/scottl-camlock/src/contrib/csup/csup.1#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/csup/main.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/csup/proto.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#4 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/ntpdate#2 integrate
.. //depot/projects/scottl-camlock/src/etc/services#6 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate
.. //depot/projects/scottl-camlock/src/lib/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/devname.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_opt_info.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_recvmsg.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_send.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sendmsg.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sys_calls.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/msgcat.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#9 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/ql.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/qr.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/sys/shm_open.2#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libefi/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/lib/libefi/efi_getvar.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libefi/efi_nextvarname.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libefi/efi_setvar.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libefi/libefi.3#1 branch
.. //depot/projects/scottl-camlock/src/lib/libefi/libefi.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libefi/libefi.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libefi/libefi_int.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libgpib/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libgpib/gpib.3#1 branch
.. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate
.. //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/mknod/mknod.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/restore/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/restore/dirs.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/restore/extern.h#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/restore/interactive.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/restore/tape.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.c#6 integrate
.. //depot/projects/scottl-camlock/src/share/examples/kld/cdev/test/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/share/examples/kld/syscall/test/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/gpib.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/pcii.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/tnt4882.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/tmpfs.5#3 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/amd64_mem.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#24 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#64 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#101 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285.ini#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_hashtab.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_hashtab.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_linux_list.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_memory.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_mm.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_mm.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sman.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sman.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_3d_reg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_dma.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_dmablit.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_dmablit.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_drm.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_drv.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_drv.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_irq.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_map.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_mm.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_verifier.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_verifier.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_video.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ieee488/ibfoo.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ieee488/pcii.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ieee488/tnt4882.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ieee488/tnt4882.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siba/siba.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_bwn.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_cc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_core.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_ids.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_pcib.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siba/sibareg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siba/sibavar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#39 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_devs.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsmount.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#31 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/i686_mem.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#42 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pcpu.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/genassym.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#44 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ath/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/drm/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/drm/drm/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/drm/via/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/siba_bwn/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/pci_ocp.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/genassym.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/swtch.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/bus.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/bus_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#28 integrate
.. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#9 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpio/cmdline.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpio/cpio.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpio/cpio.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/csup/Makefile#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/contrib/csup/Makefile#3 (text) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/contrib/csup/Makefile,v 1.2 2009/01/05 15:18:16 lulf Exp $
+# $FreeBSD: src/contrib/csup/Makefile,v 1.3 2010/02/02 05:57:42 lulf Exp $
 
 PREFIX?=	/usr/local
 BINDIR?=	${PREFIX}/bin
@@ -7,7 +7,7 @@
 UNAME!=		/usr/bin/uname -s
 
 PROG=	csup
-SRCS=	attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \
+SRCS=	attrstack.c auth.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \
 	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
 	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \
 	rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c
@@ -42,4 +42,7 @@
 DPADD=	${LIBCRYPTO} ${LIBZ}
 LDADD=	-lcrypto -lz
 
+SCRIPTS=	cpasswd.sh
+MAN=		csup.1 cpasswd.1
+
 .include <bsd.prog.mk>

==== //depot/projects/scottl-camlock/src/contrib/csup/TODO#3 (text) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/csup/TODO,v 1.2 2009/01/05 15:18:16 lulf Exp $
+$FreeBSD: src/contrib/csup/TODO,v 1.3 2010/02/02 05:57:42 lulf Exp $
 
 BUGS:
 
@@ -17,7 +17,6 @@
 
 MISSING FEATURES:
 
-- Add support for authentication.
 - Add support for shell commands sent by the server.
 - Add missing support for various CVSup options : -D, -a (requires
   authentication support), -e and -E (requires shell commands support)

==== //depot/projects/scottl-camlock/src/contrib/csup/config.h#2 (text) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/csup/config.h,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $
+ * $FreeBSD: src/contrib/csup/config.h,v 1.2 2010/02/02 05:57:42 lulf Exp $
  */
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
@@ -108,6 +108,7 @@
 	struct chan *chan1;
 	struct stream *server;
 	fattr_support_t fasupport;
+	int reqauth;
 };
 
 struct config	*config_init(const char *, struct coll *, int);

==== //depot/projects/scottl-camlock/src/contrib/csup/csup.1#3 (text) ====

@@ -22,7 +22,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $
-.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2 2009/01/07 18:37:07 lulf Exp $
+.\" $FreeBSD: src/contrib/csup/csup.1,v 1.3 2010/02/02 05:57:42 lulf Exp $
 .\"
 .Dd February 1, 2006
 .Os FreeBSD
@@ -32,7 +32,7 @@
 .Nd network distribution package for CVS repositories
 .Sh SYNOPSIS
 .Nm
-.Op Fl 146ksvzZ
+.Op Fl 146aksvzZ
 .Op Fl A Ar addr
 .Op Fl b Ar base
 .Op Fl c Ar collDir
@@ -106,6 +106,12 @@
 Forces
 .Nm
 to use IPv6 addresses only.
+.It Fl a
+Requires the server to authenticate itself (prove its identity) to
+the client.  If authentication of the server fails, the update is
+canceled.  See
+.Sx AUTHENTICATION ,
+below.
 .It Fl A Ar addr
 Specifies a local address to bind to when connecting to the server.
 The local address might be a hostname or a numeric host address string
@@ -793,6 +799,102 @@
 .It
 .Pa /bar/stool/src-all/refuse.cvs:RELENG_3
 .El
+.Sh AUTHENTICATION
+.Nm
+implements an optional authentication mechanism which can be used by the
+client and server to verify each other's identities.
+Public CVSup servers normally do not enable authentication.
+.Nm
+users may ignore this section unless they have been informed
+that authentication is required by the administrator of their server.
+.Pp
+The authentication subsystem uses a
+challenge-response protocol which is immune to packet sniffing and
+replay attacks.  No passwords are sent over the network in either
+direction.  Both the client and the server can independently verify
+the identities of each other.
+.Pp
+The file
+.Li $ Ns Ev HOME Ns Pa /.csup/auth
+holds the information used for authentication.  This file contains a
+record for each server that the client is allowed to access.  Each
+record occupies one line in the file.  Lines beginning with
+.Ql #
+are ignored, as are lines containing only white space.  White space is
+significant everywhere else in the file.  Fields are separated by
+.Ql \&:
+characters.
+.Pp
+Each record of the file has the following form:
+.Bd -literal -offset indent
+.Sm off
+.Xo Ar serverName No : Ar clientName No :
+.Ar password No : Ar comment
+.Xc
+.Sm on
+.Ed
+.Pp
+All fields must be present even if some of them are empty.
+.Ar ServerName
+is the name of the server to which the record applies.  By convention,
+it is the canonical fully-qualified domain name of the server, e.g.,
+.Ql CVSup177.FreeBSD.ORG .
+This must agree with the server's own idea of its name.  The name is
+case-insensitive.
+.Pp
+.Ar ClientName
+is the name the client uses to gain access to the server.  By
+convention, e-mail addresses are used for all client names, e.g.,
+.Ql BillyJoe at FreeBSD.ORG .
+Client names are case-insensitive.
+.Pp
+.Ar Password
+is a secret string of characters that the client uses to prove its
+identity.  It may not contain any
+.Ql \&:
+or newline characters.
+.Pp
+.Ar Comment
+may contain any additional information to identify the record.  It
+is not interpreted by the program.
+.Pp
+To set up authentication for a given server, one must perform the
+following steps:
+.Bl -enum
+.It
+Obtain the official
+.Ar serverName
+from the administrator of the server or from some other source.
+.It
+Choose an appropriate
+.Ar clientName .
+It should be in the form of a valid e-mail address, to make it easy
+for the server administrator to contact the user if necessary.
+.It
+Choose an arbitrary secret
+.Ar password .
+.It
+Run the
+.Nm cpasswd
+utility, and type in the
+.Ar password
+when prompted for it.  The utility will print out a line to send
+to the server administrator, and instruct you how to modify your
+.Li $ Ns Ev HOME Ns Pa /.csup/auth
+file.  You should use a secure channel to send the line to the
+server administrator.
+.El
+.Pp
+Since
+.Li $ Ns Ev HOME Ns Pa /.csup/auth
+contains passwords, you should ensure that it is not readable by
+anyone except yourself.
+.Pp
+Authentication works independently in both directions.  The server
+administrator controls whether you must prove your identity.
+You control whether to check the server's identity, by means of the
+.Fl a
+command line option.
 .Sh csup AND FIREWALLS
 In its default mode,
 .Nm
@@ -865,6 +967,7 @@
 List files.
 .El
 .Sh SEE ALSO
+.Xr cpasswd 1 ,
 .Xr cvs 1 ,
 .Xr rcsintro 1 ,
 .Xr ssh 1 .

==== //depot/projects/scottl-camlock/src/contrib/csup/main.c#2 (text) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/csup/main.c,v 1.1.1.2 2006/03/14 03:51:11 mux Exp $
+ * $FreeBSD: src/contrib/csup/main.c,v 1.2 2010/02/02 05:57:42 lulf Exp $
  */
 
 #include <sys/file.h>
@@ -60,6 +60,8 @@
 	    "(same as \"-r 0\")");
 	lprintf(-1, USAGE_OPTFMT, "-4", "Force usage of IPv4 addresses");
 	lprintf(-1, USAGE_OPTFMT, "-6", "Force usage of IPv6 addresses");
+	lprintf(-1, USAGE_OPTFMT, "-a",
+		"Require server to authenticate itself to us");
 	lprintf(-1, USAGE_OPTFMT, "-A addr",
 	    "Bind local socket to a specific address");
 	lprintf(-1, USAGE_OPTFMT, "-b base",
@@ -107,7 +109,7 @@
 	struct stream *lock;
 	char *argv0, *file, *lockfile;
 	int family, error, lockfd, lflag, overridemask;
-	int c, i, deletelim, port, retries, status;
+	int c, i, deletelim, port, retries, status, reqauth;
 	time_t nexttry;
 
 	error = 0;
@@ -124,9 +126,10 @@
 	lockfile = NULL;
 	override = coll_new(NULL);
 	overridemask = 0;
+	reqauth = 0;
 
 	while ((c = getopt(argc, argv,
-	    "146A:b:c:d:gh:i:kl:L:p:P:r:svzZ")) != -1) {
+	    "146aA:b:c:d:gh:i:kl:L:p:P:r:svzZ")) != -1) {
 		switch (c) {
 		case '1':
 			retries = 0;
@@ -137,6 +140,10 @@
 		case '6':
 			family = AF_INET6;
 			break;
+		case 'a':
+			/* Require server authentication */
+			reqauth = 1;
+			break;
 		case 'A':
 			error = getaddrinfo(optarg, NULL, NULL, &res);
 			if (error) {
@@ -303,6 +310,7 @@
 		config->laddrlen = laddrlen;
 	}
 	config->deletelim = deletelim;
+	config->reqauth = reqauth;
 	lprintf(2, "Connecting to %s\n", config->host);
 
 	i = 0;

==== //depot/projects/scottl-camlock/src/contrib/csup/proto.c#3 (text) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/csup/proto.c,v 1.3 2009/02/15 13:22:21 lulf Exp $
+ * $FreeBSD: src/contrib/csup/proto.c,v 1.4 2010/02/02 05:57:42 lulf Exp $
  */
 
 #include <sys/param.h>
@@ -45,6 +45,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "auth.h"
 #include "config.h"
 #include "detailer.h"
 #include "fattr.h"
@@ -74,7 +75,6 @@
 static int		 proto_waitconnect(int);
 static int		 proto_greet(struct config *);
 static int		 proto_negproto(struct config *);
-static int		 proto_login(struct config *);
 static int		 proto_fileattr(struct config *);
 static int		 proto_xchgcoll(struct config *);
 static struct mux	*proto_mux(struct config *);
@@ -251,56 +251,6 @@
 	return (STATUS_FAILURE);
 }
 
-static int
-proto_login(struct config *config)
-{
-	struct stream *s;
-	char hostbuf[MAXHOSTNAMELEN];
-	char *line, *login, *host, *cmd, *realm, *challenge, *msg;
-	int error;
-
-	s = config->server;
-	error = gethostname(hostbuf, sizeof(hostbuf));
-	hostbuf[sizeof(hostbuf) - 1] = '\0';
-	if (error)
-		host = NULL;
-	else
-		host = hostbuf;
-	login = getlogin();
-	proto_printf(s, "USER %s %s\n", login != NULL ? login : "?",
-	    host != NULL ? host : "?");
-	stream_flush(s);
-	line = stream_getln(s, NULL);
-	cmd = proto_get_ascii(&line);
-	realm = proto_get_ascii(&line);
-	challenge = proto_get_ascii(&line);
-	if (challenge == NULL || line != NULL)
-		goto bad;
-	if (strcmp(realm, ".") != 0 || strcmp(challenge, ".") != 0) {
-		lprintf(-1, "Authentication required by the server and not "
-		    "supported by client\n");
-		return (STATUS_FAILURE);
-	}
-	proto_printf(s, "AUTHMD5 . . .\n");
-	stream_flush(s);
-	line = stream_getln(s, NULL);
-	cmd = proto_get_ascii(&line);
-	if (cmd == NULL || line == NULL)
-		goto bad;
-	if (strcmp(cmd, "OK") == 0)
-		return (STATUS_SUCCESS);
-	if (strcmp(cmd, "!") == 0) {
-		msg = proto_get_rest(&line);
-		if (msg == NULL)
-			goto bad;
-		lprintf(-1, "Server error: %s\n", msg);
-		return (STATUS_FAILURE);
-	}
-bad:
-	lprintf(-1, "Invalid server reply to AUTHMD5\n");
-	return (STATUS_FAILURE);
-}
-
 /*
  * File attribute support negotiation.
  */
@@ -601,7 +551,7 @@
 	if (status == STATUS_SUCCESS)
 		status = proto_negproto(config);
 	if (status == STATUS_SUCCESS)
-		status = proto_login(config);
+		status = auth_login(config);
 	if (status == STATUS_SUCCESS)
 		status = proto_fileattr(config);
 	if (status == STATUS_SUCCESS)

==== //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#4 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.4 2009/12/08 19:12:38 delphij Exp $
+# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.5 2010/02/02 00:30:44 delphij Exp $
 Project:	netcat (aka src/usr.bin/nc in OpenBSD)
 ProjectURL:	http://www.openbsd.org/
-Version:	4.5
+Version:	4.6
 License:	BSD

==== //depot/projects/scottl-camlock/src/etc/rc.d/ntpdate#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ntpdate,v 1.16 2006/07/20 10:07:34 flz Exp $
+# $FreeBSD: src/etc/rc.d/ntpdate,v 1.17 2010/01/30 16:34:52 ume Exp $
 #
 
 # PROVIDE: ntpdate
@@ -19,7 +19,9 @@
 	if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then
 		ntpdate_hosts=`awk '
 			/^server[ \t]*127.127/      {next}
-			/^(server|peer)/            {print $2}
+			/^(server|peer)/            {
+			    if ($2 ~/^-/)           {print $3}
+			    else                    {print $2}}
 		' < ${ntpdate_config}`
 	fi
 	if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then

==== //depot/projects/scottl-camlock/src/etc/services#6 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.116 2010/01/27 11:23:21 edwin Exp $
+# $FreeBSD: src/etc/services,v 1.117 2010/02/01 13:30:06 ume Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -2225,6 +2225,8 @@
 nuts_dem	4132/udp   #NUTS Daemon
 nuts_bootp	4133/tcp   #NUTS Bootp Server
 nuts_bootp	4133/udp   #NUTS Bootp Server
+sieve		4190/tcp   #ManageSieve Protocol
+sieve		4190/udp   #ManageSieve Protocol
 rwhois		4321/tcp   #Remote Who Is
 rwhois		4321/udp   #Remote Who Is
 unicall		4343/tcp

==== //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#7 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.72 2010/01/15 14:05:06 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.73 2010/02/01 20:54:45 joerg Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -46,6 +46,7 @@
 .ds doc-str-Lb-libelf      ELF Parsing Library (libelf, \-lelf)
 .ds doc-str-Lb-libfetch    File Transfer Library (libfetch, \-lfetch)
 .ds doc-str-Lb-libgeom     Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
+.ds doc-str-Lb-libgpib     General-Purpose Instrument Bus (GPIB) library (libgpib, \-lgpib)
 .ds doc-str-Lb-libipx      IPX Address Conversion Support Library (libipx, \-lipx)
 .ds doc-str-Lb-libjail     Jail Library (libjail, \-ljail)
 .ds doc-str-Lb-libkiconv   Kernel side iconv library (libkiconv, \-lkiconv)

==== //depot/projects/scottl-camlock/src/lib/Makefile#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.242 2010/01/25 18:52:47 yongari Exp $
+# $FreeBSD: src/lib/Makefile,v 1.243 2010/01/30 04:24:03 marcel Exp $
 
 .include <bsd.own.mk>
 
@@ -33,8 +33,8 @@
 	libtacplus libutil ${_libypclnt} libalias libarchive \
 	${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
-	libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
-	${_libgssapi} ${_librpcsec_gss} libipsec \
+	libdwarf libedit ${_libefi} libexpat libfetch libftpio libgeom \
+	${_libgpib} ${_libgssapi} ${_librpcsec_gss} libipsec \
 	${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
 	${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
 	${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
@@ -104,6 +104,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"
+_libefi=	libefi
 _libsmb=	libsmb
 .endif
 

==== //depot/projects/scottl-camlock/src/lib/libc/gen/devname.c#2 (text+ko) ====

@@ -31,15 +31,12 @@
 static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.11 2007/01/09 00:27:53 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.12 2010/01/31 14:51:04 ed Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
-#include <err.h>
-#include <fcntl.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -49,22 +46,22 @@
 {
 	int i;
 	size_t j;
-	char *r;
+
+	if (dev == NODEV || !(S_ISCHR(type) || S_ISBLK(dev))) {
+		strlcpy(buf, "#NODEV", len);
+		return (buf);
+	}
 
-	if ((type & S_IFMT) == S_IFCHR) {
+	if (S_ISCHR(type)) {
 		j = len;
 		i = sysctlbyname("kern.devname", buf, &j, &dev, sizeof (dev));
 		if (i == 0)
-		    return (buf);
+			return (buf);
 	}
 
 	/* Finally just format it */
-	if (dev == NODEV)
-		r = "#NODEV";
-	else 
-		r = "#%c:%d:0x%x";
-	snprintf(buf, len, r,
-	    (type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev));
+	snprintf(buf, len, "#%c:%d:0x%x",
+	    S_ISCHR(type) ? 'C' : 'B', major(dev), minor(dev));
 	return (buf);
 }
 
@@ -73,5 +70,5 @@
 {
 	static char buf[SPECNAMELEN + 1];
 
-	return(devname_r(dev, type, buf, sizeof(buf)));
+	return (devname_r(dev, type, buf, sizeof(buf)));
 }

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_opt_info.3#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.5 2010/01/12 21:45:03 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.6 2010/01/31 21:45:14 brucec Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_OPT_INFO 3
@@ -87,6 +87,8 @@
 .Dv SCTP_PEER_AUTH_CHUNKS
 .Pp
 .Dv SCTP_LOCAL_AUTH_CHUNKS
+.Sh RETURN VALUES
+The call returns 0 on success and -1 upon error.
 .Sh ERRORS
 The
 .Fn sctp_opt_info

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_recvmsg.3#4 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.6 2010/01/12 21:45:03 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.7 2010/01/31 21:45:14 brucec Exp $
 .\"
 .Dd August 13, 2007
 .Dt SCTP_RECVMSG 3
@@ -269,7 +269,7 @@
 but may be caused by transient congestion.
 .It Bq Er EHOSTUNREACH
 The remote host was unreachable.
-.It Bq Er ENOTCON
+.It Bq Er ENOTCONN
 On a one-to-one style socket no association exists.
 .It Bq Er ECONNRESET
 An abort was received by the stack while the user was

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_send.3#5 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.6 2010/01/12 21:45:03 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.7 2010/01/31 21:45:14 brucec Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_SEND 3
@@ -319,7 +319,7 @@
 but may be caused by transient congestion.
 .It Bq Er EHOSTUNREACH
 The remote host was unreachable.
-.It Bq Er ENOTCON
+.It Bq Er ENOTCONN
 On a one-to-one style socket no association exists.
 .It Bq Er ECONNRESET
 An abort was received by the stack while the user was

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sendmsg.3#5 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.6 2010/01/12 21:45:03 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.7 2010/01/31 21:45:14 brucec Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_SENDMSG 3
@@ -296,7 +296,7 @@
 but may be caused by transient congestion.
 .It Bq Er EHOSTUNREACH
 The remote host was unreachable.
-.It Bq Er ENOTCON
+.It Bq Er ENOTCONN
 On a one-to-one style socket no association exists.
 .It Bq Er ECONNRESET
 An abort was received by the stack while the user was

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sys_calls.c#3 (text+ko) ====

@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.14 2007/07/24 20:06:01 rrs Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.15 2010/01/31 21:47:39 brucec Exp $");
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -784,7 +784,7 @@
 	free(buf);
 	if (ret != 0) {
 		if (errno == EALREADY) {
-			no_end_cx = 1;;
+			no_end_cx = 1;
 			goto continue_send;
 		}
 		return (ret);

==== //depot/projects/scottl-camlock/src/lib/libc/nls/msgcat.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.52 2010/01/25 23:44:00 gabor Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.53 2010/01/29 18:33:59 gabor Exp $");
 
 #define _NLS_PRIVATE
 
@@ -107,12 +107,12 @@
 nl_catd
 catopen(const char *name, int type)
 {
-	int		 spcleft, saverr;
-	char		 path[PATH_MAX];
-	char		*nlspath, *lang, *base, *cptr, *pathP, *tmpptr;
-	char		*cptr1, *plang, *pter, *pcode;
-	struct stat	 sbuf;
-	struct catentry	*np;
+	struct stat sbuf;
+	struct catentry *np;
+	char *base, *cptr, *cptr1, *lang, *nlspath, *pathP, *pcode;
+	char *plang, *pter, *tmpptr;
+	int saverr, spcleft;
+	char path[PATH_MAX];
 
 	if (name == NULL || *name == '\0')
 		NLRETERR(EINVAL);
@@ -247,10 +247,10 @@
 char *
 catgets(nl_catd catd, int set_id, int msg_id, const char *s)
 {
-	struct _nls_cat_hdr	*cat_hdr;
-	struct _nls_set_hdr	*set_hdr;
-	struct _nls_msg_hdr	*msg_hdr;
-	int			 l, u, i, r;
+	struct _nls_cat_hdr *cat_hdr;
+	struct _nls_msg_hdr *msg_hdr;
+	struct _nls_set_hdr *set_hdr;
+	int i, l, r, u;
 
 	if (catd == NULL || catd == NLERR) {
 		errno = EBADF;
@@ -315,7 +315,7 @@
 int
 catclose(nl_catd catd)
 {
-	struct catentry		*np;
+	struct catentry *np;
 
 	if (catd == NULL || catd == NLERR) {
 		errno = EBADF;
@@ -348,11 +348,11 @@
 static nl_catd
 load_msgcat(const char *path, const char *name, const char *lang)
 {
-	struct stat	 st;
-	nl_catd		 catd;
-	struct catentry	*np;
-	void		*data;
-	int		 fd;
+	struct stat st;
+	nl_catd	catd;
+	struct catentry *np;
+	void *data;
+	int fd;
 
 	/* path/name will never be NULL here */
 
@@ -418,4 +418,3 @@
 	UNLOCK;
 	return (catd);
 }
-

==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.3#5 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.81 2009/09/26 18:20:40 alc Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.82 2010/01/31 23:16:10 jasone Exp $
 .\"
-.Dd September 26, 2009
+.Dd January 31, 2010
 .Dt MALLOC 3
 .Os
 .Sh NAME
@@ -55,9 +55,7 @@
 .Ft const char *
 .Va _malloc_options ;
 .Ft void
-.Fo \*(lp*_malloc_message\*(rp
-.Fa "const char *p1" "const char *p2" "const char *p3" "const char *p4"
-.Fc
+.Fn \*(lp*_malloc_message\*(rp "const char *p1" "const char *p2" "const char *p3" "const char *p4"
 .In malloc_np.h
 .Ft size_t
 .Fn malloc_usable_size "const void *ptr"
@@ -124,7 +122,9 @@
 This is a
 .Fx
 specific API designed to ease the problems with traditional coding styles
-for realloc causing memory leaks in libraries.
+for
+.Fn realloc
+causing memory leaks in libraries.
 .Pp
 The
 .Fn free
@@ -184,18 +184,6 @@
 The process will call
 .Xr abort 3
 in these cases.
-.It B
-Double/halve the per-arena lock contention threshold at which a thread is
-randomly re-assigned to an arena.
-This dynamic load balancing tends to push threads away from highly contended
-arenas, which avoids worst case contention scenarios in which threads
-disproportionately utilize arenas.
-However, due to the highly dynamic load that applications may place on the
-allocator, it is impossible for the allocator to know in advance how sensitive
-it should be to contention over arenas.
-Therefore, some applications may benefit from increasing or decreasing this
-threshold parameter.
-This option is not available for some configurations (non-PIC).
 .It C
 Double/halve the size of the maximum size class that is a multiple of the
 cacheline size (64).
@@ -209,44 +197,62 @@
 See the
 .Dq M
 option for related information and interactions.
+.It E
+Double/halve the size of the maximum medium size class.
+The valid range is from one page to one half chunk.
+The default value is 32 KiB.
 .It F
-Double/halve the per-arena maximum number of dirty unused pages that are
-allowed to accumulate before informing the kernel about at least half of those
-pages via
+Halve/double the per-arena minimum ratio of active to dirty pages.
+Some dirty unused pages may be allowed to accumulate, within the limit set by
+the ratio, before informing the kernel about at least half of those pages via
 .Xr madvise 2 .
 This provides the kernel with sufficient information to recycle dirty pages if
 physical memory becomes scarce and the pages remain unused.
-The default is 512 pages per arena;
-.Ev MALLOC_OPTIONS=10f
-will prevent any dirty unused pages from accumulating.
+The default minimum ratio is 32:1;
+.Ev MALLOC_OPTIONS=6F
+will disable dirty page purging.
 .It G
-When there are multiple threads, use thread-specific caching for objects that
-are smaller than one page.
-This option is enabled by default.
-Thread-specific caching allows many allocations to be satisfied without
-performing any thread synchronization, at the cost of increased memory use.
+Double/halve the approximate interval (counted in terms of
+thread-specific cache allocation/deallocation events) between full
+thread-specific cache garbage collection sweeps.
+Garbage collection is actually performed incrementally, one size
+class at a time, in order to avoid large collection pauses.
+The default sweep interval is 8192;
+.Ev JEMALLOC_OPTIONS=14g
+will disable garbage collection.
+.It H
+Double/halve the number of thread-specific cache slots per size
+class.
+When there are multiple threads, each thread uses a
+thread-specific cache for small and medium objects.
+Thread-specific caching allows many allocations to be satisfied
+without performing any thread synchronization, at the cost of
+increased memory use.
 See the
-.Dq R
+.Dq G
 option for related tuning information.
-This option is not available for some configurations (non-PIC).
+The default number of cache slots is 128;
+.Ev JEMALLOC_OPTIONS=7h
+will disable thread-specific caching.
+Note that one cache slot per size class is not a valid
+configuration due to implementation details.
 .It J
 Each byte of new memory allocated by
 .Fn malloc ,

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list