Merge branch 'master' of https://github.com/xrootd/xrootd

xrootd · Jun 3, 2016 · 762173d · 762173d
2 parents 8f1dcc5 + 63b0987
commit 762173d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/docs/PreReleaseNotes.txt b/docs/PreReleaseNotes.txt
@@ -14,7 +14,9 @@ Prerelease Notes
   * [Authentication/sss] Fix dynamic id incompatability introduced in 4.0.
 
 + **Minor bug fixes**
+  * [Server] Make sure lockfile time is updated in deprecated runmodeold.
   * [Server] Fixes #344 - squash path before checking for static redirect.
   * [Server] Free Entity before replacing it from the cache (memleak).  
 
 + **Miscellaneous**
+  * [Apps] Add xrdacctest to the tools set to test access control databases.
diff --git 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 → src/XrdApps/XrdAccTest.cc b/src/XrdAcc/XrdAccTest.cc → 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);
    }

diff --git a/src/XrdFrm/XrdFrmTransfer.cc b/src/XrdFrm/XrdFrmTransfer.cc
@@ -767,7 +767,7 @@ void XrdFrmTransfer::ThrowDone(XrdFrmTranChk *cP, time_t endTime)
       } else {
        struct stat Stat;
        strcpy(&xfrP->PFN[xfrP->pfnEnd], ".lock");
-       if (stat(xfrP->PFN, &Stat))
+       if (!stat(xfrP->PFN, &Stat))
           {struct utimbuf tbuff;
            tbuff.actime = tbuff.modtime = endTime;
            if (utime(xfrP->PFN, &tbuff))