From: Rainer Toebbicke <rtb@pclella.cern.ch>
Date: Tue, 13 Dec 2005 21:58:49 +0000 (+0000)
Subject: fix-cbd-20051213
X-Git-Tag: openafs-devel-1_5_0~163
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=68900af5e7dc40a52043d499eaa3babae992f8b9;p=packages%2Fo%2Fopenafs.git

fix-cbd-20051213


The attached patch makes the cbd program (the stand-alone version of
the fileserver's callback.c) work again.

(Now I expect 99% "what's that?" and 0% "what a relief!" reactions. As
a reminder that's one of the things you might go hunting for after a
'kill -XCPU' to the fileserver - this program is probably used
infrequently but the older you get... )
---

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 2c5716e5b..8b25dfce1 100644
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -1957,6 +1957,9 @@ PrintCB(register struct CallBack *cb, afs_uint32 now)
     struct FileEntry *fe = itofe(cb->fhead);
     time_t expires = TIndexToTime(cb->thead);
 
+    if (fe == NULL)
+	return;
+
     printf("vol=%u vn=%u cbs=%d hi=%d st=%d fest=%d, exp in %d secs at %s",
 	   fe->volid, fe->vnode, fe->ncbs, cb->hhead, cb->status, fe->status,
 	   expires - now, ctime(&expires));