[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Nicolas DUPEUX]

The following commit has been merged in the debian/master branch:
commit c3365434cbe658d3069773bc3a1552f24bf206fb
Author: Nicolas DUPEUX <nicolas.dupeux at arkea.com>
Date:   Thu Feb 16 17:45:18 2012 +0100

    Fix the 2038 bug in TSCA

diff --git a/contrib/clients/TSCA/java/src/JavaClientThrift.java b/contrib/clients/TSCA/java/src/JavaClientThrift.java
index 15afaaf..477b887 100644
--- a/contrib/clients/TSCA/java/src/JavaClientThrift.java
+++ b/contrib/clients/TSCA/java/src/JavaClientThrift.java
@@ -53,7 +53,7 @@ public class JavaClientThrift{
 				line = file.readLine();
 		                while (line != null){
 		                        State state = new State();
-                	  	      	state.timestamp = (int)date.getTime();
+                	  	      	state.timestamp = date.getTime();
                         		String[] tab = line.split(",");
                         		state.hostname = tab[0];
 		                        state.serv = tab[1];
diff --git a/contrib/clients/TSCA/python/PythonClient.py b/contrib/clients/TSCA/python/PythonClient.py
index ef24b33..d45e696 100755
--- a/contrib/clients/TSCA/python/PythonClient.py
+++ b/contrib/clients/TSCA/python/PythonClient.py
@@ -61,7 +61,7 @@ try:
     cr = csv.reader(open(sys.argv[1],"rb"))
     for elt in cr :
         trace = State()
-        trace.timestamp = int(round(time.time()))
+        trace.timestamp = long(round(time.time()))
         trace.hostname = elt[0]
         trace.serv = elt[1]
         trace.output = elt[2]
diff --git a/thrift/tsca.thrift b/thrift/tsca.thrift
index 06e5a8c..41a45ed 100644
--- a/thrift/tsca.thrift
+++ b/thrift/tsca.thrift
@@ -23,7 +23,7 @@ enum ReturnCode {
 }
 
 struct State {
-  1: i32 timestamp,
+  1: i64 timestamp,
   2: string hostname,
   3: string serv,
   4: string output,

-- 
UNNAMED PROJECT