Branch: master

1edd64c6 2016-10-01 13:46:29 Timothy Pearson
Fix FTBFS
M lib/libtqtrla/src/Makefile.am
M servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
M servers/auth_server_lin/src/auth_conn.cpp
diff --git a/lib/libtqtrla/src/Makefile.am b/lib/libtqtrla/src/Makefile.am
index 55d705c..5395ee2 100644
--- a/lib/libtqtrla/src/Makefile.am
+++ b/lib/libtqtrla/src/Makefile.am
@@ -8,4 +8,4 @@
 
 libtqtrla_la_SOURCES = tqtrla.cpp
 libtqtrla_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI)
-libtqtrla_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) $(LIB_TDEPARTS) -ltdekrbsocket
+libtqtrla_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) $(LIB_TDEPARTS) -ltdeldap -ltdekrbsocket
diff --git a/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp b/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
index 2746467..a2cd088 100644
--- a/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
+++ b/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
@@ -299,7 +299,7 @@
 							if (databaseActivityCursor.next()) {
 								TQSqlRecord *buffer = databaseActivityCursor.primeUpdate();
 								if (terminationOffset > -2) {
-									buffer->setValue("terminate", terminationTime.toTime_t());
+									buffer->setValue("terminate", (TQ_ULLONG)terminationTime.toTime_t());
 								}
 								else {
 									buffer->setValue("terminate", 0);
diff --git a/servers/auth_server_lin/src/auth_conn.cpp b/servers/auth_server_lin/src/auth_conn.cpp
index ce1e752..c5f8fa7 100644
--- a/servers/auth_server_lin/src/auth_conn.cpp
+++ b/servers/auth_server_lin/src/auth_conn.cpp
@@ -383,7 +383,7 @@
 	}
 	TQString userID = m_authenticatedUserName + "@" + m_authenticatedRealmName;
 	TQSqlRecord *buffer = m_databaseStatisticsCursor->primeInsert();
-	buffer->setValue("timestamp", TQDateTime::currentDateTime().toTime_t());
+	buffer->setValue("timestamp", (TQ_ULLONG)TQDateTime::currentDateTime().toTime_t());
 	buffer->setValue("eventtypeid", eventType);
 	buffer->setValue("arbiter", m_localMachineFQDN);
 	buffer->setValue("stationid", m_stationID);
@@ -567,7 +567,7 @@
 								buffer->setValue("arbiter", m_localMachineFQDN);
 								buffer->setValue("username", m_authenticatedUserName);
 								buffer->setValue("realmname", m_authenticatedRealmName);
-								buffer->setValue("logontime", TQDateTime::currentDateTime().toTime_t());
+								buffer->setValue("logontime", (TQ_ULLONG)TQDateTime::currentDateTime().toTime_t());
 								buffer->setValue("serviceid", m_serviceID);
 								buffer->setValue("terminate", 0);
 								m_databaseActivityCursor->insert();
@@ -658,7 +658,7 @@
 											buffer->setValue("arbiter", m_localMachineFQDN);
 											buffer->setValue("username", m_authenticatedUserName);
 											buffer->setValue("realmname", m_authenticatedRealmName);
-											buffer->setValue("logontime", TQDateTime::currentDateTime().toTime_t());
+											buffer->setValue("logontime", (TQ_ULLONG)TQDateTime::currentDateTime().toTime_t());
 											buffer->setValue("serviceid", m_serviceID);
 											buffer->setValue("terminate", 0);
 											m_databaseActivityCursor->insert();
@@ -804,7 +804,7 @@
 	// Update statistics
 	TQSqlCursor databaseStatisticsCursor("statistics", TRUE, m_database);
 	TQSqlRecord *buffer = databaseStatisticsCursor.primeInsert();
-	buffer->setValue("timestamp", TQDateTime::currentDateTime().toTime_t());
+	buffer->setValue("timestamp", (TQ_ULLONG)TQDateTime::currentDateTime().toTime_t());
 	buffer->setValue("eventtypeid", STATISTICS_SERVER_START_EVENT);
 	databaseStatisticsCursor.insert();
 
@@ -826,7 +826,7 @@
 	// Update statistics
 	TQSqlCursor databaseStatisticsCursor("statistics", TRUE, m_database);
 	TQSqlRecord *buffer = databaseStatisticsCursor.primeInsert();
-	buffer->setValue("timestamp", TQDateTime::currentDateTime().toTime_t());
+	buffer->setValue("timestamp", (TQ_ULLONG)TQDateTime::currentDateTime().toTime_t());
 	buffer->setValue("eventtypeid", STATISTICS_SERVER_STOP_EVENT);
 	databaseStatisticsCursor.insert();