From: Matt Benjamin <matt@linuxbox.com>
Date: Fri, 27 Aug 2010 00:37:52 +0000 (-0400)
Subject: sed s/porc/proc/
X-Git-Tag: upstream/1.8.0_pre1^2~4890
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a9958b34a930223877e01de5109e934f1224d988;p=packages%2Fo%2Fopenafs.git

sed s/porc/proc/

There is no osi macro osi_curporc.  Typo.

Change-Id: I02f151be942471579ca60ed1e2190d0895288e4c
Reviewed-on: http://gerrit.openafs.org/2617
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index b0be492e1..61a7cae33 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -1823,7 +1823,7 @@ _settok_setParentPag(afs_ucred_t **cred) {
     osi_procname(procname, 256);
     afs_warnuser("Process %d (%s) tried to change pags in PSetTokens\n",
 	         MyPidxx2Pid(MyPidxx), procname);
-    return setpag(osi_curporc(), cred, -1, &pag, 1);
+    return setpag(osi_curproc(), cred, -1, &pag, 1);
 #else
     return setpag(cred, -1, &pag, 1);
 #endif
diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
index 187ee4c87..422659e05 100644
--- a/src/rx/FBSD/rx_knet.c
+++ b/src/rx/FBSD/rx_knet.c
@@ -108,8 +108,7 @@ osi_StopListener(void)
 	       "rx_shutdown_timedwait", 1 * hz);
 	--tries;
       }
-      if (so_is_disconn(rx_socket))
-          soclose(rx_socket);
+      soclose(rx_socket);
       MUTEX_EXIT(&s_mtx);
       MUTEX_DESTROY(&s_mtx);
     }