diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-27 02:16:11 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-27 02:16:11 -0600 |
commit | b4426c06a4374b8e1025adce41427f0b1b072721 (patch) | |
tree | b4181220745e6623995f9db4120a781a2455304a /servers/admin_user_mgmt_server_lin/src | |
parent | e21781df2ef6bfdb1a650bab5298b0261c8f7d3c (diff) | |
download | ulab-b4426c06a4374b8e1025adce41427f0b1b072721.tar.gz ulab-b4426c06a4374b8e1025adce41427f0b1b072721.zip |
Fix remaining name references to use the uLab system name
Fix incorrect Debian init scripts and a wrong binary name
Diffstat (limited to 'servers/admin_user_mgmt_server_lin/src')
-rw-r--r-- | servers/admin_user_mgmt_server_lin/src/Makefile.am | 8 | ||||
-rw-r--r-- | servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp | 2 | ||||
-rw-r--r-- | servers/admin_user_mgmt_server_lin/src/main.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/servers/admin_user_mgmt_server_lin/src/Makefile.am b/servers/admin_user_mgmt_server_lin/src/Makefile.am index 1e60128..045d16e 100644 --- a/servers/admin_user_mgmt_server_lin/src/Makefile.am +++ b/servers/admin_user_mgmt_server_lin/src/Makefile.am @@ -1,11 +1,11 @@ INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl KDE_CXXFLAGS = $(USE_EXCEPTIONS) -bin_PROGRAMS = remotefpga_adminsysctlserver +bin_PROGRAMS = ulab_adminusermgmtserver -remotefpga_adminsysctlserver_SOURCES = main.cpp admin_user_mgmt.cpp +ulab_adminusermgmtserver_SOURCES = main.cpp admin_user_mgmt.cpp -remotefpga_adminsysctlserver_METASOURCES = AUTO -remotefpga_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla +ulab_adminusermgmtserver_METASOURCES = AUTO +ulab_adminusermgmtserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla KDE_OPTIONS = nofinal diff --git a/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp b/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp index 29914bd..e5c9f9e 100644 --- a/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp +++ b/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp @@ -73,7 +73,7 @@ SysCtlSocket::SysCtlSocket(int sock, TQObject *parent, const char *name) : connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake())); m_servClientTimeout = new TQTimer(); - setServiceName("remotefpga"); + setServiceName("ulab"); line = 0; connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler())); diff --git a/servers/admin_user_mgmt_server_lin/src/main.cpp b/servers/admin_user_mgmt_server_lin/src/main.cpp index f17a433..83a8ead 100644 --- a/servers/admin_user_mgmt_server_lin/src/main.cpp +++ b/servers/admin_user_mgmt_server_lin/src/main.cpp @@ -45,7 +45,7 @@ static const char version[] = "v0.0.1"; int main(int argc, char *argv[]) { - TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("uLab System Administration User Management Server"), + TDEAboutData aboutData( "ulab_admin_sys_ctl_server", I18N_NOOP("uLab System Administration User Management Server"), version, description, TDEAboutData::License_GPL, "(c) 2013, Timothy Pearson"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) TDEStartupInfo::appStarted(); - KSimpleConfig config("remotefpga_adminusermgmtserver.conf", false); + KSimpleConfig config("ulab_adminusermgmtserver.conf", false); config.setGroup("Server"); UserMgmtServer fpgasvr(0, config.readNumEntry("port", 4016), &config); return app.exec(); |