From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 21 Sep 2005 01:34:13 +0000 (+0000)
Subject: STABLE14-rx-send-error-code-propagation-20050916
X-Git-Tag: openafs-stable-1_4_0-rc5~18
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7624eff082dcdd4bb5b123a70b9996765d147b30;p=packages%2Fo%2Fopenafs.git

STABLE14-rx-send-error-code-propagation-20050916


corrections to rx-send-error-code-propagation-20050915 for bsd


(cherry picked from commit fbba9553640a785bc449672d60870a6fcd043436)
---

diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c
index bf67a62a9..2c9c9eced 100644
--- a/src/rx/rx_getaddr.c
+++ b/src/rx/rx_getaddr.c
@@ -33,7 +33,8 @@ RCSID
  * the pthreads for solaris requires the socket call to be mapped.
  */
 #include "rx.h"
-#endif
+#include "rx_globals.h"
+#endif /* AFS_NT40_ENV */
 #else /* KERNEL */
 #ifdef UKERNEL
 #include "rx/rx_kcommon.h"
@@ -462,7 +463,7 @@ rxi_getAllAddrMaskMtu(afs_int32 addrBuffer[], afs_int32 maskBuffer[],
                 continue;   /* skip loopback address as well. */
 
 	    if (count >= maxSize) {	/* no more space */
-		dpf("Too many interfaces..ignoring 0x%x\n",
+		dpf(("Too many interfaces..ignoring 0x%x\n",
 		       a->sin_addr.s_addr));
 		continue;
 	    }
diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index 9120442d2..66f56913d 100644
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -126,7 +126,7 @@ osi_Panic(msg, a1, a2, a3)
     if (!msg)
 	msg = "Unknown AFS panic";
 
-    dpf(msg, a1, a2, a3));
+    dpf((msg, a1, a2, a3));
 #ifdef AFS_LINUX24_ENV
     BUG();
 #else