Start to merge the new ACL mapping code from Andreas Gruenbacher <agruen@suse.de>.

[samba.git] / source3 / libsmb / climessage.c

diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c
index e0a308104bda1792c019e6358a1f9f408b0b2c6b..1587e6f4cd77cad21ba6ce8f46f56648ddb6be3f 100644 (file)
--- a/source3/libsmb/climessage.c
+++ b/source3/libsmb/climessage.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    client message handling routines
    Copyright (C) Andrew Tridgell 1994-1998
    
@@ -35,7 +34,7 @@ BOOL cli_message_start(struct cli_state *cli, char *host, char *username,
        /* send a SMBsendstrt command */
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,0,0,True);
-       CVAL(cli->outbuf,smb_com) = SMBsendstrt;
+       SCVAL(cli->outbuf,smb_com,SMBsendstrt);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
        
@@ -53,7 +52,7 @@ BOOL cli_message_start(struct cli_state *cli, char *host, char *username,
                return False;
        }
 
-       if (cli_error(cli, NULL, NULL, NULL)) return False;
+       if (cli_is_error(cli)) return False;
 
        *grp = SVAL(cli->inbuf,smb_vwv0);
 
@@ -70,7 +69,7 @@ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
 
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,1,0,True);
-       CVAL(cli->outbuf,smb_com) = SMBsendtxt;
+       SCVAL(cli->outbuf,smb_com,SMBsendtxt);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
 
@@ -89,7 +88,7 @@ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
                return False;
        }
 
-       if (cli_error(cli, NULL, NULL, NULL)) return False;
+       if (cli_is_error(cli)) return False;
 
        return True;
 }      
@@ -101,7 +100,7 @@ BOOL cli_message_end(struct cli_state *cli, int grp)
 {
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,1,0,True);
-       CVAL(cli->outbuf,smb_com) = SMBsendend;
+       SCVAL(cli->outbuf,smb_com,SMBsendend);
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
 
        SSVAL(cli->outbuf,smb_vwv0,grp);
@@ -114,7 +113,7 @@ BOOL cli_message_end(struct cli_state *cli, int grp)
                return False;
        }
 
-       if (cli_error(cli, NULL, NULL, NULL)) return False;
+       if (cli_is_error(cli)) return False;
 
        return True;
 }