summaryrefslogtreecommitdiffstats
path: root/servers
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-22 15:02:32 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-22 15:02:32 -0500
commitb48b26b86975d2166a4da7fc41086facefb3c4f2 (patch)
tree149c0a635434e9c46febf272cae6fde90a4a65ef /servers
parentb1ee542e95f9358985970d141701d766ac30cea2 (diff)
downloadulab-b48b26b86975d2166a4da7fc41086facefb3c4f2.tar.gz
ulab-b48b26b86975d2166a4da7fc41086facefb3c4f2.zip
Fix problems with Kerberos sockets
Diffstat (limited to 'servers')
-rw-r--r--servers/auth_server_lin/src/Makefile.am2
-rw-r--r--servers/auth_server_lin/src/auth_conn.cpp7
-rw-r--r--servers/auth_server_lin/src/auth_conn.h5
3 files changed, 13 insertions, 1 deletions
diff --git a/servers/auth_server_lin/src/Makefile.am b/servers/auth_server_lin/src/Makefile.am
index e7250a4..c9c9fde 100644
--- a/servers/auth_server_lin/src/Makefile.am
+++ b/servers/auth_server_lin/src/Makefile.am
@@ -5,6 +5,6 @@ bin_PROGRAMS = remotefpga_authserver
remotefpga_authserver_SOURCES = main.cpp auth_conn.cpp
remotefpga_authserver_METASOURCES = AUTO
-remotefpga_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket
+remotefpga_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal
diff --git a/servers/auth_server_lin/src/auth_conn.cpp b/servers/auth_server_lin/src/auth_conn.cpp
index 41a09f9..013b9bd 100644
--- a/servers/auth_server_lin/src/auth_conn.cpp
+++ b/servers/auth_server_lin/src/auth_conn.cpp
@@ -57,6 +57,13 @@ int AuthSocket::initiateKerberosHandshake() {
bool user_authorized = false;
if (setUsingKerberos(true) == 0) {
+ TQ_UINT32 magicnum = MAGIC_NUMBER;
+ TQ_UINT32 protover = PROTOCOL_VERSION;
+
+ TQDataStream ds(this);
+ ds << magicnum;
+ ds << protover;
+
// RAJA FIXME
if (user_authorized == 1) {
// Send list of available servers...
diff --git a/servers/auth_server_lin/src/auth_conn.h b/servers/auth_server_lin/src/auth_conn.h
index 7c9d000..e9432f5 100644
--- a/servers/auth_server_lin/src/auth_conn.h
+++ b/servers/auth_server_lin/src/auth_conn.h
@@ -31,6 +31,11 @@
#include <tdekrbserversocket.h>
+#include <tqtrla.h>
+
+#define MAGIC_NUMBER 1
+#define PROTOCOL_VERSION 1
+
class AuthSocket : public TDEKerberosServerSocket
{
Q_OBJECT