diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-21 09:20:43 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-21 22:08:52 +0200 |
| commit | 25447a528a1f5c37e0e62bbc990b87c868de784a (patch) | |
| tree | 1c6dbdf6ce7dd670d621fd92cc2c1ca87d14c230 /source3/libsmb/clientgen.c | |
| parent | c70103f3f81c45846acc60fa84027247d72913f5 (diff) | |
| download | samba-25447a528a1f5c37e0e62bbc990b87c868de784a.tar.gz samba-25447a528a1f5c37e0e62bbc990b87c868de784a.tar.bz2 samba-25447a528a1f5c37e0e62bbc990b87c868de784a.zip | |
s3:libsmb: move cli->vuid to cli->smb1.uid and hide it behind cli_state_[g|s]et_uid()
metze
Diffstat (limited to 'source3/libsmb/clientgen.c')
| -rw-r--r-- | source3/libsmb/clientgen.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index ab0079650a..be27f1e093 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -70,7 +70,7 @@ void cli_setup_packet_buf(struct cli_state *cli, char *buf) SIVAL(buf,smb_rcls,0); SSVAL(buf,smb_pid,cli->smb1.pid); memset(buf+smb_pidhigh, 0, 12); - SSVAL(buf,smb_uid,cli->vuid); + SSVAL(buf,smb_uid, cli_state_get_uid(cli)); SSVAL(buf,smb_mid,cli->smb1.mid); if (cli->protocol <= PROTOCOL_CORE) { @@ -184,7 +184,6 @@ struct cli_state *cli_initialise_ex(int signing_state) } cli->fd = -1; cli->raw_status = NT_STATUS_INTERNAL_ERROR; - cli->vuid = UID_FIELD_INVALID; cli->protocol = PROTOCOL_NT1; cli->timeout = 20000; /* Timeout is in milliseconds. */ cli->max_xmit = CLI_BUFFER_SIZE+4; @@ -241,6 +240,7 @@ struct cli_state *cli_initialise_ex(int signing_state) cli->smb1.pid = (uint16_t)sys_getpid(); cli->smb1.vc_num = cli->smb1.pid; cli->smb1.tid = UINT16_MAX; + cli->smb1.uid = UID_FIELD_INVALID; return cli; @@ -391,6 +391,18 @@ uint16_t cli_state_set_tid(struct cli_state *cli, uint16_t tid) return ret; } +uint16_t cli_state_get_uid(struct cli_state *cli) +{ + return cli->smb1.uid; +} + +uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid) +{ + uint16_t ret = cli->smb1.uid; + cli->smb1.uid = uid; + return ret; +} + /**************************************************************************** Set the case sensitivity flag on the packets. Returns old state. ****************************************************************************/ |