Message ID | 20160412160014.935.49138.stgit@seurat.1015granger.net |
---|---|
State | Accepted |
Headers | show
Return-Path: <fedfs-utils-devel-bounces@oss.oracle.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qks9b2YPqz9t4F for <incoming@patchwork.ozlabs.org>; Wed, 13 Apr 2016 02:01:07 +1000 (AEST) Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u3CG10Wo010553 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Apr 2016 16:01:01 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u3CG10mH013401 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 12 Apr 2016 16:01:00 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from <fedfs-utils-devel-bounces@oss.oracle.com>) id 1aq0kO-0001vk-64; Tue, 12 Apr 2016 09:01:00 -0700 Received: from aserv0022.oracle.com ([141.146.126.234]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from <chucklever@gmail.com>) id 1aq0jk-0001su-CM for fedfs-utils-devel@oss.oracle.com; Tue, 12 Apr 2016 09:00:20 -0700 Received: from userp1030.oracle.com (userp1030.oracle.com [156.151.31.80]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u3CG0JpE003622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for <fedfs-utils-devel@oss.oracle.com>; Tue, 12 Apr 2016 16:00:20 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by userp1030.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u3CG0J5P020458 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for <fedfs-utils-devel@oss.oracle.com>; Tue, 12 Apr 2016 16:00:19 GMT Authentication-Results: userp1030.oracle.com; dkim=pass reason="2048-bit key" header.d=gmail.com header.i=@gmail.com header.b=UKU+ht/H Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.15.0.59/8.15.0.59) with SMTP id u3CFxJ4x035307 for <fedfs-utils-devel@oss.oracle.com>; Tue, 12 Apr 2016 16:00:19 GMT Received: from mail-ig0-f193.google.com (mail-ig0-f193.google.com [209.85.213.193]) by userp2030.oracle.com with ESMTP id 226u2x5wnr-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for <fedfs-utils-devel@oss.oracle.com>; Tue, 12 Apr 2016 16:00:19 +0000 Received: by mail-ig0-f193.google.com with SMTP id fn8so3084047igb.2 for <fedfs-utils-devel@oss.oracle.com>; Tue, 12 Apr 2016 09:00:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=3vTVimFioAHatU3nlp+1QZ/HchlZLzfr9v3v8Rq31vs=; b=fYt/bDKQrcxBk+cVgu4Iq+hVaQBLVxB7i+kk4hVk6j2X6Nn+OgRmFJfSMR7gl/rzwn RKOnD+5MhQIOx4ekg/zyOAnwazPrTzpw7+hibSawi1A4uziKOOQM7fnm1DWC6Lbjirf2 3jUsAgSESPNH/aLVougs9IJZJw2XsXrnwPddH5A6FGrGmk62NVTnmgnuR1ddbcOeN89R AhtWB58iWNI7RQJDWhzjGbTrmrQ0L4BJ/GUfO5SPiN2vtQHy6uZ1SjG0rHC5N/Cv3gxU zyheAz2Z3Eu1Qnmz39tGAEgQhAGq6W6dihSoGnpqu1giiAWZii6bhvzAJhvVFlzf+Xn8 ptZA== X-Gm-Message-State: AD7BkJLSPEJkfZvW2d/m7R9AoSsDD7L10HazSujsnLO3UF8ubDtnO5MjayCyjxwaeDipgw== X-Received: by 10.50.8.101 with SMTP id q5mr24476394iga.22.1460476817581; Tue, 12 Apr 2016 09:00:17 -0700 (PDT) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe44:ec31]) by smtp.gmail.com with ESMTPSA id g2sm16093730igi.2.2016.04.12.09.00.16 for <fedfs-utils-devel@oss.oracle.com> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Apr 2016 09:00:16 -0700 (PDT) From: Chuck Lever <chuck.lever@oracle.com> To: fedfs-utils-devel@oss.oracle.com Date: Tue, 12 Apr 2016 12:00:14 -0400 Message-ID: <20160412160014.935.49138.stgit@seurat.1015granger.net> In-Reply-To: <20160412155728.935.85144.stgit@seurat.1015granger.net> References: <20160412155728.935.85144.stgit@seurat.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 redirect=_spf.google.com X-ServerName: mail-ig0-f193.google.com X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8133 signatures=670708 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1603180000 definitions=main-1604120227 Subject: [fedfs-utils] [PATCH 1/3] fedfsd: libtirpc 1.0 moves the xp_auth field X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers <fedfs-utils-devel@oss.oracle.com> List-Id: fedfs-utils Developers <fedfs-utils-devel.oss.oracle.com> List-Unsubscribe: <https://oss.oracle.com/mailman/listinfo/fedfs-utils-devel>, <mailto:fedfs-utils-devel-request@oss.oracle.com?subject=unsubscribe> List-Archive: <http://oss.oracle.com/pipermail/fedfs-utils-devel> List-Post: <mailto:fedfs-utils-devel@oss.oracle.com> List-Help: <mailto:fedfs-utils-devel-request@oss.oracle.com?subject=help> List-Subscribe: <https://oss.oracle.com/mailman/listinfo/fedfs-utils-devel>, <mailto:fedfs-utils-devel-request@oss.oracle.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: userv0021.oracle.com [156.151.31.71] |
diff --git a/src/fedfsd/gss.c b/src/fedfsd/gss.c index c63f42f..f762466 100644 --- a/src/fedfsd/gss.c +++ b/src/fedfsd/gss.c @@ -175,6 +175,10 @@ fedfsd_get_gss_cred(struct svc_req *rqstp) { SVCAUTH *auth; +#if defined(SVC_XP_AUTH) + auth = &SVC_XP_AUTH(rqstp->rq_xprt); +#else auth = rqstp->rq_xprt->xp_auth; +#endif return svcauth_gss_get_principal(auth); }
svcauth_gss_get_principal() comes from the legacy U-M svc GSS API, but is not documented, and does not appear in TI-RPC headers. fedfs-utils 0.10 adopted this API to provide RPCGSS support for the FedFS ADMIN protocol. As a consequence of using an undocumented API, fedfs-utils 0.10 is exposed to library changes to this API. Add some compatibility measures. The fedfsd in fedfs-utils 0.11 replaces this call with a valid contract API that does not expose SVCAUTH. Just a rebuild-relink should take care of it there. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- src/fedfsd/gss.c | 4 ++++ 1 file changed, 4 insertions(+)