From ced27aa1f69a7c41bdf67f8d39f786899947aa26 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Sat, 28 Nov 2015 19:04:40 +0100 Subject: [PATCH] dtlogin: don't use crypt(3) on openbsd des support has been removed from crypt(3) on openbsd since version 5.8 --- cde/config/cf/OpenBSD.cf | 2 ++ cde/programs/dtlogin/Imakefile | 2 ++ cde/programs/dtlogin/genauth.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf index 96ac66e71..51de43114 100644 --- a/cde/config/cf/OpenBSD.cf +++ b/cde/config/cf/OpenBSD.cf @@ -122,6 +122,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define HasBSDAuth YES #endif +#define HasXdmAuth YES + /* OpenBSD 3.0 and later has getpeereid() */ #if OSMajorVersion >= 3 # define HasGetpeereid YES diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile index 7a4887fb9..8f8f8c516 100644 --- a/cde/programs/dtlogin/Imakefile +++ b/cde/programs/dtlogin/Imakefile @@ -242,6 +242,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2 DEFINES = $(DTDEFINES) -DXDMCP -DSIA #elif defined (LinuxArchitecture) DEFINES = $(DTDEFINES) -DXDMCP +#elif defined (OpenBSDArchitecture) + DEFINES = $(DTDEFINES) -DXDMCP #else DEFINES = $(DTDEFINES) -D_NO_PROTO #endif diff --git a/cde/programs/dtlogin/genauth.c b/cde/programs/dtlogin/genauth.c index 38e81eeb7..089eb16db 100644 --- a/cde/programs/dtlogin/genauth.c +++ b/cde/programs/dtlogin/genauth.c @@ -124,7 +124,7 @@ extern int errno; # define USE_CRYPT # endif # ifdef __OpenBSD__ -# define USE_CRYPT +# define DONT_USE_DES # endif # ifdef sun # define USE_CRYPT