dtlogin: Enable XDM authentication on FreeBSD

2016-04-17 11:55:41 +02:00
parent ff7c7d72cf
commit 7cddb0d165
4 changed files with 5 additions and 2 deletions
--- 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
--- 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
--- 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,
--- 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;