Changeset 745 for trunk/server/source4/torture/locktest.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/locktest.c (modified) (13 diffs)

trunk/server/source4/torture/locktest.c

@@ -27 +27 @@
 #include "libcli/libcli.h"
 #include "param/param.h"
-#include "dynconfig/dynconfig.h"
 #include "libcli/resolve/resolve.h"
 
@@ -35 +34 @@
 static int hide_unlock_fails;
 static int use_oplocks;
-static uint_t lock_range = 100;
-static uint_t lock_base = 0;
-static uint_t min_length = 0;
+static unsigned int lock_range = 100;
+static unsigned int lock_base = 0;
+static unsigned int min_length = 0;
 static int exact_error_codes;
 static int zero_zero;
@@ -120 +119 @@
         struct smbcli_session_options session_options;
 
-        lp_smbcli_options(lp_ctx, &options);
-        lp_smbcli_session_options(lp_ctx, &session_options);
+        lpcfg_smbcli_options(lp_ctx, &options);
+        lpcfg_smbcli_session_options(lp_ctx, &session_options);
 
         printf("connect_one(%s, %d, %d)\n", share, snum, conn);
@@ -135 +134 @@
                 int num_unc_names;
                 const char *p;
-                p = lp_parm_string(lp_ctx, NULL, "torture", "unclist");
+                p = lpcfg_parm_string(lp_ctx, NULL, "torture", "unclist");
                 if (p) {
                         char *h, *s;
@@ -156 +155 @@
 
 
-        myname = talloc_asprintf(mem_ctx, "lock-%u-%u", getpid(), snum);
+        myname = talloc_asprintf(mem_ctx, "lock-%d-%d", (int) getpid(), snum);
         cli_credentials_set_workstation(servers[snum], myname, CRED_SPECIFIED);
 
@@ -163 +162 @@
                 status = smbcli_full_connection(NULL, &c, 
                                                 server, 
-                                                lp_smb_ports(lp_ctx),
+                                                lpcfg_smb_ports(lp_ctx),
                                                 share, NULL,
-                                                lp_socket_options(lp_ctx),
+                                                lpcfg_socket_options(lp_ctx),
                                                 servers[snum], 
-                                                lp_resolve_context(lp_ctx),
+                                                lpcfg_resolve_context(lp_ctx),
                                                 ev, &options, &session_options,
-                                                lp_iconv_convenience(lp_ctx),
-                                                lp_gensec_settings(mem_ctx, lp_ctx));
+                                                lpcfg_gensec_settings(mem_ctx, lp_ctx));
                 if (!NT_STATUS_IS_OK(status)) {
                         sleep(2);
@@ -203 +201 @@
                         talloc_free(cli[server][conn]);
                 }
-                cli[server][conn] = connect_one(ev, lp_ctx, mem_ctx, share[server], 
+                cli[server][conn] = connect_one(ev, lp_ctx, mem_ctx, share[server],
                                                 server, conn);
                 if (!cli[server][conn]) {
@@ -218 +216 @@
                      struct record *rec)
 {
-        uint_t conn = rec->conn;
-        uint_t f = rec->f;
+        unsigned int conn = rec->conn;
+        unsigned int f = rec->f;
         uint64_t start = rec->start;
         uint64_t len = rec->len;
@@ -236 +234 @@
 
                         if (!(tree->session->transport->negotiate.capabilities & CAP_LARGE_FILES)) {
-                                res=smbcli_lock(tree, fn, start, len, LOCK_TIMEOUT, rec->lock_op);
+                                res=smbcli_lock(tree, fn, start, len, LOCK_TIMEOUT, (enum brl_type) rec->lock_op);
                         } else {
                                 union smb_lock parms;
@@ -387 +385 @@
 {
         int i;
-        printf("testing %u ...\n", n);
+        printf("Testing %u ...\n", n);
         for (i=0; i<n; i++) {
                 if (i && i % 100 == 0) {
@@ -408 +406 @@
 static int test_locks(struct tevent_context *ev,
                       struct loadparm_context *lp_ctx,
-                          TALLOC_CTX *mem_ctx,
+                      TALLOC_CTX *mem_ctx,
                       char *share[NSERVERS])
 {
@@ -428 +426 @@
                         recorded[n].conn = random() % NCONNECTIONS;
                         recorded[n].f = random() % NFILES;
-                        recorded[n].start = lock_base + ((uint_t)random() % (lock_range-1));
+                        recorded[n].start = lock_base + ((unsigned int)random() % (lock_range-1));
                         recorded[n].len =  min_length +
                                 random() % (lock_range-(recorded[n].start-lock_base));
@@ -601 +599 @@
                 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;
                 case 'U':