From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 12 May 2011 15:21:09 +0000 (-0500)
Subject: viced: h_SetupCallbackConn_r in removeAddress_r
X-Git-Tag: upstream/1.6.6_pre2^2~119
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2870a6278079dd070aed278c8560cc0bc5590d36;p=packages%2Fo%2Fopenafs.git

viced: h_SetupCallbackConn_r in removeAddress_r

removeAddress_r has some code that is identical to the
h_SetupCallbackConn_r function. Call the function instead.

Reviewed-on: http://gerrit.openafs.org/4645
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 0376255747ac17ed41afbc219f5a5978e58d8e9c)

Change-Id: I9f7b4fbc6059a15b30d675a7c78ac9ff00ba32b0
Reviewed-on: http://gerrit.openafs.org/9419
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/viced/host.c b/src/viced/host.c
index 5e4739d60..1bfe477e4 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -1340,12 +1340,7 @@ removeAddress_r(struct host *host, afs_uint32 addr, afs_uint16 port)
                     rxconn = NULL;
                 }
 
-                if (!sc)
-                    sc = rxnull_NewClientSecurityObject();
-                host->callback_rxcon =
-                    rx_NewConnection(host->host, host->port, 1, sc, 0);
-                rx_SetConnDeadTime(host->callback_rxcon, 50);
-                rx_SetConnHardDeadTime(host->callback_rxcon, AFS_HARDDEADTIME);
+		h_SetupCallbackConn_r(host);
             }
         } else {
             /* not the primary addr/port, just invalidate it */