Pass session options around; saves another use of global_loadparm.

[amitay/samba.git] / source4 / libcli / smb_composite / smb_composite.h

diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index e7e131869c95decb5e59583ea823fca05a282e32..08ca40c833072ce4260e8b619f3f97762186a70b 100644 (file)
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -29,6 +29,7 @@
 
 #include "libcli/raw/signing.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/smb2/smb2.h"
 
 
 /*
@@ -56,6 +57,7 @@ struct smb_composite_fetchfile {
                const char *workgroup;
                const char *filename;
                struct smbcli_options options;
+               struct smbcli_session_options session_options;
                struct resolve_context *resolve_ctx;
        } in;
        struct {
@@ -83,8 +85,8 @@ struct smb_composite_savefile {
     - socket establishment
     - session request
     - negprot
-    - session setup
-    - tree connect
+    - session setup (if credentials are not NULL)
+    - tree connect (if service is not NULL)
 */
 struct smb_composite_connect {
        struct {
@@ -97,6 +99,7 @@ struct smb_composite_connect {
                bool fallback_to_anonymous;
                const char *workgroup;
                struct smbcli_options options;
+               struct smbcli_session_options session_options;
        } in;
        struct {
                struct smbcli_tree *tree;