DEVEL15-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 bdbd142c67e86ae452322895c140368b94f62243..f879b5dc6ff50d3333aa9d30b9e04f8cdb566449 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -7458,11 +7458,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 152bb82248839c0005e6b2b139484f73fde9e193..0a8075a8021f6b2c738e3e5e0f6239d2ad5cce04 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -2991,11 +2991,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)