From owner-svn-src-all@FreeBSD.ORG Sat Sep 8 18:34:19 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D5B41065676 for ; Sat, 8 Sep 2012 18:34:19 +0000 (UTC) (envelope-from bryan@shatow.net) Received: from secure.xzibition.com (secure.xzibition.com [173.160.118.92]) by mx1.freebsd.org (Postfix) with ESMTP id E9AED8FC16 for ; Sat, 8 Sep 2012 18:34:18 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=shatow.net; h=message-id :date:from:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; q=dns; s=sweb; b=lupBVY xNIu3bk/bEFZb1+nQW3mwLjtSqe4rLpc/js4haRQci7VQAXxPklTmRGu59vV8jD6 Z+lZNWgrl+rSubV+aLz7PArbUXbT9255cPbh9doO93TqXsgswhveV/CUnhIzYda9 wq4BwFffxIyyUVPpUOBvSfFH4EagsYVcr1Jb0= DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=shatow.net; h=message-id :date:from:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; s=sweb; bh=06SRc30sHMZe AuqNbXBi16vekEOE41OmXavqYnMgLxI=; b=g2g1YgCoX8Vt4U+XMpHyWH3GMP0E ujxXaPXXRVdpD8LRAoPzjL0KYgCHnD98TAi+TzNFEzuV7Ai3V1nFBIyutT7GODnZ bRreZXX8QYWp4DVbGdt23OPCt+Dn+XGj9XvmfxTiTrUlam0ZwkFzU+dUApTcrtIm pCUoNg/rx5jx/Qs= Received: (qmail 29130 invoked from network); 8 Sep 2012 13:34:15 -0500 Received: from unknown (HELO ?10.10.0.115?) (bryan@shatow.net@10.10.0.115) by sweb.xzibition.com with ESMTPA; 8 Sep 2012 13:34:15 -0500 Message-ID: <504B8F9A.80809@shatow.net> Date: Sat, 08 Sep 2012 13:34:02 -0500 From: Bryan Drewery 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 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2012 18:34:19 -0000 On 9/7/2012 9:41 PM, 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) > Thanks! > 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); > } > > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" > -- Regards, Bryan Drewery bdrewery@freenode/EFNet