Fix a number of problems and add skeleton FPGA prog server

1 files changed, 10 insertions, 2 deletions

diff --git a/servers/auth_server_lin/src/auth_conn.cpp b/servers/auth_server_lin/src/auth_conn.cpp
index db73811..51dcef0 100644
--- a/servers/auth_server_lin/src/auth_conn.cpp
+++ b/servers/auth_server_lin/src/auth_conn.cpp
@@ -111,7 +111,6 @@ void AuthSocket::connectionClosedHandler() {
 }
 
 int AuthSocket::initiateKerberosHandshake() {
-	// RAJA FIXME
 	setUsingKerberos(true);
 	while (kerberosStatus() == TDEKerberosServerSocket::KerberosInitializing) {
 		tqApp->processEvents();
@@ -154,6 +153,7 @@ int AuthSocket::servLoop() {
 						m_servActive = false;
 						delete m_servClientTimeout;
 						m_servClientTimeout = NULL;
+						close();
 					}
 				}
 				else {
@@ -178,6 +178,7 @@ int AuthSocket::servLoop() {
 					m_servActive = false;
 					delete m_servClientTimeout;
 					m_servClientTimeout = NULL;
+					close();
 				}
 				break;
 			case 2:
@@ -195,6 +196,7 @@ int AuthSocket::servLoop() {
 					m_servActive = false;
 					delete m_servClientTimeout;
 					m_servClientTimeout = NULL;
+					close();
 				}
 				break;
 			case 3:
@@ -220,6 +222,7 @@ int AuthSocket::servLoop() {
 							m_servActive = false;
 							delete m_servClientTimeout;
 							m_servClientTimeout = NULL;
+							close();
 						}
 					}
 					else {
@@ -231,6 +234,7 @@ int AuthSocket::servLoop() {
 							m_servActive = false;
 							delete m_servClientTimeout;
 							m_servClientTimeout = NULL;
+							close();
 						}
 					}
 				}
@@ -241,6 +245,7 @@ int AuthSocket::servLoop() {
 					m_servActive = false;
 					delete m_servClientTimeout;
 					m_servClientTimeout = NULL;
+					close();
 				}
 				break;
 			case 4:
@@ -264,6 +269,7 @@ int AuthSocket::servLoop() {
 					ds << TQString("ERRNOTAVL");
 					printf("[DEBUG] Connection terminated by remote host %s:%d for user %s@%s\n\r", m_srvServiceHostName.ascii(), m_srvServicePort, m_authenticatedUserName.ascii(), m_authenticatedRealmName.ascii()); fflush(stdout);
 					m_servActive = false;
+					close();
 				}
 				break;
 		}
@@ -339,6 +345,7 @@ void AuthSocket::commandLoop() {
 									m_databaseServiceTypesCursor->select(TQString("serviceid=%1").arg(m_databaseServicesCursor->value("servicetype").toInt()));
 									ServiceType svt;
 									if (m_databaseServiceTypesCursor->next()) {
+										svt.type = m_databaseServiceTypesCursor->value("serviceid").toInt();
 										svt.name = m_databaseServiceTypesCursor->value("name").toString();
 										svt.description = m_databaseServiceTypesCursor->value("description").toString();
 										svt.clientLibrary = m_databaseServiceTypesCursor->value("client_library").toString();
@@ -409,6 +416,7 @@ void AuthSocket::commandLoop() {
 						// Get client library name from the client
 						TQString libname;
 						ds >> libname;
+						printf("[DEBUG] SERV command parameter was %s from user %s@%s\n\r", libname.ascii(), m_authenticatedUserName.ascii(), m_authenticatedRealmName.ascii()); fflush(stdout);
 	
 						m_databaseActivityCursor->select(TQString("username='%1' AND realmname='%2'").arg(m_authenticatedUserName).arg(m_authenticatedRealmName));
 						if (m_databaseActivityCursor->next()) {
@@ -434,7 +442,7 @@ void AuthSocket::commandLoop() {
 								}
 								else {
 									// Attempt to connect to the backend server
-									m_databaseServicesCursor->select(TQString("pk=%1 AND station=%2").arg(sid).arg(m_stationID));
+									m_databaseServicesCursor->select(TQString("servicetype=%1 AND station=%2").arg(sid).arg(m_stationID));
 									if (m_databaseServicesCursor->next()) {
 										m_srvServiceHostName = m_databaseServicesCursor->value("hostname").toString();
 										m_srvServicePort = m_databaseServicesCursor->value("port").toInt();