From: Hans-Gunther Borrmann <hans-gunther.borrmann@rz.uni-freiburg.de>
Date: Tue, 13 Jul 2004 06:52:44 +0000 (+0000)
Subject: butc-xbsa-20040713
X-Git-Tag: openafs-devel-1_3_66~57
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=320ddefc691b71ba4bf29a91ced8e55028f9bfb6;p=packages%2Fo%2Fopenafs.git

butc-xbsa-20040713

FIXES 5761

update for butc xbsa support
---

diff --git a/Makefile.in b/Makefile.in
index c4ca338a0..675d4f881 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -443,7 +443,7 @@ butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx
 
 tbutc: cmd comerr bubasics butm budb bucoord cmd butc
 	case ${SYS_NAME} in \
-	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux11*|ia64_hpux*) \
+	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
 		${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
 	*) \
 		echo Not building MT butc for ${SYS_NAME} ;; \
diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index d7bc516a6..51c7922ac 100644
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -59,7 +59,7 @@ tdump: tdump.c AFS_component_version_number.c
 
 butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS}
 	@case ${SYS_NAME} in \
-	  rs_aix4*) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} /usr/lib/libc_r.a -o butc;; \
+	  rs_aix*) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} /usr/lib/libc_r.a -o butc;; \
 	  *)        ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} -o butc;; \
 	esac
 
@@ -84,7 +84,7 @@ clean:
 
 install:  
 	@case ${SYS_NAME} in \
-	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux*) \
+	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \
 		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
 	*_darwin_[1-6][0-9]) \
 		echo ${INSTALL} butc ${DEST}/etc/butc ; \
@@ -100,7 +100,7 @@ install:
 include ../config/Makefile.version
 dest:  
 	@case ${SYS_NAME} in \
-	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux*) \
+	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \
 		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
 	*_darwin_[1-6][0-9]) \
 		echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \
diff --git a/src/butc/butc_xbsa.c b/src/butc/butc_xbsa.c
index f1b455e75..7139a43bf 100644
--- a/src/butc/butc_xbsa.c
+++ b/src/butc/butc_xbsa.c
@@ -24,6 +24,7 @@ RCSID
 #include <errno.h>
 #include "butc_xbsa.h"
 #include <afs/butx.h>
+#include <afs/bubasics.h>
 
 #include "error_macros.h"
 
diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index f451f504f..5c2467d58 100644
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -51,6 +51,20 @@ callPermitted(call)
     return 1;
 }
 
+/* XBSA Global Parameters */
+afs_int32 xbsaType;
+#ifdef xbsa
+struct butx_transactionInfo butxInfo;
+
+#define rpc_c_protect_level_default 0
+afs_uint32 dumpRestAuthnLevel = rpc_c_protect_level_default;
+char *xbsaObjectOwner;
+char *appObjectOwner;
+char *adsmServerName;
+char *xbsaSecToken;
+char *xbsalGName;
+#endif
+
 /* -------------------------
  * butc - interface routines - alphabetic order
  * -------------------------