trying to get HEAD building again. If you want the code

[kai/samba.git] / source3 / client / client.c

diff --git a/source3/client/client.c b/source3/client/client.c
index b498b5b4a88638521d4c50a799ce8ac71ea40100..d9c3a7aa1b197b6c05628d247150cb27ccae434a 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -659,7 +659,7 @@ static int do_get(char *rname, char *lname, BOOL reget)
        GetTimeOfDay(&tp_start);
 
        if (lowercase) {
-               strlower(lname);
+               strlower_m(lname);
        }
 
        fnum = cli_open(cli, rname, O_RDONLY, DENY_NONE);
@@ -834,7 +834,7 @@ static void do_mget(file_info *finfo)
 
        unix_format(finfo->name);
        if (lowercase)
-               strlower(finfo->name);
+               strlower_m(finfo->name);
        
        if (!directory_exist(finfo->name,NULL) && 
            mkdir(finfo->name,0777) != 0) {
@@ -2108,7 +2108,7 @@ static struct
   
   /* Yes, this must be here, see crh's comment above. */
   {"!",NULL,"run a shell command on the local system",{COMPL_NONE,COMPL_NONE}},
-  {"",NULL,NULL,{COMPL_NONE,COMPL_NONE}}
+  {NULL,NULL,NULL,{COMPL_NONE,COMPL_NONE}}
 };
 
 
@@ -2261,8 +2261,14 @@ static char **remote_completion(const char *text, int len)
 {
        pstring dirmask;
        int i;
-       completion_remote_t info = { "", NULL, 1, len, text, len };
+       completion_remote_t info = { "", NULL, 1, 0, NULL, 0 };
 
+       /* can't have non-static intialisation on Sun CC, so do it
+          at run time here */
+       info.samelen = len;
+       info.text = text;
+       info.len = len;
+               
        if (len >= PATH_MAX)
                return(NULL);
 
@@ -2557,6 +2563,9 @@ static struct cli_state *do_connect(const char *server, const char *share)
                if (password[0] || !username[0] || use_kerberos ||
                    !cli_session_setup(c, "", "", 0, "", 0, lp_workgroup())) { 
                        d_printf("session setup failed: %s\n", cli_errstr(c));
+                       if (NT_STATUS_V(cli_nt_error(c)) == 
+                           NT_STATUS_V(NT_STATUS_MORE_PROCESSING_REQUIRED))
+                               d_printf("did you forget to run kinit?\n");
                        cli_shutdown(c);
                        return NULL;
                }
@@ -2741,7 +2750,7 @@ static void remember_query_host(const char *arg,
                { "tar", 'T', POPT_ARG_STRING, NULL, 'T', "Command line tar", "<c|x>IXFqgbNan" },
                { "directory", 'D', POPT_ARG_STRING, NULL, 'D', "Start from directory", "DIR" },
                { "command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated commands" }, 
-               { "send-buffer", 'b', POPT_ARG_INT, NULL, 'b', "Changes the transmit/send buffer", "BYTES" },
+               { "send-buffer", 'b', POPT_ARG_INT, &io_bufsize, 'b', "Changes the transmit/send buffer", "BYTES" },
                { "port", 'p', POPT_ARG_INT, &port, 'p', "Port to connect to", "PORT" },
                POPT_COMMON_SAMBA
                POPT_COMMON_CONNECTION
@@ -2815,9 +2824,6 @@ static void remember_query_host(const char *arg,
                case 'D':
                        fstrcpy(base_directory,poptGetOptArg(pc));
                        break;
-               case 'b':
-                       io_bufsize = MAX(1, atoi(poptGetOptArg(pc)));
-                       break;
                }
        }
 
@@ -2856,6 +2862,7 @@ static void remember_query_host(const char *arg,
 
        pstrcpy(username, cmdline_auth_info.username);
        pstrcpy(password, cmdline_auth_info.password);
+
        use_kerberos = cmdline_auth_info.use_kerberos;
        got_pass = cmdline_auth_info.got_pass;