From: Derrick Brashear <shadow@dementix.org>
Date: Wed, 4 Jan 2012 18:21:43 +0000 (-0500)
Subject: ukernel: enable nat ping again
X-Git-Tag: upstream/1.8.0_pre1^2~2858
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=38b74b34d2d370030f0e1abf835cfefefeaa0de2;p=packages%2Fo%2Fopenafs.git

ukernel: enable nat ping again

if we're not root, no nat ping at all. fix that.

Change-Id: I7ea4db77b30ba639921b11c4ccad35a2e14133b4
Reviewed-on: http://gerrit.openafs.org/6509
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index fcb42609a..8d456a471 100644
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -469,7 +469,11 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
 	 * Will need to be revisited if/when CB gets security.
 	 */
 	if ((isec == 0) && (service != 52) && !(tu->states & UTokensBad) &&
-	    (tu->viceId == UNDEFVID) && (tu->uid == 0))
+	    (tu->viceId == UNDEFVID)
+#ifndef UKERNEL /* ukernel runs as just one uid anyway */
+	    && (tu->uid == 0)
+#endif
+	    )
 	    rx_SetConnSecondsUntilNatPing(tc->id, 20);
 
 	tc->forceConnectFS = 0;	/* apparently we're appropriately connected now */