From: alx <alx@fastestcode.org>
Date: Sun, 17 Apr 2016 09:55:41 +0000 (+0200)
Subject: dtlogin: Enable XDM authentication on FreeBSD
X-Git-Tag: 2.2.4~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7cddb0d165809d8cd7ea28740dc42038c5ec5be5;p=oweals%2Fcde.git

dtlogin: Enable XDM authentication on FreeBSD
---

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index c8945df4..929b2c61 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -20,6 +20,7 @@ XCOMM operating system:  OSName (OSMajorVersion/**/./**/OSMinorVersion/**/./**/O
 #define HasPutenv		YES
 #define HasBSD44Sockets		YES
 #define HasZlib			YES
+#define HasXdmAuth		YES
 
 #if OSMajorVersion >= 10 && defined(UseGcc)
 USE_GCC = UseGcc
diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 8f8f8c51..d039a7be 100644
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -244,6 +244,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 	 DEFINES = $(DTDEFINES) -DXDMCP
 #elif defined (OpenBSDArchitecture)
 	DEFINES = $(DTDEFINES) -DXDMCP
+#elif defined (FreeBSDArchitecture)
+	DEFINES = $(DTDEFINES) -DXDMCP
 #else
         DEFINES = $(DTDEFINES) -D_NO_PROTO
 #endif
diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h
index 2569f63a..fa3bc23f 100644
--- a/cde/programs/dtlogin/dm.h
+++ b/cde/programs/dtlogin/dm.h
@@ -1007,7 +1007,7 @@ extern Xauth * XdmGetAuth(
 #endif /* NeedWidePrototypes */
                         char *name) ;
 
-extern int XdmGetXdmcpAuth( 
+extern void XdmGetXdmcpAuth(
                         struct protoDisplay *pdpy,
 #if NeedWidePrototypes
                         unsigned int authorizationNameLen,
diff --git a/cde/programs/dtlogin/xdmauth.c b/cde/programs/dtlogin/xdmauth.c
index 47d003ec..70e9eba8 100644
--- a/cde/programs/dtlogin/xdmauth.c
+++ b/cde/programs/dtlogin/xdmauth.c
@@ -208,7 +208,7 @@ XdmGetAuth (namelen, name)
 
 #ifdef XDMCP
 
-XdmGetXdmcpAuth (pdpy,authorizationNameLen, authorizationName)
+void XdmGetXdmcpAuth (pdpy,authorizationNameLen, authorizationName)
     struct protoDisplay	*pdpy;
 #if NeedWidePrototypes
     unsigned int authorizationNameLen;