From owner-svn-src-all@FreeBSD.ORG Sun Sep 9 20:36:22 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 622761065672 for ; Sun, 9 Sep 2012 20:36:22 +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 E98488FC16 for ; Sun, 9 Sep 2012 20:36:21 +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=Q3CUaS kXYwQDOP/T+bN3I1ZVGvjw+YWoa1CrYjTH8WER1ns+igLm60Jw9cCvDRaeU6mmGc 6s8rKM5xOKC+3RlSCuDOBiQoIqOZTB2MUHo/Mon2lTHr5R90ZcPhnqXmSEnbT8l7 6xvYxliJ5mmYilBb9PEmskRgJus2V/p0TuaqI= 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=KCRqPnFF7llb PsDxUAXTECYwUEuGYYJcG/LOMTSxYXE=; b=x6amCf5EBQU+1oZVjldLUbtdCR0K nvam59RtPIotNI6p++XdUM6EBUAWdcruj3jfSPDOX9ZlwrRR9XqYcyMOMsKql31r /UOwII02rPGiMrTPf0XjdW2tbgX5dxCJ/UfOgTVNHc3kOu7Cwg3tcgfjYy6+Olqu FYnwKQLgHp6fNNg= Received: (qmail 8809 invoked from network); 9 Sep 2012 15:36:13 -0500 Received: from unknown (HELO ?10.10.0.115?) (bryan@shatow.net@10.10.0.115) by sweb.xzibition.com with ESMTPA; 9 Sep 2012 15:36:13 -0500 Message-ID: <504CFDBB.5090405@shatow.net> Date: Sun, 09 Sep 2012 15:36:11 -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: Martin Matuska References: <201209092026.q89KQJS8032905@svn.freebsd.org> In-Reply-To: <201209092026.q89KQJS8032905@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-releng@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r240288 - releng/9.1/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: Sun, 09 Sep 2012 20:36:22 -0000 On 9/9/2012 3:26 PM, Martin Matuska wrote: > Author: mm > Date: Sun Sep 9 20:26:19 2012 > New Revision: 240288 > URL: http://svn.freebsd.org/changeset/base/240288 > > Log: > MFC r230454 (pjd): > 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. > > MFC r240162 (mm): > Make r230454 more readable and vendor-like. > > PR: kern/171380 > Approved by: re (kib) This is great. Thank you! > > Modified: > releng/9.1/sys/cddl/compat/opensolaris/sys/sid.h > Directory Properties: > releng/9.1/sys/ (props changed) > > Modified: releng/9.1/sys/cddl/compat/opensolaris/sys/sid.h > ============================================================================== > --- releng/9.1/sys/cddl/compat/opensolaris/sys/sid.h Sun Sep 9 20:13:11 2012 (r240287) > +++ releng/9.1/sys/cddl/compat/opensolaris/sys/sid.h Sun Sep 9 20:26:19 2012 (r240288) > @@ -30,7 +30,8 @@ > #define _OPENSOLARIS_SYS_SID_H_ > > typedef struct ksiddomain { > - char kd_name[16]; /* Domain part of SID */ > + char *kd_name; /* Domain part of SID */ > + uint_t kd_len; > } ksiddomain_t; > typedef void ksid_t; > > @@ -38,9 +39,13 @@ static __inline ksiddomain_t * > ksid_lookupdomain(const char *domain) > { > ksiddomain_t *kd; > + size_t len; > > + len = strlen(domain) + 1; > kd = kmem_alloc(sizeof(*kd), KM_SLEEP); > - strlcpy(kd->kd_name, "FreeBSD", sizeof(kd->kd_name)); > + kd->kd_len = (uint_t)len; > + kd->kd_name = kmem_alloc(len, KM_SLEEP); > + strcpy(kd->kd_name, domain); > return (kd); > } > > @@ -48,6 +53,7 @@ static __inline void > ksiddomain_rele(ksiddomain_t *kd) > { > > + kmem_free(kd->kd_name, kd->kd_len); > kmem_free(kd, sizeof(*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