solaris10-20040624

FIXES 5396

as substantially done by Jeff Woodward <Jeffrey.B.Woodward@Dartmouth.EDU>,
work diffed out and slightly rewritten

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
FIXES 5396

this should be the correct way to give up the socket on all solaris versions

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 903903f4f6151f5149ab0c0a73090a33fd812b15..07c3a8aa9fe450665e1acfb24042dad31542ddac 100644 (file)
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -35,7 +35,7 @@ process.o     : process.s process.i386.s process.c
        @case "$(SYS_NAME)" in \
        pmax_he1) \
                $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} process.s;; \
-       sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5?) \
+       sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5* ) \
                /usr/ccs/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
                ${AS} process.ss -o process.o; \
                        $(RM) process.ss ;; \

diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c
index 43314c1c00bc29f8d7f6639f525c1f7b9f0e009b..d8c192ca4eb014b23fa62f36946db997d5164931 100644 (file)
--- a/src/rx/SOLARIS/rx_knet.c
+++ b/src/rx/SOLARIS/rx_knet.c
@@ -341,14 +341,11 @@ osi_FreeSocket(register struct osi_socket *asocket)
        afs_osi_Sleep(&rxk_ListenerPid);
     }
 
-#ifdef AFS_SUN510_ENV
+    /* Was sockfs_sounbind(so, 0); sockfs_sockfree(so); That's wrong */
     vp = SOTOV(so);
     VOP_CLOSE(vp, FREAD|FWRITE, 1, (offset_t)0, CRED());
     VN_RELE(vp);
-#else
-    sockfs_sounbind(so, 0);
-    sockfs_sockfree(so);
-#endif
+
     return 0;
 }