 @@ -210,26 +210,28 @@ AC_CHECK_FUNC([getdtablesize],
 	AC_DEFINE(HAS_GETDTABLESIZE, 1, [Have the 'getdtablesize' function.]))
 AC_CHECK_FUNC([getifaddrs],
 	AC_DEFINE(HAS_GETIFADDRS, 1, [Have the 'getifaddrs' function.]))
 AC_CHECK_FUNC([getpeereid],
 	AC_DEFINE(HAS_GETPEEREID, 1, [Have the 'getpeereid' function.]))
 AC_CHECK_FUNC([getpeerucred],
 	AC_DEFINE(HAS_GETPEERUCRED, 1, [Have the 'getpeerucred' function.]))
 AC_CHECK_FUNC([strlcat], HAVE_STRLCAT=yes, HAVE_STRLCAT=no)
 AM_CONDITIONAL(NEED_STRLCAT, [test x$HAVE_STRLCAT = xno])
 AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_STRLCPY, 1, [Have the 'strlcpy' function]))
 AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])
 AC_CHECK_LIB([bsd], [arc4random_buf])
 dnl Check for mmap support for Xvfb
 AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP, 1, [Have the 'mmap' function.]))
 dnl Find the math libary
 AC_CHECK_LIB(m, sqrt)
 AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
 AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
 dnl AGPGART headers
 AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)
 AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])

 @@ -123,26 +123,29 @@
 /* Have Quartz */
 #undef XQUARTZ
 /* Support application updating through sparkle. */
 #undef XQUARTZ_SPARKLE
 /* Prefix to use for launchd identifiers */
 #undef LAUNCHD_ID_PREFIX
 /* Build a standalone xpbproxy */
 #undef STANDALONE_XPBPROXY
 /* Define to 1 if you have the `bsd' library (-lbsd). */
 #undef HAVE_LIBBSD
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 /* Define to 1 if you have the `link' function. */
 #undef HAVE_LINK
 /* Define to 1 if you have the <linux/agpgart.h> header file. */
 #undef HAVE_LINUX_AGPGART_H
 /* Define to 1 if you have the <linux/apm_bios.h> header file. */
 #undef HAVE_LINUX_APM_BIOS_H
 /* Define to 1 if you have the <linux/fb.h> header file. */
 @@ -150,26 +153,29 @@
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 /* Define to 1 if you have the <ndbm.h> header file. */
 #undef HAVE_NDBM_H
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 /* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
 #undef HAVE_RPCSVC_DBM_H
 /* Define to 1 if you have the `arc4random_buf' function. */
 #undef HAVE_ARC4RANDOM_BUF
 /* Define to use libc SHA1 functions */
 #undef HAVE_SHA1_IN_LIBC
 /* Define to use CommonCrypto SHA1 functions */
 #undef HAVE_SHA1_IN_COMMONCRYPTO
 /* Define to use libmd SHA1 functions */
 #undef HAVE_SHA1_IN_LIBMD
 /* Define to use libgcrypt SHA1 functions */
 #undef HAVE_SHA1_IN_LIBGCRYPT
 /* Define to use libsha1 for SHA1 */

 @@ -35,26 +35,29 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 # include   <X11/X.h>
 # include   <X11/Xauth.h>
 # include   "misc.h"
 # include   "osdep.h"
 # include   "dixstruct.h"
 # include   <sys/types.h>
 # include   <sys/stat.h>
 #ifdef WIN32
 #include    <X11/Xw32defs.h>
 #endif
 #ifdef HAVE_LIBBSD
 #include   <bsd/stdlib.h>       /* for arc4random_buf() */
 #endif
 struct protocol {
     unsigned short   name_length;
     char    *name;
     AuthAddCFunc	Add;	/* new authorization data */
     AuthCheckFunc	Check;	/* verify client authorization data */
     AuthRstCFunc	Reset;	/* delete all authorization data entries */
     AuthFromIDFunc	FromID;	/* convert ID to cookie */
     AuthRemCFunc	Remove;	/* remove a specific cookie */
 #ifdef XCSECURITY
     AuthGenCFunc	Generate;
 #endif
 };
 @@ -307,21 +310,25 @@ GenerateAuthorization(
 	    memcmp (protocols[i].name, name, (int) name_length) == 0 &&
 	    protocols[i].Generate)
+    	{
 	    return (*protocols[i].Generate) (data_length, data,
 			FakeClientID(0), data_length_return, data_return);
+    	}
+    }
     return -1;
+}
 void
 GenerateRandomData (int len, char *buf)
+{
 #ifdef HAVE_ARC4RANDOMBUF
     arc4random_buf(buf, len);
 #else
     int fd;
     fd = open("/dev/urandom", O_RDONLY);
     read(fd, buf, len);
     close(fd);
 #endif
+}
 #endif /* XCSECURITY */

 @@ -124,26 +124,29 @@
 /* Have Quartz */
 /* #undef XQUARTZ */
 /* Support application updating through sparkle. */
 /* #undef XQUARTZ_SPARKLE */
 /* Prefix to use for launchd identifiers */
 #define LAUNCHD_ID_PREFIX "org.x"
 /* Build a standalone xpbproxy */
 /* #undef STANDALONE_XPBPROXY */
 /* Define to 1 if you have the `bsd' library (-lbsd). */
 /* #undef HAVE_LIBBSD */
 /* Define to 1 if you have the `m' library (-lm). */
 #define HAVE_LIBM 1
 /* Define to 1 if you have the `link' function. */
 #define HAVE_LINK 1
 /* Define to 1 if you have the <linux/agpgart.h> header file. */
 /* #undef HAVE_LINUX_AGPGART_H */
 /* Define to 1 if you have the <linux/apm_bios.h> header file. */
 /* #undef HAVE_LINUX_APM_BIOS_H */
 /* Define to 1 if you have the <linux/fb.h> header file. */
 @@ -151,26 +154,29 @@
 /* Define to 1 if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
 /* Define to 1 if you have the <ndbm.h> header file. */
 #define HAVE_NDBM_H 1
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 /* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
 /* #undef HAVE_RPCSVC_DBM_H */
 /* Define to 1 if you have the `arc4random_buf' function. */
 #define HAVE_ARC4RANDOM_BUF 1
 /* Define to use libc SHA1 functions */
 #define HAVE_SHA1_IN_LIBC 1
 /* Define to use CommonCrypto SHA1 functions */
 /* #undef HAVE_SHA1_IN_COMMONCRYPTO */
 /* Define to use libmd SHA1 functions */
 /* #undef HAVE_SHA1_IN_LIBMD */
 /* Define to use libgcrypt SHA1 functions */
 /* #undef HAVE_SHA1_IN_LIBGCRYPT */
 /* Define to use libsha1 for SHA1 */