summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-04-10 21:52:03 +0200
committerGünther Deschner <gd@samba.org>2008-04-10 21:52:03 +0200
commit8ab9696bfb5e127a35ab31e7e7746388a8f8a365 (patch)
tree86bfb7b1ffb5101105ad825b117ebcb4b24d36d1 /source3/lib
parent4968ce25554b0891bf78601c4b41c8b18c89bde1 (diff)
downloadsamba-8ab9696bfb5e127a35ab31e7e7746388a8f8a365.tar.gz
samba-8ab9696bfb5e127a35ab31e7e7746388a8f8a365.tar.bz2
samba-8ab9696bfb5e127a35ab31e7e7746388a8f8a365.zip
Split out private headers in libnetapi.
Guenther (This used to be commit dd6251d51472a96bfc5ba3d62ea788c8924d4c6b)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/netapi/getdc.c1
-rw-r--r--source3/lib/netapi/joindomain.c1
-rw-r--r--source3/lib/netapi/libnetapi.c1
-rw-r--r--source3/lib/netapi/netapi.h51
-rw-r--r--source3/lib/netapi/netapi_private.h32
-rw-r--r--source3/lib/netapi/serverinfo.c1
-rw-r--r--source3/lib/netapi/user.c1
7 files changed, 80 insertions, 8 deletions
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index a865474019..944cfb24f3 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -21,6 +21,7 @@
#include "librpc/gen_ndr/libnetapi.h"
#include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "libnet/libnet.h"
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 48a6a91888..96c2f3d1fc 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -21,6 +21,7 @@
#include "librpc/gen_ndr/libnetapi.h"
#include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "libnet/libnet.h"
diff --git a/source3/lib/netapi/libnetapi.c b/source3/lib/netapi/libnetapi.c
index eeff7c5229..fd1802f99f 100644
--- a/source3/lib/netapi/libnetapi.c
+++ b/source3/lib/netapi/libnetapi.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "librpc/gen_ndr/libnetapi.h"
#include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
#include "libnetapi.h"
#include "librpc/gen_ndr/ndr_libnetapi.h"
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index a9b50c4e89..7b03e41c19 100644
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -95,16 +95,51 @@ struct libnetapi_ctx {
****************************************************************/
NET_API_STATUS libnetapi_init(struct libnetapi_ctx **ctx);
-NET_API_STATUS libnetapi_getctx(struct libnetapi_ctx **ctx);
+
+/****************************************************************
+****************************************************************/
+
NET_API_STATUS libnetapi_free(struct libnetapi_ctx *ctx);
-NET_API_STATUS libnetapi_set_debuglevel(struct libnetapi_ctx *ctx, const char *debuglevel);
-NET_API_STATUS libnetapi_get_debuglevel(struct libnetapi_ctx *ctx, char **debuglevel);
-NET_API_STATUS libnetapi_set_username(struct libnetapi_ctx *ctx, const char *username);
-NET_API_STATUS libnetapi_set_password(struct libnetapi_ctx *ctx, const char *password);
-NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx, const char *workgroup);
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS libnetapi_getctx(struct libnetapi_ctx **ctx);
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS libnetapi_set_debuglevel(struct libnetapi_ctx *ctx,
+ const char *debuglevel);
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS libnetapi_set_username(struct libnetapi_ctx *ctx,
+ const char *username);
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS libnetapi_set_password(struct libnetapi_ctx *ctx,
+ const char *password);
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx,
+ const char *workgroup);
+
+/****************************************************************
+****************************************************************/
+
const char *libnetapi_errstr(NET_API_STATUS status);
-NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx, const char *format, ...);
-const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx, NET_API_STATUS status);
+
+/****************************************************************
+****************************************************************/
+
+const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
+ NET_API_STATUS status);
/****************************************************************
diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h
new file mode 100644
index 0000000000..2591a7bc09
--- /dev/null
+++ b/source3/lib/netapi/netapi_private.h
@@ -0,0 +1,32 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * NetApi Support
+ * Copyright (C) Guenther Deschner 2008
+ *
+ * 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 __LIB_NETAPI_PRIVATE_H__
+#define __LIB_NETAPI_PRIVATE_H__
+
+NET_API_STATUS libnetapi_get_password(struct libnetapi_ctx *ctx, char **password);
+NET_API_STATUS libnetapi_get_username(struct libnetapi_ctx *ctx, char **username);
+NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx, const char *format, ...);
+NET_API_STATUS libnetapi_get_debuglevel(struct libnetapi_ctx *ctx, char **debuglevel);
+
+WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
+ const char *server_name,
+ struct cli_state **cli);
+WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx);
+#endif
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 643b04c4da..fb5d9402cf 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -21,6 +21,7 @@
#include "librpc/gen_ndr/libnetapi.h"
#include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "libnet/libnet.h"
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 8dcc159c9e..54157a8f82 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -21,6 +21,7 @@
#include "librpc/gen_ndr/libnetapi.h"
#include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
/****************************************************************