dtlogin: don't use crypt(3) on openbsd

des support has been removed from crypt(3) on openbsd since version 5.8

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 96ac66e7179efba0a438a231ff599630eb3418e5..51de431142400548ca0b87c0cd477bdce8026efd 100644 (file)
--- 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 7a4887fb9c5c3918078c5302560f91cedb0c1acc..8f8f8c516ddf3d752b04601c2c38869febb6b7f0 100644 (file)
--- 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 38e81eeb7acae6ec36ac29daa83577baf6abd5c1..089eb16db00a203a4fb529a19a84fcafcb8e15fb 100644 (file)
--- 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