From owner-svn-src-stable@FreeBSD.ORG Sat Sep 8 19:21:41 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1A39106566C; Sat, 8 Sep 2012 19:21:41 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:150:6101::4]) by mx1.freebsd.org (Postfix) with ESMTP id 8C0C68FC08; Sat, 8 Sep 2012 19:21:41 +0000 (UTC) Received: from core.vx.sk (localhost [127.0.0.2]) by mail.vx.sk (Postfix) with ESMTP id EBE2B3A8F3; Sat, 8 Sep 2012 21:21:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by core.vx.sk (amavisd-new, unix socket) with LMTP id CjEanHvDLAd3; Sat, 8 Sep 2012 21:21:39 +0200 (CEST) Received: from [10.9.8.1] (188-167-78-15.dynamic.chello.sk [188.167.78.15]) by mail.vx.sk (Postfix) with ESMTPSA id CD4CD3A8E2; Sat, 8 Sep 2012 21:21:38 +0200 (CEST) Message-ID: <504B9AC3.2070705@FreeBSD.org> Date: Sat, 08 Sep 2012 21:21:39 +0200 From: Martin Matuska User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: Eitan Adler References: <201209080241.q882foC1005948@svn.freebsd.org> In-Reply-To: <201209080241.q882foC1005948@svn.freebsd.org> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r240225 - stable/9/sys/cddl/compat/opensolaris/sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2012 19:21:42 -0000 This commit is missing the PR number (kern/171380) and should be MFCed together with r230454. I was planning to MFC these two tomorrow. On 8.9.2012 4:41, Eitan Adler wrote: > Author: eadler > Date: Sat Sep 8 02:41:50 2012 > New Revision: 240225 > URL: http://svn.freebsd.org/changeset/base/240225 > > Log: > MFC r230454: > Use provided name when allocating ksid domain. It isn't really used on FreeBSD, > but should fix a panic when pool is imported from another OS that is using this. > > No objections from; pjd > Approved by: cperciva (implicit) > > Modified: > stable/9/sys/cddl/compat/opensolaris/sys/sid.h > Directory Properties: > stable/9/sys/ (props changed) > > Modified: stable/9/sys/cddl/compat/opensolaris/sys/sid.h > ============================================================================== > --- stable/9/sys/cddl/compat/opensolaris/sys/sid.h Sat Sep 8 01:26:52 2012 (r240224) > +++ stable/9/sys/cddl/compat/opensolaris/sys/sid.h Sat Sep 8 02:41:50 2012 (r240225) > @@ -30,7 +30,7 @@ > #define _OPENSOLARIS_SYS_SID_H_ > > typedef struct ksiddomain { > - char kd_name[16]; /* Domain part of SID */ > + char kd_name[1]; /* Domain part of SID */ > } ksiddomain_t; > typedef void ksid_t; > > @@ -39,8 +39,8 @@ ksid_lookupdomain(const char *domain) > { > ksiddomain_t *kd; > > - kd = kmem_alloc(sizeof(*kd), KM_SLEEP); > - strlcpy(kd->kd_name, "FreeBSD", sizeof(kd->kd_name)); > + kd = kmem_alloc(sizeof(*kd) + strlen(domain), KM_SLEEP); > + strcpy(kd->kd_name, domain); > return (kd); > } > -- Martin Matuska FreeBSD committer http://blog.vx.sk