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

trunk/server/source4/client/client.c

@@ -36 +36 @@
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/util/clilsa.h"
 #include "system/dir.h"
@@ -49 +46 @@
 #include "libcli/resolve/resolve.h"
 #include "libcli/security/security.h"
-#include "lib/smbreadline/smbreadline.h"
+#include "../libcli/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
-#include "librpc/rpc/dcerpc.h"
 #include "libcli/raw/raw_proto.h"
 
@@ -77 +73 @@
 /* timing globals */
 static uint64_t get_total_size = 0;
-static uint_t get_total_time_ms = 0;
+static unsigned int get_total_time_ms = 0;
 static uint64_t put_total_size = 0;
-static uint_t put_total_time_ms = 0;
+static unsigned int put_total_time_ms = 0;
 
 /* Unfortunately, there is no way to pass the a context to the completion function as an argument */
@@ -265 +261 @@
            new directory is invalid */
         if (newdir[0] == '\\')
-                dname = talloc_strdup(NULL, newdir);
+                dname = talloc_strdup(ctx, newdir);
         else
-                dname = talloc_asprintf(NULL, "%s\\%s", ctx->remote_cur_dir, newdir);
+                dname = talloc_asprintf(ctx, "%s\\%s", ctx->remote_cur_dir, newdir);
 
         dos_format(dname);
@@ -686 +682 @@
   get a file from rname to lname
   ****************************************************************************/
-static int do_get(struct smbclient_context *ctx, char *rname, const char *lname, bool reget)
+static int do_get(struct smbclient_context *ctx, char *rname, const char *p_lname, bool reget)
 {  
         int handle = 0, fnum;
@@ -698 +694 @@
         off_t nread = 0;
         int rc = 0;
-
+        char *lname;
+
+
+        lname = talloc_strdup(ctx, p_lname);
         GetTimeOfDay(&tp_start);
 
         if (ctx->lowercase) {
-                strlower(discard_const_p(char, lname));
+                strlower(lname);
         }
 
@@ -859 +858 @@
         char *mget_mask;
         char *saved_curdir;
+        char *l_fname;
 
         if (ISDOT(finfo->name) || ISDOTDOT(finfo->name))
@@ -864 +864 @@
 
         if (finfo->attrib & FILE_ATTRIBUTE_DIRECTORY)
-                asprintf(&quest, "Get directory %s? ",finfo->name);
+                quest = talloc_asprintf(ctx, "Get directory %s? ",finfo->name);
         else
-                asprintf(&quest, "Get file %s? ",finfo->name);
+                quest = talloc_asprintf(ctx, "Get file %s? ",finfo->name);
 
         if (ctx->prompt && !yesno(quest)) return;
 
-        SAFE_FREE(quest);
+        talloc_free(quest);
 
         if (!(finfo->attrib & FILE_ATTRIBUTE_DIRECTORY)) {
-                asprintf(&rname, "%s%s",ctx->remote_cur_dir,finfo->name);
+                rname = talloc_asprintf(ctx, "%s%s",ctx->remote_cur_dir,
+                                        finfo->name);
                 do_get(ctx, rname, finfo->name, false);
-                SAFE_FREE(rname);
+                talloc_free(rname);
                 return;
         }
 
         /* handle directories */
-        saved_curdir = talloc_strdup(NULL, ctx->remote_cur_dir);
+        saved_curdir = talloc_strdup(ctx, ctx->remote_cur_dir);
 
         ctx->remote_cur_dir = talloc_asprintf_append_buffer(NULL, "%s\\", finfo->name);
 
-        string_replace(discard_const_p(char, finfo->name), '\\', '/');
+        l_fname = talloc_strdup(ctx, finfo->name);
+
+        string_replace(l_fname, '\\', '/');
         if (ctx->lowercase) {
-                strlower(discard_const_p(char, finfo->name));
-        }
-        
-        if (!directory_exist(finfo->name) && 
-            mkdir(finfo->name,0777) != 0) {
-                d_printf("failed to create directory %s\n",finfo->name);
+                strlower(l_fname);
+        }
+        
+        if (!directory_exist(l_fname) &&
+            mkdir(l_fname, 0777) != 0) {
+                d_printf("failed to create directory %s\n", l_fname);
                 return;
         }
         
-        if (chdir(finfo->name) != 0) {
-                d_printf("failed to chdir to directory %s\n",finfo->name);
+        if (chdir(l_fname) != 0) {
+                d_printf("failed to chdir to directory %s\n", l_fname);
                 return;
         }
 
-        mget_mask = talloc_asprintf(NULL, "%s*", ctx->remote_cur_dir);
+        mget_mask = talloc_asprintf(ctx, "%s*", ctx->remote_cur_dir);
         
         do_list(ctx, mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,do_mget,false, true);
@@ -964 +967 @@
         
         for (i = 1; args[i]; i++) {
-                mget_mask = talloc_strdup(ctx,ctx->remote_cur_dir);
+                mget_mask = talloc_strdup(ctx, ctx->remote_cur_dir);
                 if(mget_mask[strlen(mget_mask)-1]!='\\')
                         mget_mask = talloc_append_string(ctx, mget_mask, "\\");
@@ -1293 +1296 @@
 {
         talloc_free(ctx->fileselection);
-        ctx->fileselection = talloc_strdup(NULL, args[1]);
+        ctx->fileselection = talloc_strdup(ctx, args[1]);
 
         return 0;
@@ -1534 +1537 @@
                 return 1;
         }
-        mask = talloc_asprintf(ctx,"%s%s", ctx->remote_cur_dir, args[1]);
+        mask = talloc_asprintf(ctx, "%s%s", ctx->remote_cur_dir, args[1]);
 
         if (NT_STATUS_IS_ERR(smbcli_unlink(ctx->cli->tree, mask))) {
@@ -2249 +2252 @@
         if (NT_STATUS_IS_ERR(smbcli_unix_chmod(ctx->cli->tree, src, mode))) {
                 d_printf("%s chmod file %s 0%o\n",
-                        smbcli_errstr(ctx->cli->tree), src, (mode_t)mode);
+                        smbcli_errstr(ctx->cli->tree), src, (unsigned)mode);
                 return 1;
         } 
@@ -2604 +2607 @@
         do {
                 ZERO_STRUCT(ctr1);
-                status = dcerpc_srvsvc_NetShareEnumAll(p, mem_ctx, &r);
+                status = dcerpc_srvsvc_NetShareEnumAll_r(p->binding_handle, mem_ctx, &r);
 
                 if (NT_STATUS_IS_OK(status) && 
@@ -2831 +2834 @@
 {
         char *dirmask;
-        int i;
+        int i, ret;
         completion_remote_t info;
 
@@ -2854 +2857 @@
                 info.dirmask = talloc_strndup(NULL, text, i+1);
                 info.dirmask[i+1] = 0;
-                asprintf(&dirmask, "%s%*s*", rl_ctx->remote_cur_dir, i-1, text);
-        } else
-                asprintf(&dirmask, "%s*", rl_ctx->remote_cur_dir);
+                ret = asprintf(&dirmask, "%s%*s*", rl_ctx->remote_cur_dir, i-1,
+                               text);
+        } else {
+                ret = asprintf(&dirmask, "%s*", rl_ctx->remote_cur_dir);
+        }
+        if (ret < 0) {
+                goto cleanup;
+        }
 
         if (smbcli_list(rl_ctx->cli->tree, dirmask, 
@@ -2995 +3003 @@
 
         /* and get the first part of the command */
-        args = str_list_make_shell(ctx, cline, NULL);
+        args = (const char **) str_list_make_shell(ctx, cline, NULL);
         if (!args || !args[0])
                 return 0;
@@ -3054 +3062 @@
                        struct smbcli_options *options,
                        struct smbcli_session_options *session_options,
-                           struct smb_iconv_convenience *iconv_convenience,
                            struct gensec_settings *gensec_settings)
 {
@@ -3077 +3084 @@
                                         cred, resolve_ctx, 
                                         ev_ctx, options, session_options,
-                                        iconv_convenience,
                                         gensec_settings);
         if (!NT_STATUS_IS_OK(status)) {
@@ -3083 +3089 @@
                          server, share, nt_errstr(status));
                 talloc_free(ctx);
-                return NULL;
-        }
-
-        return ctx;
+                return false;
+        }
+
+        return true;
 }
 
@@ -3112 +3118 @@
                          struct resolve_context *resolve_ctx,
                          struct smbcli_options *options,
-                         struct smb_iconv_convenience *iconv_convenience,
              const char *socket_options)
 {
@@ -3128 +3133 @@
             !smbcli_socket_connect(cli, server_name, destports,
                                    ev_ctx, resolve_ctx, options,
-                                   iconv_convenience,
                    socket_options)) {
                 d_printf("Connection to %s failed\n", server_name);
@@ -3152 +3156 @@
  int main(int argc,char *argv[])
 {
-        const char *base_directory = NULL;
+        char *base_directory = NULL;
         const char *dest_ip = NULL;
         int opt;
         const char *query_host = NULL;
         bool message = false;
-        const char *desthost = NULL;
+        char *desthost = NULL;
         poptContext pc;
         const char *service = NULL;
@@ -3258 +3262 @@
         poptFreeContext(pc);
 
-        lp_smbcli_options(cmdline_lp_ctx, &smb_options);
-        lp_smbcli_session_options(cmdline_lp_ctx, &smb_session_options);
+        lpcfg_smbcli_options(cmdline_lp_ctx, &smb_options);
+        lpcfg_smbcli_session_options(cmdline_lp_ctx, &smb_session_options);
 
         ev_ctx = s4_event_context_init(talloc_autofree_context());
@@ -3273 +3277 @@
         if (query_host) {
                 rc = do_host_query(cmdline_lp_ctx, ev_ctx, query_host,
-                                   lp_workgroup(cmdline_lp_ctx));
+                                   lpcfg_workgroup(cmdline_lp_ctx));
                 return rc;
         }
 
         if (message) {
-                rc = do_message_op(lp_netbios_name(cmdline_lp_ctx), desthost,
-                                   lp_smb_ports(cmdline_lp_ctx), dest_ip,
+                rc = do_message_op(lpcfg_netbios_name(cmdline_lp_ctx), desthost,
+                                   lpcfg_smb_ports(cmdline_lp_ctx), dest_ip,
                                    name_type, ev_ctx,
-                                   lp_resolve_context(cmdline_lp_ctx),
-                                   &smb_options, lp_iconv_convenience(cmdline_lp_ctx),
-                   lp_socket_options(cmdline_lp_ctx));
+                                   lpcfg_resolve_context(cmdline_lp_ctx),
+                                   &smb_options, 
+                   lpcfg_socket_options(cmdline_lp_ctx));
                 return rc;
         }
         
-        if (!do_connect(ctx, ev_ctx, lp_resolve_context(cmdline_lp_ctx),
-                        desthost, lp_smb_ports(cmdline_lp_ctx), service,
-                        lp_socket_options(cmdline_lp_ctx),
+        if (!do_connect(ctx, ev_ctx, lpcfg_resolve_context(cmdline_lp_ctx),
+                        desthost, lpcfg_smb_ports(cmdline_lp_ctx), service,
+                        lpcfg_socket_options(cmdline_lp_ctx),
                         cmdline_credentials, &smb_options, &smb_session_options,
-                        lp_iconv_convenience(cmdline_lp_ctx),
-                        lp_gensec_settings(ctx, cmdline_lp_ctx)))
+                        lpcfg_gensec_settings(ctx, cmdline_lp_ctx)))
                 return 1;