summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-12-14 12:22:20 +0100
committerGünther Deschner <gd@samba.org>2007-12-21 15:29:10 +0100
commit41410c86cc698f997dd82a143fd92277060384b0 (patch)
tree88c8d123f3a43569c671fb98ea1ba1916bbd06eb
parent5b5f75d229978d5b9fe14dca768fd8b68d2ab319 (diff)
downloadsamba-41410c86cc698f997dd82a143fd92277060384b0.tar.gz
samba-41410c86cc698f997dd82a143fd92277060384b0.tar.bz2
samba-41410c86cc698f997dd82a143fd92277060384b0.zip
Some libnet and netapi build fixes.
Guenther (This used to be commit 1d47247283f7bc75291007be3fde72b1d3d95b99)
-rw-r--r--source3/lib/netapi/joindomain.h5
-rw-r--r--source3/lib/netapi/netapi.h5
-rw-r--r--source3/libnet/libnet.h26
-rw-r--r--source3/utils/net_conf.c2
4 files changed, 37 insertions, 1 deletions
diff --git a/source3/lib/netapi/joindomain.h b/source3/lib/netapi/joindomain.h
index d0badd979d..73d2ec3d32 100644
--- a/source3/lib/netapi/joindomain.h
+++ b/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
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index ec629d56d9..0810ecb7bc 100644
--- a/source3/lib/netapi/netapi.h
+++ b/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
diff --git a/source3/libnet/libnet.h b/source3/libnet/libnet.h
new file mode 100644
index 0000000000..fa24c3b40a
--- /dev/null
+++ b/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
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index c853a79249..808ba8d885 100644
--- a/source3/utils/net_conf.c
+++ b/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