[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Mon May 16 11:02:06 MDT 2011


The branch, v3-6-test has been updated
       via  68936f4 s3-includes: no need to globally include libads/ads_status.h.
       via  58cae16 s3-includes: finally only include client.h when libsmb is used.
       via  66f6359 s3-build Remove distinct LOCALEDIR subsystem
       via  3b2fe47 s3-libsmb: move protos to libsmb/proto.h
      from  138da8f s3: only include tdb headers where needed.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 68936f478dfc0cb9c7ae9e7b208b5e5c22ea2973
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 6 12:54:59 2011 +0200

    s3-includes: no need to globally include libads/ads_status.h.
    
    Guenther
    (cherry picked from commit 1e208a705718adb105d89093041c0ba5d51f2429)

commit 58cae168b5f29afda9dc7132f2770c3f58a89772
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 6 12:53:38 2011 +0200

    s3-includes: finally only include client.h when libsmb is used.
    
    Guenther
    (cherry picked from commit 675573d54b717ffc24cf3b49301ff649aecc259a)

commit 66f6359d9106872e226f08a9bbcf0917c987b84a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Apr 13 15:13:45 2011 +1000

    s3-build Remove distinct LOCALEDIR subsystem
    
    This is no different to the rest of dynconfig, and so should be dealt
    with there.
    
    Andrew Bartlett
    (cherry picked from commit d309499b9e268bff5e366a9986528f0accbc02b3)

commit 3b2fe4728d6d916508b677e696ecad88f8b7b9fd
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 6 11:47:43 2011 +0200

    s3-libsmb: move protos to libsmb/proto.h
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 libgpo/gpo_fetch.c                                 |    1 +
 source3/Makefile.in                                |    9 +-
 source3/auth/auth_domain.c                         |    1 +
 source3/auth/auth_server.c                         |    1 +
 source3/build/dynconfig.py                         |    1 +
 source3/build/wscript                              |    3 -
 source3/client/client.c                            |    1 +
 source3/client/client_proto.h                      |    2 +
 source3/client/clitar.c                            |    1 +
 source3/client/smbspool.c                          |    1 +
 source3/dynconfig.c                                |    1 +
 source3/include/ads.h                              |    1 +
 source3/include/async_smb.h                        |    2 +-
 source3/include/dynconfig.h                        |    4 +
 source3/include/includes.h                         |    3 -
 source3/include/localedir.h                        |    6 -
 source3/include/proto.h                            |  819 +-------------------
 source3/lib/netapi/cm.c                            |    1 +
 source3/libads/ads_status.c                        |    1 +
 source3/libads/ads_status.h                        |    4 +
 source3/libads/kerberos_proto.h                    |    2 +
 source3/libgpo/gpo_filesync.c                      |    1 +
 source3/libnet/libnet_join.c                       |    1 +
 source3/libsmb/async_smb.c                         |    1 +
 source3/libsmb/cli_np_tstream.c                    |    1 +
 source3/libsmb/cliconnect.c                        |    1 +
 source3/libsmb/clidfs.c                            |    1 +
 source3/libsmb/clidgram.c                          |    1 +
 source3/libsmb/clientgen.c                         |    1 +
 source3/libsmb/clierror.c                          |    1 +
 source3/libsmb/clifile.c                           |    1 +
 source3/libsmb/clifsinfo.c                         |    1 +
 source3/libsmb/clilist.c                           |    1 +
 source3/libsmb/climessage.c                        |    1 +
 source3/libsmb/clioplock.c                         |    1 +
 source3/libsmb/cliprint.c                          |    1 +
 source3/libsmb/cliquota.c                          |    1 +
 source3/libsmb/clirap.c                            |    1 +
 source3/libsmb/clirap.h                            |    2 +
 source3/libsmb/clirap2.c                           |    1 +
 source3/libsmb/clireadwrite.c                      |    1 +
 source3/libsmb/clisecdesc.c                        |    1 +
 source3/libsmb/clisigning.c                        |    1 +
 source3/libsmb/clistr.c                            |    1 +
 source3/libsmb/clitrans.c                          |    1 +
 .../libnet/grouptest.h => source3/libsmb/libsmb.h  |   11 +-
 source3/libsmb/libsmb_cache.c                      |    1 +
 source3/libsmb/libsmb_context.c                    |    1 +
 source3/libsmb/libsmb_dir.c                        |    1 +
 source3/libsmb/libsmb_file.c                       |    1 +
 source3/libsmb/libsmb_misc.c                       |    1 +
 source3/libsmb/libsmb_printjob.c                   |    1 +
 source3/libsmb/libsmb_server.c                     |    1 +
 source3/libsmb/libsmb_stat.c                       |    1 +
 source3/libsmb/libsmb_xattr.c                      |    1 +
 source3/libsmb/passchange.c                        |    1 +
 source3/libsmb/proto.h                             |  839 ++++++++++++++++++++
 source3/libsmb/smb_seal.c                          |    1 +
 source3/libsmb/smbsock_connect.c                   |    1 +
 source3/libsmb/trusts_util.c                       |    1 +
 source3/localedir.c                                |    3 -
 source3/nmbd/nmbd_packets.c                        |    1 +
 source3/nmbd/nmbd_synclists.c                      |    1 +
 source3/rpc_client/cli_pipe.c                      |    1 +
 source3/rpc_client/cli_pipe_schannel.c             |    1 +
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |    1 +
 source3/rpcclient/cmd_spoolss.c                    |    1 +
 source3/rpcclient/rpcclient.c                      |    1 +
 source3/smbd/ntquotas.c                            |    1 +
 source3/smbd/nttrans.c                             |    1 +
 source3/smbd/process.c                             |    1 +
 source3/smbd/seal.c                                |    1 +
 source3/smbd/trans2.c                              |    1 +
 source3/torture/denytest.c                         |    1 +
 source3/torture/locktest.c                         |    1 +
 source3/torture/locktest2.c                        |    1 +
 source3/torture/mangle_test.c                      |    1 +
 source3/torture/masktest.c                         |    1 +
 source3/torture/nbench.c                           |    1 +
 source3/torture/nbio.c                             |    1 +
 source3/torture/proto.h                            |    2 +
 source3/torture/scanner.c                          |    1 +
 source3/torture/test_async_echo.c                  |    1 +
 source3/torture/test_case_insensitive.c            |   80 ++
 source3/torture/test_notify_online.c               |  294 +++++++
 source3/torture/test_posix_append.c                |    1 +
 source3/torture/torture.c                          |    1 +
 source3/torture/utable.c                           |    1 +
 source3/utils/net.c                                |    2 +-
 source3/utils/net.h                                |    3 +-
 source3/utils/net_ads.c                            |    1 +
 source3/utils/net_dom.c                            |    1 +
 source3/utils/net_proto.h                          |    1 +
 source3/utils/net_rap.c                            |    1 +
 source3/utils/net_rpc.c                            |    1 +
 source3/utils/net_rpc_join.c                       |    1 +
 source3/utils/net_rpc_printer.c                    |    1 +
 source3/utils/net_rpc_registry.c                   |    1 +
 source3/utils/net_rpc_shell.c                      |    1 +
 source3/utils/net_rpc_trust.c                      |    1 +
 source3/utils/net_time.c                           |    1 +
 source3/utils/net_util.c                           |    1 +
 source3/utils/netlookup.c                          |    1 +
 source3/utils/smbcacls.c                           |    1 +
 source3/utils/smbcquotas.c                         |    1 +
 source3/utils/smbtree.c                            |    1 +
 source3/web/diagnose.c                             |    1 +
 source3/winbindd/winbindd_cm.c                     |    1 +
 source3/wscript_build                              |    7 +-
 109 files changed, 1333 insertions(+), 853 deletions(-)
 delete mode 100644 source3/include/localedir.h
 copy source4/torture/libnet/grouptest.h => source3/libsmb/libsmb.h (81%)
 create mode 100644 source3/libsmb/proto.h
 delete mode 100644 source3/localedir.c
 create mode 100644 source3/torture/test_case_insensitive.c
 create mode 100644 source3/torture/test_notify_online.c


Changeset truncated at 500 lines:

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 00f9b5c..3cfe1d5 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -34,6 +34,7 @@
 #include "lib/util/util.h"
 #else
 #include "libgpo/gpo_proto.h"
+#include "libsmb/libsmb.h"
 #endif
 
 /****************************************************************
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 561f215..ff05d02 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1205,7 +1205,7 @@ NET_OBJ = $(NET_OBJ1) \
 	  $(LIBSMBCONF_OBJ) \
 	  $(REGFIO_OBJ) \
 	  $(PRIVILEGES_BASIC_OBJ) \
-	  $(LIB_EVENTLOG_OBJ) localedir.o
+	  $(LIB_EVENTLOG_OBJ)
 
 CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
@@ -1740,13 +1740,6 @@ libsmb/libsmb_thread_posix.o: libsmb/libsmb_thread_posix.c
 		$(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
 ### End section of object files that require PTHREAD_CFLAGS
 
-localedir.o: localedir.c Makefile
-	@echo Compiling $*.c
-	@$(COMPILE_CC_PATH) && exit 0;\
-		echo "The following command failed:" 1>&2;\
-		echo "$(COMPILE_CC_PATH)" 1>&2;\
-		$(COMPILE_CC_PATH) >/dev/null 2>&1
-
 lib/pidfile.o: lib/pidfile.c
 	@echo Compiling $*.c
 	@$(COMPILE_CC_PATH) && exit 0;\
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 5824d91..8a71603 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -26,6 +26,7 @@
 #include "rpc_client/cli_netlogon.h"
 #include "secrets.h"
 #include "passdb.h"
+#include "libsmb/libsmb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 5dc8ea7..94530ab 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -22,6 +22,7 @@
 #include "auth.h"
 #include "system/passwd.h"
 #include "smbd/smbd.h"
+#include "libsmb/libsmb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index f243baa..65436b9 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -30,6 +30,7 @@ dyn_cflags = {
     'CONFIGFILE'                     : '${SYSCONFDIR}/smb.conf',
     'DATADIR'                        : '${DATADIR}',
     'LIBDIR'                         : '${LIBDIR}',
+    'LOCALEDIR'                      : '${LOCALEDIR}',
     'LMHOSTSFILE'                    : '${SYSCONFDIR}/lmhosts',
     'LOCKDIR'                        : '${LOCALSTATEDIR}/locks',
     'LOGFILEBASE'                    : '${LOCALSTATEDIR}',
diff --git a/source3/build/wscript b/source3/build/wscript
index 70219bc..d370daf 100644
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -45,9 +45,6 @@ def build(bld):
                         '../dynconfig.c',
                         deps='replace talloc tdb popt',
                         cflags=cflags)
-    bld.SAMBA3_SUBSYSTEM('LOCALE_DIR',
-                        '../localedir.c',
-                        cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
 
 
 def dynconfig_cflags(bld):
diff --git a/source3/client/client.c b/source3/client/client.c
index 4c90716..b94893d 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -32,6 +32,7 @@
 #include "../libcli/smbreadline/smbreadline.h"
 #include "../libcli/security/security.h"
 #include "system/select.h"
+#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
 #include "libsmb/nmblib.h"
diff --git a/source3/client/client_proto.h b/source3/client/client_proto.h
index fa3ca40..d119014 100644
--- a/source3/client/client_proto.h
+++ b/source3/client/client_proto.h
@@ -23,6 +23,8 @@
 #ifndef _CLIENT_PROTO_H_
 #define _CLIENT_PROTO_H_
 
+struct cli_state;
+struct file_info;
 
 /* The following definitions come from client/client.c  */
 
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 289e578..f8178c7 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -38,6 +38,7 @@
 #include "system/filesys.h"
 #include "clitar.h"
 #include "client/client_proto.h"
+#include "libsmb/libsmb.h"
 
 static int clipfind(char **aret, int ret, char *tok);
 
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 5a736c4..e16086d 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/passwd.h"
+#include "libsmb/libsmb.h"
 
 /*
  * Starting with CUPS 1.3, Kerberos support is provided by cupsd including
diff --git a/source3/dynconfig.c b/source3/dynconfig.c
index c3ecae5..32f64a6 100644
--- a/source3/dynconfig.c
+++ b/source3/dynconfig.c
@@ -83,3 +83,4 @@ DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
 DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR)
 DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
+DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
diff --git a/source3/include/ads.h b/source3/include/ads.h
index ee6e5b8..8a8ce28 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -6,6 +6,7 @@
   basically this is a wrapper around ldap
 */
 
+#include "libads/ads_status.h"
 #include "smb_ldap.h"
 
 struct ads_struct;
diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h
index d2303cc..a8852b2 100644
--- a/source3/include/async_smb.h
+++ b/source3/include/async_smb.h
@@ -20,7 +20,7 @@
 #ifndef __ASYNC_SMB_H__
 #define __ASYNC_SMB_H__
 
-#include "includes.h"
+struct cli_state;
 
 /*
  * Fetch an error out of a NBT packet
diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h
index cd6dcb7..d0e42dc 100644
--- a/source3/include/dynconfig.h
+++ b/source3/include/dynconfig.h
@@ -94,3 +94,7 @@ bool is_default_dyn_SMB_PASSWD_FILE(void);
 const char *get_dyn_PRIVATE_DIR(void);
 const char *set_dyn_PRIVATE_DIR(const char *newpath);
 bool is_default_dyn_PRIVATE_DIR(void);
+
+const char *get_dyn_LOCALEDIR(void);
+const char *set_dyn_LOCALEDIR(const char *newpath);
+bool is_default_dyn_LOCALEDIR(void);
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 432e475..1beca26 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -521,7 +521,6 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/debug_s3.h"
 
 #include "../libcli/util/ntstatus.h"
-#include "libads/ads_status.h"
 #include "../libcli/util/error.h"
 #include "../lib/util/charset/charset.h"
 #include "dynconfig.h"
@@ -530,8 +529,6 @@ typedef char fstring[FSTRING_LEN];
 #include "smb.h"
 #include "../lib/util/byteorder.h"
 
-#include "client.h"
-
 #include "module.h"
 #include "../lib/util/talloc_stack.h"
 #include "../lib/util/smb_threads.h"
diff --git a/source3/include/localedir.h b/source3/include/localedir.h
deleted file mode 100644
index 2a291d3..0000000
--- a/source3/include/localedir.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LOCALEDIR_H__
-#define __LOCALEDIR_H__
-
-extern const char *dyn_LOCALEDIR;
-
-#endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c48d58f..d25764b 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1069,735 +1069,6 @@ void wins_srv_tags_free(char **list);
 struct in_addr wins_srv_ip_tag(const char *tag, struct in_addr src_ip);
 unsigned wins_srv_count_tag(const char *tag);
 
-/* The following definitions come from libsmb/cliconnect.c  */
-
-ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, 
-			      const char *pass, const char *user_domain,
-				    const char * dest_realm);
-
-NTSTATUS cli_session_setup(struct cli_state *cli,
-			   const char *user,
-			   const char *pass, int passlen,
-			   const char *ntpass, int ntpasslen,
-			   const char *workgroup);
-struct tevent_req *cli_session_setup_guest_create(TALLOC_CTX *mem_ctx,
-						  struct event_context *ev,
-						  struct cli_state *cli,
-						  struct tevent_req **psmbreq);
-struct tevent_req *cli_session_setup_guest_send(TALLOC_CTX *mem_ctx,
-						struct event_context *ev,
-						struct cli_state *cli);
-NTSTATUS cli_session_setup_guest_recv(struct tevent_req *req);
-struct tevent_req *cli_ulogoff_send(TALLOC_CTX *mem_ctx,
-				    struct tevent_context *ev,
-				    struct cli_state *cli);
-NTSTATUS cli_ulogoff_recv(struct tevent_req *req);
-NTSTATUS cli_ulogoff(struct cli_state *cli);
-struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *share, const char *dev,
-					const char *pass, int passlen,
-					struct tevent_req **psmbreq);
-struct tevent_req *cli_tcon_andx_send(TALLOC_CTX *mem_ctx,
-				      struct event_context *ev,
-				      struct cli_state *cli,
-				      const char *share, const char *dev,
-				      const char *pass, int passlen);
-NTSTATUS cli_tcon_andx_recv(struct tevent_req *req);
-NTSTATUS cli_tcon_andx(struct cli_state *cli, const char *share,
-		       const char *dev, const char *pass, int passlen);
-struct tevent_req *cli_tdis_send(TALLOC_CTX *mem_ctx,
-                                 struct tevent_context *ev,
-                                 struct cli_state *cli);
-NTSTATUS cli_tdis_recv(struct tevent_req *req);
-NTSTATUS cli_tdis(struct cli_state *cli);
-NTSTATUS cli_negprot(struct cli_state *cli);
-struct tevent_req *cli_negprot_send(TALLOC_CTX *mem_ctx,
-				    struct event_context *ev,
-				    struct cli_state *cli);
-NTSTATUS cli_negprot_recv(struct tevent_req *req);
-bool cli_session_request(struct cli_state *cli,
-			 struct nmb_name *calling, struct nmb_name *called);
-NTSTATUS cli_connect(struct cli_state *cli,
-		const char *host,
-		struct sockaddr_storage *dest_ss);
-NTSTATUS cli_start_connection(struct cli_state **output_cli, 
-			      const char *my_name, 
-			      const char *dest_host, 
-			      struct sockaddr_storage *dest_ss, int port,
-			      int signing_state, int flags);
-NTSTATUS cli_full_connection(struct cli_state **output_cli, 
-			     const char *my_name, 
-			     const char *dest_host, 
-			     struct sockaddr_storage *dest_ss, int port,
-			     const char *service, const char *service_type,
-			     const char *user, const char *domain, 
-			     const char *password, int flags,
-			     int signing_state);
-bool attempt_netbios_session_request(struct cli_state **ppcli, const char *srchost, const char *desthost,
-                                     struct sockaddr_storage *pdest_ss);
-NTSTATUS cli_raw_tcon(struct cli_state *cli, 
-		      const char *service, const char *pass, const char *dev,
-		      uint16 *max_xmit, uint16 *tid);
-struct cli_state *get_ipc_connect(char *server,
-				struct sockaddr_storage *server_ss,
-				const struct user_auth_info *user_info);
-struct cli_state *get_ipc_connect_master_ip(TALLOC_CTX *ctx,
-				struct sockaddr_storage *mb_ip,
-				const struct user_auth_info *user_info,
-				char **pp_workgroup_out);
-struct cli_state *get_ipc_connect_master_ip_bcast(TALLOC_CTX *ctx,
-					const struct user_auth_info *user_info,
-					char **pp_workgroup_out);
-
-/* The following definitions come from libsmb/clidfs.c  */
-
-NTSTATUS cli_cm_force_encryption(struct cli_state *c,
-			const char *username,
-			const char *password,
-			const char *domain,
-			const char *sharename);
-struct cli_state *cli_cm_open(TALLOC_CTX *ctx,
-				struct cli_state *referring_cli,
-				const char *server,
-				const char *share,
-				const struct user_auth_info *auth_info,
-				bool show_hdr,
-				bool force_encrypt,
-				int max_protocol,
-				int port,
-				int name_type);
-void cli_cm_display(const struct cli_state *c);
-struct client_dfs_referral;
-NTSTATUS cli_dfs_get_referral(TALLOC_CTX *ctx,
-			struct cli_state *cli,
-			const char *path,
-			struct client_dfs_referral **refs,
-			size_t *num_refs,
-			size_t *consumed);
-bool cli_resolve_path(TALLOC_CTX *ctx,
-			const char *mountpt,
-			const struct user_auth_info *dfs_auth_info,
-			struct cli_state *rootcli,
-			const char *path,
-			struct cli_state **targetcli,
-			char **pp_targetpath);
-
-bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
-			struct cli_state *cli,
-			const char *sharename,
-			char **pp_newserver,
-			char **pp_newshare,
-			bool force_encrypt,
-			const char *username,
-			const char *password,
-			const char *domain);
-
-/* The following definitions come from libsmb/clientgen.c  */
-
-int cli_set_message(char *buf,int num_words,int num_bytes,bool zero);
-unsigned int cli_set_timeout(struct cli_state *cli, unsigned int timeout);
-void cli_set_port(struct cli_state *cli, int port);
-bool cli_state_seqnum_persistent(struct cli_state *cli,
-				 uint16_t mid);
-bool cli_state_seqnum_remove(struct cli_state *cli,
-			     uint16_t mid);
-bool cli_receive_smb(struct cli_state *cli);
-bool cli_send_smb(struct cli_state *cli);
-void cli_setup_packet_buf(struct cli_state *cli, char *buf);
-void cli_setup_packet(struct cli_state *cli);
-void cli_setup_bcc(struct cli_state *cli, void *p);
-NTSTATUS cli_set_domain(struct cli_state *cli, const char *domain);
-NTSTATUS cli_set_username(struct cli_state *cli, const char *username);
-NTSTATUS cli_set_password(struct cli_state *cli, const char *password);
-NTSTATUS cli_init_creds(struct cli_state *cli, const char *username, const char *domain, const char *password);
-struct cli_state *cli_initialise(void);
-struct cli_state *cli_initialise_ex(int signing_state);
-void cli_nt_pipes_close(struct cli_state *cli);
-void cli_shutdown(struct cli_state *cli);
-void cli_sockopt(struct cli_state *cli, const char *options);
-uint16 cli_setpid(struct cli_state *cli, uint16 pid);
-bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
-struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
-				 struct cli_state *cli, uint16_t num_echos,
-				 DATA_BLOB data);
-NTSTATUS cli_echo_recv(struct tevent_req *req);
-NTSTATUS cli_echo(struct cli_state *cli, uint16_t num_echos, DATA_BLOB data);
-bool cli_ucs2(struct cli_state *cli);
-bool is_andx_req(uint8_t cmd);
-NTSTATUS cli_smb(TALLOC_CTX *mem_ctx, struct cli_state *cli,
-		 uint8_t smb_command, uint8_t additional_flags,
-		 uint8_t wct, uint16_t *vwv,
-		 uint32_t num_bytes, const uint8_t *bytes,
-		 struct tevent_req **result_parent,
-		 uint8_t min_wct, uint8_t *pwct, uint16_t **pvwv,
-		 uint32_t *pnum_bytes, uint8_t **pbytes);
-
-/* The following definitions come from libsmb/clierror.c  */
-
-const char *cli_errstr(struct cli_state *cli);
-NTSTATUS cli_nt_error(struct cli_state *cli);
-void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode);
-int cli_errno(struct cli_state *cli);
-bool cli_is_error(struct cli_state *cli);
-bool cli_is_nt_error(struct cli_state *cli);
-bool cli_is_dos_error(struct cli_state *cli);
-NTSTATUS cli_get_nt_error(struct cli_state *cli);
-void cli_set_nt_error(struct cli_state *cli, NTSTATUS status);
-void cli_reset_error(struct cli_state *cli);
-bool cli_state_is_connected(struct cli_state *cli);
-
-/* The following definitions come from libsmb/clifile.c  */
-
-struct tevent_req *cli_setpathinfo_send(TALLOC_CTX *mem_ctx,
-					struct tevent_context *ev,
-					struct cli_state *cli,
-					uint16_t level,
-					const char *path,
-					uint8_t *data,
-					size_t data_len);
-NTSTATUS cli_setpathinfo_recv(struct tevent_req *req);
-NTSTATUS cli_setpathinfo(struct cli_state *cli,
-			 uint16_t level,
-			 const char *path,
-			 uint8_t *data,
-			 size_t data_len);
-
-struct tevent_req *cli_posix_symlink_send(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *oldname,
-					const char *newname);
-NTSTATUS cli_posix_symlink_recv(struct tevent_req *req);
-NTSTATUS cli_posix_symlink(struct cli_state *cli,
-			const char *oldname,
-			const char *newname);
-struct tevent_req *cli_posix_readlink_send(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *fname,
-					size_t len);
-NTSTATUS cli_posix_readlink_recv(struct tevent_req *req, struct cli_state *cli,
-				char *retpath, size_t len);
-NTSTATUS cli_posix_readlink(struct cli_state *cli, const char *fname,
-			char *linkpath, size_t len);
-struct tevent_req *cli_posix_hardlink_send(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *oldname,
-					const char *newname);
-NTSTATUS cli_posix_hardlink_recv(struct tevent_req *req);
-NTSTATUS cli_posix_hardlink(struct cli_state *cli,
-			const char *oldname,
-			const char *newname);
-uint32_t unix_perms_to_wire(mode_t perms);
-mode_t wire_perms_to_unix(uint32_t perms);
-struct tevent_req *cli_posix_getfacl_send(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *fname);
-NTSTATUS cli_posix_getfacl_recv(struct tevent_req *req,
-				TALLOC_CTX *mem_ctx,
-				size_t *prb_size,
-				char **retbuf);
-NTSTATUS cli_posix_getfacl(struct cli_state *cli,
-			const char *fname,
-			TALLOC_CTX *mem_ctx,
-			size_t *prb_size,
-			char **retbuf);
-struct tevent_req *cli_posix_stat_send(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *fname);
-NTSTATUS cli_posix_stat_recv(struct tevent_req *req,
-				SMB_STRUCT_STAT *sbuf);
-NTSTATUS cli_posix_stat(struct cli_state *cli,
-			const char *fname,
-			SMB_STRUCT_STAT *sbuf);
-struct tevent_req *cli_posix_chmod_send(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *fname,
-					mode_t mode);
-NTSTATUS cli_posix_chmod_recv(struct tevent_req *req);
-NTSTATUS cli_posix_chmod(struct cli_state *cli, const char *fname, mode_t mode);
-struct tevent_req *cli_posix_chown_send(TALLOC_CTX *mem_ctx,
-					struct event_context *ev,
-					struct cli_state *cli,
-					const char *fname,
-					uid_t uid,
-					gid_t gid);
-NTSTATUS cli_posix_chown_recv(struct tevent_req *req);
-NTSTATUS cli_posix_chown(struct cli_state *cli,
-			const char *fname,
-			uid_t uid,
-			gid_t gid);
-struct tevent_req *cli_rename_send(TALLOC_CTX *mem_ctx,
-                                struct event_context *ev,
-                                struct cli_state *cli,
-                                const char *fname_src,
-                                const char *fname_dst);
-NTSTATUS cli_rename_recv(struct tevent_req *req);
-NTSTATUS cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst);
-struct tevent_req *cli_ntrename_send(TALLOC_CTX *mem_ctx,
-                                struct event_context *ev,
-                                struct cli_state *cli,
-                                const char *fname_src,


-- 
Samba Shared Repository


More information about the samba-cvs mailing list