Fix for filetemplate from 1.7.x

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index 7cc08d2..c3994cf 100644 (file)
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,6 @@
+* Wed Sep 9 2009 Andrew McNab <Andrew.McNab@cern.ch>
+- Import fix of %016lx specification when creating 
+  passcodes from 1.7.x branch.
 * Fri Jul 24 2009 Andrew McNab <Andrew.McNab@cern.ch>
 - ==== GridSite version 1.5.13 ====
 * Fri Jul 24 2009 Andrew McNab <Andrew.McNab@cern.ch>

diff --git a/org.gridsite.core/src/mod_gridsite.c b/org.gridsite.core/src/mod_gridsite.c
index 169a312..4e4ce37 100644 (file)
--- a/org.gridsite.core/src/mod_gridsite.c
+++ b/org.gridsite.core/src/mod_gridsite.c
@@ -830,7 +830,7 @@ char *make_passcode_file(request_rec *r, mod_gridsite_dir_cfg *conf,
                                   sizeof(gridauthcookie))
          != APR_SUCCESS) return NULL;
     
-    filetemplate = apr_psprintf(r->pool, "%s/passcode-%016llxXXXXXX", 
+    filetemplate = apr_psprintf(r->pool, "%s/passcode-%016lxXXXXXX", 
      ap_server_root_relative(r->pool,
      sessionsdir),
      gridauthcookie);