diff options
Diffstat (limited to 'kdm/backend')
-rw-r--r-- | kdm/backend/CMakeLists.txt | 8 | ||||
-rw-r--r-- | kdm/backend/Makefile.am | 6 | ||||
-rw-r--r-- | kdm/backend/client.c | 2 | ||||
-rw-r--r-- | kdm/backend/ctrl.c | 2 | ||||
-rw-r--r-- | kdm/backend/error.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt index b93174e4c..cd98b3a9c 100644 --- a/kdm/backend/CMakeLists.txt +++ b/kdm/backend/CMakeLists.txt @@ -21,11 +21,11 @@ link_directories( ${DBUS_TQT_LIBRARY_DIRS} ) -##### kdm (executable) ########################## +##### tdm (executable) ########################## add_custom_command( OUTPUT config.ci - COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci - DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) + COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci + DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def ) set_property( SOURCE auth.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) @@ -35,7 +35,7 @@ else() set( XDMCP_LIBRARIES "" ) endif() -tde_add_executable( kdm +tde_add_executable( tdm SOURCES access.c auth.c bootman.c choose.c client.c consolekit.c ctrl.c daemon.c dm.c dpylist.c error.c genauth.c diff --git a/kdm/backend/Makefile.am b/kdm/backend/Makefile.am index 58c2a9e43..6b5779d51 100644 --- a/kdm/backend/Makefile.am +++ b/kdm/backend/Makefile.am @@ -6,8 +6,8 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \ $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \ $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4) -bin_PROGRAMS = kdm -kdm_SOURCES = \ +bin_PROGRAMS = tdm +tdm_SOURCES = \ access.c \ auth.c \ bootman.c \ @@ -44,4 +44,4 @@ EXTRA_DIST = printf.c noinst_HEADERS = dm.h dm_socket.h dm_error.h dm_auth.h greet.h # for unsermake (automake is handled by SUBDIRS in ../) -kdm_COMPILE_FIRST = ../config.ci +tdm_COMPILE_FIRST = ../config.ci diff --git a/kdm/backend/client.c b/kdm/backend/client.c index 56d9fa09f..0cf4e216b 100644 --- a/kdm/backend/client.c +++ b/kdm/backend/client.c @@ -1305,7 +1305,7 @@ StartClient() env = setEnv( env, "SHELL", p->pw_shell ); env = setEnv( env, "HOME", p->pw_dir ); if (cursource == PWSRC_AUTOLOGIN) - env = setEnv (env, "KDM_AUTOLOGIN", curuser); + env = setEnv (env, "TDM_AUTOLOGIN", curuser); #if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS) if (krbtkfile[0] != '\0') env = setEnv( env, "KRBTKFILE", krbtkfile ); diff --git a/kdm/backend/ctrl.c b/kdm/backend/ctrl.c index f7ed05308..622c9370d 100644 --- a/kdm/backend/ctrl.c +++ b/kdm/backend/ctrl.c @@ -520,7 +520,7 @@ processCtrl( const char *string, int len, int fd, struct display *d ) if (fd >= 0 && !strcmp( ar[0], "caps" )) { if (ar[1]) goto exce; - Reply( "ok\tkdm\tlist\t" ); + Reply( "ok\ttdm\tlist\t" ); if (bootManager != BO_NONE) Reply( "bootoptions\t" ); if (d) { diff --git a/kdm/backend/error.c b/kdm/backend/error.c index 0680ed3a5..93ec40e70 100644 --- a/kdm/backend/error.c +++ b/kdm/backend/error.c @@ -113,7 +113,7 @@ InitErrorLog( const char *errorLogFile ) # endif # define WARNMSG \ "********************************************************************************\n" \ - "Note that your system uses syslog. All of kdm's internally generated messages\n" \ + "Note that your system uses syslog. All of tdm's internally generated messages\n" \ "(i.e., not from libraries and external programs/scripts it uses) go to the\n" \ "daemon.* syslog facility; check your syslog configuration to find out to which\n" \ "file(s) it is logged." PAMLOG "\n" \ |