From 7574a7287e2e121c9d5c91a5f4ea38c5b3ae2a04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:28:57 -0600 Subject: Additional kde to tde renaming --- kdesu/kdesud/CMakeLists.txt | 12 ++++++------ kdesu/kdesud/Makefile.am | 22 +++++++++++----------- kdesu/kdesud/handler.cpp | 12 ++++++------ kdesu/kdesud/handler.h | 2 +- kdesu/kdesud/kdesud.cpp | 28 ++++++++++++++-------------- kdesu/kdesud/lexer.cpp | 4 ++-- kdesu/kdesud/lexer.h | 4 ++-- kdesu/kdesud/repo.cpp | 2 +- kdesu/kdesud/repo.h | 2 +- kdesu/kdesud/secure.cpp | 4 ++-- kdesu/kdesud/secure.h | 2 +- 11 files changed, 47 insertions(+), 47 deletions(-) (limited to 'kdesu/kdesud') diff --git a/kdesu/kdesud/CMakeLists.txt b/kdesu/kdesud/CMakeLists.txt index 5e7fe6cbb..2696a8197 100644 --- a/kdesu/kdesud/CMakeLists.txt +++ b/kdesu/kdesud/CMakeLists.txt @@ -23,13 +23,13 @@ link_directories( ) -##### kdesud (executable) ####################### +##### tdesud (executable) ####################### -tde_add_executable( kdesud - SOURCES kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp - LINK kdesu-shared +tde_add_executable( tdesud + SOURCES tdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp + LINK tdesu-shared DESTINATION ${BIN_INSTALL_DIR} ) -install( CODE "execute_process( COMMAND chown root:${nogroup} \$ENV{DESTDIR}${_destination}/kdesud )" ) -install( CODE "execute_process( COMMAND chmod 2755 \$ENV{DESTDIR}${_destination}/kdesud )" ) +install( CODE "execute_process( COMMAND chown root:${nogroup} \$ENV{DESTDIR}${_destination}/tdesud )" ) +install( CODE "execute_process( COMMAND chmod 2755 \$ENV{DESTDIR}${_destination}/tdesud )" ) diff --git a/kdesu/kdesud/Makefile.am b/kdesu/kdesud/Makefile.am index 07e11dd15..140cbce06 100644 --- a/kdesu/kdesud/Makefile.am +++ b/kdesu/kdesud/Makefile.am @@ -1,31 +1,31 @@ -## Makefile.am for kdesud +## Makefile.am for tdesud INCLUDES = $(all_includes) KDE_CXXFLAGS = $(KDE_USE_FPIE) -bin_PROGRAMS = kdesud -kdesud_SOURCES = kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp -kdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) -kdesud_LDADD = $(LIB_KDECORE) -lkdesu $(LIBSOCKET) +bin_PROGRAMS = tdesud +tdesud_SOURCES = tdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp +tdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) +tdesud_LDADD = $(LIB_KDECORE) -ltdesu $(LIBSOCKET) noinst_HEADERS = repo.h handler.h lexer.h secure.h -## kdesud needs to be suid or sgid something +## tdesud needs to be suid or sgid something install-data-local: @echo "********************************************************" @echo "" - @echo "For security reasons, kdesud is installed setgid nogroup." + @echo "For security reasons, tdesud is installed setgid nogroup." @echo "Kdesud is the daemon that implements the password caching." @echo "" - @echo "You should NOT use the password caching feature if kdesud is" + @echo "You should NOT use the password caching feature if tdesud is" @echo "not installed setgid nogroup." @echo "" @echo "********************************************************" install-exec-hook: - @(chown root:@nogroup@ $(DESTDIR)$(bindir)/kdesud && chmod 2755 $(DESTDIR)$(bindir)/kdesud) \ - || echo "Error: Could not install kdesud as setgid nogroup!!\n" \ + @(chown root:@nogroup@ $(DESTDIR)$(bindir)/tdesud && chmod 2755 $(DESTDIR)$(bindir)/tdesud) \ + || echo "Error: Could not install tdesud as setgid nogroup!!\n" \ "The password caching feature is disabled." messages: - $(XGETTEXT) $(kdesud_SOURCES) -o $(podir)/kdesud.pot + $(XGETTEXT) $(tdesud_SOURCES) -o $(podir)/tdesud.pot diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp index 1d52a58ac..2a744b217 100644 --- a/kdesu/kdesud/handler.cpp +++ b/kdesu/kdesud/handler.cpp @@ -1,8 +1,8 @@ /* - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * - * handler.cpp: A connection handler for kdesud. + * handler.cpp: A connection handler for tdesud. */ @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include "handler.h" #include "repo.h" @@ -32,7 +32,7 @@ // Global repository extern Repository *repo; -void kdesud_cleanup(); +void tdesud_cleanup(); ConnectionHandler::ConnectionHandler(int fd) : SocketSecurity(fd), m_exitCode(0), m_hasExitCode(false), m_needExitCode(false), m_pid(0) @@ -490,7 +490,7 @@ int ConnectionHandler::doCommand(TQCString buf) goto parse_error; kdDebug(1205) << "Stopping by command" << endl; respond(Res_OK); - kdesud_cleanup(); + tdesud_cleanup(); exit(0); default: diff --git a/kdesu/kdesud/handler.h b/kdesu/kdesud/handler.h index 785d1179f..8728efe78 100644 --- a/kdesu/kdesud/handler.h +++ b/kdesu/kdesud/handler.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ diff --git a/kdesu/kdesud/kdesud.cpp b/kdesu/kdesud/kdesud.cpp index f4b4081e9..d369aaf9b 100644 --- a/kdesu/kdesud/kdesud.cpp +++ b/kdesu/kdesud/kdesud.cpp @@ -1,12 +1,12 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * * - * kdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su. + * tdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su. * - * The socket $KDEHOME/socket-$(HOSTNAME)/kdesud_$(display) is used for communication with + * The socket $KDEHOME/socket-$(HOSTNAME)/tdesud_$(display) is used for communication with * client programs. * * The protocol: Client initiates the connection. All commands and responses @@ -67,8 +67,8 @@ #include #include #include -#include -#include +#include +#include #include #include "repo.h" @@ -93,7 +93,7 @@ Display *x11Display; int pipeOfDeath[2]; -void kdesud_cleanup() +void tdesud_cleanup() { unlink(sock); } @@ -106,7 +106,7 @@ extern "C" int xio_errhandler(Display *); int xio_errhandler(Display *) { kdError(1205) << "Fatal IO error, exiting...\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); return 1; //silence compilers } @@ -138,7 +138,7 @@ extern "C" { void signal_exit(int sig) { kdDebug(1205) << "Exiting on signal " << sig << "\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); } @@ -168,7 +168,7 @@ int create_socket() // strip the screen number from the display display.replace(TQRegExp("\\.[0-9]+$"), ""); - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(static_cast(display)))); + sock = TQFile::encodeName(locateLocal("socket", TQString("tdesud_%1").arg(static_cast(display)))); int stat_err=lstat(sock, &s); if(!stat_err && S_ISLNK(s.st_mode)) { kdWarning(1205) << "Someone is running a symlink attack on you\n"; @@ -191,7 +191,7 @@ int create_socket() } } else { - kdWarning(1205) << "kdesud is already running\n"; + kdWarning(1205) << "tdesud is already running\n"; return -1; } @@ -251,8 +251,8 @@ int main(int argc, char *argv[]) { prctl(PR_SET_DUMPABLE, 0); - KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"), - Version, I18N_NOOP("Daemon used by kdesu"), + KAboutData aboutData("tdesud", I18N_NOOP("KDE su daemon"), + Version, I18N_NOOP("Daemon used by tdesu"), KAboutData::License_Artistic, "Copyright (c) 1999,2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Author"), @@ -276,7 +276,7 @@ int main(int argc, char *argv[]) if (listen(sockfd, 1) < 0) { kdError(1205) << "listen(): " << ERR << "\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); } int maxfd = sockfd; @@ -286,7 +286,7 @@ int main(int argc, char *argv[]) if (pid == -1) { kdError(1205) << "fork():" << ERR << "\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); } if (pid) diff --git a/kdesu/kdesud/lexer.cpp b/kdesu/kdesud/lexer.cpp index d9fbf4639..f1932f07d 100644 --- a/kdesu/kdesud/lexer.cpp +++ b/kdesu/kdesud/lexer.cpp @@ -1,9 +1,9 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * - * lexer.cpp: A lexer for the kdesud protocol. See kdesud.cpp for a + * lexer.cpp: A lexer for the tdesud protocol. See tdesud.cpp for a * description of the protocol. */ diff --git a/kdesu/kdesud/lexer.h b/kdesu/kdesud/lexer.h index 1ca55b907..d8f529cd8 100644 --- a/kdesu/kdesud/lexer.h +++ b/kdesu/kdesud/lexer.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ @@ -10,7 +10,7 @@ class TQCString; /** - * This is a lexer for the kdesud protocol. + * This is a lexer for the tdesud protocol. */ class Lexer { diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp index cc0f79ae5..e923d6411 100644 --- a/kdesu/kdesud/repo.cpp +++ b/kdesu/kdesud/repo.cpp @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ diff --git a/kdesu/kdesud/repo.h b/kdesu/kdesud/repo.h index 24c156a34..70027793f 100644 --- a/kdesu/kdesud/repo.h +++ b/kdesu/kdesud/repo.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ diff --git a/kdesu/kdesud/secure.cpp b/kdesu/kdesud/secure.cpp index 3abda20bc..9b30ab4ee 100644 --- a/kdesu/kdesud/secure.cpp +++ b/kdesu/kdesud/secure.cpp @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * * secure.cpp: Peer credentials for a UNIX socket. @@ -67,7 +67,7 @@ SocketSecurity::SocketSecurity(int sockfd) if (!warned_him) { kdWarning() << "Using void socket security. Please add support for your" << endl; - kdWarning() << "platform to kdesu/kdesud/secure.cpp" << endl; + kdWarning() << "platform to tdesu/tdesud/secure.cpp" << endl; warned_him = TRUE; } diff --git a/kdesu/kdesud/secure.h b/kdesu/kdesud/secure.h index 8e122fac3..edf58d9c6 100644 --- a/kdesu/kdesud/secure.h +++ b/kdesu/kdesud/secure.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ -- cgit v1.2.3