From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Mon, 10 Aug 2009 14:53:27 +0000 (+0000)
Subject: Sync
X-Git-Tag: glite-yaim-myproxy_R_4_0_4_2~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5cb84aefd4e5e0e699f60ee0da551f7ec69a5177;p=jra1mw.git

Sync
---

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index 19c5e63..307bf94 100644
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,5 @@
+* Mon Aug 10 2009 Andrew McNab <Andrew.McNab@cern.ch>
+- Fix %016lx specification when creating passcodes.
 * Fri Aug 7 2009 Andrew McNab <Andrew.McNab@cern.ch>
 - ==== GridSite version 1.7.6 ====
 * Wed Jul 29 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 e009bfc..48dfef2 100644
--- a/org.gridsite.core/src/mod_gridsite.c
+++ b/org.gridsite.core/src/mod_gridsite.c
@@ -841,7 +841,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);