Some libnet and netapi build fixes.

Guenther
(This used to be commit 1d47247283)

source3/lib/netapi/joindomain.h

@@ -17,6 +17,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __LIB_NETAPI_JOINDOMAIN_H__
+#define __LIB_NETAPI_JOINDOMAIN_H__
+
 WERROR NetJoinDomain(const char *server,
 		     const char *domain,
 		     const char *account_ou,
@@ -30,3 +33,5 @@ WERROR NetUnjoinDomain(const char *server_name,
 WERROR NetGetJoinInformation(const char *server_name,
 			     const char **name_buffer,
 			     uint16_t *name_type);
+
+#endif

source3/lib/netapi/netapi.h

@@ -17,6 +17,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __LIB_NETAPI_H__
+#define __LIB_NETAPI_H__
+
 struct libnetapi_ctx {
 	int debuglevel;
 };
@@ -25,3 +28,5 @@ WERROR libnetapi_init(struct libnetapi_ctx **ctx);
 WERROR libnetapi_free(struct libnetapi_ctx *ctx);
 
 #include "joindomain.h"
+
+#endif

source3/libnet/libnet.h

@@ -0,0 +1,26 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *  libnet Support
+ *  Copyright (C) Guenther Deschner 2007
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LIBNET_H__
+#define __LIBNET_H__
+
+#include "libnet/libnet_join.h"
+#include "libnet/libnet_proto.h"
+
+#endif

source3/utils/net_conf.c

@@ -26,7 +26,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
-#include "libnet/libnet_proto.h"
+#include "libnet/libnet.h"
 
 /*
  * usage functions