butc-xbsa-cleanup-20040818

make things compile when xbas is defined.

diff --git a/src/butc/butc_xbsa.h b/src/butc/butc_xbsa.h
index 63c14a5da17dbe2d49e2f36b647342cc23a9a6ba..1c4a748ee057968ed8ec174554f66fe345d22bc2 100644 (file)
--- a/src/butc/butc_xbsa.h
+++ b/src/butc/butc_xbsa.h
@@ -123,4 +123,26 @@ extern afs_int32 xbsa_DeleteObject(struct butx_transactionInfo *info,
                                   char *objectSpaceName, char *pathName);
 
 #endif /*xbsa */
+
+
+/* XBSA Global Parameters */
+
+#ifdef XBSA_TCMAIN
+#define XBSA_EXT
+#else
+#define XBSA_EXT extern
+#endif
+
+XBSA_EXT afs_int32 xbsaType;
+#ifdef xbsa
+XBSA_EXT struct butx_transactionInfo butxInfo;
+
+#define rpc_c_protect_level_default 0
+XBSA_EXT afs_uint32 dumpRestAuthnLevel;
+XBSA_EXT char *xbsaObjectOwner;
+XBSA_EXT char *appObjectOwner;
+XBSA_EXT char *adsmServerName;
+XBSA_EXT char *xbsaSecToken;
+XBSA_EXT char *xbsalGName;
+#endif /*xbsa*/
 #endif /* OPENAFS_BUTC_XBSA_H */

diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index 1369978be3f17f39443377680692cbc043c26728..d804794f69bb8f74079b0eeb696b97fa02440bb7 100644 (file)
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -55,6 +55,7 @@ RCSID
 #include "error_macros.h"
 #include <afs/budb_errs.h>
 #include "afs/butx.h"
+#define XBSA_TCMAIN
 #include "butc_xbsa.h"
 
 #define N_SECURITY_OBJECTS 3
@@ -92,20 +93,6 @@ char *closecallout;
 char *restoretofile;
 int forcemultiple;
 
-/* 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
-
 int maxpass;
 #define PASSESMIN  1
 #define PASSESMAX  10

diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index 5c2467d58cc8e7f9ad0874919ba3885da7236dcd..f451f504f1b0b574dca7632278eb93b36824e061 100644 (file)
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -51,20 +51,6 @@ 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
  * -------------------------