Changeset 745 for trunk/server/source4/torture/masktest.c

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/torture/masktest.c (modified) (5 diffs)

trunk/server/source4/torture/masktest.c

@@ -23 +23 @@
 #include "system/dir.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
-#include "dynconfig/dynconfig.h"
 #include "libcli/resolve/resolve.h"
 #include "lib/events/events.h"
@@ -80 +78 @@
                                         struct smbcli_options *options,
                                         struct smbcli_session_options *session_options,
-                                        struct smb_iconv_convenience *iconv_convenience,
                                         struct gensec_settings *gensec_settings)
 {
@@ -102 +99 @@
                                         cmdline_credentials, resolve_ctx, ev,
                                         options, session_options,
-                                        iconv_convenience,
                                         gensec_settings);
 
@@ -336 +332 @@
                 switch (opt) {
                 case OPT_UNCLIST:
-                        lp_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
+                        lpcfg_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
                         break;
                 }
@@ -369 +365 @@
         gensec_init(lp_ctx);
 
-        lp_smbcli_options(lp_ctx, &options);
-        lp_smbcli_session_options(lp_ctx, &session_options);
-
-        cli = connect_one(lp_resolve_context(lp_ctx), ev, mem_ctx, share, 
-                          lp_smb_ports(lp_ctx), lp_socket_options(lp_ctx), 
+        lpcfg_smbcli_options(lp_ctx, &options);
+        lpcfg_smbcli_session_options(lp_ctx, &session_options);
+
+        cli = connect_one(lpcfg_resolve_context(lp_ctx), ev, mem_ctx, share,
+                          lpcfg_smb_ports(lp_ctx), lpcfg_socket_options(lp_ctx),
                           &options, &session_options,
-                          lp_iconv_convenience(lp_ctx),
-                          lp_gensec_settings(mem_ctx, lp_ctx));
+                          lpcfg_gensec_settings(mem_ctx, lp_ctx));
         if (!cli) {
                 DEBUG(0,("Failed to connect to %s\n", share));