[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-02-14 17:15:00
Message-ID: 20050214171500.55BA7143BA () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

cleverer ifdef-ery


  M +13 -11    auth.c   1.49


--- kdebase/kdm/backend/auth.c  #1.48:1.49
@@ -636,5 +636,5 @@ ifioctl (int fd, int cmd, char *arg)
 
 static void
-DefineSelf( int fd, FILE *file, Xauth *auth )
+DefineSelf( FILE *file, Xauth *auth )
 {
         struct ifaddrs *ifap, *ifr;
@@ -645,5 +645,4 @@ DefineSelf( int fd, FILE *file, Xauth *a
                 return;
         for (ifr = ifap; ifr; ifr = ifr->ifa_next) {
-                len = sizeof(*(ifr->ifa_addr));
                 family = ConvertAddr( (XdmcpNetaddr)(ifr->ifa_addr), &len, &addr );
                 if (family == -1 || family == FamilyLocal)
@@ -1013,5 +1012,5 @@ static void
 writeLocalAuth( FILE *file, Xauth *auth, const char *name )
 {
-#ifdef XDMCP
+#if defined(XDMCP) && (defined(STREAMSCONN) || !defined(HAVE_GETIFADDRS))
         int fd;
 #endif
@@ -1020,5 +1019,5 @@ writeLocalAuth( FILE *file, Xauth *auth,
         setAuthNumber( auth, name );
 #ifdef XDMCP
-#ifdef STREAMSCONN
+# ifdef STREAMSCONN
         fd = t_open( "/dev/tcp", O_RDWR, 0 );
         t_bind( fd, NULL, NULL );
@@ -1026,19 +1025,22 @@ writeLocalAuth( FILE *file, Xauth *auth,
         t_unbind( fd );
         t_close( fd );
-#endif
-#ifdef TCPCONN
-#if defined(IPv6) && defined(AF_INET6)
+# elif defined(HAVE_GETIFADDRS)
+        DefineSelf( file, auth );
+# else
+#  ifdef TCPCONN
+#   if defined(IPv6) && defined(AF_INET6)
         fd = socket( AF_INET6, SOCK_STREAM, 0 );
         if (fd < 0)
-#endif
+#   endif
         fd = socket( AF_INET, SOCK_STREAM, 0 );
         DefineSelf( fd, file, auth );
         close( fd );
-#endif
-#ifdef DNETCONN
+#  endif
+#  ifdef DNETCONN
         fd = socket( AF_DECnet, SOCK_STREAM, 0 );
         DefineSelf( fd, file, auth );
         close( fd );
-#endif
+#  endif
+# endif /* HAVE_GETIFADDRS */
 #endif /* XDMCP */
         DefineLocal( file, auth );


[prev in list] [next in list] [prev in thread] [next in thread]