From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 21 Aug 2007 09:28:37 +0000 (+0000)
Subject: STABLE14-viced-remove-asserts-20070821
X-Git-Tag: openafs-stable-1_4_5-pre1~21
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b1c7df93f9daa0a8f40395b620afc0900ff863c0;p=packages%2Fo%2Fopenafs.git

STABLE14-viced-remove-asserts-20070821


remove asserts testing the number of alternate interfaces.


(cherry picked from commit d0f62da48417989040986a0bd6539d9696616229)
---

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index a00ffc64b..e55e87b55 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -7573,11 +7573,9 @@ SRXAFS_CallBackRxConnAddr (struct rx_call * acall, afs_int32 *addr)
     if ( !thost->interface ) 
 	goto Bad_CallBackRxConnAddr;
     
-    assert(thost->interface->numberOfInterfaces > 0 );
-    
     /* the only address is the primary interface */
     /* can't change when there's only 1 address, anyway */
-    if ( thost->interface->numberOfInterfaces == 1 ) 
+    if ( thost->interface->numberOfInterfaces <= 1 ) 
 	goto Bad_CallBackRxConnAddr;
     
     /* initialise a security object only once */
diff --git a/src/viced/callback.c b/src/viced/callback.c
index ec7f0d478..173dd1e7d 100644
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -2134,11 +2134,9 @@ MultiProbeAlternateAddress_r(struct host *host)
     if (!host->interface)
 	return 1;		/* failure */
 
-    assert(host->interface->numberOfInterfaces > 0);
-
     /* the only address is the primary interface */
-    if (host->interface->numberOfInterfaces == 1)
-	return 1;		/* failure */
+    if (host->interface->numberOfInterfaces <= 1)
+        return 1;               /* failure */
 
     /* initialise a security object only once */
     if (!sc)