Remove bdb env on exit

[netatalk.git] / libatalk / netddp / netddp_open.c

diff --git a/libatalk/netddp/netddp_open.c b/libatalk/netddp/netddp_open.c
index 2cf9007fabb42b06acafda956c9a81bd9e3d8898..20ab8efc3b8c98433d7d10bceb47d771f57bfcf9 100644 (file)
--- a/libatalk/netddp/netddp_open.c
+++ b/libatalk/netddp/netddp_open.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_open.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: netddp_open.c,v 1.9 2005-04-28 20:50:02 bfernhomberg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -13,16 +13,14 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-static int _netddp_open_dummy;
-
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
 #endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>
@@ -30,6 +28,11 @@ static int _netddp_open_dummy;
 
 int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
 {
+
+#ifdef NO_DDP
+    return -1;
+#else /* !NO_DDP */
+
     int s;
 
 #ifdef MACOSX_SERVER
@@ -56,7 +59,7 @@ int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
       bridge->sat_port = baddress.socket;
     }
 #else /* MACOSX_SERVER */
-    int len;
+    socklen_t len;
 
     if ((s = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0) 
        return -1;
@@ -80,4 +83,5 @@ int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
 #endif /* MACOSX_SERVER */
 
     return s;
+#endif /* NO_DDP */
 }