diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-11-03 18:04:46 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2020-07-14 15:52:43 +0200 |
| commit | 2bbe76d8b3e9657b78bb43f11b2764a400b8a698 (patch) | |
| tree | 2199d126c4bdd808271ba5d3205ed94cd566565e | |
| parent | 763b3bbc20442aaedc3fdf03ecabb5a5281e0669 (diff) | |
Remove the unused 'keyFile' resource.
It is not used anymore in xenodm (was used to specify the secret keys
for the XDM-AUTHORIZATION-1 authentication protocol in xdm with
xdmcp).
ok kn@
| -rw-r--r-- | config/xenodm-config.in | 3 | ||||
| -rw-r--r-- | include/dm.h | 1 | ||||
| -rw-r--r-- | xenodm/resource.c | 6 |
3 files changed, 1 insertions, 9 deletions
diff --git a/config/xenodm-config.in b/config/xenodm-config.in index 5c5e354..9cf647c 100644 --- a/config/xenodm-config.in +++ b/config/xenodm-config.in @@ -1,8 +1,7 @@ -! $OpenBSD: xenodm-config.in,v 1.4 2017/09/05 17:48:07 deraadt Exp $ +! $OpenBSD: xenodm-config.in,v 1.5 2018/11/03 18:04:45 matthieu Exp $ ! 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 diff --git a/include/dm.h b/include/dm.h index 45c6aa2..76de42e 100644 --- a/include/dm.h +++ b/include/dm.h @@ -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), diff --git a/xenodm/resource.c b/xenodm/resource.c index ec61b3f..c661046 100644 --- a/xenodm/resource.c +++ b/xenodm/resource.c @@ -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, |