STABLE14-butc-xbsa-cleanup-20040818

make things compile when xbas is defined.


(cherry picked from commit 4d44764c15)
This commit is contained in:
Derrick Brashear 2004-08-25 08:12:37 +00:00
parent 17dfbd5be4
commit 55c8e616eb
3 changed files with 23 additions and 28 deletions

View File

@ -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 */

View File

@ -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

View File

@ -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
* -------------------------