From 0ef24d8fff7817104eaaf89ff45a72c954e6cc22 Mon Sep 17 00:00:00 2001
From: Andrew Hanushevsky <abh@stanford.edu>
Date: Thu, 2 Jun 2016 19:02:59 -0700
Subject: [PATCH] [Apps] Add xrdacctest to the tools set to test access control
 databases.

---
 src/XrdApps.cmake                     | 12 ++++++++++++
 src/{XrdAcc => XrdApps}/XrdAccTest.cc | 12 ++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 rename src/{XrdAcc => XrdApps}/XrdAccTest.cc (97%)

diff --git a/src/XrdApps.cmake b/src/XrdApps.cmake
index b1dae2ffcd7..da943d21b14 100644
--- a/src/XrdApps.cmake
+++ b/src/XrdApps.cmake
@@ -60,6 +60,18 @@ target_link_libraries(
   pthread
   ${EXTRA_LIBS} )
 
+#-------------------------------------------------------------------------------
+# xrdacctest
+#-------------------------------------------------------------------------------
+add_executable(
+  xrdacctest
+  XrdApps/XrdAccTest.cc )
+
+target_link_libraries(
+  xrdacctest
+  XrdServer
+  XrdUtils )
+
 #-------------------------------------------------------------------------------
 # xrdmapc
 #-------------------------------------------------------------------------------
diff --git a/src/XrdAcc/XrdAccTest.cc b/src/XrdApps/XrdAccTest.cc
similarity index 97%
rename from src/XrdAcc/XrdAccTest.cc
rename to src/XrdApps/XrdAccTest.cc
index e831683ca7c..83924b186dc 100644
--- a/src/XrdAcc/XrdAccTest.cc
+++ b/src/XrdApps/XrdAccTest.cc
@@ -52,6 +52,8 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
+#include "XrdVersion.hh"
+
 #include "XrdAcc/XrdAccAuthorize.hh"
 #include "XrdAcc/XrdAccConfig.hh"
 #include "XrdAcc/XrdAccGroups.hh"
@@ -106,9 +108,11 @@ int opcnt = sizeof(optab)/sizeof(optab[0]);
   
 int main(int argc, char **argv)
 {
-extern XrdAccAuthorize *XrdAccDefaultAuthorizeObject(XrdSysLogger *lp,
-                                                     const char   *cfn,
-                                                     const char   *parm);
+static XrdVERSIONINFODEF(myVer, XrdAccTest, XrdVNUMBER, XrdVERSION);
+extern XrdAccAuthorize *XrdAccDefaultAuthorizeObject(XrdSysLogger   *lp,
+                                                     const char     *cfn,
+                                                     const char     *parm,
+                                                     XrdVersionInfo &myVer);
 void Usage(const char *);
 char *p2l(XrdAccPrivs priv, char *buff, int blen);
 int rc = 0, argnum, DebugON = 0;
@@ -131,7 +135,7 @@ char *ConfigFN = (char *)"./acc.cf";
 
 // Obtain the authorization object
 //
-if (!(Authorize = XrdAccDefaultAuthorizeObject(&myLogger, ConfigFN, 0)))
+if (!(Authorize = XrdAccDefaultAuthorizeObject(&myLogger, ConfigFN, 0, myVer)))
    {cerr << "testaccess: Initialization failed." <<endl;
     exit(2);
    }