From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sat, 3 Dec 2011 22:49:47 +0000 (-0500)
Subject: Windows: apply Nat Pings only to cm_rootUser connections
X-Git-Tag: upstream/1.6.1.pre4^2~27
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=aacc6f18ba5648e2f86276bc8bb88655a37caf4d;p=packages%2Fo%2Fopenafs.git

Windows: apply Nat Pings only to cm_rootUser connections

Use CM_UCELLFLAG_ROOTUSER flag to identify the cm_rootUser
connections and only apply Nat pings to those connections
instead of examining the security state of the connection.

Reviewed-on: http://gerrit.openafs.org/6208
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
(cherry picked from commit 01f55bbf14210ef3e4f4c0246409af370de3a383)

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

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index e786fe2dc..453d3463e 100644
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -1225,8 +1225,10 @@ static void cm_NewRXConnection(cm_conn_t *tcp, cm_ucell_t *ucellp,
      * Only file servers implement client callbacks and we only need one ping
      * to be sent to each server.
      */
-    if (NatPingInterval && serverp->type == CM_SERVER_FILE && secIndex == 0)
+    if (NatPingInterval && serverp->type == CM_SERVER_FILE &&
+         (ucellp->flags & CM_UCELLFLAG_ROOTUSER)) {
         rx_SetConnSecondsUntilNatPing(tcp->rxconnp, NatPingInterval);
+    }
 
     tcp->ucgen = ucellp->gen;
     if (secObjp)