diff options
Diffstat (limited to 'kdesu')
-rw-r--r-- | kdesu/CMakeLists.txt | 22 | ||||
-rw-r--r-- | kdesu/Mainpage.dox | 4 | ||||
-rw-r--r-- | kdesu/Makefile.am | 26 | ||||
-rw-r--r-- | kdesu/README | 6 | ||||
-rw-r--r-- | kdesu/client.cpp | 18 | ||||
-rw-r--r-- | kdesu/client.h | 12 | ||||
-rw-r--r-- | kdesu/configure.in.in | 18 | ||||
-rw-r--r-- | kdesu/defaults.h | 2 | ||||
-rw-r--r-- | kdesu/kcookie.cpp | 2 | ||||
-rw-r--r-- | kdesu/kcookie.h | 2 | ||||
-rw-r--r-- | kdesu/kdesu_pty.cpp | 4 | ||||
-rw-r--r-- | kdesu/kdesu_pty.h | 2 | ||||
-rw-r--r-- | kdesu/kdesu_stub.c | 48 | ||||
-rw-r--r-- | kdesu/libkdesu.nmcheck | 2 | ||||
-rw-r--r-- | kdesu/process.cpp | 4 | ||||
-rw-r--r-- | kdesu/process.h | 4 | ||||
-rw-r--r-- | kdesu/ssh.cpp | 10 | ||||
-rw-r--r-- | kdesu/ssh.h | 2 | ||||
-rw-r--r-- | kdesu/stub.cpp | 10 | ||||
-rw-r--r-- | kdesu/stub.h | 10 | ||||
-rw-r--r-- | kdesu/su.cpp | 12 | ||||
-rw-r--r-- | kdesu/su.h | 2 |
22 files changed, 111 insertions, 111 deletions
diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt index 02a871cd9..97ede6b97 100644 --- a/kdesu/CMakeLists.txt +++ b/kdesu/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -25,33 +25,33 @@ link_directories( ##### headers ################################### install( FILES - defaults.h client.h process.h kdesu_pty.h + defaults.h client.h process.h tdesu_pty.h kcookie.h su.h ssh.h stub.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdesu ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdesu ) ##### libtdesu ################################## -set( target kdesu ) +set( target tdesu ) set( ${target}_SRCS client.cpp process.cpp kcookie.cpp - su.cpp ssh.cpp stub.cpp kdesu_pty.cpp + su.cpp ssh.cpp stub.cpp tdesu_pty.cpp ) tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kdecore-shared ${LIB_UTIL} + LINK tdecore-shared ${LIB_UTIL} DESTINATION ${LIB_INSTALL_DIR} ) -tde_install_symlink( kdesu_pty.h ${INCLUDE_INSTALL_DIR}/kdesu/pty.h ) +tde_install_symlink( tdesu_pty.h ${INCLUDE_INSTALL_DIR}/tdesu/pty.h ) -##### kdesu_stub ################################ +##### tdesu_stub ################################ -tde_add_executable( kdesu_stub - SOURCES kdesu_stub.c +tde_add_executable( tdesu_stub + SOURCES tdesu_stub.c DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesu/Mainpage.dox b/kdesu/Mainpage.dox index a887e2255..c39881397 100644 --- a/kdesu/Mainpage.dox +++ b/kdesu/Mainpage.dox @@ -1,7 +1,7 @@ /** @mainpage Console-mode authentication libtdesu provides functionality for building GUI front ends for -(password asking) console mode programs. For example, kdesu and +(password asking) console mode programs. For example, tdesu and kdessh use it to interface with su and ssh respectively. @authors @@ -16,6 +16,6 @@ Adriaan de Groot \<groot@kde.org\> */ -// DOXYGEN_REFERENCES = kdecore +// DOXYGEN_REFERENCES = tdecore // DOXYGEN_SET_PROJECT_NAME = Trinitysu // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kdesu/Makefile.am b/kdesu/Makefile.am index 31a553ec8..847a21ee1 100644 --- a/kdesu/Makefile.am +++ b/kdesu/Makefile.am @@ -3,28 +3,28 @@ INCLUDES = -I$(top_srcdir)/kio/ $(all_includes) lib_LTLIBRARIES = libtdesu.la -libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp kdesu_pty.cpp +libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp tdesu_pty.cpp libtdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) libtdesu_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la libtdesu_la_NMCHECK = $(srcdir)/libtdesu.nmcheck -libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/kdecore/libtdecore_weak.nmcheck \ - $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck +libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \ + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck -kdesudir = $(includedir)/kdesu -kdesu_HEADERS = defaults.h client.h process.h kdesu_pty.h kcookie.h su.h ssh.h stub.h +tdesudir = $(includedir)/tdesu +tdesu_HEADERS = defaults.h client.h process.h tdesu_pty.h kcookie.h su.h ssh.h stub.h install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(kdesudir) - -rm -f $(DESTDIR)$(kdesudir)/pty.h - ln -s kdesu_pty.h $(DESTDIR)$(kdesudir)/pty.h + $(mkinstalldirs) $(DESTDIR)$(tdesudir) + -rm -f $(DESTDIR)$(tdesudir)/pty.h + ln -s tdesu_pty.h $(DESTDIR)$(tdesudir)/pty.h uninstall-local: - -rm -f $(DESTDIR)$(kdesudir)/pty.h + -rm -f $(DESTDIR)$(tdesudir)/pty.h -bin_PROGRAMS = kdesu_stub -kdesu_stub_SOURCES = kdesu_stub.c -kdesu_stub_LDFLAGS = $(all_libraries) -kdesu_stub_LDADD = +bin_PROGRAMS = tdesu_stub +tdesu_stub_SOURCES = tdesu_stub.c +tdesu_stub_LDFLAGS = $(all_libraries) +tdesu_stub_LDADD = include $(top_srcdir)/admin/Doxyfile.am diff --git a/kdesu/README b/kdesu/README index 2ed2228bd..c81f5c23b 100644 --- a/kdesu/README +++ b/kdesu/README @@ -1,11 +1,11 @@ Maintainer: Adriaan de Groot <groot@kde.org> -Maintainer: kdesu was maintained by Alan Eldridge until his +Maintainer: tdesu was maintained by Alan Eldridge until his death in 2003. README for libtdesu. -Libkdesu provides functionality for building GUI front ends for -(password asking) console mode programs. For example, kdesu and +Libtdesu provides functionality for building GUI front ends for +(password asking) console mode programs. For example, tdesu and kdessh use it to interface with su and ssh respectively. libtdesu is Copyright (c) 1999,2000 Geert Jansen <jansen@kde.org> diff --git a/kdesu/client.cpp b/kdesu/client.cpp index 030053da0..18accc313 100644 --- a/kdesu/client.cpp +++ b/kdesu/client.cpp @@ -2,14 +2,14 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library * General Public License, version 2. See the file "COPYING.LIB" for the * exact licensing terms. * - * client.cpp: A client for kdesud. + * client.cpp: A client for tdesud. */ #include <config.h> @@ -64,7 +64,7 @@ KDEsuClient::KDEsuClient() TQCString display("QWS"); #endif - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display.data()))); + sock = TQFile::encodeName(locateLocal("socket", TQString("tdesud_%1").arg(display.data()))); d = new KDEsuClientPrivate; connect(); } @@ -387,9 +387,9 @@ int KDEsuClient::stopServer() static TQString findDaemon() { - TQString daemon = locate("bin", "kdesud"); + TQString daemon = locate("bin", "tdesud"); if (daemon.isEmpty()) // if not in KDEDIRS, rely on PATH - daemon = KStandardDirs::findExe("kdesud"); + daemon = KStandardDirs::findExe("tdesud"); if (daemon.isEmpty()) { @@ -422,14 +422,14 @@ int KDEsuClient::startServer() return -1; if (!isServerSGID()) { - kdWarning(900) << k_lineinfo << "kdesud not setgid!\n"; + kdWarning(900) << k_lineinfo << "tdesud not setgid!\n"; } - // kdesud only forks to the background after it is accepting + // tdesud only forks to the background after it is accepting // connections. - // We start it via kdeinit to make sure that it doesn't inherit + // We start it via tdeinit to make sure that it doesn't inherit // any fd's from the parent process. - int ret = kapp->kdeinitExecWait(d->daemon); + int ret = kapp->tdeinitExecWait(d->daemon); connect(); return ret; } diff --git a/kdesu/client.h b/kdesu/client.h index c1df06ff1..420d5dadd 100644 --- a/kdesu/client.h +++ b/kdesu/client.h @@ -2,14 +2,14 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library * General Public License, version 2. See the file "COPYING.LIB" for the * exact licensing terms. * - * client.h: client to access kdesud. + * client.h: client to access tdesud. */ #ifndef __KDE_su_Client_h_Included__ @@ -30,7 +30,7 @@ typedef TQValueList<TQCString> QCStringList; /** - * A client class to access kdesud, the KDE su daemon. Kdesud can assist in + * A client class to access tdesud, the KDE su daemon. Kdesud can assist in * password caching in two ways: * * @li For high security passwords, like for su and ssh, it executes the @@ -53,7 +53,7 @@ public: ~KDEsuClient(); /** - * Lets kdesud execute a command. If the daemon does not have a password + * Lets tdesud execute a command. If the daemon does not have a password * for this command, this will fail and you need to call setPass(). * * @param command The command to execute. @@ -169,7 +169,7 @@ public: int delGroup(const TQCString &group); /** - * Ping kdesud. This can be used for diagnostics. + * Ping tdesud. This can be used for diagnostics. * @return Zero on success, -1 on failure */ int ping(); @@ -180,7 +180,7 @@ public: int stopServer(); /** - * Try to start up kdesud + * Try to start up tdesud */ int startServer(); diff --git a/kdesu/configure.in.in b/kdesu/configure.in.in index 4b4c6b78f..5f398b720 100644 --- a/kdesu/configure.in.in +++ b/kdesu/configure.in.in @@ -14,24 +14,24 @@ else AC_DEFINE_UNQUOTED(__PATH_SUDO, "$path_sudo", [path to sudo]) fi -AC_ARG_WITH(sudo-kdesu-backend, - AC_HELP_STRING([--with-sudo-kdesu-backend], - [use sudo as backend for kdesu (default is su)]), +AC_ARG_WITH(sudo-tdesu-backend, + AC_HELP_STRING([--with-sudo-tdesu-backend], + [use sudo as backend for tdesu (default is su)]), [ if test x$withval = xyes; then - use_kdesu_backend="sudo" + use_tdesu_backend="sudo" else - use_kdesu_backend="su" + use_tdesu_backend="su" fi ], - use_kdesu_backend="su" + use_tdesu_backend="su" ) -if test x$use_kdesu_backend = xsudo -a x$path_sudo = xno; then - AC_MSG_ERROR(sudo was chosen as kdesu backend, but was not found in path.) +if test x$use_tdesu_backend = xsudo -a x$path_sudo = xno; then + AC_MSG_ERROR(sudo was chosen as tdesu backend, but was not found in path.) fi -AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_kdesu_backend", [Use su or sudo]) +AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_tdesu_backend", [Use su or sudo]) dnl Check for POSIX.1b scheduling AC_MSG_CHECKING([POSIX.1b scheduling]) diff --git a/kdesu/defaults.h b/kdesu/defaults.h index 668cdd02f..4649b2b16 100644 --- a/kdesu/defaults.h +++ b/kdesu/defaults.h @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kcookie.cpp b/kdesu/kcookie.cpp index f60ec7314..99b34ec4e 100644 --- a/kdesu/kcookie.cpp +++ b/kdesu/kcookie.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kcookie.h b/kdesu/kcookie.h index 4bd9fbf1e..713922011 100644 --- a/kdesu/kcookie.h +++ b/kdesu/kcookie.h @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kdesu_pty.cpp b/kdesu/kdesu_pty.cpp index 8f48f0b88..d3392ec5e 100644 --- a/kdesu/kdesu_pty.cpp +++ b/kdesu/kdesu_pty.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This file contains code from TEShell.C of the KDE konsole. @@ -42,7 +42,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include "kdesu_pty.h" +#include "tdesu_pty.h" // stdlib.h is meant to declare the prototypes but doesn't :( #ifndef __THROW diff --git a/kdesu/kdesu_pty.h b/kdesu/kdesu_pty.h index 1a6a12c35..1dab49dcb 100644 --- a/kdesu/kdesu_pty.h +++ b/kdesu/kdesu_pty.h @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kdesu_stub.c b/kdesu/kdesu_stub.c index 8ef7f503e..5e1f09c24 100644 --- a/kdesu/kdesu_stub.c +++ b/kdesu/kdesu_stub.c @@ -2,10 +2,10 @@ * * $Id$ * - * 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 <jansen@kde.org> * - * kdesu_stub.c: KDE su executes this stub through su or ssh. This stub in turn + * tdesu_stub.c: KDE su executes this stub through su or ssh. This stub in turn * executes the target program. Before that, startup parameters * are sent through stdin. * @@ -14,7 +14,7 @@ * * Parameter Description Format (csl = comma separated list) * - * - kdesu_stub Header "ok" | "stop" + * - tdesu_stub Header "ok" | "stop" * - display X11 display string * - display_auth X11 authentication "type cookie" pair * - dcopserver KDE dcopserver csl of netids @@ -67,7 +67,7 @@ struct param_struct struct param_struct params[] = { - { "kdesu_stub", 0L }, + { "tdesu_stub", 0L }, { "display", 0L }, { "display_auth", 0L }, { "dcopserver", 0L }, @@ -192,7 +192,7 @@ int main() pid_t pid; FILE *fout; struct passwd *pw; - const char* kdesu_lc_all; + const char* tdesu_lc_all; /* Get startup parameters. */ @@ -203,7 +203,7 @@ int main() if (fgets(buf, BUFSIZE, stdin) == 0L) { printf("end\n"); fflush(stdout); - perror("kdesu_stub: fgets()"); + perror("tdesu_stub: fgets()"); exit(1); } params[i].value = xstrdup(buf); @@ -222,7 +222,7 @@ int main() if (fgets(buf, BUFSIZE, stdin) == 0L) { printf("end\n"); fflush(stdout); - perror("kdesu_stub: fgets()"); + perror("tdesu_stub: fgets()"); exit(1); } tmp = xstrdup( buf ); @@ -237,9 +237,9 @@ int main() xsetenv("PATH", params[P_PATH].value); xsetenv("DESKTOP_STARTUP_ID", params[P_APP_STARTUP_ID].value); - kdesu_lc_all = getenv( "KDESU_LC_ALL" ); - if( kdesu_lc_all != NULL ) - xsetenv("LC_ALL",kdesu_lc_all); + tdesu_lc_all = getenv( "KDESU_LC_ALL" ); + if( tdesu_lc_all != NULL ) + xsetenv("LC_ALL",tdesu_lc_all); else unsetenv("LC_ALL"); @@ -248,7 +248,7 @@ int main() pw = getpwnam(params[P_USER].value); if (pw == 0L) { - printf("kdesu_stub: user %s does not exist!\n", params[P_USER].value); + printf("tdesu_stub: user %s does not exist!\n", params[P_USER].value); exit(1); } xsetenv("HOME", pw->pw_dir); @@ -265,7 +265,7 @@ int main() sched.sched_priority = min + (int) (((double) prio) * (max - min) / 100 + 0.5); sched_setscheduler(0, SCHED_FIFO, &sched); #else - printf("kdesu_stub: realtime scheduling not supported\n"); + printf("tdesu_stub: realtime scheduling not supported\n"); #endif } else { @@ -281,19 +281,19 @@ int main() { if (setgid(pw->pw_gid) == -1) { - perror("kdesu_stub: setgid()"); + perror("tdesu_stub: setgid()"); exit(1); } #ifdef HAVE_INITGROUPS if (initgroups(pw->pw_name, pw->pw_gid) == -1) { - perror("kdesu_stub: initgroups()"); + perror("tdesu_stub: initgroups()"); exit(1); } #endif if (setuid(pw->pw_uid) == -1) { - perror("kdesu_stub: setuid()"); + perror("tdesu_stub: setuid()"); exit(1); } xsetenv("HOME", pw->pw_dir); @@ -323,7 +323,7 @@ int main() umask(oldumask); if (fd2 == -1) { - perror("kdesu_stub: mkstemp()"); + perror("tdesu_stub: mkstemp()"); exit(1); } else close(fd2); @@ -332,7 +332,7 @@ int main() fout = popen("xauth >/dev/null 2>&1","w"); if (fout == NULL) { - perror("kdesu_stub: popen(xauth)"); + perror("tdesu_stub: popen(xauth)"); exit(1); } fprintf(fout, "add %s %s\n", disp, @@ -361,7 +361,7 @@ int main() fd = mkstemp(iceauthority); umask(oldumask); if (fd == -1) { - perror("kdesu_stub: mkstemp()"); + perror("tdesu_stub: mkstemp()"); exit(1); } else close(fd); @@ -369,7 +369,7 @@ int main() fout = popen("iceauth >/dev/null 2>&1", "w"); if (!fout) { - perror("kdesu_stub: popen iceauth"); + perror("tdesu_stub: popen iceauth"); exit(1); } for (i=0; host[i]; i++) @@ -381,11 +381,11 @@ int main() } } - /* Rebuild the sycoca and start kdeinit? */ + /* Rebuild the sycoca and start tdeinit? */ if (strcmp(params[P_XWIN_ONLY].value, "no")) { - system("kdeinit --suicide"); + system("tdeinit --suicide"); } /* Execute the command */ @@ -393,7 +393,7 @@ int main() pid = fork(); if (pid == -1) { - perror("kdesu_stub: fork()"); + perror("tdesu_stub: fork()"); exit(1); } if (pid) @@ -408,7 +408,7 @@ int main() if (errno == EINTR) continue; if (errno != ECHILD) - perror("kdesu_stub: waitpid()"); + perror("tdesu_stub: waitpid()"); break; } if (WIFEXITED(state)) @@ -426,7 +426,7 @@ int main() /* Child: exec command. */ sprintf(buf, "%s", params[P_COMMAND].value); execl("/bin/sh", "sh", "-c", buf, (void *)0); - perror("kdesu_stub: exec()"); + perror("tdesu_stub: exec()"); _exit(1); } } diff --git a/kdesu/libkdesu.nmcheck b/kdesu/libkdesu.nmcheck index 11712f7d6..8e4827481 100644 --- a/kdesu/libkdesu.nmcheck +++ b/kdesu/libkdesu.nmcheck @@ -1,6 +1,6 @@ # KDE namespace check file -# kdesu classes +# tdesu classes SshProcess:* PTY::* SuProcess::* diff --git a/kdesu/process.cpp b/kdesu/process.cpp index d50e188f5..d52308f63 100644 --- a/kdesu/process.cpp +++ b/kdesu/process.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This file contains code from TEShell.C of the KDE konsole. @@ -53,7 +53,7 @@ #include <kstandarddirs.h> #include "process.h" -#include "kdesu_pty.h" +#include "tdesu_pty.h" #include "kcookie.h" int PtyProcess::waitMS(int fd,int ms) diff --git a/kdesu/process.h b/kdesu/process.h index c45132a9c..ec3af9a62 100644 --- a/kdesu/process.h +++ b/kdesu/process.h @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library @@ -128,7 +128,7 @@ public: public: /* static */ /* ** This is a collection of static functions that can be - ** used for process control inside kdesu. I'd suggest + ** used for process control inside tdesu. I'd suggest ** against using this publicly. There are probably ** nicer Qt based ways to do what you want. */ diff --git a/kdesu/ssh.cpp b/kdesu/ssh.cpp index d39634ac5..f45b38e7e 100644 --- a/kdesu/ssh.cpp +++ b/kdesu/ssh.cpp @@ -2,7 +2,7 @@ * * $Id$ * -* This file is part of the KDE project, module kdesu. +* This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library @@ -44,7 +44,7 @@ SshProcess::SshProcess(const TQCString &host, const TQCString &user, const TQCSt m_Host = host; m_User = user; m_Command = command; - m_Stub = "kdesu_stub"; + m_Stub = "tdesu_stub"; srand(time(0L)); } @@ -116,7 +116,7 @@ int SshProcess::exec(const char *password, int check) if (ret < 0) { if (!check) - kdError(900) << k_lineinfo << "Converstation with kdesu_stub failed\n"; + kdError(900) << k_lineinfo << "Converstation with tdesu_stub failed\n"; return ret; } else if (ret == 1) @@ -205,8 +205,8 @@ int SshProcess::ConverseSsh(const char *password, int check) switch (state) { case 0: - // Check for "kdesu_stub" header. - if (line == "kdesu_stub") + // Check for "tdesu_stub" header. + if (line == "tdesu_stub") { unreadLine(line); return 0; diff --git a/kdesu/ssh.h b/kdesu/ssh.h index 66ee0fccc..c84c56d02 100644 --- a/kdesu/ssh.h +++ b/kdesu/ssh.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/stub.cpp b/kdesu/stub.cpp index 2af171d72..7f083d71b 100644 --- a/kdesu/stub.cpp +++ b/kdesu/stub.cpp @@ -2,14 +2,14 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library * General Public License, version 2. See the file "COPYING.LIB" for the * exact licensing terms. * - * stub.cpp: Conversation with kdesu_stub. + * stub.cpp: Conversation with tdesu_stub. */ #include <config.h> @@ -72,8 +72,8 @@ TQCString StubProcess::commaSeparatedList(QCStringList lst) } /* - * Conversation with kdesu_stub. This is how we pass the authentication - * tokens (X11, DCOP) and other stuff to kdesu_stub. + * Conversation with tdesu_stub. This is how we pass the authentication + * tokens (X11, DCOP) and other stuff to tdesu_stub. * return values: -1 = error, 0 = ok, 1 = kill me */ @@ -86,7 +86,7 @@ int StubProcess::ConverseStub(int check) if (line.isNull()) return -1; - if (line == "kdesu_stub") + if (line == "tdesu_stub") { // This makes parsing a lot easier. enableLocalEcho(false); diff --git a/kdesu/stub.h b/kdesu/stub.h index 48d2f65bb..8bfc70a7f 100644 --- a/kdesu/stub.h +++ b/kdesu/stub.h @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library @@ -24,9 +24,9 @@ typedef TQValueList<TQCString> QCStringList; /** - * Chat with kdesu_stub. + * Chat with tdesu_stub. * - * StubProcess extends PtyProcess with functionality to chat with kdesu_stub. + * StubProcess extends PtyProcess with functionality to chat with tdesu_stub. */ class KDESU_EXPORT StubProcess: public PtyProcess @@ -52,7 +52,7 @@ public: void setUser(const TQCString &user) { m_User = user; } /** - * Set to "X only mode": Sycoca is not built and kdeinit is not launched. + * Set to "X only mode": Sycoca is not built and tdeinit is not launched. */ void setXOnly(bool xonly) { m_bXOnly = xonly; } @@ -82,7 +82,7 @@ public: protected: /** - * Exchange all parameters with kdesu_stub. + * Exchange all parameters with tdesu_stub. */ int ConverseStub(int check); diff --git a/kdesu/su.cpp b/kdesu/su.cpp index 864a3bcc0..0739c29c3 100644 --- a/kdesu/su.cpp +++ b/kdesu/su.cpp @@ -2,7 +2,7 @@ * * $Id$ * -* 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 <jansen@kde.org> * * Sudo support added by Jonathan Riddell <jriddell@ ubuntu.com> @@ -112,7 +112,7 @@ int SuProcess::exec(const char *password, int check) if (superUserCommand == "su") { args += "-c"; } - args += TQCString(__KDE_BINDIR) + "/kdesu_stub"; + args += TQCString(__KDE_BINDIR) + "/tdesu_stub"; #ifndef Q_OS_DARWIN args += "-"; #endif @@ -199,7 +199,7 @@ int SuProcess::exec(const char *password, int check) if (iret < 0) { if (!check) - kdError(900) << k_lineinfo << "Converstation with kdesu_stub failed\n"; + kdError(900) << k_lineinfo << "Converstation with tdesu_stub failed\n"; return iret; } else if (iret == 1) @@ -245,7 +245,7 @@ int SuProcess::ConverseSU(const char *password) case WaitForPrompt: { // In case no password is needed. - if (line == "kdesu_stub") + if (line == "tdesu_stub") { unreadLine(line); return ok; @@ -319,8 +319,8 @@ int SuProcess::ConverseSU(const char *password) } ////////////////////////////////////////////////////////////////////////// case HandleStub: - // Read till we get "kdesu_stub" - if (line == "kdesu_stub") + // Read till we get "tdesu_stub" + if (line == "tdesu_stub") { unreadLine(line); return ok; diff --git a/kdesu/su.h b/kdesu/su.h index bb99e6f31..dcb67a14c 100644 --- a/kdesu/su.h +++ b/kdesu/su.h @@ -2,7 +2,7 @@ * * $Id$ * - * 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 <jansen@kde.org> * * This is free software; you can use this library under the GNU Library |