summaryrefslogtreecommitdiffstats
path: root/tdm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /tdm
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdm')
-rw-r--r--tdm/TODO2
-rw-r--r--tdm/backend/client.c22
-rw-r--r--tdm/kfrontend/CMakeLists.txt2
-rw-r--r--tdm/kfrontend/sakdlg.cc2
-rw-r--r--tdm/kfrontend/tdmclock.cpp2
-rw-r--r--tdm/kfrontend/tdmconfig.cpp2
-rw-r--r--tdm/kfrontend/tdmshutdown.cpp2
7 files changed, 17 insertions, 17 deletions
diff --git a/tdm/TODO b/tdm/TODO
index 75518b779..a36dd8edf 100644
--- a/tdm/TODO
+++ b/tdm/TODO
@@ -46,7 +46,7 @@ save these options to .dmrc?
- make config position independent
- parse /etc/kderc?
-- merge multiple tdmrcs in the style of kconfig. how to set section priorities?
+- merge multiple tdmrcs in the style of tdeconfig. how to set section priorities?
- gentdmconf: treat backgroundrc as an ini file, not as a text blob
- add proper quoting and dequoting to gentdmconf ini parser & writer
diff --git a/tdm/backend/client.c b/tdm/backend/client.c
index 0cf4e216b..313812f3f 100644
--- a/tdm/backend/client.c
+++ b/tdm/backend/client.c
@@ -133,7 +133,7 @@ static char tty[16], hostname[100];
static struct spwd *sp;
# endif
# ifdef KERBEROS
-static char krbtkfile[MAXPATHLEN];
+static char krbttdefile[MAXPATHLEN];
# endif
#endif
@@ -719,24 +719,24 @@ Verify( GConvFunc gconv, int rootok )
V_RET_FAIL( 0 );
}
- sprintf( krbtkfile, "%s.%.*s", TKT_ROOT, MAXPATHLEN - strlen( TKT_ROOT ) - 2, td->name );
- krb_set_tkt_string( krbtkfile );
- unlink( krbtkfile );
+ sprintf( krbttdefile, "%s.%.*s", TKT_ROOT, MAXPATHLEN - strlen( TKT_ROOT ) - 2, td->name );
+ krb_set_tkt_string( krbttdefile );
+ unlink( krbttdefile );
ret = krb_verify_user( curuser, "", realm, curpass, 1, "rcmd" );
if (ret == KSUCCESS) {
- chown( krbtkfile, p->pw_uid, p->pw_gid );
+ chown( krbttdefile, p->pw_uid, p->pw_gid );
Debug( "KerberosIV verify succeeded\n" );
goto done;
} else if (ret != KDC_PR_UNKNOWN && ret != SKDC_CANT) {
LogError( "KerberosIV verification failure %\"s for %s\n",
krb_get_err_text( ret ), curuser );
- krbtkfile[0] = '\0';
+ krbttdefile[0] = '\0';
V_RET_FAIL( 0 );
}
Debug( "KerberosIV verify failed: %s\n", krb_get_err_text( ret ) );
}
- krbtkfile[0] = '\0';
+ krbttdefile[0] = '\0';
# endif /* KERBEROS */
# if defined(ultrix) || defined(__ultrix__)
@@ -1259,7 +1259,7 @@ StartClient()
}
# else /* _AIX */
# if defined(KERBEROS) && !defined(NO_AFS)
- if (krbtkfile[0] != '\0') {
+ if (krbttdefile[0] != '\0') {
if (k_hasafs()) {
if (k_setpag() == -1)
LogError( "setpag() for %s failed\n", curuser );
@@ -1307,8 +1307,8 @@ StartClient()
if (cursource == PWSRC_AUTOLOGIN)
env = setEnv (env, "TDM_AUTOLOGIN", curuser);
#if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS)
- if (krbtkfile[0] != '\0')
- env = setEnv( env, "KRBTKFILE", krbtkfile );
+ if (krbttdefile[0] != '\0')
+ env = setEnv( env, "KRBTKFILE", krbttdefile );
#endif
#ifdef WITH_CONSOLE_KIT
if (ck_session_cookie != NULL) {
@@ -1752,7 +1752,7 @@ SessionExit( int status )
#endif /* K5AUTH */
#if !defined(USE_PAM) && !defined(_AIX)
# ifdef KERBEROS
- if (krbtkfile[0]) {
+ if (krbttdefile[0]) {
(void)dest_tkt();
# ifndef NO_AFS
if (k_hasafs())
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index bf2449fd6..092e68b78 100644
--- a/tdm/kfrontend/CMakeLists.txt
+++ b/tdm/kfrontend/CMakeLists.txt
@@ -76,7 +76,7 @@ tde_add_executable( tdm_greet AUTOMOC
tde_add_executable( krootimage AUTOMOC
SOURCES krootimage.cpp
- LINK bgnd-static kio-shared
+ LINK bgnd-static tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index dfa65a945..8ba04697e 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -16,7 +16,7 @@
#include <kseparator.h>
#include <kstandarddirs.h>
#include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kiconloader.h>
#include <tdesu/defaults.h>
#include <kpassdlg.h>
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index 14d8deeaf..3bafc2aaa 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "tdmclock.h"
//#include <kapplication.h>
-//#include <kconfig.h>
+//#include <tdeconfig.h>
#include <tqdatetime.h>
#include <tqpixmap.h>
diff --git a/tdm/kfrontend/tdmconfig.cpp b/tdm/kfrontend/tdmconfig.cpp
index 5b57a6375..c50b94f85 100644
--- a/tdm/kfrontend/tdmconfig.cpp
+++ b/tdm/kfrontend/tdmconfig.cpp
@@ -64,7 +64,7 @@ GetCfgQStrList( int id )
return qsl;
}
-// Based on kconfigbase.cpp
+// Based on tdeconfigbase.cpp
static TQFont
Str2Font( const TQString &aValue )
{
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index db598aed2..8b1f61a3c 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kdialog.h>
#include <kstandarddirs.h>
#include <kuser.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kiconloader.h>
#include <tqcombobox.h>