obsd44-pass1-20090123

[openafs.git] / src / rx / rx_kcommon.c

diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index c2f1d98..8d174be 100644 (file)
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -136,6 +136,18 @@ osi_Panic(char *msg, ...)
     if (!msg)
         msg = "Unknown AFS panic";
     printf(msg, a1, a2, a3);
+    panic(msg);
+#elif defined(AFS_DARWIN80_ENV) && !defined(AFS_DARWIN90_ENV)
+    char buf[256];
+    va_list ap;
+    if (!msg)
+       msg = "Unknown AFS panic";
+
+    va_start(ap, msg);
+    vsnprintf(buf, sizeof(buf), msg, ap);
+    va_end(ap);
+    printf(buf);
+    panic(buf);
 #else
     va_list ap;
     if (!msg)
@@ -143,11 +155,12 @@ osi_Panic(char *msg, ...)
 
     va_start(ap, msg);
     vprintf(msg, ap);
-#endif
-#ifdef AFS_LINUX20_ENV
+    va_end(ap);
+# ifdef AFS_LINUX20_ENV
     * ((char *) 0) = 0; 
-#else
+# else
     panic(msg);
+# endif
 #endif
 }
 
@@ -1008,10 +1021,12 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport)
     }
     nam->m_len = sizeof(myaddr);
     memcpy(mtod(nam, caddr_t), &myaddr, sizeof(myaddr));
-#ifdef AFS_SGI65_ENV
+#if defined(AFS_SGI65_ENV)
     BHV_PDATA(&bhv) = (void *)newSocket;
     code = sobind(&bhv, nam);
     m_freem(nam);
+#elif defined(AFS_OBSD44_ENV)
+    code = sobind(newSocket, nam, osi_curproc());
 #else
     code = sobind(newSocket, nam);
 #endif