From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat, 11 Sep 2010 22:17:24 +0000 (+0100)
Subject: viced: Don't fall back to tokens
X-Git-Tag: upstream/1.8.0_pre1^2~4800
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6152b5322e2b1699252c04c757a2013c2e3c8939;p=packages%2Fo%2Fopenafs.git

viced: Don't fall back to tokens

I can't think of any circumstances in which it is appropriate for
the fileserver to fallback to using tokens from the kernel, rather than
those generated from keys on disk. So, remove that fallback.

Change-Id: I92b8987ce63759234d238812a8fe998daed4c20f
Reviewed-on: http://gerrit.openafs.org/2758
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/viced/host.c b/src/viced/host.c
index 868d2729d..684785826 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -310,8 +310,6 @@ hpr_Initialize(struct ubik_client **uclient)
 	    ViceLog(0, ("hpr_Initialize: clientauthsecure returns %d %s (so trying noauth)", code, afs_error_message(code)));
         if (code)
             scIndex = RX_SECIDX_NULL;
-    } else {
-	afsconf_ClientAuthToken(&info, 0, &sc, &scIndex, NULL);
     }
     if ((scIndex == RX_SECIDX_NULL) && (sc == NULL))
         sc = rxnull_NewClientSecurityObject();