From patchwork Sat May 11 11:54:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Nazar X-Patchwork-Id: 2553581 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 449A8DF230 for ; Sat, 11 May 2013 11:54:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751118Ab3EKLyd (ORCPT ); Sat, 11 May 2013 07:54:33 -0400 Received: from mail-ia0-f182.google.com ([209.85.210.182]:40431 "EHLO mail-ia0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751042Ab3EKLyd (ORCPT ); Sat, 11 May 2013 07:54:33 -0400 Received: by mail-ia0-f182.google.com with SMTP id j5so3547493iaf.27 for ; Sat, 11 May 2013 04:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type; bh=6tFZuPmFqa99DPk3KAyTZCdTQeheKIAea3bv+GhgHgA=; b=m6GzavMhaqrBjQwhIxexX7eVKOhWpO7lYJLE4PbLz7Qzswb/sRpq0KiLYY56sNpV4v 6goUOLPyqk2FcLbC+P9KwXcdp0e5/DV/rnsHHbmBz2PXAm8cVzlhK3mVJm+HvurtokPg 7Z4r77ihO8b0TsFKGA8uGT1DqnN8KdD6jS+g12tfDM0kQ3Eubez9HaL/eYvy6RQ/puy2 RHw+dj5eOmHik8o0Kx/FhD8D7fvvtnDspTcNMuQT5a1inxOwrvgcs7ZJ5gTotjcmaCK7 orIfarDGMsOZUo9EEuhwzO7VZObKSAbNXtcL0scnpRzRT+ts1n2EdNwm3voQ6RUXTpYX Ks+A== X-Received: by 10.50.110.10 with SMTP id hw10mr4881636igb.55.1368273272572; Sat, 11 May 2013 04:54:32 -0700 (PDT) Received: from [192.168.21.211] (CPE0018e7e4b223-CM0013718c1d6c.cpe.net.cable.rogers.com. [99.232.58.77]) by mx.google.com with ESMTPSA id qs4sm4320594igb.10.2013.05.11.04.54.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 11 May 2013 04:54:31 -0700 (PDT) Message-ID: <518E316A.8050002@gmail.com> Date: Sat, 11 May 2013 07:54:18 -0400 From: Doug Nazar User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Thunderbird/22.0a2 MIME-Version: 1.0 To: linux-nfs@vger.kernel.org Subject: Fix gssd ignore machine credentials for root Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Commit 1c787f14 [gssd: scan for DIR: ccaches, too] changed the default prefix for the credential cache files. Update the check to ignore the machine credential file when running with -n (root ignores machine credentials). Doug --- utils/gssd/krb5_util.c 2013-05-11 00:33:08.054297810 -0400 +++ ../nfs-utils-1.2.7.new/utils/gssd/krb5_util.c 2012-11-11 18:01:23.000000000 -0500 @@ -231,7 +231,7 @@ continue; } if (uid == 0 && !root_uses_machine_creds && - strstr(namelist[i]->d_name, "_machine_")) { + strstr(namelist[i]->d_name, "machine_")) { printerr(3, "CC '%s' not available to root\n", statname); free(namelist[i]);