From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 12:42:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D6A916A559 for ; Wed, 16 Aug 2006 12:42:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 939E943D46 for ; Wed, 16 Aug 2006 12:38:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2377746B9F for ; Wed, 16 Aug 2006 08:38:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A8EB256501; Wed, 16 Aug 2006 12:38:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9516816A513; Wed, 16 Aug 2006 12:38:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A5B816A510 for ; Wed, 16 Aug 2006 12:38:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 895D343E0F for ; Wed, 16 Aug 2006 12:34:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCYUvm057467 for ; Wed, 16 Aug 2006 12:34:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCYSAu057464 for perforce@freebsd.org; Wed, 16 Aug 2006 12:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:34:28 GMT Message-Id: <200608161234.k7GCYSAu057464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104211 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:42:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=104211 Change 104211 by rwatson@rwatson_zoo on 2006/08/16 12:33:42 Rename MAX_ARGS and MAX_ENV by inserting BSM_ in front, in order to reduce the chances of a name space collision. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define MAX_ARGS 10 -#define MAX_ENV 10 +#define BSM_MAX_ARGS 10 +#define BSM_MAX_ENV 10 #include #include @@ -227,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ARGS]; + char *text[BSM_MAX_ARGS]; } au_execarg_t; /* @@ -236,7 +236,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ENV]; + char *text[BSM_MAX_ENV]; } au_execenv_t; /*