merge upstream 3.4.0

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2936 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 39 insertions, 0 deletions

diff --git a/source4/utils/net/net.h b/source4/utils/net/net.h
new file mode 100644
index 0000000000..16223a15bb
--- /dev/null
+++ b/source4/utils/net/net.h
@@ -0,0 +1,39 @@
+/* 
+   Samba Unix/Linux SMB client library 
+   Distributed SMB/CIFS Server Management Utility 
+
+   Copyright (C) Stefan Metzmacher 2004
+
+   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 _UTIL_NET_H
+#define _UTIL_NET_H
+
+struct net_context {
+	struct cli_credentials *credentials;
+	struct loadparm_context *lp_ctx;
+	struct tevent_context *event_ctx;
+};
+
+struct net_functable {
+	const char *name;
+	const char *desc;
+	int (*fn)(struct net_context *ctx, int argc, const char **argv);
+	int (*usage)(struct net_context *ctx, int argc, const char **argv);
+};
+
+#include "utils/net/net_proto.h"
+
+#endif /* _UTIL_NET_H */