dtlogin: Enable XDM authentication on FreeBSD

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index c8945df46f49463b7bd8d4b8a26023690b055bb8..929b2c611efdbf5b10c8c863706e1fc5d4f760f9 100644 (file)
--- 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 8f8f8c516ddf3d752b04601c2c38869febb6b7f0..d039a7be7069d686a9e1c1fa7599dfe74229e283 100644 (file)
--- 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 2569f63a1338a0ecd8869cb49ab1f404c39e6238..fa3bc23f9c7e799c666e13ca3074fcca84447c89 100644 (file)
--- 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 47d003ecdd215635348027e3ce08b7c9ba286d72..70e9eba852af99bc3bdd4bb2ddf3892de04181b8 100644 (file)
--- 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;