Changeset 745 for trunk/server/source4/ntvfs/cifs

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/ntvfs/cifs/vfs_cifs.c (modified) (2 diffs)

trunk/server/source4/ntvfs/cifs/vfs_cifs.c

@@ -232 +232 @@
         /* connect to the server, using the smbd event context */
         io.in.dest_host = host;
-        io.in.dest_ports = lp_smb_ports(ntvfs->ctx->lp_ctx);
-        io.in.socket_options = lp_socket_options(ntvfs->ctx->lp_ctx);
+        io.in.dest_ports = lpcfg_smb_ports(ntvfs->ctx->lp_ctx);
+        io.in.socket_options = lpcfg_socket_options(ntvfs->ctx->lp_ctx);
         io.in.called_name = host;
         io.in.credentials = credentials;
         io.in.fallback_to_anonymous = false;
-        io.in.workgroup = lp_workgroup(ntvfs->ctx->lp_ctx);
+        io.in.workgroup = lpcfg_workgroup(ntvfs->ctx->lp_ctx);
         io.in.service = remote_share;
         io.in.service_type = "?????";
-        io.in.iconv_convenience = lp_iconv_convenience(ntvfs->ctx->lp_ctx);
-        io.in.gensec_settings = lp_gensec_settings(p, ntvfs->ctx->lp_ctx);
-        lp_smbcli_options(ntvfs->ctx->lp_ctx, &io.in.options);
-        lp_smbcli_session_options(ntvfs->ctx->lp_ctx, &io.in.session_options);
+        io.in.gensec_settings = lpcfg_gensec_settings(p, ntvfs->ctx->lp_ctx);
+        lpcfg_smbcli_options(ntvfs->ctx->lp_ctx, &io.in.options);
+        lpcfg_smbcli_session_options(ntvfs->ctx->lp_ctx, &io.in.session_options);
 
         if (!(ntvfs->ctx->client_caps & NTVFS_CLIENT_CAP_LEVEL_II_OPLOCKS)) {
@@ -250 +249 @@
 
         creq = smb_composite_connect_send(&io, p,
-                                          lp_resolve_context(ntvfs->ctx->lp_ctx),
+                                          lpcfg_resolve_context(ntvfs->ctx->lp_ctx),
                                           ntvfs->ctx->event_ctx);
         status = smb_composite_connect_recv(creq, p);