Rename xdm -> xenodm

9 files changed, 74 insertions, 74 deletions

diff --git a/config/GiveConsole b/config/GiveConsole
index cc07003..b209f17 100644
--- a/config/GiveConsole
+++ b/config/GiveConsole
@@ -11,4 +11,4 @@ chown $USER /dev/console
 if [ -c /dev/drm0 ]; then
     chown $USER /dev/drm0
 fi
-/usr/X11R6/bin/sessreg -a -l $DISPLAY -u none -x /etc/X11/xdm/Xservers $USER
+/usr/X11R6/bin/sessreg -a -l $DISPLAY -u none -x /etc/X11/xenodm/Xservers $USER
diff --git a/config/Makefile.am b/config/Makefile.am
index 30e22ea..37bfb3b 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -2,38 +2,38 @@
 
 include $(top_srcdir)/cpprules.in
 
-xdmscriptdir = $(XDMSCRIPTDIR)
-xdmconfigdir = $(XDMCONFIGDIR)
+xenodmscriptdir = $(XENODMSCRIPTDIR)
+xenodmconfigdir = $(XENODMCONFIGDIR)
 
-dist_xdmconfig_DATA = \
+dist_xenodmconfig_DATA = \
 	Xaccess
 
-xdmconfig_DATA = \
-	xdm-config \
+xenodmconfig_DATA = \
+	xenodm-config \
 	Xresources \
 	Xservers
 
-xdmscript_SCRIPTS = \
+xenodmscript_SCRIPTS = \
 	Xreset \
 	Xsession \
 	Xstartup
 
-dist_xdmscript_SCRIPTS = \
+dist_xenodmscript_SCRIPTS = \
 	GiveConsole \
 	TakeConsole \
 	Xsetup_0 \
 	Xwilling
 
-pixmapdir = $(XDM_PIXMAPDIR)
+pixmapdir = $(XENODM_PIXMAPDIR)
 
 dist_pixmap_DATA = xorg-bw.xpm xorg.xpm
 
-BUILT_SOURCES = Xservers.ws xdm-config Xreset Xresources Xsession Xstartup
+BUILT_SOURCES = Xservers.ws xenodm-config Xreset Xresources Xsession Xstartup
 
 CLEANFILES = $(BUILT_SOURCES) Xservers
 
 EXTRA_DIST = Xservers.ws.cpp Xservers.fs \
-	xdm-config.cpp Xreset.cpp Xresources.cpp Xsession.cpp Xstartup.cpp
+	xenodm-config.cpp Xreset.cpp Xresources.cpp Xsession.cpp Xstartup.cpp
 
 Xservers: Xservers.$(SERVERSTYPE)
 	ln -s Xservers.$(SERVERSTYPE) Xservers
@@ -41,8 +41,8 @@ Xservers: Xservers.$(SERVERSTYPE)
 # Defines used when cpp'ing config files to replace settings in the files
 
 #if USE_XPM
-XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \
-        -DXDM_BWPIXMAP=$(XDM_BWPIXMAP)
+XPMDEFINES = -DXPM -DBITMAPDIR=$(XENODM_PIXMAPDIR) -DXENODM_PIXMAP=$(XENODM_PIXMAP) \
+        -DXENODM_BWPIXMAP=$(XENODM_BWPIXMAP)
 #endif
 
 #if HAVE_MKTEMP_COMMAND
@@ -51,11 +51,11 @@ MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
 
 CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
     -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
-    -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
-    -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
-    -DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \
-    -DXDMSCRIPTDIR="$(XDMSCRIPTDIR)" -DSU="$(SU)" \
-    -DCHOOSERPATH="$(XDMLIBDIR)/chooser" $(XPMDEFINES) \
+    -DXENODMDIR="$(XENODMLIBDIR)" -DXENODMLOGDIR="$(XENODMLOGDIR)" \
+    -DXENODMXAUTHDIR="$(XENODMXAUTHDIR)" \
+    -DXENODMPIDDIR="$(XENODMPIDDIR)" -DXENODMCONFIGDIR="$(XENODMCONFIGDIR)" \
+    -DXENODMSCRIPTDIR="$(XENODMSCRIPTDIR)" -DSU="$(SU)" \
+    -DCHOOSERPATH="$(XENODMLIBDIR)/chooser" $(XPMDEFINES) \
     -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
 
 Xservers.ws: $(srcdir)/Xservers.ws.cpp
diff --git a/config/README b/config/README
index 04922e5..36a2313 100644
--- a/config/README
+++ b/config/README
@@ -1,10 +1,10 @@
 
-Xdm Sample Configuration
+Xenodm Sample Configuration
 
 This directory contains a collection of files which describe a sample
-configuration of xdm.  Choose between the sample Xservers.* files; copy the
-appropriate one to "$(XDMDIR)/Xservers" along with the other
+configuration of xenodm.  Choose between the sample Xservers.* files; copy the
+appropriate one to "$(XENODMDIR)/Xservers" along with the other
 files in this directory.
 
-Only a few of the many configuration parameters which xdm can be tuned with
-are set in this sample, read the xdm manual page for a complete description.
+Only a few of the many configuration parameters which xenodm can be tuned with
+are set in this sample, read the xenodm manual page for a complete description.
diff --git a/config/TakeConsole b/config/TakeConsole
index 2581b4c..7b08050 100644
--- a/config/TakeConsole
+++ b/config/TakeConsole
@@ -8,4 +8,4 @@ chown root /dev/console
 if [ -c /dev/drm0 ]; then
     chown root /dev/drm0
 fi
-/usr/X11R6/bin/sessreg -d -l $DISPLAY -u /var/run/utmp -x /etc/X11/xdm/Xservers $USER
+/usr/X11R6/bin/sessreg -d -l $DISPLAY -u /var/run/utmp -x /etc/X11/xenodm/Xservers $USER
diff --git a/config/Xreset.cpp b/config/Xreset.cpp
index 321cd89..e890814 100644
--- a/config/Xreset.cpp
+++ b/config/Xreset.cpp
@@ -2,4 +2,4 @@ XCOMM!/bin/sh
 XCOMM Deregister a login. (Derived from TakeConsole as follows:)
 XCOMM
 BINDIR/sessreg -d -w WTMP_FILE -u UTMP_FILE \
-	-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
+	-x XENODMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
diff --git a/config/Xsession.cpp b/config/Xsession.cpp
index 4bac5e3..05bc1f5 100644
--- a/config/Xsession.cpp
+++ b/config/Xsession.cpp
@@ -92,13 +92,13 @@ else
                 . /etc/default/xdesktops
         }
 
-        [ -r /etc/default/xdm ] && {
-                . /etc/default/xdm
+        [ -r /etc/default/xenodm ] && {
+                . /etc/default/xenodm
         }
 
         XCOMM Allow the user to over-ride the system default desktop
-        [ -r $HOME/.xdmdesktop ] && {
-                . $HOME/.xdmdesktop
+        [ -r $HOME/.xenodmdesktop ] && {
+                . $HOME/.xenodmdesktop
         }
 
         [ -n "$XDESKTOP" ] && {
diff --git a/config/Xstartup.cpp b/config/Xstartup.cpp
index 1bc8dcc..dd9bfe4 100644
--- a/config/Xstartup.cpp
+++ b/config/Xstartup.cpp
@@ -7,4 +7,4 @@ if [ -f /etc/nologin ]; then
         exit 1
 fi
 exec BINDIR/sessreg  -a -w WTMP_FILE -u UTMP_FILE \
-	-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
+	-x XENODMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
diff --git a/config/xdm-config.cpp b/config/xdm-config.cpp
deleted file mode 100644
index 24702a3..0000000
--- a/config/xdm-config.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-! $OpenBSD: xdm-config.cpp,v 1.5 2012/10/07 15:55:28 matthieu Exp $
-!
-!
-!
-!
-!
-#ifndef XDMCONFIGDIR
-#define XDMCONFIGDIR XDMDIR
-#endif
-#ifndef XDMSCRIPTDIR
-#define XDMSCRIPTDIR XDMDIR
-#endif
-DisplayManager.authDir:	XDMXAUTHDIR
-DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
-DisplayManager.pidFile:		XDMPIDDIR/xdm.pid
-DisplayManager.keyFile:		XDMCONFIGDIR/xdm-keys
-DisplayManager.servers:		XDMCONFIGDIR/Xservers
-DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
-DisplayManager*resources:	XDMCONFIGDIR/Xresources
-DisplayManager.willing:		SU nobody -s /bin/sh XDMSCRIPTDIR/Xwilling
-! All displays should use authorization, but we cannot be sure
-! X terminals may not be configured that way, so they will require
-! individual resource settings.
-DisplayManager*authorize:	true
-!
-DisplayManager*chooser:		CHOOSERPATH
-DisplayManager*startup:		XDMSCRIPTDIR/Xstartup
-DisplayManager*session:		XDMSCRIPTDIR/Xsession
-DisplayManager*reset:		XDMSCRIPTDIR/Xreset
-DisplayManager*authComplain:	true
-! The following three resources set up display :0 as the console.
-DisplayManager._0.setup:	XDMSCRIPTDIR/Xsetup_0
-DisplayManager._0.startup:	XDMSCRIPTDIR/GiveConsole
-DisplayManager._0.reset:	XDMSCRIPTDIR/TakeConsole
-#if HAS_DES_AUTH == YES
-DisplayManager.*.authName:     MIT-MAGIC-COOKIE-1
-#endif
-#ifdef XPM
-DisplayManager*loginmoveInterval:	10
-#endif /* XPM */
-!
-! SECURITY: do not listen for XDMCP or Chooser requests
-! Comment out this line if you want to manage X terminals with xdm
-DisplayManager.requestPort:	0
diff --git a/config/xenodm-config.cpp b/config/xenodm-config.cpp
new file mode 100644
index 0000000..ab82e64
--- /dev/null
+++ b/config/xenodm-config.cpp
@@ -0,0 +1,44 @@
+! $OpenBSD: xenodm-config.cpp,v 1.5 2012/10/07 15:55:28 matthieu Exp $
+!
+!
+!
+!
+!
+#ifndef XENODMCONFIGDIR
+#define XENODMCONFIGDIR XENODMDIR
+#endif
+#ifndef XENODMSCRIPTDIR
+#define XENODMSCRIPTDIR XENODMDIR
+#endif
+DisplayManager.authDir:	XENODMXAUTHDIR
+DisplayManager.errorLogFile:	XENODMLOGDIR/xenodm.log
+DisplayManager.pidFile:		XENODMPIDDIR/xenodm.pid
+DisplayManager.keyFile:		XENODMCONFIGDIR/xenodm-keys
+DisplayManager.servers:		XENODMCONFIGDIR/Xservers
+DisplayManager.accessFile:	XENODMCONFIGDIR/Xaccess
+DisplayManager*resources:	XENODMCONFIGDIR/Xresources
+DisplayManager.willing:		SU nobody -s /bin/sh XENODMSCRIPTDIR/Xwilling
+! All displays should use authorization, but we cannot be sure
+! X terminals may not be configured that way, so they will require
+! individual resource settings.
+DisplayManager*authorize:	true
+!
+DisplayManager*chooser:		CHOOSERPATH
+DisplayManager*startup:		XENODMSCRIPTDIR/Xstartup
+DisplayManager*session:		XENODMSCRIPTDIR/Xsession
+DisplayManager*reset:		XENODMSCRIPTDIR/Xreset
+DisplayManager*authComplain:	true
+! The following three resources set up display :0 as the console.
+DisplayManager._0.setup:	XENODMSCRIPTDIR/Xsetup_0
+DisplayManager._0.startup:	XENODMSCRIPTDIR/GiveConsole
+DisplayManager._0.reset:	XENODMSCRIPTDIR/TakeConsole
+#if HAS_DES_AUTH == YES
+DisplayManager.*.authName:     MIT-MAGIC-COOKIE-1
+#endif
+#ifdef XPM
+DisplayManager*loginmoveInterval:	10
+#endif /* XPM */
+!
+! SECURITY: do not listen for XDMCP or Chooser requests
+! Comment out this line if you want to manage X terminals with xenodm
+DisplayManager.requestPort:	0