Changeset 745 for trunk/server/source4/libcli/smb_composite

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/smb_composite/appendacl.c (modified) (1 diff)
• source4/libcli/smb_composite/connect.c (modified) (6 diffs)
• source4/libcli/smb_composite/fetchfile.c (modified) (1 diff)
• source4/libcli/smb_composite/fsinfo.c (modified) (1 diff)
• source4/libcli/smb_composite/smb_composite.h (modified) (4 diffs)

trunk/server/source4/libcli/smb_composite/appendacl.c

@@ -255 +255 @@
         
         state->io_open->ntcreatex.level               = RAW_OPEN_NTCREATEX;
-        state->io_open->ntcreatex.in.root_fid = 0;
+        state->io_open->ntcreatex.in.root_fid.fnum    = 0;
         state->io_open->ntcreatex.in.flags            = 0;
         state->io_open->ntcreatex.in.access_mask      = SEC_FLAG_MAXIMUM_ALLOWED;

trunk/server/source4/libcli/smb_composite/connect.c

@@ -31 +31 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
+#include "lib/util/util_net.h"
 
 /* the stages of this call */
-enum connect_stage {CONNECT_RESOLVE, 
-                    CONNECT_SOCKET, 
+enum connect_stage {CONNECT_SOCKET, 
                     CONNECT_SESSION_REQUEST,
                     CONNECT_NEGPROT,
@@ -324 +324 @@
         /* the socket is up - we can initialise the smbcli transport layer */
         state->transport = smbcli_transport_init(state->sock, state, true, 
-                                                 &io->in.options, io->in.iconv_convenience);
+                                                 &io->in.options);
         NT_STATUS_HAVE_NO_MEMORY(state->transport);
 
@@ -363 +363 @@
 
 /*
-  called when name resolution is finished
-*/
-static NTSTATUS connect_resolve(struct composite_context *c, 
-                                struct smb_composite_connect *io)
-{
-        struct connect_state *state = talloc_get_type(c->private_data, struct connect_state);
-        NTSTATUS status;
-        const char *address;
-
-        status = resolve_name_recv(state->creq, state, &address);
-        NT_STATUS_NOT_OK_RETURN(status);
-
-        state->creq = smbcli_sock_connect_send(state, address, 
-                                               io->in.dest_ports,
-                                               io->in.dest_host, 
-                                               NULL, c->event_ctx, 
-                                                  io->in.socket_options);
-        NT_STATUS_HAVE_NO_MEMORY(state->creq);
-
-        state->stage = CONNECT_SOCKET;
-        state->creq->async.private_data = c;
-        state->creq->async.fn = composite_handler;
-
-        return NT_STATUS_OK;
-}
-
-
-/*
   handle and dispatch state transitions
 */
@@ -398 +370 @@
 
         switch (state->stage) {
-        case CONNECT_RESOLVE:
-                c->status = connect_resolve(c, state->io);
-                break;
         case CONNECT_SOCKET:
                 c->status = connect_socket(c, state->io);
@@ -462 +431 @@
         struct composite_context *c;
         struct connect_state *state;
-        struct nbt_name name;
 
         c = talloc_zero(mem_ctx, struct composite_context);
@@ -479 +447 @@
         c->private_data = state;
 
-        state->stage = CONNECT_RESOLVE;
-        make_nbt_name_server(&name, io->in.dest_host);
-        state->creq = resolve_name_send(resolve_ctx, state, &name, c->event_ctx);
-
+        state->creq = smbcli_sock_connect_send(state, 
+                                               NULL,
+                                               io->in.dest_ports,
+                                               io->in.dest_host, 
+                                               resolve_ctx, c->event_ctx, 
+                                               io->in.socket_options);
         if (state->creq == NULL) goto failed;
+
+        state->stage = CONNECT_SOCKET;
         state->creq->async.private_data = c;
         state->creq->async.fn = composite_handler;

trunk/server/source4/libcli/smb_composite/fetchfile.c

@@ -147 +147 @@
         state->connect->in.workgroup    = io->in.workgroup;
         state->connect->in.gensec_settings = io->in.gensec_settings;
-        state->connect->in.iconv_convenience = io->in.iconv_convenience;
 
         state->connect->in.options      = io->in.options;

trunk/server/source4/libcli/smb_composite/fsinfo.c

@@ -154 +154 @@
         state->connect->in.fallback_to_anonymous = false;
         state->connect->in.workgroup    = io->in.workgroup;
-        state->connect->in.iconv_convenience = io->in.iconv_convenience;
         state->connect->in.gensec_settings = io->in.gensec_settings;
 

trunk/server/source4/libcli/smb_composite/smb_composite.h

@@ -61 +61 @@
                 struct smbcli_session_options session_options;
                 struct resolve_context *resolve_ctx;
-                struct smb_iconv_convenience *iconv_convenience;
                 struct gensec_settings *gensec_settings;
         } in;
@@ -105 +104 @@
                 struct smbcli_options options;
                 struct smbcli_session_options session_options;
-                struct smb_iconv_convenience *iconv_convenience;
                 struct gensec_settings *gensec_settings;
         } in;
@@ -146 +144 @@
                 const char *workgroup;
                 enum smb_fsinfo_level level;
-                struct smb_iconv_convenience *iconv_convenience;
                 struct gensec_settings *gensec_settings;
         } in;
@@ -182 +179 @@
                 const char **hostnames;
                 const char **addresses;
-                int *ports;     /* Either NULL for lp_smb_ports() per
+                int *ports;     /* Either NULL for lpcfg_smb_ports() per
                                  * destination or a list of explicit ports */
         } in;