Hi,
The 'keyfile' resource is not used anymore in xenodm (it was used to
specify the secret keys for the XDM-AUTHORIZATION-1 authentication
protocol in xdm with xdmcp).
ok?
Index: config/xenodm-config.in
===================================================================
RCS file: /cvs/OpenBSD/xenocara/app/xenodm/config/xenodm-config.in,v
retrieving revision 1.4
diff -u -p -u -r1.4 xenodm-config.in
--- config/xenodm-config.in 5 Sep 2017 17:48:07 -0000 1.4
+++ config/xenodm-config.in 3 Nov 2018 16:37:43 -0000
@@ -2,7 +2,6 @@
!
DisplayManager.authDir: @XENODMXAUTHDIR@
DisplayManager.errorLogFile: @XENODMLOGDIR@/xenodm.log
-DisplayManager.keyFile: @XENODMCONFIGDIR@/xenodm-keys
DisplayManager.servers: @XENODMCONFIGDIR@/Xservers
DisplayManager*resources: @XENODMCONFIGDIR@/Xresources
! All displays should use authorization, but we cannot be sure
Index: include/dm.h
===================================================================
RCS file: /cvs/OpenBSD/xenocara/app/xenodm/include/dm.h,v
retrieving revision 1.13
diff -u -p -u -r1.13 dm.h
--- include/dm.h 10 Jul 2018 14:20:42 -0000 1.13
+++ include/dm.h 3 Nov 2018 16:35:48 -0000
@@ -182,7 +182,6 @@ extern int daemonMode;
extern char *authDir;
extern int autoRescan;
extern int removeDomainname;
-extern char *keyFile;
extern char **exportList;
extern struct display *FindDisplayByName (char *name),
Index: xenodm/resource.c
===================================================================
RCS file: /cvs/OpenBSD/xenocara/app/xenodm/xenodm/resource.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 resource.c
--- xenodm/resource.c 10 Jul 2018 15:32:27 -0000 1.4
+++ xenodm/resource.c 3 Nov 2018 16:36:16 -0000
@@ -50,7 +50,6 @@ int sourceAddress;
char *authDir;
int autoRescan;
int removeDomainname;
-char *keyFile;
char **exportList;
#define DM_STRING 0
@@ -95,9 +94,6 @@ char **exportList;
#ifndef DEF_USER_AUTH_DIR
# define DEF_USER_AUTH_DIR "/tmp"
#endif
-#ifndef DEF_KEY_FILE
-# define DEF_KEY_FILE ""
-#endif
#ifndef DEF_ACCESS_FILE
# define DEF_ACCESS_FILE ""
#endif
@@ -122,8 +118,6 @@ struct dmResources {
"true"} ,
{ "removeDomainname","RemoveDomainname",DM_BOOL,(char **) &removeDomainname,
"true"} ,
-{ "keyFile", "KeyFile", DM_STRING, &keyFile,
- DEF_KEY_FILE} ,
{ "exportList", "ExportList", DM_ARGV, (char **) &exportList,
""} ,
{ "sourceAddress","SourceAddress",DM_BOOL, (char **) &sourceAddress,
--
Matthieu Herrb
