From owner-svn-src-stable-6@FreeBSD.ORG Sun Nov 29 17:35:31 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE71B106568D; Sun, 29 Nov 2009 17:35:31 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9A4658FC08; Sun, 29 Nov 2009 17:35:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nATHZVJS002545; Sun, 29 Nov 2009 17:35:31 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nATHZVuk002535; Sun, 29 Nov 2009 17:35:31 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200911291735.nATHZVuk002535@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sun, 29 Nov 2009 17:35:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199902 - in stable/6: . sys/compat/pecoff sys/conf sys/i386/conf sys/i386/include sys/modules sys/modules/pecoff sys/pc98/conf sys/pc98/include X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 17:35:31 -0000 Author: bz Date: Sun Nov 29 17:35:31 2009 New Revision: 199902 URL: http://svn.freebsd.org/changeset/base/199902 Log: MFC r179785, r180496: Remove obselete PECOFF image activator support. Discussed with: secteam, kib Approved by: re (kensmith) Deleted: stable/6/sys/compat/pecoff/ stable/6/sys/i386/include/pecoff_machdep.h stable/6/sys/modules/pecoff/ stable/6/sys/pc98/include/pecoff_machdep.h Modified: stable/6/ObsoleteFiles.inc (contents, props changed) stable/6/UPDATING stable/6/sys/conf/files.i386 stable/6/sys/conf/files.pc98 stable/6/sys/conf/options.i386 stable/6/sys/conf/options.pc98 stable/6/sys/i386/conf/NOTES stable/6/sys/modules/Makefile stable/6/sys/pc98/conf/NOTES Directory Properties: stable/6/sys/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) Modified: stable/6/ObsoleteFiles.inc ============================================================================== --- stable/6/ObsoleteFiles.inc Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/ObsoleteFiles.inc Sun Nov 29 17:35:31 2009 (r199902) @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091129: pecoff image activator removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/pecoff_machdep.h +.endif # 20090203: adding_user.8 moved to adding_user.7 OLD_FILES+=usr/share/man/man8/adding_user.8.gz # 20080407: pkg_sign has been removed Modified: stable/6/UPDATING ============================================================================== --- stable/6/UPDATING Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/UPDATING Sun Nov 29 17:35:31 2009 (r199902) @@ -8,6 +8,9 @@ Items affecting the ports and packages s /usr/ports/UPDATING. Please read that file before running portupgrade. +20091129: + PECOFF image activator support removed. + 20081128: FreeBSD 6.4-RELEASE Modified: stable/6/sys/conf/files.i386 ============================================================================== --- stable/6/sys/conf/files.i386 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/files.i386 Sun Nov 29 17:35:31 2009 (r199902) @@ -109,7 +109,6 @@ compat/ndis/subr_ntoskrnl.c optional ndi compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 Modified: stable/6/sys/conf/files.pc98 ============================================================================== --- stable/6/sys/conf/files.pc98 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/files.pc98 Sun Nov 29 17:35:31 2009 (r199902) @@ -66,7 +66,6 @@ compat/linux/linux_sysctl.c optional com compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 Modified: stable/6/sys/conf/options.i386 ============================================================================== --- stable/6/sys/conf/options.i386 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/options.i386 Sun Nov 29 17:35:31 2009 (r199902) @@ -25,8 +25,6 @@ COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h Modified: stable/6/sys/conf/options.pc98 ============================================================================== --- stable/6/sys/conf/options.pc98 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/options.pc98 Sun Nov 29 17:35:31 2009 (r199902) @@ -23,8 +23,6 @@ IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h Modified: stable/6/sys/i386/conf/NOTES ============================================================================== --- stable/6/sys/i386/conf/NOTES Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/i386/conf/NOTES Sun Nov 29 17:35:31 2009 (r199902) @@ -1117,10 +1117,6 @@ options KSTACK_PAGES=3 options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -options PECOFF_SUPPORT -options PECOFF_DEBUG - options I4B_SMP_WORKAROUND options I586_PMC_GUPROF=0x70000 options KBDIO_DEBUG=2 Modified: stable/6/sys/modules/Makefile ============================================================================== --- stable/6/sys/modules/Makefile Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/modules/Makefile Sun Nov 29 17:35:31 2009 (r199902) @@ -199,7 +199,6 @@ SUBDIR= ${_3dfx} \ ${_pccard} \ ${_pcfclock} \ pcn \ - ${_pecoff} \ ${_pf} \ ${_pflog} \ plip \ @@ -386,7 +385,6 @@ _nwfs= nwfs _oltr= oltr _pccard= pccard _pcfclock= pcfclock -_pecoff= pecoff _pst= pst _puc= puc _ray= ray @@ -510,7 +508,7 @@ _twa= twa .if ${MACHINE_ARCH} == "ia64" # Modules not enabled on ia64 (as compared to i386) include: # aac acpi aout apm atspeaker drm ibcs2 linprocfs linux ncv -# nsp oltr pecoff s3 sbni stg vesa +# nsp oltr s3 sbni stg vesa # acpi is not enabled because it is broken as a module on ia64 _aic= aic #_ar= ar not 64-bit clean Modified: stable/6/sys/pc98/conf/NOTES ============================================================================== --- stable/6/sys/pc98/conf/NOTES Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/pc98/conf/NOTES Sun Nov 29 17:35:31 2009 (r199902) @@ -709,10 +709,6 @@ options KSTACK_PAGES=3 options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -options PECOFF_SUPPORT -options PECOFF_DEBUG - options I4B_SMP_WORKAROUND options I586_PMC_GUPROF=0x70000 options KBDIO_DEBUG=2 From owner-svn-src-stable-6@FreeBSD.ORG Mon Nov 30 21:00:42 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CA191065670; Mon, 30 Nov 2009 21:00:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 632E48FC2D; Mon, 30 Nov 2009 21:00:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAUL0gX7042578; Mon, 30 Nov 2009 21:00:42 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAUL0gqE042577; Mon, 30 Nov 2009 21:00:42 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200911302100.nAUL0gqE042577@svn.freebsd.org> From: John Baldwin Date: Mon, 30 Nov 2009 21:00:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199973 - in stable/6/sys: . conf contrib/pf dev/cxgb X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2009 21:00:42 -0000 Author: jhb Date: Mon Nov 30 21:00:42 2009 New Revision: 199973 URL: http://svn.freebsd.org/changeset/base/199973 Log: Fixup mergeinfo and move sys/conf mergeinfo up to sys/. Modified: Directory Properties: stable/6/sys/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) From owner-svn-src-stable-6@FreeBSD.ORG Thu Dec 3 09:18:41 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEDF910656AC; Thu, 3 Dec 2009 09:18:41 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 999E98FC31; Thu, 3 Dec 2009 09:18:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB39IfY7061881; Thu, 3 Dec 2009 09:18:41 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB39Ifr3061875; Thu, 3 Dec 2009 09:18:41 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <200912030918.nB39Ifr3061875@svn.freebsd.org> From: Colin Percival Date: Thu, 3 Dec 2009 09:18:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200054 - head/crypto/openssl/ssl head/etc/mtree head/usr.sbin/freebsd-update releng/6.3 releng/6.3/crypto/openssl/ssl releng/6.3/etc/mtree releng/6.3/usr.sbin/freebsd-update releng/6.4... X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 09:18:41 -0000 Author: cperciva Date: Thu Dec 3 09:18:40 2009 New Revision: 200054 URL: http://svn.freebsd.org/changeset/base/200054 Log: Disable SSL renegotiation in order to protect against a serious protocol flaw. [09:15] Correctly handle failures from unsetenv resulting from a corrupt environment in rtld-elf. [09:16] Fix permissions in freebsd-update in order to prevent leakage of sensitive files. [09:17] Approved by: so (cperciva) Security: FreeBSD-SA-09:15.ssl Security: FreeBSD-SA-09:16.rtld Security: FreeBSD-SA-09:17.freebsd-udpate Modified: stable/6/crypto/openssl/ssl/s3_lib.c stable/6/crypto/openssl/ssl/s3_pkt.c stable/6/crypto/openssl/ssl/s3_srvr.c stable/6/etc/mtree/BSD.var.dist stable/6/usr.sbin/freebsd-update/freebsd-update.sh Changes in other areas also in this revision: Modified: head/crypto/openssl/ssl/s3_lib.c head/crypto/openssl/ssl/s3_pkt.c head/crypto/openssl/ssl/s3_srvr.c head/etc/mtree/BSD.var.dist head/usr.sbin/freebsd-update/freebsd-update.sh releng/6.3/UPDATING releng/6.3/crypto/openssl/ssl/s3_lib.c releng/6.3/crypto/openssl/ssl/s3_pkt.c releng/6.3/crypto/openssl/ssl/s3_srvr.c releng/6.3/etc/mtree/BSD.var.dist releng/6.3/usr.sbin/freebsd-update/freebsd-update.sh releng/6.4/UPDATING releng/6.4/crypto/openssl/ssl/s3_lib.c releng/6.4/crypto/openssl/ssl/s3_pkt.c releng/6.4/crypto/openssl/ssl/s3_srvr.c releng/6.4/etc/mtree/BSD.var.dist releng/6.4/usr.sbin/freebsd-update/freebsd-update.sh releng/7.1/UPDATING releng/7.1/crypto/openssl/ssl/s3_lib.c releng/7.1/crypto/openssl/ssl/s3_pkt.c releng/7.1/crypto/openssl/ssl/s3_srvr.c releng/7.1/etc/mtree/BSD.var.dist releng/7.1/libexec/rtld-elf/rtld.c releng/7.1/usr.sbin/freebsd-update/freebsd-update.sh releng/7.2/UPDATING releng/7.2/crypto/openssl/ssl/s3_lib.c releng/7.2/crypto/openssl/ssl/s3_pkt.c releng/7.2/crypto/openssl/ssl/s3_srvr.c releng/7.2/etc/mtree/BSD.var.dist releng/7.2/libexec/rtld-elf/rtld.c releng/7.2/usr.sbin/freebsd-update/freebsd-update.sh releng/8.0/UPDATING releng/8.0/crypto/openssl/ssl/s3_lib.c releng/8.0/crypto/openssl/ssl/s3_pkt.c releng/8.0/crypto/openssl/ssl/s3_srvr.c releng/8.0/etc/mtree/BSD.var.dist releng/8.0/libexec/rtld-elf/rtld.c releng/8.0/usr.sbin/freebsd-update/freebsd-update.sh stable/7/crypto/openssl/ssl/s3_lib.c stable/7/crypto/openssl/ssl/s3_pkt.c stable/7/crypto/openssl/ssl/s3_srvr.c stable/7/etc/mtree/BSD.var.dist stable/7/usr.sbin/freebsd-update/freebsd-update.sh stable/8/crypto/openssl/ssl/s3_lib.c stable/8/crypto/openssl/ssl/s3_pkt.c stable/8/crypto/openssl/ssl/s3_srvr.c stable/8/etc/mtree/BSD.var.dist stable/8/usr.sbin/freebsd-update/freebsd-update.sh Modified: stable/6/crypto/openssl/ssl/s3_lib.c ============================================================================== --- stable/6/crypto/openssl/ssl/s3_lib.c Thu Dec 3 08:11:20 2009 (r200053) +++ stable/6/crypto/openssl/ssl/s3_lib.c Thu Dec 3 09:18:40 2009 (r200054) @@ -1768,6 +1768,9 @@ int ssl3_renegotiate(SSL *s) if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) return(0); + if (1) + return(0); + s->s3->renegotiate=1; return(1); } Modified: stable/6/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- stable/6/crypto/openssl/ssl/s3_pkt.c Thu Dec 3 08:11:20 2009 (r200053) +++ stable/6/crypto/openssl/ssl/s3_pkt.c Thu Dec 3 09:18:40 2009 (r200054) @@ -975,9 +975,7 @@ start: if (s->msg_callback) s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->s3->handshake_fragment, 4, s, s->msg_callback_arg); - if (SSL_is_init_finished(s) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && - !s->s3->renegotiate) + if (0) { ssl3_renegotiate(s); if (ssl3_renegotiate_check(s)) @@ -1108,8 +1106,7 @@ start: /* Unexpected handshake message (Client Hello, or protocol violation) */ if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) { - if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) + if (0) { #if 0 /* worked only because C operator preferences are not as expected (and * because this is not really needed for clients except for detecting Modified: stable/6/crypto/openssl/ssl/s3_srvr.c ============================================================================== --- stable/6/crypto/openssl/ssl/s3_srvr.c Thu Dec 3 08:11:20 2009 (r200053) +++ stable/6/crypto/openssl/ssl/s3_srvr.c Thu Dec 3 09:18:40 2009 (r200054) @@ -654,6 +654,13 @@ static int ssl3_get_client_hello(SSL *s) SSL_COMP *comp=NULL; STACK_OF(SSL_CIPHER) *ciphers=NULL; + if (s->new_session) + { + al=SSL_AD_HANDSHAKE_FAILURE; + SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); + goto f_err; + } + /* We do this so that we will respond with our native type. * If we are TLSv1 and we get SSLv3, we will respond with TLSv1, * This down switching should be handled by a different method. Modified: stable/6/etc/mtree/BSD.var.dist ============================================================================== --- stable/6/etc/mtree/BSD.var.dist Thu Dec 3 08:11:20 2009 (r200053) +++ stable/6/etc/mtree/BSD.var.dist Thu Dec 3 09:18:40 2009 (r200054) @@ -32,7 +32,7 @@ db entropy uname=operator gname=operator mode=0700 .. - freebsd-update + freebsd-update mode=0700 .. ipf mode=0700 .. Modified: stable/6/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- stable/6/usr.sbin/freebsd-update/freebsd-update.sh Thu Dec 3 08:11:20 2009 (r200053) +++ stable/6/usr.sbin/freebsd-update/freebsd-update.sh Thu Dec 3 09:18:40 2009 (r200054) @@ -533,6 +533,7 @@ fetch_check_params () { echo ${WORKDIR} exit 1 fi + chmod 700 ${WORKDIR} cd ${WORKDIR} || exit 1 # Generate release number. The s/SECURITY/RELEASE/ bit exists From owner-svn-src-stable-6@FreeBSD.ORG Fri Dec 4 07:10:18 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A34231065670; Fri, 4 Dec 2009 07:10:18 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 91AD88FC08; Fri, 4 Dec 2009 07:10:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB47AIPY045817; Fri, 4 Dec 2009 07:10:18 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB47AIgf045815; Fri, 4 Dec 2009 07:10:18 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200912040710.nB47AIgf045815@svn.freebsd.org> From: Christian Brueffer Date: Fri, 4 Dec 2009 07:10:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200094 - stable/6/lib/libc/string X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2009 07:10:18 -0000 Author: brueffer Date: Fri Dec 4 07:10:18 2009 New Revision: 200094 URL: http://svn.freebsd.org/changeset/base/200094 Log: MFC: r199988 Add an .Nm for strncat. Modified: stable/6/lib/libc/string/strcat.3 Directory Properties: stable/6/lib/libc/ (props changed) Modified: stable/6/lib/libc/string/strcat.3 ============================================================================== --- stable/6/lib/libc/string/strcat.3 Fri Dec 4 07:09:17 2009 (r200093) +++ stable/6/lib/libc/string/strcat.3 Fri Dec 4 07:10:18 2009 (r200094) @@ -36,11 +36,12 @@ .\" @(#)strcat.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd December 1, 2009 .Dt STRCAT 3 .Os .Sh NAME -.Nm strcat +.Nm strcat , +.Nm strncat .Nd concatenate strings .Sh LIBRARY .Lb libc