From 0cf683dc257e0e6d2cd77d47010c6ce6fae99012 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 23 Feb 2004 21:34:18 +0000
Subject: merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214

---
 src/sm_genid.c   | 4 ++--
 src/sm_manager.c | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/sm_genid.c b/src/sm_genid.c
index 8771d07..01e6e35 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/SM/sm_genid.c,v 3.17 2003/07/09 15:27:28 tsi Exp $ */
+/* $XFree86: xc/lib/SM/sm_genid.c,v 3.18 2004/01/20 03:36:27 dawes Exp $ */
 
 /*
  * Author: Ralph Mor, X Consortium
@@ -136,7 +136,7 @@ SmsGenerateClientID (smsConn)
     struct in_addr *haddr = NULL;
 #if defined(IPv6) && defined(AF_INET6)
     struct addrinfo *ai, *first_ai;
-    if (getaddrinfo(hostname,NULL,NULL,&ai) == 0)
+    if (getaddrinfo(hostname,NULL,NULL,&ai) != 0)
 	return NULL;
 
     for (first_ai = ai; ai != NULL; ai = ai->ai_next) {
diff --git a/src/sm_manager.c b/src/sm_manager.c
index 2f62b15..5c7cc55 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group.
 #include "SMlibint.h"
 #include <X11/Xtrans.h>
 
+#ifdef __USLC__
+#undef shutdown
+#endif
 
 
 Status
-- 
cgit v1.2.3