--- source-trees/gt2-cvs/gatekeeper/source/globus_gatekeeper.c	18 Apr 2005 21:33:06 -0000	1.93
+++ source-trees/gt2-cvs/gatekeeper/source/globus_gatekeeper.c	30 Jan 2008 21:56:07 -0000
@@ -1588,6 +1588,30 @@
         free(tmpbuf);
     }
 
+    /*
+     * Cook up a unique ID such that we can link the GSI info logged by
+     * the Gatekeeper to the batch system info logged by the Job Manager.
+     */
+    {
+	time_t       clock;
+	struct tm  * tmp;
+	const char * gk_jm_id_var = "GATEKEEPER_JM_ID";
+	char         gatekeeper_jm_id[64];
+
+	time(&clock);
+	tmp = localtime(&clock);
+
+	sprintf(gatekeeper_jm_id, "%04d-%02d-%02d.%02d:%02d:%02d.%010u.%010u",
+	    tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
+	    tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
+	    gatekeeper_pid & 0xFFFFFFFF, reqnr & 0xFFFFFFFF);
+
+	setenv(gk_jm_id_var, gatekeeper_jm_id, 1);
+	setenv("GATEKEEPER_PEER", peernum, 1);
+
+	notice5(0, "%s %s for %s on %s", gk_jm_id_var, gatekeeper_jm_id,
+	    client_name, peernum);
+    }
 
     /*
      * now that we know the desired service, do authorization
@@ -2037,31 +2061,6 @@
     setenv("GLOBUS_ID",client_name,1);
     setenv("GRID_ID",client_name,1);
     setenv("GRID_AUTH_METHOD","TO_FILLED_IN_LATER",1);
-
-    /*
-     * Cook up a unique ID such that we can link the GSI info logged by
-     * the Gatekeeper to the batch system info logged by the Job Manager.
-     */
-    {
-	time_t       clock;
-	struct tm  * tmp;
-	const char * gk_jm_id_var = "GATEKEEPER_JM_ID";
-	char         gatekeeper_jm_id[64];
-
-	time(&clock);
-	tmp = localtime(&clock);
-
-	sprintf(gatekeeper_jm_id, "%04d-%02d-%02d.%02d:%02d:%02d.%010u.%010u",
-	    tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
-	    tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
-	    gatekeeper_pid & 0xFFFFFFFF, reqnr & 0xFFFFFFFF);
-
-	setenv(gk_jm_id_var, gatekeeper_jm_id, 1);
-	setenv("GATEKEEPER_PEER", peernum, 1);
-
-	notice5(0, "%s %s for %s on %s", gk_jm_id_var, gatekeeper_jm_id,
-	    client_name, peernum);
-    }
 
     /*
      * Become the appropriate user