- (dtucker] [misc.c] Shrink the area covered by USE_ROUTINGDOMAIN more

   to eliminate an unused variable warning.

diff --git a/ChangeLog b/ChangeLog
index 8266723e8a8cb8c95fa6f17f516e9e2ffbe9c2de..adb52db3aaf1a1bb84edc242f8375038c6b8b371 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -165,6 +165,8 @@
    too.
  - (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to
    be created.
+ - (dtucker] [misc.c] Shrink the area covered by USE_ROUTINGDOMAIN more
+   to eliminate an unused variable warning.
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

diff --git a/misc.c b/misc.c
index 08a80226d8e150bd72db210b45ce6fad5806b153..f62f8efc6d55769d219eada8b30b44d991a5fb03 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -163,12 +163,12 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
        if (rdomain == -1)
                return (sock);
 
-#ifdef USE_ROUTINGDOMAIN
        switch (domain) {
        case AF_INET6:
                ipproto = IPPROTO_IPV6;
                /* FALLTHROUGH */
        case AF_INET:
+#ifdef USE_ROUTINGDOMAIN
                debug2("socket %d af %d setting rdomain %d",
                    sock, domain, rdomain);
                if (setsockopt(sock, ipproto, SO_RDOMAIN, &rdomain,
@@ -178,6 +178,7 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
                        close(sock);
                        return (-1);
                }
+#endif
                break;
        default:
                debug("socket %d af %d does not support rdomain %d",
@@ -187,9 +188,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
        }
 
        return (sock);
-#else
-       return (-1);
-#endif
 }
 
 /* Characters considered whitespace in strsep calls. */

diff --git a/roaming_client.c b/roaming_client.c
index b77dbd59b9af8296d6d7fedb1dc000b46176a2c7..cfa57f61382f42952ee284429560288fc0adcdfa 100644 (file)
--- a/roaming_client.c
+++ b/roaming_client.c
@@ -15,6 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "includes.h"
+
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/socket.h>