This commit was generated by cvs2svn to compensate for changes in r153,

which included commits to RCS files with non-trunk default branches.

diff --git a/src/config/Makefile.version-NOCML b/src/config/Makefile.version-NOCML
index 9edc0ddf0c64e31582c39b10dd2915c8b8a93a13..d310e0ecdf7b3529c56bf35c9cc38053ffde86ae 100644 (file)
--- a/src/config/Makefile.version-NOCML
+++ b/src/config/Makefile.version-NOCML
@@ -8,7 +8,7 @@
 AFS_component_version_number.o: AFS_component_version_number.c
 
 AFS_component_version_number.c: 
-       echo 'char cml_version_number[]="@(#) OpenAFS devel built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c;
+       echo 'char cml_version_number[]="@(#) OpenAFS stable 1.0.2 built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c;
        echo 'char* AFSVersion = "openafs devel"; ' >>AFS_component_version_number.c;
 
 noversion: install

diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c
index 37a39f41f0908959953a7394841fb66a1946b6ac..e7307e2be19f8e2993cda3cc9a1ee512dbcc87db 100644 (file)
--- a/src/rx/LINUX/rx_knet.c
+++ b/src/rx/LINUX/rx_knet.c
@@ -176,7 +176,11 @@ void osi_StopListener(void)
 
     if (rxk_ListenerPid) {
        (void) (*sys_killp)(rxk_ListenerPid, 9);
+#ifdef AFS_LINUX24_ENV
+       afs_osi_Sleep(&rxk_ListenerPid);
+#else
        rxk_ListenerPid = 0;
+#endif
     }
     sock_release(rx_socket);
     rx_socket = NULL;

diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index f377feec61d2f0e3d6ebc4a9b38f8bc6fbf6c760..005664ddc9bda6a7e75e19b8741fe3a27d61ed0d 100644 (file)
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -969,6 +969,9 @@ void rxk_Listener(void)
        afs_osi_Wakeup(&afs_termState);
     }
     rxk_ListenerPid = 0;
+#ifdef AFS_LINUX24_ENV
+    afs_osi_Wakeup(&rxk_ListenerPid);
+#endif
 #ifdef AFS_SUN5_ENV
     AFS_GUNLOCK();
 #endif /* AFS_SUN5_ENV */