Removed version number from file header.
[samba.git] / source / libsmb / clifile.c
index 8dc16c3f66af05e9d332288077f0d7bec662ca37..71b3f44b0dac737117d9c62ef2575800bda13b99 100644 (file)
@@ -1,8 +1,8 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    client file operations
    Copyright (C) Andrew Tridgell 1994-1998
+   Copyright (C) Jeremy Allison 2001-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 #include "includes.h"
 
 /****************************************************************************
-rename a file
+ Hard/Symlink a file (UNIX extensions).
 ****************************************************************************/
-BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst)
+
+static BOOL cli_link_internal(struct cli_state *cli, const char *fname_src, const char *fname_dst, BOOL hard_link)
+{
+       int data_len = 0;
+       int param_len = 0;
+       uint16 setup = TRANSACT2_SETPATHINFO;
+       char param[sizeof(pstring)+6];
+       pstring data;
+       char *rparam=NULL, *rdata=NULL;
+       char *p;
+
+       memset(param, 0, sizeof(param));
+       SSVAL(param,0,hard_link ? SMB_SET_FILE_UNIX_HLINK : SMB_SET_FILE_UNIX_LINK);
+       p = &param[6];
+
+       p += clistr_push(cli, p, fname_src, -1, STR_TERMINATE);
+       param_len = PTR_DIFF(p, param);
+
+       p = data;
+       p += clistr_push(cli, p, fname_dst, -1, STR_TERMINATE);
+       data_len = PTR_DIFF(p, data);
+
+       if (!cli_send_trans(cli, SMBtrans2,
+               NULL,                        /* name */
+               -1, 0,                          /* fid, flags */
+               &setup, 1, 0,                   /* setup, length, max */
+               param, param_len, 2,            /* param, length, max */
+               (char *)&data,  data_len, cli->max_xmit /* data, length, max */
+               )) {
+                       return False;
+       }
+
+       if (!cli_receive_trans(cli, SMBtrans2,
+               &rparam, &param_len,
+               &rdata, &data_len)) {
+                       return False;
+       }
+
+       SAFE_FREE(rdata);
+       SAFE_FREE(rparam);
+
+       return True;
+}
+
+/****************************************************************************
+ Map standard UNIX permissions onto wire representations.
+****************************************************************************/
+
+uint32  unix_perms_to_wire(mode_t perms)
+{
+        uint ret = 0;
+
+        ret |= ((perms & S_IXOTH) ?  UNIX_X_OTH : 0);
+        ret |= ((perms & S_IWOTH) ?  UNIX_W_OTH : 0);
+        ret |= ((perms & S_IROTH) ?  UNIX_R_OTH : 0);
+        ret |= ((perms & S_IXGRP) ?  UNIX_X_GRP : 0);
+        ret |= ((perms & S_IWGRP) ?  UNIX_W_GRP : 0);
+        ret |= ((perms & S_IRGRP) ?  UNIX_R_GRP : 0);
+        ret |= ((perms & S_IXUSR) ?  UNIX_X_USR : 0);
+        ret |= ((perms & S_IWUSR) ?  UNIX_W_USR : 0);
+        ret |= ((perms & S_IRUSR) ?  UNIX_R_USR : 0);
+#ifdef S_ISVTX
+        ret |= ((perms & S_ISVTX) ?  UNIX_STICKY : 0);
+#endif
+#ifdef S_ISGID
+        ret |= ((perms & S_ISGID) ?  UNIX_SET_GID : 0);
+#endif
+#ifdef S_ISUID
+        ret |= ((perms & S_ISVTX) ?  UNIX_SET_UID : 0);
+#endif
+        return ret;
+}
+
+/****************************************************************************
+ Symlink a file (UNIX extensions).
+****************************************************************************/
+
+BOOL cli_unix_symlink(struct cli_state *cli, const char *fname_src, const char *fname_dst)
 {
-        char *p;
+       return cli_link_internal(cli, fname_src, fname_dst, False);
+}
+
+/****************************************************************************
+ Hard a file (UNIX extensions).
+****************************************************************************/
+
+BOOL cli_unix_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst)
+{
+       return cli_link_internal(cli, fname_src, fname_dst, True);
+}
+
+/****************************************************************************
+ Chmod or chown a file internal (UNIX extensions).
+****************************************************************************/
+
+static BOOL cli_unix_chmod_chown_internal(struct cli_state *cli, const char *fname, uint32 mode, uint32 uid, uint32 gid)
+{
+       int data_len = 0;
+       int param_len = 0;
+       uint16 setup = TRANSACT2_SETPATHINFO;
+       char param[sizeof(pstring)+6];
+       char data[100];
+       char *rparam=NULL, *rdata=NULL;
+       char *p;
+
+       memset(param, 0, sizeof(param));
+       memset(data, 0, sizeof(data));
+       SSVAL(param,0,SMB_SET_FILE_UNIX_BASIC);
+       p = &param[6];
+
+       p += clistr_push(cli, p, fname, -1, STR_TERMINATE);
+       param_len = PTR_DIFF(p, param);
 
-        memset(cli->outbuf,'\0',smb_size);
-        memset(cli->inbuf,'\0',smb_size);
+       SIVAL(data,40,uid);
+       SIVAL(data,48,gid);
+       SIVAL(data,84,mode);
+
+       data_len = 100;
+
+       if (!cli_send_trans(cli, SMBtrans2,
+               NULL,                        /* name */
+               -1, 0,                          /* fid, flags */
+               &setup, 1, 0,                   /* setup, length, max */
+               param, param_len, 2,            /* param, length, max */
+               (char *)&data,  data_len, cli->max_xmit /* data, length, max */
+               )) {
+                       return False;
+       }
 
-        set_message(cli->outbuf,1, 4 + strlen(fname_src) + strlen(fname_dst), True);
+       if (!cli_receive_trans(cli, SMBtrans2,
+               &rparam, &param_len,
+               &rdata, &data_len)) {
+                       return False;
+       }
 
-        CVAL(cli->outbuf,smb_com) = SMBmv;
-        SSVAL(cli->outbuf,smb_tid,cli->cnum);
-        cli_setup_packet(cli);
+       SAFE_FREE(rdata);
+       SAFE_FREE(rparam);
 
-        SSVAL(cli->outbuf,smb_vwv0,aSYSTEM | aHIDDEN | aDIR);
+       return True;
+}
 
-        p = smb_buf(cli->outbuf);
-        *p++ = 4;
-        pstrcpy(p,fname_src);
-        unix_to_dos(p,True);
-        p = skip_string(p,1);
-        *p++ = 4;
-        pstrcpy(p,fname_dst);
-        unix_to_dos(p,True);
+/****************************************************************************
+ chmod a file (UNIX extensions).
+****************************************************************************/
 
-        cli_send_smb(cli);
-        if (!cli_receive_smb(cli)) {
-                return False;
-        }
+BOOL cli_unix_chmod(struct cli_state *cli, const char *fname, mode_t mode)
+{
+       return cli_unix_chmod_chown_internal(cli, fname, 
+               unix_perms_to_wire(mode), SMB_UID_NO_CHANGE, SMB_GID_NO_CHANGE);
+}
 
-        if (CVAL(cli->inbuf,smb_rcls) != 0) {
-                return False;
-        }
+/****************************************************************************
+ chown a file (UNIX extensions).
+****************************************************************************/
 
-        return True;
+BOOL cli_unix_chown(struct cli_state *cli, const char *fname, uid_t uid, gid_t gid)
+{
+       return cli_unix_chmod_chown_internal(cli, fname, SMB_MODE_NO_CHANGE, (uint32)uid, (uint32)gid);
 }
 
 /****************************************************************************
-delete a file
+ Rename a file.
 ****************************************************************************/
-BOOL cli_unlink(struct cli_state *cli, char *fname)
+
+BOOL cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst)
 {
        char *p;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,1, 2 + strlen(fname),True);
+       set_message(cli->outbuf,1, 0, True);
 
-       CVAL(cli->outbuf,smb_com) = SMBunlink;
+       SCVAL(cli->outbuf,smb_com,SMBmv);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
-       SSVAL(cli->outbuf,smb_vwv0,aSYSTEM | aHIDDEN);
-  
+       SSVAL(cli->outbuf,smb_vwv0,aSYSTEM | aHIDDEN | aDIR);
+
        p = smb_buf(cli->outbuf);
-       *p++ = 4;      
-       pstrcpy(p,fname);
-    unix_to_dos(p,True);
+       *p++ = 4;
+       p += clistr_push(cli, p, fname_src, -1, STR_TERMINATE);
+       *p++ = 4;
+       p += clistr_push(cli, p, fname_dst, -1, STR_TERMINATE);
+
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
-       if (!cli_receive_smb(cli)) {
+       if (!cli_receive_smb(cli))
                return False;
-       }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli))
                return False;
-       }
 
        return True;
 }
 
 /****************************************************************************
-create a directory
+ Delete a file.
 ****************************************************************************/
-BOOL cli_mkdir(struct cli_state *cli, char *dname)
+
+BOOL cli_unlink(struct cli_state *cli, const char *fname)
 {
        char *p;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,0, 0,True);
+       set_message(cli->outbuf,1, 0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBmkdir;
+       SCVAL(cli->outbuf,smb_com,SMBunlink);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
+       SSVAL(cli->outbuf,smb_vwv0,aSYSTEM | aHIDDEN);
+  
        p = smb_buf(cli->outbuf);
        *p++ = 4;      
-       p += clistr_push(cli, p, dname, -1, CLISTR_CONVERT|CLISTR_TERMINATE);
-
-       set_message(cli->outbuf,0, PTR_DIFF(p, smb_buf(cli->outbuf)), False);
+       p += clistr_push(cli, p, fname, -1, STR_TERMINATE);
 
+       cli_setup_bcc(cli, p);
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return False;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
@@ -132,33 +260,34 @@ BOOL cli_mkdir(struct cli_state *cli, char *dname)
 }
 
 /****************************************************************************
-remove a directory
+ Create a directory.
 ****************************************************************************/
-BOOL cli_rmdir(struct cli_state *cli, char *dname)
+
+BOOL cli_mkdir(struct cli_state *cli, const char *dname)
 {
        char *p;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,0, 0, True);
+       set_message(cli->outbuf,0, 0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBrmdir;
+       SCVAL(cli->outbuf,smb_com,SMBmkdir);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
        p = smb_buf(cli->outbuf);
        *p++ = 4;      
-       p += clistr_push(cli, p, dname, -1, CLISTR_TERMINATE|CLISTR_CONVERT);
+       p += clistr_push(cli, p, dname, -1, STR_TERMINATE);
 
-       set_message(cli->outbuf,0, PTR_DIFF(p, smb_buf(cli->outbuf)), False);
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return False;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
@@ -166,107 +295,154 @@ BOOL cli_rmdir(struct cli_state *cli, char *dname)
 }
 
 /****************************************************************************
-open a file
+ Remove a directory.
 ****************************************************************************/
-int cli_nt_create(struct cli_state *cli, char *fname, uint32 DesiredAccess)
+
+BOOL cli_rmdir(struct cli_state *cli, const char *dname)
 {
        char *p;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,24,1 + strlen(fname),True);
+       set_message(cli->outbuf,0, 0, True);
 
-       CVAL(cli->outbuf,smb_com) = SMBntcreateX;
+       SCVAL(cli->outbuf,smb_com,SMBrmdir);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
-       SSVAL(cli->outbuf,smb_vwv0,0xFF);
-       if (cli->use_oplocks)
-               SIVAL(cli->outbuf,smb_ntcreate_Flags, REQUEST_OPLOCK|REQUEST_BATCH_OPLOCK);
-       else
-               SIVAL(cli->outbuf,smb_ntcreate_Flags, 0);
-       SIVAL(cli->outbuf,smb_ntcreate_RootDirectoryFid, 0x0);
-       SIVAL(cli->outbuf,smb_ntcreate_DesiredAccess, DesiredAccess);
-       SIVAL(cli->outbuf,smb_ntcreate_FileAttributes, 0x0);
-       SIVAL(cli->outbuf,smb_ntcreate_ShareAccess, 0x03);
-       SIVAL(cli->outbuf,smb_ntcreate_CreateDisposition, 0x01);
-       SIVAL(cli->outbuf,smb_ntcreate_CreateOptions, 0x0);
-       SIVAL(cli->outbuf,smb_ntcreate_ImpersonationLevel, 0x02);
-       SSVAL(cli->outbuf,smb_ntcreate_NameLength, strlen(fname));
-
        p = smb_buf(cli->outbuf);
-       pstrcpy(p,fname);
-       unix_to_dos(p,True);
-       p = skip_string(p,1);
+       *p++ = 4;      
+       p += clistr_push(cli, p, dname, -1, STR_TERMINATE);
+
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
-               return -1;
+               return False;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
-               return -1;
+       if (cli_is_error(cli)) {
+               return False;
        }
 
-       return SVAL(cli->inbuf,smb_vwv2 + 1);
+       return True;
+}
+
+/****************************************************************************
+ Set or clear the delete on close flag.
+****************************************************************************/
+
+int cli_nt_delete_on_close(struct cli_state *cli, int fnum, BOOL flag)
+{
+       int data_len = 1;
+       int param_len = 6;
+       uint16 setup = TRANSACT2_SETFILEINFO;
+       pstring param;
+       unsigned char data;
+       char *rparam=NULL, *rdata=NULL;
+
+       memset(param, 0, param_len);
+       SSVAL(param,0,fnum);
+       SSVAL(param,2,SMB_SET_FILE_DISPOSITION_INFO);
+
+       data = flag ? 1 : 0;
+
+       if (!cli_send_trans(cli, SMBtrans2,
+                                               NULL,                        /* name */
+                                               -1, 0,                          /* fid, flags */
+                                               &setup, 1, 0,                   /* setup, length, max */
+                                               param, param_len, 2,            /* param, length, max */
+                                               (char *)&data,  data_len, cli->max_xmit /* data, length, max */
+                                               )) {
+               return False;
+       }
+
+       if (!cli_receive_trans(cli, SMBtrans2,
+                                               &rparam, &param_len,
+                                               &rdata, &data_len)) {
+               return False;
+       }
+
+       SAFE_FREE(rdata);
+       SAFE_FREE(rparam);
+
+       return True;
 }
 
 /****************************************************************************
-open a file
+ Open a file - exposing the full horror of the NT API :-).
+ Used in smbtorture.
 ****************************************************************************/
-int cli_nt_create_uni(struct cli_state *cli, char *fname, uint32 DesiredAccess)
+
+int cli_nt_create_full(struct cli_state *cli, const char *fname, uint32 DesiredAccess,
+                uint32 FileAttributes, uint32 ShareAccess,
+                uint32 CreateDisposition, uint32 CreateOptions)
 {
-       pstring uni;
        char *p;
+       int len;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,24,(strlen(fname) + 1) * 2 + 1,True);
+       set_message(cli->outbuf,24,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBntcreateX;
+       SCVAL(cli->outbuf,smb_com,SMBntcreateX);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
        SSVAL(cli->outbuf,smb_vwv0,0xFF);
        if (cli->use_oplocks)
                SIVAL(cli->outbuf,smb_ntcreate_Flags, REQUEST_OPLOCK|REQUEST_BATCH_OPLOCK);
-       else 
+       else
                SIVAL(cli->outbuf,smb_ntcreate_Flags, 0);
        SIVAL(cli->outbuf,smb_ntcreate_RootDirectoryFid, 0x0);
        SIVAL(cli->outbuf,smb_ntcreate_DesiredAccess, DesiredAccess);
-       SIVAL(cli->outbuf,smb_ntcreate_FileAttributes, 0x0);
-       SIVAL(cli->outbuf,smb_ntcreate_ShareAccess, 0x03);
-       SIVAL(cli->outbuf,smb_ntcreate_CreateDisposition, 0x01);
-       SIVAL(cli->outbuf,smb_ntcreate_CreateOptions, 0x0);
+       SIVAL(cli->outbuf,smb_ntcreate_FileAttributes, FileAttributes);
+       SIVAL(cli->outbuf,smb_ntcreate_ShareAccess, ShareAccess);
+       SIVAL(cli->outbuf,smb_ntcreate_CreateDisposition, CreateDisposition);
+       SIVAL(cli->outbuf,smb_ntcreate_CreateOptions, CreateOptions);
        SIVAL(cli->outbuf,smb_ntcreate_ImpersonationLevel, 0x02);
-       SSVAL(cli->outbuf,smb_ntcreate_NameLength, strlen(fname) * 2);
 
        p = smb_buf(cli->outbuf);
-       p++; /* Alignment */
-       pstrcpy(uni, fname);
-       unix_to_dos(uni, True);
-       dos_struni2(p, uni, (strlen(fname) + 1) * 2);
+       /* this alignment and termination is critical for netapp filers. Don't change */
+       p += clistr_align_out(cli, p, 0);
+       len = clistr_push(cli, p, fname, -1, 0);
+       p += len;
+       SSVAL(cli->outbuf,smb_ntcreate_NameLength, len);
+       /* sigh. this copes with broken netapp filer behaviour */
+       p += clistr_push(cli, p, "", -1, STR_TERMINATE);
+
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return -1;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return -1;
        }
 
        return SVAL(cli->inbuf,smb_vwv2 + 1);
 }
 
+/****************************************************************************
+ Open a file.
+****************************************************************************/
+
+int cli_nt_create(struct cli_state *cli, const char *fname, uint32 DesiredAccess)
+{
+       return cli_nt_create_full(cli, fname, DesiredAccess, 0,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_EXISTS_OPEN, 0x0);
+}
 
 /****************************************************************************
-open a file
-WARNING: if you open with O_WRONLY then getattrE won't work!
+ Open a file
+ WARNING: if you open with O_WRONLY then getattrE won't work!
 ****************************************************************************/
-int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
+
+int cli_open(struct cli_state *cli, const char *fname, int flags, int share_mode)
 {
        char *p;
        unsigned openfn=0;
@@ -304,7 +480,7 @@ int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
 
        set_message(cli->outbuf,15,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBopenX;
+       SCVAL(cli->outbuf,smb_com,SMBopenX);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
@@ -318,34 +494,32 @@ int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
        if (cli->use_oplocks) {
                /* if using oplocks then ask for a batch oplock via
                    core and extended methods */
-               CVAL(cli->outbuf,smb_flg) |= 
-                       FLAG_REQUEST_OPLOCK|FLAG_REQUEST_BATCH_OPLOCK;
+               SCVAL(cli->outbuf,smb_flg, CVAL(cli->outbuf,smb_flg)|
+                       FLAG_REQUEST_OPLOCK|FLAG_REQUEST_BATCH_OPLOCK);
                SSVAL(cli->outbuf,smb_vwv2,SVAL(cli->outbuf,smb_vwv2) | 6);
        }
   
        p = smb_buf(cli->outbuf);
-       p += clistr_push(cli, p, fname, -1, CLISTR_TERMINATE | CLISTR_CONVERT);
+       p += clistr_push(cli, p, fname, -1, STR_TERMINATE);
 
-       set_message(cli->outbuf,15, PTR_DIFF(p, smb_buf(cli->outbuf)), False);
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return -1;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return -1;
        }
 
        return SVAL(cli->inbuf,smb_vwv2);
 }
 
-
-
-
 /****************************************************************************
-  close a file
+ Close a file.
 ****************************************************************************/
+
 BOOL cli_close(struct cli_state *cli, int fnum)
 {
        memset(cli->outbuf,'\0',smb_size);
@@ -353,7 +527,7 @@ BOOL cli_close(struct cli_state *cli, int fnum)
 
        set_message(cli->outbuf,3,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBclose;
+       SCVAL(cli->outbuf,smb_com,SMBclose);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
@@ -365,35 +539,31 @@ BOOL cli_close(struct cli_state *cli, int fnum)
                return False;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
-               return False;
-       }
-
-       return True;
+       return !cli_is_error(cli);
 }
 
-
 /****************************************************************************
-  lock a file
+ Lock a file.
 ****************************************************************************/
+
 BOOL cli_lock(struct cli_state *cli, int fnum, 
              uint32 offset, uint32 len, int timeout, enum brl_type lock_type)
 {
        char *p;
-        int saved_timeout = cli->timeout;
+       int saved_timeout = cli->timeout;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0', smb_size);
 
-       set_message(cli->outbuf,8,10,True);
+       set_message(cli->outbuf,8,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBlockingX;
+       SCVAL(cli->outbuf,smb_com,SMBlockingX);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
-       CVAL(cli->outbuf,smb_vwv0) = 0xFF;
+       SCVAL(cli->outbuf,smb_vwv0,0xFF);
        SSVAL(cli->outbuf,smb_vwv2,fnum);
-       CVAL(cli->outbuf,smb_vwv3) = (lock_type == READ_LOCK? 1 : 0);
+       SCVAL(cli->outbuf,smb_vwv3,(lock_type == READ_LOCK? 1 : 0));
        SIVALS(cli->outbuf, smb_vwv4, timeout);
        SSVAL(cli->outbuf,smb_vwv6,0);
        SSVAL(cli->outbuf,smb_vwv7,1);
@@ -402,18 +572,23 @@ BOOL cli_lock(struct cli_state *cli, int fnum,
        SSVAL(p, 0, cli->pid);
        SIVAL(p, 2, offset);
        SIVAL(p, 6, len);
+
+       p += 10;
+
+       cli_setup_bcc(cli, p);
+
        cli_send_smb(cli);
 
-        cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000);
+       cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000);
 
        if (!cli_receive_smb(cli)) {
-                cli->timeout = saved_timeout;
+               cli->timeout = saved_timeout;
                return False;
        }
 
        cli->timeout = saved_timeout;
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
@@ -421,8 +596,9 @@ BOOL cli_lock(struct cli_state *cli, int fnum,
 }
 
 /****************************************************************************
-  unlock a file
+ Unlock a file.
 ****************************************************************************/
+
 BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len)
 {
        char *p;
@@ -430,15 +606,15 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len)
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,8,10,True);
+       set_message(cli->outbuf,8,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBlockingX;
+       SCVAL(cli->outbuf,smb_com,SMBlockingX);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
-       CVAL(cli->outbuf,smb_vwv0) = 0xFF;
+       SCVAL(cli->outbuf,smb_vwv0,0xFF);
        SSVAL(cli->outbuf,smb_vwv2,fnum);
-       CVAL(cli->outbuf,smb_vwv3) = 0;
+       SCVAL(cli->outbuf,smb_vwv3,0);
        SIVALS(cli->outbuf, smb_vwv4, 0);
        SSVAL(cli->outbuf,smb_vwv6,1);
        SSVAL(cli->outbuf,smb_vwv7,0);
@@ -447,23 +623,24 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len)
        SSVAL(p, 0, cli->pid);
        SIVAL(p, 2, offset);
        SIVAL(p, 6, len);
-
+       p += 10;
+       cli_setup_bcc(cli, p);
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return False;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
        return True;
 }
 
-
 /****************************************************************************
-  lock a file with 64 bit offsets
+ Lock a file with 64 bit offsets.
 ****************************************************************************/
+
 BOOL cli_lock64(struct cli_state *cli, int fnum, 
                SMB_BIG_UINT offset, SMB_BIG_UINT len, int timeout, enum brl_type lock_type)
 {
@@ -471,31 +648,36 @@ BOOL cli_lock64(struct cli_state *cli, int fnum,
         int saved_timeout = cli->timeout;
        int ltype;
 
+       if (! (cli->capabilities & CAP_LARGE_FILES)) {
+               return cli_lock(cli, fnum, offset, len, timeout, lock_type);
+       }
+
        ltype = (lock_type == READ_LOCK? 1 : 0);
        ltype |= LOCKING_ANDX_LARGE_FILES;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0', smb_size);
 
-       set_message(cli->outbuf,8,20,True);
+       set_message(cli->outbuf,8,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBlockingX;
+       SCVAL(cli->outbuf,smb_com,SMBlockingX);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
-       CVAL(cli->outbuf,smb_vwv0) = 0xFF;
+       SCVAL(cli->outbuf,smb_vwv0,0xFF);
        SSVAL(cli->outbuf,smb_vwv2,fnum);
-       CVAL(cli->outbuf,smb_vwv3) = ltype;
+       SCVAL(cli->outbuf,smb_vwv3,ltype);
        SIVALS(cli->outbuf, smb_vwv4, timeout);
        SSVAL(cli->outbuf,smb_vwv6,0);
        SSVAL(cli->outbuf,smb_vwv7,1);
 
        p = smb_buf(cli->outbuf);
        SIVAL(p, 0, cli->pid);
-       SIVAL(p, 4, (offset>>32));
-       SIVAL(p, 8, (offset&0xffffffff));
-       SIVAL(p, 12, (len>>32));
-       SIVAL(p, 16, (len&0xffffffff));
+       SOFF_T_R(p, 4, offset);
+       SOFF_T_R(p, 12, len);
+       p += 20;
+
+       cli_setup_bcc(cli, p);
        cli_send_smb(cli);
 
         cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000);
@@ -507,7 +689,7 @@ BOOL cli_lock64(struct cli_state *cli, int fnum,
 
        cli->timeout = saved_timeout;
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
@@ -515,54 +697,55 @@ BOOL cli_lock64(struct cli_state *cli, int fnum,
 }
 
 /****************************************************************************
-  unlock a file with 64 bit offsets
+ Unlock a file with 64 bit offsets.
 ****************************************************************************/
+
 BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_UINT len)
 {
        char *p;
 
+       if (! (cli->capabilities & CAP_LARGE_FILES)) {
+               return cli_unlock(cli, fnum, offset, len);
+       }
+
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,8,20,True);
+       set_message(cli->outbuf,8,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBlockingX;
+       SCVAL(cli->outbuf,smb_com,SMBlockingX);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
-       CVAL(cli->outbuf,smb_vwv0) = 0xFF;
+       SCVAL(cli->outbuf,smb_vwv0,0xFF);
        SSVAL(cli->outbuf,smb_vwv2,fnum);
-       CVAL(cli->outbuf,smb_vwv3) = LOCKING_ANDX_LARGE_FILES;
+       SCVAL(cli->outbuf,smb_vwv3,LOCKING_ANDX_LARGE_FILES);
        SIVALS(cli->outbuf, smb_vwv4, 0);
        SSVAL(cli->outbuf,smb_vwv6,1);
        SSVAL(cli->outbuf,smb_vwv7,0);
 
        p = smb_buf(cli->outbuf);
        SIVAL(p, 0, cli->pid);
-       SIVAL(p, 4, (offset>>32));
-       SIVAL(p, 8, (offset&0xffffffff));
-       SIVAL(p, 12, (len>>32));
-       SIVAL(p, 16, (len&0xffffffff));
-
+       SOFF_T_R(p, 4, offset);
+       SOFF_T_R(p, 12, len);
+       p += 20;
+       cli_setup_bcc(cli, p);
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return False;
        }
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
        return True;
 }
 
-
-
-
-
 /****************************************************************************
-do a SMBgetattrE call
+ Do a SMBgetattrE call.
 ****************************************************************************/
+
 BOOL cli_getattrE(struct cli_state *cli, int fd, 
                  uint16 *attr, size_t *size, 
                  time_t *c_time, time_t *a_time, time_t *m_time)
@@ -572,7 +755,7 @@ BOOL cli_getattrE(struct cli_state *cli, int fd,
 
        set_message(cli->outbuf,1,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBgetattrE;
+       SCVAL(cli->outbuf,smb_com,SMBgetattrE);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
@@ -583,7 +766,7 @@ BOOL cli_getattrE(struct cli_state *cli, int fd,
                return False;
        }
        
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
@@ -610,11 +793,11 @@ BOOL cli_getattrE(struct cli_state *cli, int fd,
        return True;
 }
 
-
 /****************************************************************************
-do a SMBgetatr call
+ Do a SMBgetatr call
 ****************************************************************************/
-BOOL cli_getatr(struct cli_state *cli, char *fname, 
+
+BOOL cli_getatr(struct cli_state *cli, const char *fname, 
                uint16 *attr, size_t *size, time_t *t)
 {
        char *p;
@@ -622,23 +805,24 @@ BOOL cli_getatr(struct cli_state *cli, char *fname,
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,0,strlen(fname)+2,True);
+       set_message(cli->outbuf,0,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBgetatr;
+       SCVAL(cli->outbuf,smb_com,SMBgetatr);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
        p = smb_buf(cli->outbuf);
-       *p = 4;
-       pstrcpy(p+1, fname);
-    unix_to_dos(p+1,True);
+       *p++ = 4;
+       p += clistr_push(cli, p, fname, -1, STR_TERMINATE);
+
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return False;
        }
        
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
@@ -658,20 +842,20 @@ BOOL cli_getatr(struct cli_state *cli, char *fname,
        return True;
 }
 
-
 /****************************************************************************
-do a SMBsetatr call
+ Do a SMBsetatr call.
 ****************************************************************************/
-BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t)
+
+BOOL cli_setatr(struct cli_state *cli, const char *fname, uint16 attr, time_t t)
 {
        char *p;
 
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       set_message(cli->outbuf,8,strlen(fname)+4,True);
+       set_message(cli->outbuf,8,0,True);
 
-       CVAL(cli->outbuf,smb_com) = SMBsetatr;
+       SCVAL(cli->outbuf,smb_com,SMBsetatr);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
@@ -679,29 +863,29 @@ BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t)
        put_dos_date3(cli->outbuf,smb_vwv1, t);
 
        p = smb_buf(cli->outbuf);
-       *p = 4;
-       pstrcpy(p+1, fname);
-    unix_to_dos(p+1,True);
-       p = skip_string(p,1);
-       *p = 4;
+       *p++ = 4;
+       p += clistr_push(cli, p, fname, -1, STR_TERMINATE);
+       *p++ = 4;
+
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return False;
        }
        
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+       if (cli_is_error(cli)) {
                return False;
        }
 
        return True;
 }
 
-
 /****************************************************************************
-check for existance of a dir
+ Check for existance of a dir.
 ****************************************************************************/
-BOOL cli_chkpath(struct cli_state *cli, char *path)
+
+BOOL cli_chkpath(struct cli_state *cli, const char *path)
 {
        pstring path2;
        char *p;
@@ -717,30 +901,29 @@ BOOL cli_chkpath(struct cli_state *cli, char *path)
        cli_setup_packet(cli);
        p = smb_buf(cli->outbuf);
        *p++ = 4;
-       p += clistr_push(cli, p, path2, -1, CLISTR_TERMINATE | CLISTR_CONVERT);
+       p += clistr_push(cli, p, path2, -1, STR_TERMINATE);
 
-       set_message(cli->outbuf,0,PTR_DIFF(p, smb_buf(cli->outbuf)), False);
+       cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);
        if (!cli_receive_smb(cli)) {
                return False;
        }
 
-       if (cli_error(cli, NULL, NULL, NULL)) return False;
+       if (cli_is_error(cli)) return False;
 
        return True;
 }
 
-
-
 /****************************************************************************
-query disk space
+ Query disk space.
 ****************************************************************************/
+
 BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail)
 {
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,0,0,True);
-       CVAL(cli->outbuf,smb_com) = SMBdskattr;
+       SCVAL(cli->outbuf,smb_com,SMBdskattr);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
@@ -756,3 +939,55 @@ BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail)
        return True;
 }
 
+/****************************************************************************
+ Create and open a temporary file.
+****************************************************************************/
+
+int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path)
+{
+       int len;
+       char *p;
+
+       memset(cli->outbuf,'\0',smb_size);
+       memset(cli->inbuf,'\0',smb_size);
+
+       set_message(cli->outbuf,3,0,True);
+
+       SCVAL(cli->outbuf,smb_com,SMBctemp);
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+       cli_setup_packet(cli);
+
+       SSVAL(cli->outbuf,smb_vwv0,0);
+       SIVALS(cli->outbuf,smb_vwv1,-1);
+
+       p = smb_buf(cli->outbuf);
+       *p++ = 4;
+       p += clistr_push(cli, p, path, -1, STR_TERMINATE);
+
+       cli_setup_bcc(cli, p);
+
+       cli_send_smb(cli);
+       if (!cli_receive_smb(cli)) {
+               return -1;
+       }
+
+       if (cli_is_error(cli)) {
+               return -1;
+       }
+
+       /* despite the spec, the result has a -1, followed by
+          length, followed by name */
+       p = smb_buf(cli->inbuf);
+       p += 4;
+       len = smb_buflen(cli->inbuf) - 4;
+       if (len <= 0) return -1;
+
+       if (tmp_path) {
+               pstring path2;
+               clistr_pull(cli, path2, p, 
+                           sizeof(path2), len, STR_ASCII);
+               *tmp_path = strdup(path2);
+       }
+
+       return SVAL(cli->inbuf,smb_vwv0);
+}