From owner-svn-src-stable-7@FreeBSD.ORG Sun Apr 18 04:49:07 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3175106564A; Sun, 18 Apr 2010 04:49:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9186E8FC1E; Sun, 18 Apr 2010 04:49:07 +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 o3I4n7SO074678; Sun, 18 Apr 2010 04:49:07 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3I4n7PX074676; Sun, 18 Apr 2010 04:49:07 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201004180449.o3I4n7PX074676@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 18 Apr 2010 04:49:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206787 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Apr 2010 04:49:07 -0000 Author: kib Date: Sun Apr 18 04:49:07 2010 New Revision: 206787 URL: http://svn.freebsd.org/changeset/base/206787 Log: MFC r206671: Fix typo. Modified: stable/7/sys/kern/vfs_cache.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/vfs_cache.c ============================================================================== --- stable/7/sys/kern/vfs_cache.c Sun Apr 18 04:35:16 2010 (r206786) +++ stable/7/sys/kern/vfs_cache.c Sun Apr 18 04:49:07 2010 (r206787) @@ -513,7 +513,7 @@ cache_enter(dvp, vp, cnp) CTR3(KTR_VFS, "cache_enter(%p, %p, %s)", dvp, vp, cnp->cn_nameptr); VNASSERT(vp == NULL || (vp->v_iflag & VI_DOOMED) == 0, vp, - ("cahe_enter: Adding a doomed vnode")); + ("cache_enter: Adding a doomed vnode")); if (!doingcache) return; From owner-svn-src-stable-7@FreeBSD.ORG Sun Apr 18 12:50:27 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5264F1065672; Sun, 18 Apr 2010 12:50:27 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 40F4C8FC1D; Sun, 18 Apr 2010 12:50:27 +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 o3ICoRni083220; Sun, 18 Apr 2010 12:50:27 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3ICoRv6083218; Sun, 18 Apr 2010 12:50:27 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201004181250.o3ICoRv6083218@svn.freebsd.org> From: Peter Holm Date: Sun, 18 Apr 2010 12:50:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206798 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Apr 2010 12:50:27 -0000 Author: pho Date: Sun Apr 18 12:50:26 2010 New Revision: 206798 URL: http://svn.freebsd.org/changeset/base/206798 Log: Fix incorrect assertion. If the caller passed in no lock flags (i.e. just checking the vnode for validity) then there is a window between the VI_UNLOCK() in _vn_lock(9) and the subsequent VI_LOCK() in vget() where another thread could have set VI_DOOMED. Submitted by: Matthew Fleming Reviewed by: kib Modified: stable/7/sys/kern/vfs_subr.c Modified: stable/7/sys/kern/vfs_subr.c ============================================================================== --- stable/7/sys/kern/vfs_subr.c Sun Apr 18 12:43:33 2010 (r206797) +++ stable/7/sys/kern/vfs_subr.c Sun Apr 18 12:50:26 2010 (r206798) @@ -2064,10 +2064,18 @@ vget(struct vnode *vp, int flags, struct return (error); } VI_LOCK(vp); + /* + * Deal with a timing window when the interlock is not held + * and VI_DOOMED can be set, since we only have a holdcnt, + * not a usecount. + */ + if (vp->v_iflag & VI_DOOMED && (flags & LK_RETRY) == 0) { + KASSERT((flags & LK_TYPE_MASK) == 0, ("Unexpected flags %x", flags)); + vdropl(vp); + return (ENOENT); + } /* Upgrade our holdcnt to a usecount. */ v_upgrade_usecount(vp); - if (vp->v_iflag & VI_DOOMED && (flags & LK_RETRY) == 0) - panic("vget: vn_lock failed to return ENOENT\n"); if (oweinact) { if (vp->v_iflag & VI_OWEINACT) vinactive(vp, td); From owner-svn-src-stable-7@FreeBSD.ORG Mon Apr 19 20:48:27 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E68D51065677; Mon, 19 Apr 2010 20:48:27 +0000 (UTC) (envelope-from keramida@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D3C428FC2F; Mon, 19 Apr 2010 20:48:27 +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 o3JKmR7f011672; Mon, 19 Apr 2010 20:48:27 GMT (envelope-from keramida@svn.freebsd.org) Received: (from keramida@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JKmR7v011669; Mon, 19 Apr 2010 20:48:27 GMT (envelope-from keramida@svn.freebsd.org) Message-Id: <201004192048.o3JKmR7v011669@svn.freebsd.org> From: Giorgos Keramidas Date: Mon, 19 Apr 2010 20:48:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206862 - stable/7/lib/libgssapi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 20:48:28 -0000 Author: keramida (doc committer) Date: Mon Apr 19 20:48:27 2010 New Revision: 206862 URL: http://svn.freebsd.org/changeset/base/206862 Log: MFC 173187 Remove duplicate (but commented out) .Sh HISTORY section heading and add a missing .El request. Modified: stable/7/lib/libgssapi/gss_wrap.3 stable/7/lib/libgssapi/gss_wrap_size_limit.3 Directory Properties: stable/7/lib/libgssapi/ (props changed) Modified: stable/7/lib/libgssapi/gss_wrap.3 ============================================================================== --- stable/7/lib/libgssapi/gss_wrap.3 Mon Apr 19 20:41:13 2010 (r206861) +++ stable/7/lib/libgssapi/gss_wrap.3 Mon Apr 19 20:48:27 2010 (r206862) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_WRAP 3 PRM .Sh NAME @@ -142,7 +142,7 @@ The specified QOP is not supported by th Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY +.El .Sh HISTORY The .Nm Modified: stable/7/lib/libgssapi/gss_wrap_size_limit.3 ============================================================================== --- stable/7/lib/libgssapi/gss_wrap_size_limit.3 Mon Apr 19 20:41:13 2010 (r206861) +++ stable/7/lib/libgssapi/gss_wrap_size_limit.3 Mon Apr 19 20:48:27 2010 (r206862) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_WRAP_SIZE_LIMIT 3 PRM .Sh NAME @@ -127,7 +127,7 @@ The specified QOP is not supported by th Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY +.El .Sh HISTORY The .Nm From owner-svn-src-stable-7@FreeBSD.ORG Mon Apr 19 20:51:54 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3ADB106566C; Mon, 19 Apr 2010 20:51:54 +0000 (UTC) (envelope-from keramida@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A06988FC0A; Mon, 19 Apr 2010 20:51:54 +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 o3JKps3h012512; Mon, 19 Apr 2010 20:51:54 GMT (envelope-from keramida@svn.freebsd.org) Received: (from keramida@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JKps8f012483; Mon, 19 Apr 2010 20:51:54 GMT (envelope-from keramida@svn.freebsd.org) Message-Id: <201004192051.o3JKps8f012483@svn.freebsd.org> From: Giorgos Keramidas Date: Mon, 19 Apr 2010 20:51:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206863 - stable/7/lib/libgssapi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 20:51:54 -0000 Author: keramida (doc committer) Date: Mon Apr 19 20:51:54 2010 New Revision: 206863 URL: http://svn.freebsd.org/changeset/base/206863 Log: MFC 173188 Remove duplicate (but commented out) .Sh HISTORY section heading. It almost "shadows" the ending .El request of a list, which seems to have caused mdoc buglets in some gss_*.3 manpages. Modified: stable/7/lib/libgssapi/gss_accept_sec_context.3 stable/7/lib/libgssapi/gss_acquire_cred.3 stable/7/lib/libgssapi/gss_add_oid_set_member.3 stable/7/lib/libgssapi/gss_canonicalize_name.3 stable/7/lib/libgssapi/gss_compare_name.3 stable/7/lib/libgssapi/gss_context_time.3 stable/7/lib/libgssapi/gss_delete_sec_context.3 stable/7/lib/libgssapi/gss_display_name.3 stable/7/lib/libgssapi/gss_display_status.3 stable/7/lib/libgssapi/gss_duplicate_name.3 stable/7/lib/libgssapi/gss_export_name.3 stable/7/lib/libgssapi/gss_export_sec_context.3 stable/7/lib/libgssapi/gss_get_mic.3 stable/7/lib/libgssapi/gss_import_name.3 stable/7/lib/libgssapi/gss_import_sec_context.3 stable/7/lib/libgssapi/gss_indicate_mechs.3 stable/7/lib/libgssapi/gss_init_sec_context.3 stable/7/lib/libgssapi/gss_inquire_context.3 stable/7/lib/libgssapi/gss_inquire_cred.3 stable/7/lib/libgssapi/gss_inquire_names_for_mech.3 stable/7/lib/libgssapi/gss_process_context_token.3 stable/7/lib/libgssapi/gss_release_buffer.3 stable/7/lib/libgssapi/gss_release_cred.3 stable/7/lib/libgssapi/gss_release_name.3 stable/7/lib/libgssapi/gss_release_oid_set.3 stable/7/lib/libgssapi/gss_test_oid_set_member.3 stable/7/lib/libgssapi/gss_unwrap.3 stable/7/lib/libgssapi/gss_verify_mic.3 Directory Properties: stable/7/lib/libgssapi/ (props changed) Modified: stable/7/lib/libgssapi/gss_accept_sec_context.3 ============================================================================== --- stable/7/lib/libgssapi/gss_accept_sec_context.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_accept_sec_context.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ACCEPT_SEC_CONTEXT 3 PRM .Sh NAME @@ -448,7 +448,6 @@ Generic Security Service Application Pro .It RFC 2744 Generic Security Service API Version 2 : C-bindings .El -.\" .Sh HISTORY .Sh HISTORY The .Nm Modified: stable/7/lib/libgssapi/gss_acquire_cred.3 ============================================================================== --- stable/7/lib/libgssapi/gss_acquire_cred.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_acquire_cred.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ACQUIRE_CRED 3 PRM .Sh NAME @@ -201,7 +201,6 @@ No credentials were found for the specif Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_add_oid_set_member.3 ============================================================================== --- stable/7/lib/libgssapi/gss_add_oid_set_member.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_add_oid_set_member.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ADD_OID_SET_MEMBER 3 PRM .Sh NAME @@ -93,7 +93,6 @@ Successful completion Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_canonicalize_name.3 ============================================================================== --- stable/7/lib/libgssapi/gss_canonicalize_name.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_canonicalize_name.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_CANONICALIZE_NAME 3 PRM .Sh NAME @@ -100,7 +100,6 @@ The provided internal name was ill-forme Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_compare_name.3 ============================================================================== --- stable/7/lib/libgssapi/gss_compare_name.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_compare_name.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_COMPARE_NAME PRM .Sh NAME @@ -85,7 +85,6 @@ One or both of name1 or name2 was ill-fo Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_context_time.3 ============================================================================== --- stable/7/lib/libgssapi/gss_context_time.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_context_time.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_CONTEXT_TIME 3 PRM .Sh NAME @@ -71,7 +71,6 @@ The context_handle parameter did not ide Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_delete_sec_context.3 ============================================================================== --- stable/7/lib/libgssapi/gss_delete_sec_context.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_delete_sec_context.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DELETE_SEC_CONTEXT 3 PRM .Sh NAME @@ -126,7 +126,6 @@ No valid context was supplied Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_display_name.3 ============================================================================== --- stable/7/lib/libgssapi/gss_display_name.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_display_name.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DISPLAY_NAME 3 PRM .Sh NAME @@ -114,7 +114,6 @@ was ill-formed Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_display_status.3 ============================================================================== --- stable/7/lib/libgssapi/gss_display_status.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_display_status.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DISPLAY_STATUS 3 PRM .Sh NAME @@ -173,7 +173,6 @@ nor Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_duplicate_name.3 ============================================================================== --- stable/7/lib/libgssapi/gss_duplicate_name.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_duplicate_name.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DUPLICATE_NAME 3 PRM .Sh NAME @@ -86,7 +86,6 @@ parameter was ill-formed Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_export_name.3 ============================================================================== --- stable/7/lib/libgssapi/gss_export_name.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_export_name.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_EXPORT_NAME 3 PRM .Sh NAME @@ -91,7 +91,6 @@ The internal name was of a type not supp Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_export_sec_context.3 ============================================================================== --- stable/7/lib/libgssapi/gss_export_sec_context.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_export_sec_context.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_EXPORT_SEC_CONTEXT 3 PRM .Sh NAME @@ -131,7 +131,6 @@ The operation is not supported Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_get_mic.3 ============================================================================== --- stable/7/lib/libgssapi/gss_get_mic.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_get_mic.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_GET_MIC 3 PRM .Sh NAME @@ -128,7 +128,6 @@ The specified QOP is not supported by th Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_import_name.3 ============================================================================== --- stable/7/lib/libgssapi/gss_import_name.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_import_name.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_IMPORT_NAME 3 PRM .Sh NAME @@ -102,7 +102,6 @@ but the mechanism contained within the i Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_import_sec_context.3 ============================================================================== --- stable/7/lib/libgssapi/gss_import_sec_context.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_import_sec_context.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_IMPORT_SEC_CONTEXT 3 PRM .Sh NAME @@ -83,7 +83,6 @@ Local policy prevents the import of this Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_indicate_mechs.3 ============================================================================== --- stable/7/lib/libgssapi/gss_indicate_mechs.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_indicate_mechs.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INDICATE_MECHS 3 PRM .Sh NAME @@ -70,7 +70,6 @@ Successful completion Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_init_sec_context.3 ============================================================================== --- stable/7/lib/libgssapi/gss_init_sec_context.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_init_sec_context.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INIT_SEC_CONTEXT 3 PRM .Sh NAME @@ -535,7 +535,6 @@ Generic Security Service Application Pro .It RFC 2744 Generic Security Service API Version 2 : C-bindings .El -.\" .Sh HISTORY .Sh HISTORY The .Nm Modified: stable/7/lib/libgssapi/gss_inquire_context.3 ============================================================================== --- stable/7/lib/libgssapi/gss_inquire_context.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_inquire_context.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INQUIRE_CONTEXT 3 PRM .Sh NAME @@ -247,7 +247,6 @@ The referenced context could not be acce Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_inquire_cred.3 ============================================================================== --- stable/7/lib/libgssapi/gss_inquire_cred.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_inquire_cred.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INQUIRE_CRED 3 PRM .Sh NAME @@ -121,7 +121,6 @@ it will be set to 0 Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_inquire_names_for_mech.3 ============================================================================== --- stable/7/lib/libgssapi/gss_inquire_names_for_mech.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_inquire_names_for_mech.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INQUIRE_NAMES_FOR_MECH 3 PRM .Sh NAME @@ -70,7 +70,6 @@ Successful completion Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_process_context_token.3 ============================================================================== --- stable/7/lib/libgssapi/gss_process_context_token.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_process_context_token.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_PROCESS_CONTEXT_TOKEN 3 PRM .Sh NAME @@ -99,7 +99,6 @@ did not refer to a valid context Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_release_buffer.3 ============================================================================== --- stable/7/lib/libgssapi/gss_release_buffer.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_release_buffer.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_RELEASE_BUFFER 3 PRM .Sh NAME @@ -74,7 +74,6 @@ Successful completion Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_release_cred.3 ============================================================================== --- stable/7/lib/libgssapi/gss_release_cred.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_release_cred.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_RELEASE_CRED 3 PRM .Sh NAME @@ -71,7 +71,6 @@ Credentials could not be accessed Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_release_name.3 ============================================================================== --- stable/7/lib/libgssapi/gss_release_name.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_release_name.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_RELEASE_NAME 3 PRM .Sh NAME @@ -67,7 +67,6 @@ The name parameter did not contain a val Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_release_oid_set.3 ============================================================================== --- stable/7/lib/libgssapi/gss_release_oid_set.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_release_oid_set.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_RELEASE_OID_SET 3 PRM .Sh NAME @@ -72,7 +72,6 @@ Successful completion Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_test_oid_set_member.3 ============================================================================== --- stable/7/lib/libgssapi/gss_test_oid_set_member.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_test_oid_set_member.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_TEST_OID_SET_MEMBER 3 PRM .Sh NAME @@ -79,7 +79,6 @@ Successful completion Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_unwrap.3 ============================================================================== --- stable/7/lib/libgssapi/gss_unwrap.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_unwrap.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_UNWRAP 3 PRM .Sh NAME @@ -155,7 +155,6 @@ The context_handle parameter did not ide Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .Sh HISTORY The .Nm Modified: stable/7/lib/libgssapi/gss_verify_mic.3 ============================================================================== --- stable/7/lib/libgssapi/gss_verify_mic.3 Mon Apr 19 20:48:27 2010 (r206862) +++ stable/7/lib/libgssapi/gss_verify_mic.3 Mon Apr 19 20:51:54 2010 (r206863) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_VERIFY_MIC 3 PRM .Sh NAME @@ -135,7 +135,6 @@ The context_handle parameter did not ide Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The From owner-svn-src-stable-7@FreeBSD.ORG Mon Apr 19 20:53:39 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D61F106566C; Mon, 19 Apr 2010 20:53:38 +0000 (UTC) (envelope-from keramida@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3261B8FC1D; Mon, 19 Apr 2010 20:53:38 +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 o3JKrcZf012953; Mon, 19 Apr 2010 20:53:38 GMT (envelope-from keramida@svn.freebsd.org) Received: (from keramida@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JKrcfU012950; Mon, 19 Apr 2010 20:53:38 GMT (envelope-from keramida@svn.freebsd.org) Message-Id: <201004192053.o3JKrcfU012950@svn.freebsd.org> From: Giorgos Keramidas Date: Mon, 19 Apr 2010 20:53:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206864 - stable/7/lib/libgssapi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 20:53:39 -0000 Author: keramida (doc committer) Date: Mon Apr 19 20:53:37 2010 New Revision: 206864 URL: http://svn.freebsd.org/changeset/base/206864 Log: MFC 173189 Change a .PP request to a valid .Pp mdoc request, and remove an extra (but commented out) .Sh HISTORY section heading. Modified: stable/7/lib/libgssapi/gss_add_cred.3 stable/7/lib/libgssapi/gss_create_empty_oid_set.3 Directory Properties: stable/7/lib/libgssapi/ (props changed) Modified: stable/7/lib/libgssapi/gss_add_cred.3 ============================================================================== --- stable/7/lib/libgssapi/gss_add_cred.3 Mon Apr 19 20:51:54 2010 (r206863) +++ stable/7/lib/libgssapi/gss_add_cred.3 Mon Apr 19 20:53:37 2010 (r206864) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ADD_CRED 3 PRM .Sh NAME @@ -86,7 +86,7 @@ is .Dv GSS_C_ACCEPT or .Dv GSS_C_BOTH ). -.PP +.Pp This routine is expected to be used primarily by context acceptors, since implementations are likely to provide mechanism-specific ways of obtaining GSS-API initiator credentials from the system login process. @@ -301,7 +301,6 @@ No credentials were found for the specif Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The Modified: stable/7/lib/libgssapi/gss_create_empty_oid_set.3 ============================================================================== --- stable/7/lib/libgssapi/gss_create_empty_oid_set.3 Mon Apr 19 20:51:54 2010 (r206863) +++ stable/7/lib/libgssapi/gss_create_empty_oid_set.3 Mon Apr 19 20:53:37 2010 (r206864) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_CREATE_EMPTY_OID_SET 3 PRM .Sh NAME @@ -55,7 +55,6 @@ object identifiers for input to .It minor_status Mechanism specific status code. .It oid_set - The empty object identifier set. The routine will allocate the gss_OID_set_desc object, which the application must free after use with a call to @@ -75,7 +74,6 @@ Successful completion Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The From owner-svn-src-stable-7@FreeBSD.ORG Mon Apr 19 20:56:04 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 684F91065674; Mon, 19 Apr 2010 20:56:04 +0000 (UTC) (envelope-from keramida@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 569E88FC1C; Mon, 19 Apr 2010 20:56:04 +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 o3JKu4pF013620; Mon, 19 Apr 2010 20:56:04 GMT (envelope-from keramida@svn.freebsd.org) Received: (from keramida@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JKu4Ml013618; Mon, 19 Apr 2010 20:56:04 GMT (envelope-from keramida@svn.freebsd.org) Message-Id: <201004192056.o3JKu4Ml013618@svn.freebsd.org> From: Giorgos Keramidas Date: Mon, 19 Apr 2010 20:56:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206867 - stable/7/lib/libgssapi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 20:56:04 -0000 Author: keramida (doc committer) Date: Mon Apr 19 20:56:04 2010 New Revision: 206867 URL: http://svn.freebsd.org/changeset/base/206867 Log: MFC 173190 Remove an extra (commented out) .Sh HISTORY section heading, to avoid the risk of "shadowing" the following .El request, strip eol spaces and delete an empty line to fix mdoc warnings. Modified: stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3 Directory Properties: stable/7/lib/libgssapi/ (props changed) Modified: stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3 ============================================================================== --- stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3 Mon Apr 19 20:55:41 2010 (r206866) +++ stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3 Mon Apr 19 20:56:04 2010 (r206867) @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INQUIRE_CRED_BY_MECH 3 PRM .Sh NAME @@ -67,9 +67,8 @@ after use with a call to .Fn gss_release_name . Specify .Dv NULL -if not required. +if not required. .It initiator_lifetime - The number of seconds for which the credential will remain capable of initiating security contexts under the specified mechanism. If the credential can no longer be used to initiate contexts, @@ -136,7 +135,6 @@ it will be set to 0. Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The From owner-svn-src-stable-7@FreeBSD.ORG Mon Apr 19 21:01:29 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9C371065677; Mon, 19 Apr 2010 21:01:29 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B690D8FC14; Mon, 19 Apr 2010 21:01:29 +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 o3JL1Tj4015034; Mon, 19 Apr 2010 21:01:29 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JL1Tkg015030; Mon, 19 Apr 2010 21:01:29 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201004192101.o3JL1Tkg015030@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 19 Apr 2010 21:01:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206871 - stable/7/share/zoneinfo X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 21:01:29 -0000 Author: edwin Date: Mon Apr 19 21:01:29 2010 New Revision: 206871 URL: http://svn.freebsd.org/changeset/base/206871 Log: MFC of tzdata2010i, r206868 - Marocco does have DST this year between May and August. - Historical data for Taiwan - Argentina / San Luis does not do DST this year. Modified: stable/7/share/zoneinfo/africa stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/southamerica Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/africa ============================================================================== --- stable/7/share/zoneinfo/africa Mon Apr 19 21:01:26 2010 (r206870) +++ stable/7/share/zoneinfo/africa Mon Apr 19 21:01:29 2010 (r206871) @@ -1,5 +1,5 @@ # 
-# @(#)africa	8.23
+# @(#)africa	8.26
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -680,6 +680,21 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
 # 
 
+# From Steffen Thorsen (2010-04-13):
+# Several news media in Morocco report that the Ministry of Modernization
+# of Public Sectors has announced that Morocco will have DST from
+# 2010-05-02 to 2010-08-08.
+#
+# Example:
+# 
+# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
+# 
+# (French)
+# Our page:
+# 
+# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+# 
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -701,6 +716,8 @@ Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:
 Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
 Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
@@ -942,6 +959,24 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Therefore, the standard time will be kept unchanged the whole year long."
 # So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
 
+# From Alexander Krivenyshev (2010-03-27):
+# According to some news reports Tunis confirmed not to use DST in 2010
+#
+# (translation):
+# "The Tunisian government has decided to abandon DST, which was scheduled on
+# Sunday...
+# Tunisian authorities had suspended the DST for the first time last year also
+# coincided with the month of Ramadan..."
+#
+# (in Arabic)
+# 
+# http://www.moheet.com/show_news.aspx?nid=358861&pg=1
+# 
+# http://www.almadenahnews.com/newss/news.php?c=118&id=38036
+# or
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
 Rule	Tunisia	1939	only	-	Nov	18	23:00s	0	-
@@ -968,8 +1003,7 @@ Rule	Tunisia	2005	only	-	May	 1	 0:00s	1
 Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
 Rule	Tunisia	2006	2008	-	Mar	lastSun	 2:00s	1:00	S
 Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
-Rule	Tunisia	2010	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Tunisia	2010	max	-	Oct	lastSun	 2:00s	0	-
+
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
 # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.

Modified: stable/7/share/zoneinfo/asia
==============================================================================
--- stable/7/share/zoneinfo/asia	Mon Apr 19 21:01:26 2010	(r206870)
+++ stable/7/share/zoneinfo/asia	Mon Apr 19 21:01:29 2010	(r206871)
@@ -1,4 +1,4 @@
-# @(#)asia	8.58
+# @(#)asia	8.60
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -566,6 +566,28 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 O
 # was still controlled by Japan.  This is hard to believe, but we don't
 # have any other information.
 
+# From smallufo (2010-04-03):
+# According to Taiwan's CWB,
+# 
+# http://www.cwb.gov.tw/V6/astronomy/cdata/summert.htm
+# 
+# Taipei has DST in 1979 between July 1st and Sep 30.
+
+# From Arthur David Olson (2010-04-07):
+# Here's Google's translation of the table at the bottom of the "summert.htm" page:
+# Decade 	                                                    Name                      Start and end date
+# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time               May 1 to September 30 
+# 41 years of the Republic of China (AD 1952)                 Daylight Saving Time      March 1 to October 31 
+# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time      April 1 to October 31 
+# In the 44 years to 45 years (AD 1955-1956 years)            Daylight Saving Time      April 1 to September 30 
+# Republic of China 46 years to 48 years (AD 1957-1959)       Summer Time               April 1 to September 30 
+# Republic of China 49 years to 50 years (AD 1960-1961)       Summer Time               June 1 to September 30 
+# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time 
+# Republic of China 63 years to 64 years (1974-1975 AD)       Daylight Saving Time      April 1 to September 30 
+# Republic of China 65 years to 67 years (1976-1978 AD)       Stop Daylight Saving Time 
+# Republic of China 68 years (AD 1979)                        Daylight Saving Time      July 1 to September 30 
+# Republic of China since 69 years (AD 1980)                  Stop Daylight Saving Time
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Taiwan	1945	1951	-	May	1	0:00	1:00	D
 Rule	Taiwan	1945	1951	-	Oct	1	0:00	0	S
@@ -576,8 +598,9 @@ Rule	Taiwan	1955	1961	-	Oct	1	0:00	0	S
 Rule	Taiwan	1960	1961	-	Jun	1	0:00	1:00	D
 Rule	Taiwan	1974	1975	-	Apr	1	0:00	1:00	D
 Rule	Taiwan	1974	1975	-	Oct	1	0:00	0	S
-Rule	Taiwan	1980	only	-	Jun	30	0:00	1:00	D
-Rule	Taiwan	1980	only	-	Sep	30	0:00	0	S
+Rule	Taiwan	1979	only	-	Jun	30	0:00	1:00	D
+Rule	Taiwan	1979	only	-	Sep	30	0:00	0	S
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Taipei	8:06:00 -	LMT	1896 # or Taibei or T'ai-pei
 			8:00	Taiwan	C%sT
@@ -1912,13 +1935,35 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # [T]he German Consulate General in Karachi reported me today that Pakistan
 # will go back to standard time on 1st of November.
 
+# From Steffen Thorsen (2010-03-26):
+# Steffen Thorsen wrote:
+# > On Thursday (2010-03-25) it was announced that DST would start in
+# > Pakistan on 2010-04-01.
+# >
+# > Then today, the president said that they might have to revert the
+# > decision if it is not supported by the parliament. So at the time
+# > being, it seems unclear if DST will be actually observed or not - but
+# > April 1 could be a more likely date than April 15.
+# Now, it seems that the decision to not observe DST in final:
+#
+# "Govt Withdraws Plan To Advance Clocks"
+# 
+# http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
+# 
+#
+# "People laud PM's announcement to end DST"
+# 
+# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
-Rule Pakistan	2009	max	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	max	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

Modified: stable/7/share/zoneinfo/southamerica
==============================================================================
--- stable/7/share/zoneinfo/southamerica	Mon Apr 19 21:01:26 2010	(r206870)
+++ stable/7/share/zoneinfo/southamerica	Mon Apr 19 21:01:29 2010	(r206871)
@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.43
+# @(#)southamerica	8.44
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -437,6 +437,27 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:
 # of the country calls it "ART".
 # ...
 
+# From Alexander Krivenyshev (2010-04-09):
+# According to news reports from El Diario de la Republica Province San
+# Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
+# after April 11, 2010--will continue to have same time as rest of
+# Argentina (UTC-3) (no DST).
+#
+# Confirmaron la prórroga del huso horario de verano (Spanish)
+# 
+# http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
+# 
+# or (some English translation):
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_argentina08.html
+# 
+
+# From Mariano Absatz (2010-04-12):
+# yes...I can confirm this...and given that San Luis keeps calling
+# UTC-03:00 "summer time", we should't just let San Luis go back to "Arg"
+# rules...San Luis is still using "Western ARgentina Time" and it got
+# stuck on Summer daylight savings time even though the summer is over.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),
@@ -570,8 +591,8 @@ Zone America/Argentina/Mendoza -4:35:16 
 #
 # San Luis (SL)
 
-Rule	SanLuis	2008	max	-	Mar	Sun>=8	0:00	0	-
-Rule	SanLuis	2007	max	-	Oct	Sun>=8	0:00	1:00	S
+Rule	SanLuis	2008	2009	-	Mar	Sun>=8	0:00	0	-
+Rule	SanLuis	2007	2009	-	Oct	Sun>=8	0:00	1:00	S
 
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Apr 19 21:02:55 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3303A106564A;
	Mon, 19 Apr 2010 21:02:55 +0000 (UTC)
	(envelope-from keramida@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 216D38FC16;
	Mon, 19 Apr 2010 21:02:55 +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 o3JL2tnh015402;
	Mon, 19 Apr 2010 21:02:55 GMT
	(envelope-from keramida@svn.freebsd.org)
Received: (from keramida@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JL2tQh015400;
	Mon, 19 Apr 2010 21:02:55 GMT
	(envelope-from keramida@svn.freebsd.org)
Message-Id: <201004192102.o3JL2tQh015400@svn.freebsd.org>
From: Giorgos Keramidas 
Date: Mon, 19 Apr 2010 21:02:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206872 - stable/7/lib/libgssapi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 19 Apr 2010 21:02:55 -0000

Author: keramida (doc committer)
Date: Mon Apr 19 21:02:54 2010
New Revision: 206872
URL: http://svn.freebsd.org/changeset/base/206872

Log:
  MFC 173194
  
  Remove an extra (commented out) .Sh HISTORY section heading, to avoid
  the risk of "shadowing" the following .El request, and delete an empty
  line to fix mdoc warnings.

Modified:
  stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3
Directory Properties:
  stable/7/lib/libgssapi/   (props changed)

Modified: stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3	Mon Apr 19 21:01:29 2010	(r206871)
+++ stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3	Mon Apr 19 21:02:54 2010	(r206872)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd November 12, 2005
+.Dd October 30, 2007
 .Os
 .Dt GSS_INQUIRE_MECHS_FOR_NAME 3 PRM
 .Sh NAME
@@ -47,7 +47,6 @@
 Returns the set of mechanisms supported by the GSS-API implementation
 that may be able to process the specified name.
 .Pp
-   
 Each mechanism returned will recognize at least one element within the
 name.
 It is permissible for this routine to be implemented within a
@@ -97,7 +96,6 @@ parameter was ill-formed
 Generic Security Service Application Program Interface Version 2, Update 1
 .It RFC 2744
 Generic Security Service API Version 2 : C-bindings
-.\" .Sh HISTORY
 .El
 .Sh HISTORY
 The

From owner-svn-src-stable-7@FreeBSD.ORG  Tue Apr 20 20:21:01 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EC96106564A;
	Tue, 20 Apr 2010 20:21:01 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D6288FC0A;
	Tue, 20 Apr 2010 20:21:01 +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 o3KKL1FP033769;
	Tue, 20 Apr 2010 20:21:01 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KKL1WO033766;
	Tue, 20 Apr 2010 20:21:01 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201004202021.o3KKL1WO033766@svn.freebsd.org>
From: Bruce Cran 
Date: Tue, 20 Apr 2010 20:21:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206912 - stable/7/contrib/top
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Tue, 20 Apr 2010 20:21:01 -0000

Author: brucec
Date: Tue Apr 20 20:21:01 2010
New Revision: 206912
URL: http://svn.freebsd.org/changeset/base/206912

Log:
  MFC r205119 and r206056:
  
  Prevent the SIZE field being corrupted when a process allocates more than
  2TB.
  
  PR:	bin/129706
  Submitted by:	brucec
  Approved by:	rrs (mentor)

Modified:
  stable/7/contrib/top/utils.c
  stable/7/contrib/top/utils.h
Directory Properties:
  stable/7/contrib/top/   (props changed)

Modified: stable/7/contrib/top/utils.c
==============================================================================
--- stable/7/contrib/top/utils.c	Tue Apr 20 20:19:19 2010	(r206911)
+++ stable/7/contrib/top/utils.c	Tue Apr 20 20:21:01 2010	(r206912)
@@ -476,7 +476,7 @@ int amt;
 
 char *format_k2(amt)
 
-int amt;
+unsigned long long amt;
 
 {
     static char retarray[NUM_STRINGS][16];

Modified: stable/7/contrib/top/utils.h
==============================================================================
--- stable/7/contrib/top/utils.h	Tue Apr 20 20:19:19 2010	(r206911)
+++ stable/7/contrib/top/utils.h	Tue Apr 20 20:21:01 2010	(r206912)
@@ -21,4 +21,4 @@ long percentages();
 char *errmsg();
 char *format_time();
 char *format_k();
-char *format_k2();
+char *format_k2(unsigned long long);

From owner-svn-src-stable-7@FreeBSD.ORG  Tue Apr 20 20:26:26 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5F181106566C;
	Tue, 20 Apr 2010 20:26:26 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4DE1F8FC18;
	Tue, 20 Apr 2010 20:26:26 +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 o3KKQQn7035060;
	Tue, 20 Apr 2010 20:26:26 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KKQQpZ035058;
	Tue, 20 Apr 2010 20:26:26 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201004202026.o3KKQQpZ035058@svn.freebsd.org>
From: Bruce Cran 
Date: Tue, 20 Apr 2010 20:26:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206914 - stable/7/sbin/sysctl
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Tue, 20 Apr 2010 20:26:26 -0000

Author: brucec
Date: Tue Apr 20 20:26:26 2010
New Revision: 206914
URL: http://svn.freebsd.org/changeset/base/206914

Log:
  MFC r205118:
  
  Free the memory allocated via strdup.
  
  PR:	bin/113881
  Submitted by:	Alexander Drozdov 
  Approved by:	rrs (mentor)

Modified:
  stable/7/sbin/sysctl/sysctl.c
Directory Properties:
  stable/7/sbin/sysctl/   (props changed)

Modified: stable/7/sbin/sysctl/sysctl.c
==============================================================================
--- stable/7/sbin/sysctl/sysctl.c	Tue Apr 20 20:24:00 2010	(r206913)
+++ stable/7/sbin/sysctl/sysctl.c	Tue Apr 20 20:26:26 2010	(r206914)
@@ -371,6 +371,7 @@ S_timeval(int l2, void *p)
 		if (*p2 == '\n')
 			*p2 = '\0';
 	fputs(p1, stdout);
+	free(p1);
 	return (0);
 }
 

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Apr 21 11:11:11 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9744F106566B;
	Wed, 21 Apr 2010 11:11:11 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B9038FC15;
	Wed, 21 Apr 2010 11:11:11 +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 o3LBBBKd035633;
	Wed, 21 Apr 2010 11:11:11 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3LBBBti035631;
	Wed, 21 Apr 2010 11:11:11 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201004211111.o3LBBBti035631@svn.freebsd.org>
From: Konstantin Belousov 
Date: Wed, 21 Apr 2010 11:11:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206991 - stable/7/lib/libc/sys
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 21 Apr 2010 11:11:11 -0000

Author: kib
Date: Wed Apr 21 11:11:11 2010
New Revision: 206991
URL: http://svn.freebsd.org/changeset/base/206991

Log:
  MFC r206549:
  Align the declaration for sa_sigaction with POSIX.
  
  MFC r206649:
  Still reference struct __sigaction with clarification when this form
  of argument declaration is needed.
  
  MFC r206802:
  Revert r206649. Simplify the presented declaration of struct sigaction.

Modified:
  stable/7/lib/libc/sys/sigaction.2
Directory Properties:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)

Modified: stable/7/lib/libc/sys/sigaction.2
==============================================================================
--- stable/7/lib/libc/sys/sigaction.2	Wed Apr 21 11:09:13 2010	(r206990)
+++ stable/7/lib/libc/sys/sigaction.2	Wed Apr 21 11:11:11 2010	(r206991)
@@ -28,7 +28,7 @@
 .\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
 .\" $FreeBSD$
 .\"
-.Dd June 7, 2004
+.Dd April 18, 2010
 .Dt SIGACTION 2
 .Os
 .Sh NAME
@@ -40,16 +40,11 @@
 .In signal.h
 .Bd -literal
 struct  sigaction {
-        union {
-                void    (*__sa_handler)(int);
-                void    (*__sa_sigaction)(int, struct __siginfo *, void *);
-        } __sigaction_u;                /* signal handler */
+        void    (*sa_handler)(int);
+        void    (*sa_sigaction)(int, siginfo_t *, void *);
         int     sa_flags;               /* see signal options below */
         sigset_t sa_mask;               /* signal mask to apply */
 };
-
-#define	sa_handler	__sigaction_u.__sa_handler
-#define	sa_sigaction	__sigaction_u.__sa_sigaction
 .Ed
 .Ft int
 .Fo sigaction
@@ -148,6 +143,16 @@ If
 is non-zero, the previous handling information for the signal
 is returned to the user.
 .Pp
+The above declaration of
+.Vt "struct sigaction"
+is not literal.
+It is provided only to list the accessible members.
+See
+.In sys/signal.h
+for the actual definition.
+In particular, the storage occupied by sa_handler and sa_sigaction overlaps,
+and an application can not use both simultaneously.
+.Pp
 Once a signal handler is installed, it normally remains installed
 until another
 .Fn sigaction

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Apr 21 17:00:16 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 983A41065674;
	Wed, 21 Apr 2010 17:00:16 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8563A8FC13;
	Wed, 21 Apr 2010 17:00:16 +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 o3LH0G5O013078;
	Wed, 21 Apr 2010 17:00:16 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3LH0Gaq013041;
	Wed, 21 Apr 2010 17:00:16 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201004211700.o3LH0Gaq013041@svn.freebsd.org>
From: Gavin Atkinson 
Date: Wed, 21 Apr 2010 17:00:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206999 - stable/7/lib/libgssapi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 21 Apr 2010 17:00:16 -0000

Author: gavin
Date: Wed Apr 21 17:00:15 2010
New Revision: 206999
URL: http://svn.freebsd.org/changeset/base/206999

Log:
  Merge r203027 from head:
  
    Correct the HISTORY section of these man pages to show when the function,
    not the "manual page example" was introduced.

Modified:
  stable/7/lib/libgssapi/gss_accept_sec_context.3
  stable/7/lib/libgssapi/gss_acquire_cred.3
  stable/7/lib/libgssapi/gss_add_cred.3
  stable/7/lib/libgssapi/gss_add_oid_set_member.3
  stable/7/lib/libgssapi/gss_canonicalize_name.3
  stable/7/lib/libgssapi/gss_compare_name.3
  stable/7/lib/libgssapi/gss_context_time.3
  stable/7/lib/libgssapi/gss_create_empty_oid_set.3
  stable/7/lib/libgssapi/gss_delete_sec_context.3
  stable/7/lib/libgssapi/gss_display_name.3
  stable/7/lib/libgssapi/gss_display_status.3
  stable/7/lib/libgssapi/gss_duplicate_name.3
  stable/7/lib/libgssapi/gss_export_name.3
  stable/7/lib/libgssapi/gss_export_sec_context.3
  stable/7/lib/libgssapi/gss_get_mic.3
  stable/7/lib/libgssapi/gss_import_name.3
  stable/7/lib/libgssapi/gss_import_sec_context.3
  stable/7/lib/libgssapi/gss_indicate_mechs.3
  stable/7/lib/libgssapi/gss_init_sec_context.3
  stable/7/lib/libgssapi/gss_inquire_context.3
  stable/7/lib/libgssapi/gss_inquire_cred.3
  stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3
  stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3
  stable/7/lib/libgssapi/gss_inquire_names_for_mech.3
  stable/7/lib/libgssapi/gss_process_context_token.3
  stable/7/lib/libgssapi/gss_release_buffer.3
  stable/7/lib/libgssapi/gss_release_cred.3
  stable/7/lib/libgssapi/gss_release_name.3
  stable/7/lib/libgssapi/gss_release_oid_set.3
  stable/7/lib/libgssapi/gss_test_oid_set_member.3
  stable/7/lib/libgssapi/gss_unwrap.3
  stable/7/lib/libgssapi/gss_verify_mic.3
  stable/7/lib/libgssapi/gss_wrap.3
  stable/7/lib/libgssapi/gss_wrap_size_limit.3
  stable/7/lib/libgssapi/gssapi.3
  stable/7/lib/libgssapi/mech.5
Directory Properties:
  stable/7/lib/libgssapi/   (props changed)

Modified: stable/7/lib/libgssapi/gss_accept_sec_context.3
==============================================================================
--- stable/7/lib/libgssapi/gss_accept_sec_context.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_accept_sec_context.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_ACCEPT_SEC_CONTEXT 3 PRM
 .Sh NAME
@@ -451,7 +451,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_acquire_cred.3
==============================================================================
--- stable/7/lib/libgssapi/gss_acquire_cred.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_acquire_cred.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_ACQUIRE_CRED 3 PRM
 .Sh NAME
@@ -205,7 +205,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_add_cred.3
==============================================================================
--- stable/7/lib/libgssapi/gss_add_cred.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_add_cred.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_ADD_CRED 3 PRM
 .Sh NAME
@@ -305,7 +305,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_add_oid_set_member.3
==============================================================================
--- stable/7/lib/libgssapi/gss_add_oid_set_member.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_add_oid_set_member.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_ADD_OID_SET_MEMBER 3 PRM
 .Sh NAME
@@ -97,7 +97,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_canonicalize_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_canonicalize_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_canonicalize_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_CANONICALIZE_NAME 3 PRM
 .Sh NAME
@@ -104,7 +104,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_compare_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_compare_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_compare_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_COMPARE_NAME PRM
 .Sh NAME
@@ -89,7 +89,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_context_time.3
==============================================================================
--- stable/7/lib/libgssapi/gss_context_time.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_context_time.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_CONTEXT_TIME 3 PRM
 .Sh NAME
@@ -75,7 +75,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_create_empty_oid_set.3
==============================================================================
--- stable/7/lib/libgssapi/gss_create_empty_oid_set.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_create_empty_oid_set.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_CREATE_EMPTY_OID_SET 3 PRM
 .Sh NAME
@@ -78,7 +78,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_delete_sec_context.3
==============================================================================
--- stable/7/lib/libgssapi/gss_delete_sec_context.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_delete_sec_context.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_DELETE_SEC_CONTEXT 3 PRM
 .Sh NAME
@@ -130,7 +130,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_display_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_display_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_display_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_DISPLAY_NAME 3 PRM
 .Sh NAME
@@ -118,7 +118,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_display_status.3
==============================================================================
--- stable/7/lib/libgssapi/gss_display_status.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_display_status.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_DISPLAY_STATUS 3 PRM
 .Sh NAME
@@ -177,7 +177,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_duplicate_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_duplicate_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_duplicate_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_DUPLICATE_NAME 3 PRM
 .Sh NAME
@@ -90,7 +90,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_export_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_export_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_export_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_EXPORT_NAME 3 PRM
 .Sh NAME
@@ -95,7 +95,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_export_sec_context.3
==============================================================================
--- stable/7/lib/libgssapi/gss_export_sec_context.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_export_sec_context.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_EXPORT_SEC_CONTEXT 3 PRM
 .Sh NAME
@@ -135,7 +135,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_get_mic.3
==============================================================================
--- stable/7/lib/libgssapi/gss_get_mic.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_get_mic.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_GET_MIC 3 PRM
 .Sh NAME
@@ -132,7 +132,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_import_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_import_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_import_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_IMPORT_NAME 3 PRM
 .Sh NAME
@@ -106,7 +106,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_import_sec_context.3
==============================================================================
--- stable/7/lib/libgssapi/gss_import_sec_context.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_import_sec_context.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_IMPORT_SEC_CONTEXT 3 PRM
 .Sh NAME
@@ -87,7 +87,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_indicate_mechs.3
==============================================================================
--- stable/7/lib/libgssapi/gss_indicate_mechs.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_indicate_mechs.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_INDICATE_MECHS 3 PRM
 .Sh NAME
@@ -74,7 +74,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_init_sec_context.3
==============================================================================
--- stable/7/lib/libgssapi/gss_init_sec_context.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_init_sec_context.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_INIT_SEC_CONTEXT 3 PRM
 .Sh NAME
@@ -538,7 +538,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_inquire_context.3
==============================================================================
--- stable/7/lib/libgssapi/gss_inquire_context.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_inquire_context.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_INQUIRE_CONTEXT 3 PRM
 .Sh NAME
@@ -251,7 +251,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_inquire_cred.3
==============================================================================
--- stable/7/lib/libgssapi/gss_inquire_cred.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_inquire_cred.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_INQUIRE_CRED 3 PRM
 .Sh NAME
@@ -125,7 +125,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3
==============================================================================
--- stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_inquire_cred_by_mech.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_INQUIRE_CRED_BY_MECH 3 PRM
 .Sh NAME
@@ -139,7 +139,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_inquire_mechs_for_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_INQUIRE_MECHS_FOR_NAME 3 PRM
 .Sh NAME
@@ -100,7 +100,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_inquire_names_for_mech.3
==============================================================================
--- stable/7/lib/libgssapi/gss_inquire_names_for_mech.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_inquire_names_for_mech.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_INQUIRE_NAMES_FOR_MECH 3 PRM
 .Sh NAME
@@ -74,7 +74,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_process_context_token.3
==============================================================================
--- stable/7/lib/libgssapi/gss_process_context_token.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_process_context_token.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_PROCESS_CONTEXT_TOKEN 3 PRM
 .Sh NAME
@@ -103,7 +103,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_release_buffer.3
==============================================================================
--- stable/7/lib/libgssapi/gss_release_buffer.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_release_buffer.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_RELEASE_BUFFER 3 PRM
 .Sh NAME
@@ -78,7 +78,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_release_cred.3
==============================================================================
--- stable/7/lib/libgssapi/gss_release_cred.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_release_cred.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_RELEASE_CRED 3 PRM
 .Sh NAME
@@ -75,7 +75,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_release_name.3
==============================================================================
--- stable/7/lib/libgssapi/gss_release_name.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_release_name.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_RELEASE_NAME 3 PRM
 .Sh NAME
@@ -71,7 +71,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_release_oid_set.3
==============================================================================
--- stable/7/lib/libgssapi/gss_release_oid_set.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_release_oid_set.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_RELEASE_OID_SET 3 PRM
 .Sh NAME
@@ -76,7 +76,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_test_oid_set_member.3
==============================================================================
--- stable/7/lib/libgssapi/gss_test_oid_set_member.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_test_oid_set_member.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_TEST_OID_SET_MEMBER 3 PRM
 .Sh NAME
@@ -83,7 +83,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_unwrap.3
==============================================================================
--- stable/7/lib/libgssapi/gss_unwrap.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_unwrap.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_UNWRAP 3 PRM
 .Sh NAME
@@ -158,7 +158,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_verify_mic.3
==============================================================================
--- stable/7/lib/libgssapi/gss_verify_mic.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_verify_mic.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_VERIFY_MIC 3 PRM
 .Sh NAME
@@ -139,7 +139,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_wrap.3
==============================================================================
--- stable/7/lib/libgssapi/gss_wrap.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_wrap.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_WRAP 3 PRM
 .Sh NAME
@@ -146,7 +146,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gss_wrap_size_limit.3
==============================================================================
--- stable/7/lib/libgssapi/gss_wrap_size_limit.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gss_wrap_size_limit.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -27,7 +27,7 @@
 .\"	$FreeBSD$
 .\"
 .\" The following commands are required for all man pages.
-.Dd October 30, 2007
+.Dd January 26, 2010
 .Os
 .Dt GSS_WRAP_SIZE_LIMIT 3 PRM
 .Sh NAME
@@ -131,7 +131,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+function first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/gssapi.3
==============================================================================
--- stable/7/lib/libgssapi/gssapi.3	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/gssapi.3	Wed Apr 21 17:00:15 2010	(r206999)
@@ -26,7 +26,7 @@
 .\"
 .\"	$FreeBSD$
 .\"
-.Dd November 30, 2005
+.Dd January 26, 2010
 .Dt GSSAPI 3
 .Os
 .Sh NAME
@@ -229,7 +229,7 @@ Generic Security Service API Version 2 :
 .Sh HISTORY
 The
 .Nm
-manual page first appeared in
+library first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 John Wray, Iris Associates

Modified: stable/7/lib/libgssapi/mech.5
==============================================================================
--- stable/7/lib/libgssapi/mech.5	Wed Apr 21 16:41:02 2010	(r206998)
+++ stable/7/lib/libgssapi/mech.5	Wed Apr 21 17:00:15 2010	(r206999)
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd November 14, 2005
+.Dd January 26, 2010
 .Dt MECH 5
 .Os
 .Sh NAME
@@ -86,7 +86,7 @@ GSS_KRB5_CONF_C_QOP_DES		0x0100	kerberos
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
+manual page first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
 This

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Apr 22 01:45:18 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 61272106566B;
	Thu, 22 Apr 2010 01:45:18 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 505228FC1C;
	Thu, 22 Apr 2010 01:45: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 o3M1jIB1031656;
	Thu, 22 Apr 2010 01:45:18 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3M1jIFu031653;
	Thu, 22 Apr 2010 01:45:18 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201004220145.o3M1jIFu031653@svn.freebsd.org>
From: Pyun YongHyeon 
Date: Thu, 22 Apr 2010 01:45:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207047 - stable/7/sys/dev/mii
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 22 Apr 2010 01:45:18 -0000

Author: yongari
Date: Thu Apr 22 01:45:18 2010
New Revision: 207047
URL: http://svn.freebsd.org/changeset/base/207047

Log:
  MFC r206563:
    Add Agere ET1011 PHY which is found on Belkin F5D5055 USB
    controller. Unlike Agere ET1011C, Agere ET1011 does not seem to
    need special DSP programming to workaround silicon bug.

Modified:
  stable/7/sys/dev/mii/miidevs
  stable/7/sys/dev/mii/truephy.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs	Thu Apr 22 01:39:45 2010	(r207046)
+++ stable/7/sys/dev/mii/miidevs	Thu Apr 22 01:45:18 2010	(r207047)
@@ -107,6 +107,7 @@ oui xxREALTEK			0x000732
  */
 
 /* Agere Systems PHYs */
+model AGERE ET1011		0x0001 ET1011 10/100/1000baseT PHY
 model AGERE ET1011C		0x0004 ET1011C 10/100/1000baseT PHY
 
 /* Altima Communications PHYs */

Modified: stable/7/sys/dev/mii/truephy.c
==============================================================================
--- stable/7/sys/dev/mii/truephy.c	Thu Apr 22 01:39:45 2010	(r207046)
+++ stable/7/sys/dev/mii/truephy.c	Thu Apr 22 01:45:18 2010	(r207047)
@@ -75,6 +75,7 @@ static device_method_t truephy_methods[]
 };
 
 static const struct mii_phydesc truephys[] = {
+	MII_PHY_DESC(AGERE,	ET1011),
 	MII_PHY_DESC(AGERE,	ET1011C),
 	MII_PHY_END
 };
@@ -160,7 +161,10 @@ truephy_attach(device_t dev)
 
 	mii->mii_instance++;
 
-	truephy_reset(sc);
+	if (MII_MODEL(ma->mii_id2) == MII_MODEL_AGERE_ET1011)
+		mii_phy_reset(sc);
+	else
+		truephy_reset(sc);
 
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	if (sc->mii_capabilities & BMSR_EXTSTAT) {

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Apr 22 12:12:52 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E365106566B;
	Thu, 22 Apr 2010 12:12:52 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DB168FC12;
	Thu, 22 Apr 2010 12:12:52 +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 o3MCCqPt072629;
	Thu, 22 Apr 2010 12:12:52 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3MCCqtc072627;
	Thu, 22 Apr 2010 12:12:52 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201004221212.o3MCCqtc072627@svn.freebsd.org>
From: Andriy Gapon 
Date: Thu, 22 Apr 2010 12:12:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207060 - stable/7/sys/cam/scsi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 22 Apr 2010 12:12:52 -0000

Author: avg
Date: Thu Apr 22 12:12:52 2010
New Revision: 207060
URL: http://svn.freebsd.org/changeset/base/207060

Log:
  MFC r206648,206651: scsi_cd: CD_FLAG_VALID_MEDIA is sufficient to set
  d_sectorsize and d_mediasize
  
  Note that there is a redundant assignment of d_maxsize.
  
  PR:		kern/138789

Modified:
  stable/7/sys/cam/scsi/scsi_cd.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cam/scsi/scsi_cd.c
==============================================================================
--- stable/7/sys/cam/scsi/scsi_cd.c	Thu Apr 22 11:46:42 2010	(r207059)
+++ stable/7/sys/cam/scsi/scsi_cd.c	Thu Apr 22 12:12:52 2010	(r207060)
@@ -2773,8 +2773,12 @@ cdcheckmedia(struct cam_periph *periph)
 		softc->flags &= ~(CD_FLAG_VALID_MEDIA|CD_FLAG_VALID_TOC);
 		cdprevent(periph, PR_ALLOW);
 		return (error);
-	} else
+	} else {
 		softc->flags |= CD_FLAG_VALID_MEDIA;
+		softc->disk->d_sectorsize = softc->params.blksize;
+		softc->disk->d_mediasize =
+		    (off_t)softc->params.blksize * softc->params.disksize;
+	}
 
 	/*
 	 * Now we check the table of contents.  This (currently) is only
@@ -2864,9 +2868,6 @@ cdcheckmedia(struct cam_periph *periph)
 
 	softc->flags |= CD_FLAG_VALID_TOC;
 	softc->disk->d_maxsize = DFLTPHYS;
-	softc->disk->d_sectorsize = softc->params.blksize;
-	softc->disk->d_mediasize =
-	    (off_t)softc->params.blksize * softc->params.disksize;
 
 bailout:
 

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Apr 22 12:50:02 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BFA6106566B;
	Thu, 22 Apr 2010 12:50:02 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B99F8FC08;
	Thu, 22 Apr 2010 12:50:02 +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 o3MCo2If080969;
	Thu, 22 Apr 2010 12:50:02 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3MCo2Hb080967;
	Thu, 22 Apr 2010 12:50:02 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201004221250.o3MCo2Hb080967@svn.freebsd.org>
From: Andriy Gapon 
Date: Thu, 22 Apr 2010 12:50:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207062 - stable/7/sys/geom
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 22 Apr 2010 12:50:02 -0000

Author: avg
Date: Thu Apr 22 12:50:01 2010
New Revision: 207062
URL: http://svn.freebsd.org/changeset/base/207062

Log:
  MFC r206650: g_io_check: respond to zero pp->mediasize with ENXIO

Modified:
  stable/7/sys/geom/geom_io.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/geom/geom_io.c
==============================================================================
--- stable/7/sys/geom/geom_io.c	Thu Apr 22 12:24:59 2010	(r207061)
+++ stable/7/sys/geom/geom_io.c	Thu Apr 22 12:50:01 2010	(r207062)
@@ -297,8 +297,8 @@ g_io_check(struct bio *bp)
 	case BIO_READ:
 	case BIO_WRITE:
 	case BIO_DELETE:
-		/* Zero sectorsize is a probably lack of media */
-		if (pp->sectorsize == 0)
+		/* Zero sectorsize or mediasize is probably a lack of media. */
+		if (pp->sectorsize == 0 || pp->mediasize == 0)
 			return (ENXIO);
 		/* Reject I/O not on sector boundary */
 		if (bp->bio_offset % pp->sectorsize)

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Apr 22 14:54:54 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96D321065672;
	Thu, 22 Apr 2010 14:54:54 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BDD68FC1E;
	Thu, 22 Apr 2010 14:54:54 +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 o3MEssOo008951;
	Thu, 22 Apr 2010 14:54:54 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3MEssYE008949;
	Thu, 22 Apr 2010 14:54:54 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201004221454.o3MEssYE008949@svn.freebsd.org>
From: Jaakko Heinonen 
Date: Thu, 22 Apr 2010 14:54:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207065 - stable/7/sys/geom
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 22 Apr 2010 14:54:54 -0000

Author: jh
Date: Thu Apr 22 14:54:54 2010
New Revision: 207065
URL: http://svn.freebsd.org/changeset/base/207065

Log:
  MFC r205385:
  
  Escape characters unsafe for XML output in GEOM class, instance and
  provider names.
  
  - Characters in range 0x01-0x1f except '\t', '\n', and '\r' are replaced
    with '?'. Those characters are disallowed in XML.
  - '&', '<', '>', '\'', '"' and characters in range 0x7f-0xff are
    replaced with XML numeric character reference.
  
  If the kern.geom.confxml sysctl provides invalid XML, libgeom
  geom_xml2tree() fails and utilities using it do not work. Unsafe
  characters are common in msdosfs and cd9660 labels.
  
  PR:		kern/104389

Modified:
  stable/7/sys/geom/geom_dump.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/geom/geom_dump.c
==============================================================================
--- stable/7/sys/geom/geom_dump.c	Thu Apr 22 14:11:59 2010	(r207064)
+++ stable/7/sys/geom/geom_dump.c	Thu Apr 22 14:54:54 2010	(r207065)
@@ -154,6 +154,28 @@ g_conftxt(void *p, int flag)
 
 
 static void
+g_conf_print_escaped(struct sbuf *sb, const char *fmt, const char *str)
+{
+	struct sbuf *s;
+	const u_char *c;
+
+	s = sbuf_new_auto();
+
+	for (c = str; *c != '\0'; c++) {
+		if (*c == '&' || *c == '<' || *c == '>' ||
+		    *c == '\'' || *c == '"' || *c > 0x7e)
+			sbuf_printf(s, "&#x%X;", *c);
+		else if (*c == '\t' || *c == '\n' || *c == '\r' || *c > 0x1f)
+			sbuf_putc(s, *c);
+		else
+			sbuf_putc(s, '?');
+	}
+	sbuf_finish(s);
+	sbuf_printf(sb, fmt, sbuf_data(s));
+	sbuf_delete(s);
+}
+
+static void
 g_conf_consumer(struct sbuf *sb, struct g_consumer *cp)
 {
 
@@ -181,7 +203,7 @@ g_conf_provider(struct sbuf *sb, struct 
 	sbuf_printf(sb, "\t  \n", pp->geom);
 	sbuf_printf(sb, "\t  r%dw%de%d\n",
 	    pp->acr, pp->acw, pp->ace);
-	sbuf_printf(sb, "\t  %s\n", pp->name);
+	g_conf_print_escaped(sb, "\t  %s\n", pp->name);
 	sbuf_printf(sb, "\t  %jd\n",
 	    (intmax_t)pp->mediasize);
 	sbuf_printf(sb, "\t  %u\n", pp->sectorsize);
@@ -204,7 +226,7 @@ g_conf_geom(struct sbuf *sb, struct g_ge
 
 	sbuf_printf(sb, "    \n", gp);
 	sbuf_printf(sb, "      \n", gp->class);
-	sbuf_printf(sb, "      %s\n", gp->name);
+	g_conf_print_escaped(sb, "      %s\n", gp->name);
 	sbuf_printf(sb, "      %d\n", gp->rank);
 	if (gp->flags & G_GEOM_WITHER)
 		sbuf_printf(sb, "      \n");
@@ -233,7 +255,7 @@ g_conf_class(struct sbuf *sb, struct g_c
 	struct g_geom *gp2;
 
 	sbuf_printf(sb, "  \n", mp);
-	sbuf_printf(sb, "    %s\n", mp->name);
+	g_conf_print_escaped(sb, "    %s\n", mp->name);
 	LIST_FOREACH(gp2, &mp->geom, geom) {
 		if (gp != NULL && gp != gp2)
 			continue;

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr 23 14:35:03 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DED661065672;
	Fri, 23 Apr 2010 14:35:03 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDAA88FC1A;
	Fri, 23 Apr 2010 14:35:03 +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 o3NEZ3dx026377;
	Fri, 23 Apr 2010 14:35:03 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3NEZ3WZ026375;
	Fri, 23 Apr 2010 14:35:03 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201004231435.o3NEZ3WZ026375@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 23 Apr 2010 14:35:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207117 - stable/7/usr.bin/indent
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 23 Apr 2010 14:35:04 -0000

Author: avg
Date: Fri Apr 23 14:35:03 2010
New Revision: 207117
URL: http://svn.freebsd.org/changeset/base/207117

Log:
  MFC r206687: indent(1): don't treat bare '_t' as a type name with -ta

Modified:
  stable/7/usr.bin/indent/lexi.c
Directory Properties:
  stable/7/usr.bin/indent/   (props changed)

Modified: stable/7/usr.bin/indent/lexi.c
==============================================================================
--- stable/7/usr.bin/indent/lexi.c	Fri Apr 23 14:32:58 2010	(r207116)
+++ stable/7/usr.bin/indent/lexi.c	Fri Apr 23 14:35:03 2010	(r207117)
@@ -251,9 +251,10 @@ lexi(void)
 
 	if (auto_typedefs) {
 	    const char *q = s_token;
+	    size_t q_len = strlen(q);
 	    /* Check if we have an "_t" in the end */
-	    if (q[0] && q[1] &&
-	        (strcmp(q + strlen(q) - 2, "_t") == 0)) {
+	    if (q_len > 2 &&
+	        (strcmp(q + q_len - 2, "_t") == 0)) {
 	        ps.its_a_keyword = true;
 		ps.last_u_d = true;
 	        goto found_auto_typedef;

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr 23 15:51:14 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34FCA1065673;
	Fri, 23 Apr 2010 15:51:14 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2309B8FC0C;
	Fri, 23 Apr 2010 15:51:14 +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 o3NFpEeB043636;
	Fri, 23 Apr 2010 15:51:14 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3NFpEjt043633;
	Fri, 23 Apr 2010 15:51:14 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201004231551.o3NFpEjt043633@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 23 Apr 2010 15:51:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207120 - in stable/7: etc/mtree share/examples
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 23 Apr 2010 15:51:14 -0000

Author: avg
Date: Fri Apr 23 15:51:13 2010
New Revision: 207120
URL: http://svn.freebsd.org/changeset/base/207120

Log:
  MFC r206996: indent.pro example: actually install the sample file

Modified:
  stable/7/etc/mtree/BSD.usr.dist
  stable/7/share/examples/Makefile
Directory Properties:
  stable/7/etc/   (props changed)
  stable/7/share/examples/   (props changed)

Modified: stable/7/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/7/etc/mtree/BSD.usr.dist	Fri Apr 23 15:24:56 2010	(r207119)
+++ stable/7/etc/mtree/BSD.usr.dist	Fri Apr 23 15:51:13 2010	(r207120)
@@ -215,6 +215,8 @@
             ..
             ibcs2
             ..
+            indent
+            ..
             ipfilter
             ..
             ipfw

Modified: stable/7/share/examples/Makefile
==============================================================================
--- stable/7/share/examples/Makefile	Fri Apr 23 15:24:56 2010	(r207119)
+++ stable/7/share/examples/Makefile	Fri Apr 23 15:51:13 2010	(r207120)
@@ -14,6 +14,7 @@ LDIRS=	BSD_daemon \
 	etc \
 	find_interface \
 	ibcs2 \
+	indent \
 	ipfw \
 	isdn \
 	kld \
@@ -76,6 +77,7 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	find_interface/find_interface.c \
 	ibcs2/README \
 	ibcs2/hello.uu \
+	indent/indent.pro \
 	ipfw/change_rules.sh \
 	isdn/FAQ \
 	isdn/KERNEL \

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr 23 16:21:40 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98AE21065743;
	Fri, 23 Apr 2010 16:21:40 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 86FD18FC0C;
	Fri, 23 Apr 2010 16:21:40 +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 o3NGLedm050558;
	Fri, 23 Apr 2010 16:21:40 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3NGLeUN050556;
	Fri, 23 Apr 2010 16:21:40 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201004231621.o3NGLeUN050556@svn.freebsd.org>
From: Matt Jacob 
Date: Fri, 23 Apr 2010 16:21:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207123 - stable/7/sbin/geom/class/multipath
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 23 Apr 2010 16:21:40 -0000

Author: mjacob
Date: Fri Apr 23 16:21:40 2010
New Revision: 207123
URL: http://svn.freebsd.org/changeset/base/207123

Log:
  This is an MFC of 205412.
  
  Add 'rotate' and 'getactive' verbs to provide some control and information
  about what the currently active path is.

Modified:
  stable/7/sbin/geom/class/multipath/geom_multipath.c
Directory Properties:
  stable/7/sbin/geom/   (props changed)
  stable/7/sbin/geom/class/label/   (props changed)
  stable/7/sbin/geom/class/part/   (props changed)
  stable/7/sbin/geom/class/stripe/   (props changed)
  stable/7/sbin/geom/misc/   (props changed)

Modified: stable/7/sbin/geom/class/multipath/geom_multipath.c
==============================================================================
--- stable/7/sbin/geom/class/multipath/geom_multipath.c	Fri Apr 23 16:20:45 2010	(r207122)
+++ stable/7/sbin/geom/class/multipath/geom_multipath.c	Fri Apr 23 16:21:40 2010	(r207123)
@@ -62,6 +62,14 @@ struct g_command class_commands[] = {
 		"clear", G_FLAG_VERBOSE, mp_main, G_NULL_OPTS,
 		NULL, "[-v] prov ..."
 	},
+	{
+		"rotate", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		NULL, "[-v] prov ..."
+	},
+	{
+		"getactive", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		NULL, "[-v] prov ..."
+	},
 	G_CMD_SENTINEL
 };
 

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr 23 16:28:07 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2850E1065673;
	Fri, 23 Apr 2010 16:28:07 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1615C8FC2C;
	Fri, 23 Apr 2010 16:28:07 +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 o3NGS6Gf052201;
	Fri, 23 Apr 2010 16:28:06 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3NGS6IN052199;
	Fri, 23 Apr 2010 16:28:06 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201004231628.o3NGS6IN052199@svn.freebsd.org>
From: Matt Jacob 
Date: Fri, 23 Apr 2010 16:28:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207125 - stable/7/sys/geom/multipath
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 23 Apr 2010 16:28:07 -0000

Author: mjacob
Date: Fri Apr 23 16:28:06 2010
New Revision: 207125
URL: http://svn.freebsd.org/changeset/base/207125

Log:
  This is an MFC of 205412.
  
  Add 'rotate' and 'getactive' verbs to provide some control and information
  about what the currently active path is.

Modified:
  stable/7/sys/geom/multipath/g_multipath.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/geom/multipath/g_multipath.c
==============================================================================
--- stable/7/sys/geom/multipath/g_multipath.c	Fri Apr 23 16:26:10 2010	(r207124)
+++ stable/7/sys/geom/multipath/g_multipath.c	Fri Apr 23 16:28:06 2010	(r207125)
@@ -70,6 +70,8 @@ static int g_multipath_destroy(struct g_
 static int
 g_multipath_destroy_geom(struct gctl_req *, struct g_class *, struct g_geom *);
 
+static int g_multipath_rotate(struct g_geom *);
+
 static g_taste_t g_multipath_taste;
 static g_ctl_req_t g_multipath_config;
 static g_init_t g_multipath_init;
@@ -416,6 +418,30 @@ g_multipath_destroy_geom(struct gctl_req
 	return (g_multipath_destroy(gp));
 }
 
+static int
+g_multipath_rotate(struct g_geom *gp)
+{
+	struct g_consumer *lcp;
+	struct g_multipath_softc *sc = gp->softc;
+
+	g_topology_assert();
+	if (sc == NULL)
+		return (ENXIO);
+	LIST_FOREACH(lcp, &gp->consumer, consumer) {
+		if ((lcp->index & MP_BAD) == 0) {
+			if (sc->cp_active != lcp) {
+				break;
+			}
+		}
+	}
+	if (lcp) {
+		sc->cp_active = lcp;
+		printf("GEOM_MULTIPATH: %s now active path in %s\n",
+		    lcp->provider->name, sc->sc_name);
+	}
+	return (0);
+}
+
 static void
 g_multipath_init(struct g_class *mp)
 {
@@ -748,6 +774,63 @@ g_multipath_ctl_destroy(struct gctl_req 
 }
 
 static void
+g_multipath_ctl_rotate(struct gctl_req *req, struct g_class *mp)
+{
+	struct g_geom *gp;
+	const char *name;
+	int error;
+
+	g_topology_assert();
+
+	name = gctl_get_asciiparam(req, "arg0");
+        if (name == NULL) {
+                gctl_error(req, "No 'arg0' argument");
+                return;
+        }
+	gp = g_multipath_find_geom(mp, name);
+	if (gp == NULL) {
+		gctl_error(req, "Device %s is invalid", name);
+		return;
+	}
+	error = g_multipath_rotate(gp);
+	if (error != 0) {
+		gctl_error(req, "failed to rotate %s (err=%d)", name, error);
+	}
+}
+
+static void
+g_multipath_ctl_getactive(struct gctl_req *req, struct g_class *mp)
+{
+	struct sbuf *sb;
+	struct g_geom *gp;
+	struct g_multipath_softc *sc;
+	const char *name;
+
+	sb = sbuf_new_auto();
+
+	g_topology_assert();
+	name = gctl_get_asciiparam(req, "arg0");
+        if (name == NULL) {
+                gctl_error(req, "No 'arg0' argument");
+                return;
+        }
+	gp = g_multipath_find_geom(mp, name);
+	if (gp == NULL) {
+		gctl_error(req, "Device %s is invalid", name);
+		return;
+	}
+	sc = gp->softc;
+	if (sc->cp_active) {
+		sbuf_printf(sb, "%s\n", sc->cp_active->provider->name);
+	} else {
+		sbuf_printf(sb, "none\n");
+	}
+	sbuf_finish(sb);
+	gctl_set_param_err(req, "output", sbuf_data(sb), sbuf_len(sb) + 1);
+	sbuf_delete(sb);
+}
+
+static void
 g_multipath_config(struct gctl_req *req, struct g_class *mp, const char *verb)
 {
 	uint32_t *version;
@@ -761,6 +844,10 @@ g_multipath_config(struct gctl_req *req,
 		g_multipath_ctl_create(req, mp);
 	} else if (strcmp(verb, "destroy") == 0) {
 		g_multipath_ctl_destroy(req, mp);
+	} else if (strcmp(verb, "rotate") == 0) {
+		g_multipath_ctl_rotate(req, mp);
+	} else if (strcmp(verb, "getactive") == 0) {
+		g_multipath_ctl_getactive(req, mp);
 	} else {
 		gctl_error(req, "Unknown verb %s", verb);
 	}

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr 23 19:35:07 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2080106566B;
	Fri, 23 Apr 2010 19:35:07 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF9C48FC12;
	Fri, 23 Apr 2010 19:35:07 +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 o3NJZ7Gf094044;
	Fri, 23 Apr 2010 19:35:07 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3NJZ7Zt094042;
	Fri, 23 Apr 2010 19:35:07 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201004231935.o3NJZ7Zt094042@svn.freebsd.org>
From: Matt Jacob 
Date: Fri, 23 Apr 2010 19:35:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207133 - stable/7/sys/geom/multipath
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 23 Apr 2010 19:35:07 -0000

Author: mjacob
Date: Fri Apr 23 19:35:07 2010
New Revision: 207133
URL: http://svn.freebsd.org/changeset/base/207133

Log:
  This is an MFC of 205847, 204071, 196580 and 196579
  
  ------------------------------------------------------------------------
  Change how multipath labels are created and managed. This makes it easier
  to support various storage boxes which really aren't active-active.
  
  We only write the label on the *first* provider. For all other providers
  we just "add" the disk. This also allows for an "add" verb.
  
  A usage implication is that you should specificy the currently active
  storage path as the first provider.
  
  Note that this does not add RDAC-like functionality, but better allows for
  autovolumefailover configurations (additional checkins elsewhere will support
  this).
  ------------------------------------------------------------------------
  
  - Style fixes.
  - Prefer strlcpy() over strncpy().
  
  ------------------------------------------------------------------------
  
  There's no need for checking result of M_WAITOK allocation.
  
  ------------------------------------------------------------------------
  
  Fix an obvious topology lock leak.

Modified:
  stable/7/sys/geom/multipath/g_multipath.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/geom/multipath/g_multipath.c
==============================================================================
--- stable/7/sys/geom/multipath/g_multipath.c	Fri Apr 23 19:26:03 2010	(r207132)
+++ stable/7/sys/geom/multipath/g_multipath.c	Fri Apr 23 19:35:07 2010	(r207133)
@@ -97,9 +97,8 @@ g_mpd(void *arg, int flags __unused)
 
 	g_topology_assert();
 	cp = arg;
-	if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) {
+	if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0)
 		g_access(cp, -cp->acr, -cp->acw, -cp->ace);
-	}
 	if (cp->provider) {
 		printf("GEOM_MULTIPATH: %s removed from %s\n",
 		    cp->provider->name, cp->geom->name);
@@ -223,15 +222,16 @@ g_multipath_done_error(struct bio *bp)
 static void
 g_multipath_kt(void *arg)
 {
+
 	g_multipath_kt_state = GKT_RUN;
 	mtx_lock(&gmtbq_mtx);
 	while (g_multipath_kt_state == GKT_RUN) {
 		for (;;) {
 			struct bio *bp;
+
 			bp = bioq_takefirst(&gmtbq);
-			if (bp == NULL) {
+			if (bp == NULL)
 				break;
-			}
 			mtx_unlock(&gmtbq_mtx);
 			g_multipath_done_error(bp);
 			mtx_lock(&gmtbq_mtx);
@@ -265,9 +265,8 @@ g_multipath_access(struct g_provider *pp
 
 fail:
 	LIST_FOREACH(cp, &gp->consumer, consumer) {
-		if (cp == badcp) {
+		if (cp == badcp)
 			break;
-		}
 		(void) g_access(cp, -dr, -dw, -de);
 	}
 	return (error);
@@ -291,9 +290,8 @@ g_multipath_create(struct g_class *mp, s
 	}
 
 	gp = g_new_geomf(mp, md->md_name);
-	if (gp == NULL) {
+	if (gp == NULL)
 		goto fail;
-	}
 
 	sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO);
 	if (sc == NULL) {
@@ -308,9 +306,8 @@ g_multipath_create(struct g_class *mp, s
 	memcpy(sc->sc_name, md->md_name, sizeof (sc->sc_name));
 
 	pp = g_new_providerf(gp, "multipath/%s", md->md_name);
-	if (pp == NULL) {
+	if (pp == NULL)
 		goto fail;
-	}
 	/* limit the provider to not have it stomp on metadata */
 	pp->mediasize = md->md_size - md->md_sectorsize;
 	pp->sectorsize = md->md_sectorsize;
@@ -319,9 +316,8 @@ g_multipath_create(struct g_class *mp, s
 	return (gp);
 fail:
 	if (gp != NULL) {
-		if (gp->softc != NULL) {
+		if (gp->softc != NULL)
 			g_free(gp->softc);
-		}
 		g_destroy_geom(gp);
 	}
 	return (NULL);
@@ -343,9 +339,8 @@ g_multipath_add_disk(struct g_geom *gp, 
 	 * Make sure that the passed provider isn't already attached
 	 */
 	LIST_FOREACH(cp, &gp->consumer, consumer) {
-		if (cp->provider == pp) {
+		if (cp->provider == pp)
 			break;
-		}
 	}
 	if (cp) {
 		printf("GEOM_MULTIPATH: provider %s already attached to %s\n",
@@ -354,9 +349,8 @@ g_multipath_add_disk(struct g_geom *gp, 
 	}
 	nxtcp = LIST_FIRST(&gp->consumer);
 	cp = g_new_consumer(gp);
-	if (cp == NULL) {
+	if (cp == NULL)
 		return (ENOMEM);
-	}
 	error = g_attach(cp, pp);
 	if (error != 0) {
 		printf("GEOM_MULTIPATH: cannot attach %s to %s",
@@ -397,13 +391,11 @@ g_multipath_destroy(struct g_geom *gp)
 	struct g_provider *pp;
 
 	g_topology_assert();
-	if (gp->softc == NULL) {
+	if (gp->softc == NULL)
 		return (ENXIO);
-	}
 	pp = LIST_FIRST(&gp->provider);
-	if (pp != NULL && (pp->acr != 0 || pp->acw != 0 || pp->ace != 0)) {
+	if (pp != NULL && (pp->acr != 0 || pp->acw != 0 || pp->ace != 0))
 		return (EBUSY);
-	}
 	printf("GEOM_MULTIPATH: destroying %s\n", gp->name);
 	g_free(gp->softc);
 	gp->softc = NULL;
@@ -415,6 +407,7 @@ static int
 g_multipath_destroy_geom(struct gctl_req *req, struct g_class *mp,
     struct g_geom *gp)
 {
+
 	return (g_multipath_destroy(gp));
 }
 
@@ -447,9 +440,8 @@ g_multipath_init(struct g_class *mp)
 {
 	bioq_init(&gmtbq);
 	mtx_init(&gmtbq_mtx, "gmtbq", NULL, MTX_DEF);
-	if (kthread_create(g_multipath_kt, mp, NULL, 0, 0, "g_mp_kt") == 0) {
+	if (kthread_create(g_multipath_kt, mp, NULL, 0, 0, "g_mp_kt") == 0)
 		g_multipath_kt_state = GKT_RUN;
-	}
 }
 
 static void
@@ -475,18 +467,16 @@ g_multipath_read_metadata(struct g_consu
 
 	g_topology_assert();
 	error = g_access(cp, 1, 0, 0);
-	if (error != 0) {
+	if (error != 0)
 		return (error);
-	}
 	pp = cp->provider;
 	g_topology_unlock();
 	buf = g_read_data(cp, pp->mediasize - pp->sectorsize,
 	    pp->sectorsize, &error);
 	g_topology_lock();
 	g_access(cp, -1, 0, 0);
-	if (buf == NULL) {
+	if (buf == NULL)
 		return (error);
-	}
 	multipath_metadata_decode(buf, md);
 	g_free(buf);
 	return (0);
@@ -513,15 +503,13 @@ g_multipath_taste(struct g_class *mp, st
 	g_detach(cp);
 	g_destroy_consumer(cp);
 	g_destroy_geom(gp);
-	if (error != 0) {
+	if (error != 0)
 		return (NULL);
-	}
 	gp = NULL;
 
 	if (strcmp(md.md_magic, G_MULTIPATH_MAGIC) != 0) {
-		if (g_multipath_debug) {
+		if (g_multipath_debug)
 			printf("%s is not MULTIPATH\n", pp->name);
-		}
 		return (NULL);
 	}
 	if (md.md_version != G_MULTIPATH_VERSION) {
@@ -530,9 +518,8 @@ g_multipath_taste(struct g_class *mp, st
 		    G_MULTIPATH_VERSION);
 		return (NULL);
 	}
-	if (g_multipath_debug) {
+	if (g_multipath_debug)
 		printf("MULTIPATH: %s/%s\n", md.md_name, md.md_uuid);
-	}
 
 	/*
 	 * Let's check if such a device already is present. We check against
@@ -548,25 +535,20 @@ g_multipath_taste(struct g_class *mp, st
 	sc = NULL;
 	LIST_FOREACH(gp, &mp->geom, geom) {
 		sc = gp->softc;
-		if (sc == NULL) {
+		if (sc == NULL)
 			continue;
-		}
-		if (strncmp(md.md_uuid, sc->sc_uuid, sizeof(md.md_uuid)) == 0) {
+		if (strncmp(md.md_uuid, sc->sc_uuid, sizeof(md.md_uuid)) == 0)
 			break;
-		}
 	}
 
 	LIST_FOREACH(gp1, &mp->geom, geom) {
-		if (gp1 == gp) {
+		if (gp1 == gp)
 			continue;
-		}
 		sc = gp1->softc;
-		if (sc == NULL) {
+		if (sc == NULL)
 			continue;
-		}
-		if (strncmp(md.md_name, sc->sc_name, sizeof(md.md_name)) == 0) {
+		if (strncmp(md.md_name, sc->sc_name, sizeof(md.md_name)) == 0)
 			break;
-		}
 	}
 
 	/*
@@ -593,9 +575,9 @@ g_multipath_taste(struct g_class *mp, st
 			    sc->sc_name, sc->sc_uuid);
 			printf("GEOM_MULTIPATH: %s will be (temporarily) %s\n",
 			    md.md_uuid, buf);
-			strlcpy(md.md_name, buf, sizeof (md.md_name));
+			strlcpy(md.md_name, buf, sizeof(md.md_name));
 		} else {
-			strlcpy(md.md_name, sc->sc_name, sizeof (md.md_name));
+			strlcpy(md.md_name, sc->sc_name, sizeof(md.md_name));
 		}
 	}
 
@@ -615,9 +597,8 @@ g_multipath_taste(struct g_class *mp, st
 	KASSERT(sc != NULL, ("sc is NULL"));
 	error = g_multipath_add_disk(gp, pp);
 	if (error != 0) {
-		if (isnew) {
+		if (isnew)
 			g_multipath_destroy(gp);
-		}
 		return (NULL);
 	}
 	return (gp);
@@ -656,9 +637,8 @@ g_multipath_ctl_create(struct gctl_req *
 		gctl_error(req, "No 'arg1' argument");
 		return;
 	}
-	if (strncmp(name, devpf, 5) == 0) {
+	if (strncmp(name, devpf, 5) == 0)
 		name += 5;
-	}
 	pp0 = g_provider_by_name(name);
 	if (pp0 == NULL) {
 		gctl_error(req, "Provider %s is invalid", name);
@@ -670,9 +650,8 @@ g_multipath_ctl_create(struct gctl_req *
 		gctl_error(req, "No 'arg2' argument");
 		return;
 	}
-	if (strncmp(name, devpf, 5) == 0) {
+	if (strncmp(name, devpf, 5) == 0)
 		name += 5;
-	}
 	pp1 = g_provider_by_name(name);
 	if (pp1 == NULL) {
 		gctl_error(req, "Provider %s is invalid", name);
@@ -716,13 +695,12 @@ g_multipath_ctl_create(struct gctl_req *
 	memset(&md, 0, sizeof(md));
 	md.md_size = pp0->mediasize;
 	md.md_sectorsize = pp0->sectorsize;
-	strncpy(md.md_name, mpname, sizeof (md.md_name));
-	strncpy(md.md_uuid, uuid, sizeof (md.md_uuid));
+	strlcpy(md.md_name, mpname, sizeof(md.md_name));
+	strlcpy(md.md_uuid, uuid, sizeof(md.md_uuid));
 
 	gp = g_multipath_create(mp, &md);
-	if (gp == NULL) {
+	if (gp == NULL)
 		return;
-	}
 	error = g_multipath_add_disk(gp, pp0);
 	if (error) {
 		g_multipath_destroy(gp);

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr 24 23:07:34 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83084106566B;
	Sat, 24 Apr 2010 23:07:34 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 716C98FC13;
	Sat, 24 Apr 2010 23:07:34 +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 o3ON7Yo6073645;
	Sat, 24 Apr 2010 23:07:34 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3ON7YoW073640;
	Sat, 24 Apr 2010 23:07:34 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201004242307.o3ON7YoW073640@svn.freebsd.org>
From: Matt Jacob 
Date: Sat, 24 Apr 2010 23:07:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207172 - stable/7/sys/dev/isp
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 24 Apr 2010 23:07:34 -0000

Author: mjacob
Date: Sat Apr 24 23:07:34 2010
New Revision: 207172
URL: http://svn.freebsd.org/changeset/base/207172

Log:
  This is an MFC of 205236
  
  Put gone device timer into a structure tag that can hold more than 32 seconds. Oops.
  
  Untangle some of the confusion about what role means when it's in the FCPARAM/SDPARAM
  or isp_fc/isp_spi structures. This fixed a problem about seeing targets appear if you've
  turned off autologin and find them, or rather don't, via camcontrol rescan.

Modified:
  stable/7/sys/dev/isp/isp_freebsd.c
  stable/7/sys/dev/isp/isp_freebsd.h
  stable/7/sys/dev/isp/isp_pci.c
  stable/7/sys/dev/isp/isp_sbus.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/7/sys/dev/isp/isp_freebsd.c	Sat Apr 24 23:05:56 2010	(r207171)
+++ stable/7/sys/dev/isp/isp_freebsd.c	Sat Apr 24 23:07:34 2010	(r207172)
@@ -3945,11 +3945,15 @@ isp_gdt(void *arg)
 		if (lp->dev_map_idx == 0 || lp->target_mode) {
 			continue;
 		}
-		if (lp->new_reserved == 0) {
+		/*
+		 * We can use new_portid here because it is untouched
+		 * while the state is ZOMBIE
+		 */
+		if (lp->new_portid == 0) {
 			continue;
 		}
-		lp->new_reserved -= 1;
-		if (lp->new_reserved != 0) {
+		lp->new_portid -= 1;
+		if (lp->new_portid != 0) {
 			more_to_do++;
 			continue;
 		}
@@ -4059,7 +4063,7 @@ isp_kthread(void *arg)
 		 *
 		 * If not, we simply just wait for loop to come up.
 		 */
-		if (lb && (fc->role & ISP_ROLE_INITIATOR)) {
+		if (lb && (FCPARAM(isp, chan)->role & ISP_ROLE_INITIATOR)) {
 			/*
 			 * Increment loop down time by the last sleep interval
 			 */
@@ -4927,7 +4931,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
 			/*
 			 * We don't do any simq freezing if we are only in target mode
 			 */
-			if (fc->role & ISP_ROLE_INITIATOR) {
+			if (FCPARAM(isp, bus)->role & ISP_ROLE_INITIATOR) {
 				if (fc->path) {
 					isp_freeze_loopdown(isp, bus, msg);
 				}
@@ -4963,7 +4967,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
 		va_end(ap);
 		fc = ISP_FC_PC(isp, bus);
 		lp->reserved = 0;
-		if ((fc->role & ISP_ROLE_INITIATOR) && (lp->roles & (SVC3_TGT_ROLE >> SVC3_ROLE_SHIFT))) {
+		if ((FCPARAM(isp, bus)->role & ISP_ROLE_INITIATOR) && (lp->roles & (SVC3_TGT_ROLE >> SVC3_ROLE_SHIFT))) {
 			int dbidx = lp - FCPARAM(isp, bus)->portdb;
 			int i;
 
@@ -5051,10 +5055,13 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
 		 *
 		 * If it isn't marked that isp_gdt is going to get rid of it,
 		 * announce that it's gone.
+		 *
+		 * We can use new_portid for the gone timer because it's
+		 * undefined while the state is ZOMBIE.
 		 */
 		if (lp->dev_map_idx && lp->reserved == 0) {
 			lp->reserved = 1;
-			lp->new_reserved = ISP_FC_PC(isp, bus)->gone_device_time;
+			lp->new_portid = ISP_FC_PC(isp, bus)->gone_device_time;
 			lp->state = FC_PORTDB_STATE_ZOMBIE;
 			if (fc->ready && !callout_active(&fc->gdt)) {
 				isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d starting Gone Device Timer", bus);
@@ -5101,7 +5108,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
 			callout_stop(&fc->ldt);
 		}
 		isp_prt(isp, ISP_LOGINFO, msg, bus);
-		if (fc->role & ISP_ROLE_INITIATOR) {
+		if (FCPARAM(isp, bus)->role & ISP_ROLE_INITIATOR) {
 			isp_freeze_loopdown(isp, bus, msg);
 		}
 		wakeup(fc);

Modified: stable/7/sys/dev/isp/isp_freebsd.h
==============================================================================
--- stable/7/sys/dev/isp/isp_freebsd.h	Sat Apr 24 23:05:56 2010	(r207171)
+++ stable/7/sys/dev/isp/isp_freebsd.h	Sat Apr 24 23:07:34 2010	(r207172)
@@ -175,7 +175,7 @@ struct isp_fc {
 		simqfrozen	: 3,
 		default_id	: 8,
 		hysteresis	: 8,
-		role		: 2,
+		def_role	: 2,	/* default role */
 		gdt_running	: 1,
 		loop_dead	: 1,
 		fcbsy		: 1,
@@ -203,7 +203,7 @@ struct isp_spi {
 		tm_enabled	: 1,
 #endif
 		simqfrozen	: 3,
-		role		: 3,
+		def_role	: 2,
 		iid		: 4;
 #ifdef	ISP_TARGET_MODE
 	struct tslist lun_hash[LUN_HASH_SIZE];
@@ -469,12 +469,12 @@ default:							\
 #define	DEFAULT_EXEC_THROTTLE(isp)	isp->isp_osinfo.exec_throttle
 
 #define	GET_DEFAULT_ROLE(isp, chan)	\
-	(IS_FC(isp)? ISP_FC_PC(isp, chan)->role : ISP_SPI_PC(isp, chan)->role)
+	(IS_FC(isp)? ISP_FC_PC(isp, chan)->def_role : ISP_SPI_PC(isp, chan)->def_role)
 #define	SET_DEFAULT_ROLE(isp, chan, val)		\
 	if (IS_FC(isp)) { 				\
-		ISP_FC_PC(isp, chan)->role = val;	\
+		ISP_FC_PC(isp, chan)->def_role = val;	\
 	} else {					\
-		ISP_SPI_PC(isp, chan)->role = val;	\
+		ISP_SPI_PC(isp, chan)->def_role = val;	\
 	}
 
 #define	DEFAULT_IID(isp, chan)		isp->isp_osinfo.pc.spi[chan].iid

Modified: stable/7/sys/dev/isp/isp_pci.c
==============================================================================
--- stable/7/sys/dev/isp/isp_pci.c	Sat Apr 24 23:05:56 2010	(r207171)
+++ stable/7/sys/dev/isp/isp_pci.c	Sat Apr 24 23:07:34 2010	(r207172)
@@ -547,10 +547,10 @@ isp_get_specific_options(device_t dev, i
 	}
 
 	if (IS_SCSI(isp)) {
-		ISP_SPI_PC(isp, chan)->role = tval;
+		ISP_SPI_PC(isp, chan)->def_role = tval;
 		return;
 	}
-	ISP_FC_PC(isp, chan)->role = tval;
+	ISP_FC_PC(isp, chan)->def_role = tval;
 
 	tval = 0;
 	if (resource_int_value(device_get_name(dev), device_get_unit(dev), "fullduplex", &tval) == 0 && tval != 0) {
@@ -833,7 +833,7 @@ isp_pci_attach(device_t dev)
 	 * The 'it' suffix really only matters for SCSI cards in target mode.
 	 */
 	isp->isp_osinfo.fw = NULL;
-	if (IS_SCSI(isp) && (ISP_SPI_PC(isp, 0)->role & ISP_ROLE_TARGET)) {
+	if (IS_SCSI(isp) && (ISP_SPI_PC(isp, 0)->def_role & ISP_ROLE_TARGET)) {
 		snprintf(fwname, sizeof (fwname), "isp_%04x_it", did);
 		isp->isp_osinfo.fw = firmware_get(fwname);
 	} else if (IS_24XX(isp) && (isp->isp_nchan > 1 || isp->isp_osinfo.forcemulti)) {

Modified: stable/7/sys/dev/isp/isp_sbus.c
==============================================================================
--- stable/7/sys/dev/isp/isp_sbus.c	Sat Apr 24 23:05:56 2010	(r207171)
+++ stable/7/sys/dev/isp/isp_sbus.c	Sat Apr 24 23:07:34 2010	(r207172)
@@ -195,7 +195,7 @@ isp_sbus_attach(device_t dev)
 	isp->isp_revision = 0;	/* XXX */
 	isp->isp_dev = dev;
 	isp->isp_nchan = 1;
-	ISP_SET_PC(isp, 0, role, role);
+	ISP_SET_PC(isp, 0, def_role, role);
 
 	/*
 	 * Get the clock frequency and convert it from HZ to MHz,

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr 24 23:13:05 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E08B4106564A;
	Sat, 24 Apr 2010 23:13:05 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFB658FC1A;
	Sat, 24 Apr 2010 23:13:05 +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 o3OND54A074959;
	Sat, 24 Apr 2010 23:13:05 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3OND5q9074957;
	Sat, 24 Apr 2010 23:13:05 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201004242313.o3OND5q9074957@svn.freebsd.org>
From: Matt Jacob 
Date: Sat, 24 Apr 2010 23:13:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207174 - stable/7/sys/cam/scsi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 24 Apr 2010 23:13:06 -0000

Author: mjacob
Date: Sat Apr 24 23:13:05 2010
New Revision: 207174
URL: http://svn.freebsd.org/changeset/base/207174

Log:
  This is an MFC of 205252.
  
  We actually can generate a host number.

Modified:
  stable/7/sys/cam/scsi/scsi_sg.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cam/scsi/scsi_sg.c
==============================================================================
--- stable/7/sys/cam/scsi/scsi_sg.c	Sat Apr 24 23:10:13 2010	(r207173)
+++ stable/7/sys/cam/scsi/scsi_sg.c	Sat Apr 24 23:13:05 2010	(r207174)
@@ -583,7 +583,7 @@ sgioctl(struct cdev *dev, u_long cmd, ca
 	{
 		struct sg_scsi_id id;
 
-		id.host_no = 0; /* XXX */
+		id.host_no = cam_sim_path(xpt_path_sim(periph->path));
 		id.channel = xpt_path_path_id(periph->path);
 		id.scsi_id = xpt_path_target_id(periph->path);
 		id.lun = xpt_path_lun_id(periph->path);