diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-07-22 09:39:52 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-07-22 17:06:07 +0200 |
commit | 13dbd5021b8f661e4fe38099e1aed03e5b0c02d6 (patch) | |
tree | 58302b4de447e72d295c902852d2342ed06ecd88 /source3/libsmb/clientgen.c | |
parent | 6d1757f1893e8f15c645eca44377de2f5a67232a (diff) | |
download | samba-13dbd5021b8f661e4fe38099e1aed03e5b0c02d6.tar.gz samba-13dbd5021b8f661e4fe38099e1aed03e5b0c02d6.tar.bz2 samba-13dbd5021b8f661e4fe38099e1aed03e5b0c02d6.zip |
s3:libsmb: move cli_state->fd to cli_state->conn.fd
metze
Diffstat (limited to 'source3/libsmb/clientgen.c')
-rw-r--r-- | source3/libsmb/clientgen.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 7a417ec6c0..ca6201e6bb 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -187,7 +187,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx, if (!cli->dfs_mountpoint) { goto error; } - cli->fd = -1; cli->raw_status = NT_STATUS_INTERNAL_ERROR; cli->protocol = PROTOCOL_NT1; cli->timeout = 20000; /* Timeout is in milliseconds. */ @@ -244,7 +243,7 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx, goto error; } - cli->fd = fd; + cli->conn.fd = fd; ss_length = sizeof(cli->src_ss); ret = getsockname(fd, @@ -364,7 +363,7 @@ void cli_shutdown(struct cli_state *cli) void cli_sockopt(struct cli_state *cli, const char *options) { - set_socket_options(cli->fd, options); + set_socket_options(cli->conn.fd, options); } uint16_t cli_state_get_vc_num(struct cli_state *cli) |