summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--config/Makefile.am3
-rw-r--r--config/Xresources.cpp10
-rw-r--r--config/xenodm-config.cpp13
-rw-r--r--configure.ac8
-rw-r--r--include/dm.h6
-rw-r--r--man/Makefile.am3
-rw-r--r--man/xenodm.man8
-rw-r--r--xenodm/dpylist.c2
-rw-r--r--xenodm/resource.c8
10 files changed, 6 insertions, 57 deletions
diff --git a/Makefile.am b/Makefile.am
index c1e1284..54b4c2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,7 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
lint:
$(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LIBS)
(cd xdm && $(MAKE) $(AM_MAKEFLAGS) lint)
- (cd xdmshell && $(MAKE) $(AM_MAKEFLAGS) lint)
(cd greeter && $(MAKE) $(AM_MAKEFLAGS) lint)
- (cd chooser && $(MAKE) $(AM_MAKEFLAGS) lint)
endif LINT
CLEANFILES = xdm.service
diff --git a/config/Makefile.am b/config/Makefile.am
index 383e4ed..5c50ca3 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -52,8 +52,7 @@ CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
-DXENODMXAUTHDIR="$(XENODMXAUTHDIR)" \
--DXENODMCONFIGDIR="$(XENODMCONFIGDIR)" \
-DXENODMSCRIPTDIR="$(XENODMSCRIPTDIR)" -DSU="$(SU)" \
- -DCHOOSERPATH="$(XENODMLIBDIR)/chooser" $(XPMDEFINES) \
- -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
+ $(XPMDEFINES) -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
Xservers.ws: $(srcdir)/Xservers.ws.cpp
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
diff --git a/config/Xresources.cpp b/config/Xresources.cpp
index 6a7bb74..25cde57 100644
--- a/config/Xresources.cpp
+++ b/config/Xresources.cpp
@@ -135,13 +135,3 @@ XConsole.text.geometry: 480x130
XConsole.verbose: true
XConsole*iconic: true
XConsole*font: fixed
-
-Chooser*geometry: 640x480
-Chooser*allowShellResize: false
-Chooser*viewport.forceBars: true
-
-Chooser*label.font: -adobe-helvetica-bold-o-normal--24-*-p-*-iso8859-1
-Chooser*label.label: XDMCP Host Menu from CLIENTHOST
-Chooser*label.foreground: black
-Chooser*list.font: lucidasanstypewriter-12
-Chooser*Command.font: -adobe-helvetica-medium-r-normal--18-*-p-*-iso8859-1
diff --git a/config/xenodm-config.cpp b/config/xenodm-config.cpp
index ae8a36d..b4ead86 100644
--- a/config/xenodm-config.cpp
+++ b/config/xenodm-config.cpp
@@ -20,7 +20,6 @@ DisplayManager*resources: XENODMCONFIGDIR/Xresources
! individual resource settings.
DisplayManager*authorize: true
!
-DisplayManager*chooser: CHOOSERPATH
DisplayManager*startup: XENODMSCRIPTDIR/Xstartup
DisplayManager*session: XENODMSCRIPTDIR/Xsession
DisplayManager*reset: XENODMSCRIPTDIR/Xreset
@@ -29,13 +28,5 @@ DisplayManager*authComplain: true
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
+
+DisplayManager.*.authName: MIT-MAGIC-COOKIE-1
diff --git a/configure.ac b/configure.ac
index 390792f..b892ee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,6 @@ AC_CHECK_LIB([util], [login_fbtab])
XENODM_CFLAGS="$XENODM_CFLAGS"
GREETER_CFLAGS="$GREETER_CFLAGS"
-CHOOSER_CFLAGS="$CHOOSER_CFLAGS"
# Find needed libraries for TCP sockets (pre-pended in $LIBS)
XTRANS_CONNECTION_FLAGS
@@ -205,8 +204,6 @@ PKG_CHECK_MODULES(XENODM, xmu x11 xau)
# Xinerama support
PKG_CHECK_MODULES(XINERAMA, xinerama)
-CHOOSER_CFLAGS="$CHOOSER_CFLAGS $XINERAMA_CFLAGS"
-CHOOSER_LIBS="$CHOOSER_LIBS $XINERAMA_LIBS"
GREETER_CFLAGS="$GREETER_CFLAGS $XINERAMA_CFLAGS"
GREETER_LIBS="$GREETER_LIBS $XINERAMA_LIBS"
@@ -365,11 +362,6 @@ AX_DEFINE_DIR(DEF_FAILSAFE_CLIENT, bindir/xterm,
AX_DEFINE_DIR(DEF_XENODM_CONFIG, XENODMCONFIGDIR/xenodm-config,
[Define to pathname of default xenodm-config file])
-# -DDEF_CHOOSER="$(CHOOSERPATH)"
-
-AX_DEFINE_DIR(DEF_CHOOSER, XENODMLIBDIR/chooser,
- [Define to pathname of where chooser binary is installed])
-
# -DDEF_AUTH_DIR="$(XENODMDIR)"
AC_ARG_WITH(authdir,
diff --git a/include/dm.h b/include/dm.h
index cdb214f..58104be 100644
--- a/include/dm.h
+++ b/include/dm.h
@@ -152,7 +152,6 @@ struct display {
char *systemPath; /* path set for startup/reset */
char *systemShell; /* interpreter for startup/reset */
char *failsafeClient;/* a client to start when the session fails */
- char *chooser; /* chooser program */
/* authorization resources */
int authorize; /* enable authorization */
@@ -206,7 +205,6 @@ struct greet_info {
Boolean allow_root_login; /* allow direct root login */
};
-typedef void (*ChooserFunc)(CARD16 connectionType, ARRAY8Ptr addr, char *closure);
typedef void (*ListenFunc)(ARRAY8Ptr addr, void **closure);
struct verify_info {
@@ -245,7 +243,6 @@ extern int removeDomainname;
extern char *keyFile;
extern char **exportList;
extern char *greeterLib;
-extern int choiceTimeout; /* chooser choice timeout */
extern struct display *FindDisplayByName (char *name),
*FindDisplayBySessionID (CARD32 sessionID),
@@ -269,9 +266,6 @@ extern struct protoDisplay *NewProtoDisplay (
/* in Login.c */
extern void DrawFail (Widget ctx);
-/* in chooser.c */
-extern void RunChooser (struct display *d);
-
/* in dm.c */
extern void CloseOnFork (void);
extern void RegisterCloseOnFork (int fd);
diff --git a/man/Makefile.am b/man/Makefile.am
index 1ec94fb..fee9084 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -30,8 +30,7 @@ CLEANFILES = $(appman_DATA) $(xenodmlman_DATA) $(noinst_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-MAN_SUBSTS += -e 's|CHOOSERPATH|$(XENODMLIBDIR)/chooser|g' \
- -e 's|XENODMLOGDIR|$(XENODMLOGDIR)|g' \
+MAN_SUBSTS += -e 's|XENODMLOGDIR|$(XENODMLOGDIR)|g' \
-e 's|XENODMDIR|$(XENODMCONFIGDIR)|g' \
-e 's|BINDIR|$(bindir)|g' \
-e 's|XENODMXAUTHDIR|$(XENODMXAUTHDIR)|g' \
diff --git a/man/xenodm.man b/man/xenodm.man
index 46f7555..14b8684 100644
--- a/man/xenodm.man
+++ b/man/xenodm.man
@@ -267,7 +267,7 @@ name of the library. The default is
.IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.resources\fP"
This resource specifies the name of the file to be loaded by \fIxrdb\fP
as the resource database onto the root window of screen 0 of the display.
-The \fIXsetup\fP program, the Login widget, and \fIchooser\fP will use
+The \fIXsetup\fP program and the Login widget will use
the resources set in this file.
This resource data base is loaded just before the authentication procedure
is started, so it can control the appearance of the login window. See the
@@ -563,7 +563,7 @@ by the new value, not a very useful result as some of the default translations
are quite useful (such as ``<Key>: insert-char ()'' which responds to normal
typing).
.PP
-This file may also contain resources for the setup program and \fIchooser\fP.
+This file may also contain resources for the setup program.
.SH "SETUP PROGRAM"
The \fIXsetup\fP file is run after
the server is reset, but before the Login window is offered.
@@ -1085,9 +1085,6 @@ the default configuration file
.I $HOME/.Xauthority
user authorization file where \fIxenodm\fP stores keys for clients to read
.TP 20
-.I CHOOSERPATH
-the default chooser
-.TP 20
.I BINDIR/xrdb
the default resource database loader
.TP 20
@@ -1110,7 +1107,6 @@ Kerberos credentials cache
.IR Xsecurity (__miscmansuffix__),
.IR sessreg (__appmansuffix__),
.IR Xserver (__appmansuffix__),
-.\" .IR chooser (__appmansuffix__), \" except that there isn't a manual for it yet
.IR fonts.conf (__filemansuffix__).
.br
.I "X Display Manager Control Protocol"
diff --git a/xenodm/dpylist.c b/xenodm/dpylist.c
index c430670..74fa734 100644
--- a/xenodm/dpylist.c
+++ b/xenodm/dpylist.c
@@ -118,7 +118,6 @@ RemoveDisplay (struct display *old)
free (d->systemPath);
free (d->systemShell);
free (d->failsafeClient);
- free (d->chooser);
if (d->authorizations)
{
for (i = 0; i < d->authNum; i++)
@@ -189,7 +188,6 @@ NewDisplay (char *name, char *class)
d->systemPath = NULL;
d->systemShell = NULL;
d->failsafeClient = NULL;
- d->chooser = NULL;
d->authorize = FALSE;
d->authorizations = NULL;
d->authNum = 0;
diff --git a/xenodm/resource.c b/xenodm/resource.c
index 5c84ffc..35ac338 100644
--- a/xenodm/resource.c
+++ b/xenodm/resource.c
@@ -53,7 +53,6 @@ int removeDomainname;
char *keyFile;
char **exportList;
char *greeterLib;
-int choiceTimeout; /* chooser choice timeout */
#define DM_STRING 0
#define DM_INT 1
@@ -88,9 +87,6 @@ int choiceTimeout; /* chooser choice timeout */
#ifndef DEF_XENODM_CONFIG
# define DEF_XENODM_CONFIG "/usr/lib/X11/xenodm/xenodm-config"
#endif
-#ifndef DEF_CHOOSER
-# define DEF_CHOOSER "/usr/lib/X11/xenodm/chooser"
-#endif
#ifndef DEF_AUTH_NAME
# define DEF_AUTH_NAME "MIT-MAGIC-COOKIE-1"
#endif
@@ -136,8 +132,6 @@ struct dmResources {
""} ,
{ "greeterLib", "GreeterLib", DM_STRING, &greeterLib,
DEF_GREETER_LIB} ,
-{ "choiceTimeout","ChoiceTimeout",DM_INT, (char **) &choiceTimeout,
- "15"} ,
{ "sourceAddress","SourceAddress",DM_BOOL, (char **) &sourceAddress,
"false"} ,
};
@@ -218,8 +212,6 @@ struct displayResource sessionResources[] = {
DEF_FAILSAFE_CLIENT },
{ "userAuthDir","UserAuthDir", DM_STRING, boffset(userAuthDir),
DEF_USER_AUTH_DIR },
-{ "chooser", "Chooser", DM_STRING, boffset(chooser),
- DEF_CHOOSER },
};
#define NUM_SESSION_RESOURCES (sizeof sessionResources/\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 17:16:55 +0000