STABLE14-tbutc-wrong-lp-getrwindex-20080428

LICENSE IPL10
FIXES 96575

The pthread butc crashes with SIGSEGV, when I restore to a volume
which already exists. This does happen with OpenAFS 1.4.7pre4 on
i386_linux26.
Looking into the code I think butc is using the wrong function
Lp_GetRwIndex (at volser/vsprocs.c:4394). It uses the one in the
library lib/libvosadmin.a, but should use the function defined
in volser/lockprocs.c.

(cherry picked from commit 668cd5331e4857a73ba1d849446e0dfcae97eadf)

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 60e8ab1e62a3b0b62009e252866607ffe8f1c1f8..8a4c6c807b5c152728d77accc7f4c2d3696551ea 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -24,7 +24,7 @@ VOLSER  = ${srcdir}/../volser
 BUCOORDOBJS=ubik_db_if.o ../bucoord/volstub.o ../bucoord/dlq.o \
            status.o ../bucoord/bucoord_errs.o
 
-VOLSEROBJS=vsprocs.o vsutils.o
+VOLSEROBJS=vsprocs.o vsutils.o lockprocs.o
 VOLSERLIBS=${TOP_LIBDIR}/libvosadmin.a ${TOP_LIBDIR}/libafsadminutil.a
 
 LWPOBJS     =lock.o
@@ -115,6 +115,9 @@ vsutils.o: ${VOLSER}/vsutils.c
 vsprocs.o: ${VOLSER}/vsprocs.c
        ${CC} ${CFLAGS} -c ${VOLSER}/vsprocs.c
 
+lockprocs.o: ${VOLSER}/lockprocs.c
+       ${CC} ${CFLAGS} -c ${VOLSER}/lockprocs.c
+
 lock.o: ${LWP}/lock.c
        ${CC} ${CFLAGS} -c ${LWP}/lock.c