configure.in: Removed net/route.h from include checks.

include/includes.h: Removed net/route.h as it breaks SCO.
smbd/ipc.c: Memory leak fix from <jasper@Cal005208.student.utwente.nl>
Jeremy.

5 files changed, 2 insertions, 15 deletions

diff --git a/source/configure b/source/configure
index eaba19a2370..50f937c5050 100755
--- a/source/configure
+++ b/source/configure
@@ -1582,7 +1582,7 @@ else
 fi
 done
 
-for ac_hdr in unistd.h utime.h grp.h sys/id.h limits.h memory.h net/route.h net/if.h
+for ac_hdr in unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/source/configure.in b/source/configure.in
index 18770825406..235147297e4 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -79,7 +79,7 @@ AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h)
-AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/route.h net/if.h)
+AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h)
 AC_CHECK_HEADERS(compat.h rpc/rpc.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h sys/param.h ctype.h )
 AC_CHECK_HEADERS(sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h)
 AC_CHECK_HEADERS(sys/filio.h string.h strings.h stdlib.h sys/socket.h)
diff --git a/source/include/config.h.in b/source/include/config.h.in
index 8f4c0a7cd1b..cb23f32fc1b 100644
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -654,9 +654,6 @@
 /* Define if you have the <net/if.h> header file.  */
 #undef HAVE_NET_IF_H
 
-/* Define if you have the <net/route.h> header file.  */
-#undef HAVE_NET_ROUTE_H
-
 /* Define if you have the <netinet/tcp.h> header file.  */
 #undef HAVE_NETINET_TCP_H
 
diff --git a/source/include/includes.h b/source/include/includes.h
index aec688e9130..789c907a639 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -216,15 +216,6 @@
 #include <sys/sem.h>
 #endif
 
-/*
- * Seems to be needed by some OS's that complain
- * about struct rtentry not being defined.
- */
- 
-#ifdef HAVE_NET_ROUTE_H
-#include <net/route.h>
-#endif
-
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index 41892504adc..75d1f31d92f 100644
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -1348,7 +1348,6 @@ static BOOL api_RNetGroupGetUsers(connection_struct *conn, uint16 vuid, char *pa
   if (!prefix_ok(str1,"zWrLeh")) return False;
   
   *rdata_len = 0;
-  *rdata = NULL;
   
   *rparam_len = 8;
   *rparam = REALLOC(*rparam,*rparam_len);