diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-08-15 18:33:43 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-08-15 18:33:43 +0000 |
| commit | 8e4ab747b02207671203d40cd2a78692da78faef (patch) | |
| tree | c4ebd704ba8a88f67513a61f4e4e5e11e78d6132 /source4/libcli | |
| parent | efacfb37fc0d7310c72c40bfed4b52ecaf365b11 (diff) | |
| download | samba-8e4ab747b02207671203d40cd2a78692da78faef.tar.gz samba-8e4ab747b02207671203d40cd2a78692da78faef.tar.bz2 samba-8e4ab747b02207671203d40cd2a78692da78faef.zip | |
more fixes from the IRIX compiler (thanks herb!)
(This used to be commit 4cf3839b727c77a727abb558bd9473119a092913)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/clifile.c | 4 | ||||
| -rw-r--r-- | source4/libcli/clilist.c | 2 | ||||
| -rw-r--r-- | source4/libcli/raw/clitree.c | 2 | ||||
| -rw-r--r-- | source4/libcli/raw/rawfileinfo.c | 2 | ||||
| -rw-r--r-- | source4/libcli/raw/rawnegotiate.c | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/source4/libcli/clifile.c b/source4/libcli/clifile.c index d37a68c1e1..27ead40740 100644 --- a/source4/libcli/clifile.c +++ b/source4/libcli/clifile.c @@ -34,11 +34,11 @@ static BOOL cli_link_internal(struct cli_state *cli, NTSTATUS status; if (hard_link) { - parms.generic.level = SMB_SFILEINFO_UNIX_HLINK; + parms.generic.level = RAW_SFILEINFO_UNIX_HLINK; parms.unix_hlink.file.fname = fname_src; parms.unix_hlink.in.link_dest = fname_dst; } else { - parms.generic.level = SMB_SFILEINFO_UNIX_LINK; + parms.generic.level = RAW_SFILEINFO_UNIX_LINK; parms.unix_link.file.fname = fname_src; parms.unix_link.in.link_dest = fname_dst; } diff --git a/source4/libcli/clilist.c b/source4/libcli/clilist.c index 620e4382f4..425a6002cc 100644 --- a/source4/libcli/clilist.c +++ b/source4/libcli/clilist.c @@ -94,7 +94,7 @@ int cli_list_new(struct cli_state *cli, const char *Mask, uint16 attribute, char *mask; int ff_eos = 0, i, ff_searchcount; int ff_dir_handle=0; - int level; + enum search_level level; /* initialize state for search */ state.dirlist = NULL; diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c index a088ae7023..1e9104308e 100644 --- a/source4/libcli/raw/clitree.c +++ b/source4/libcli/raw/clitree.c @@ -121,7 +121,6 @@ NTSTATUS smb_tree_connect_recv(struct cli_request *req, TALLOC_CTX *mem_ctx, uni case RAW_TCON_TCONX: ZERO_STRUCT(parms->tconx.out); - CLI_CHECK_MIN_WCT(req, 0); /* this depends on the protocol level */ parms->tconx.out.cnum = SVAL(req->in.hdr, HDR_TID); if (req->in.wct >= 4) { parms->tconx.out.options = SVAL(req->in.vwv, VWV(3)); @@ -245,7 +244,6 @@ NTSTATUS cli_tree_full_connection(struct cli_tree **ret_tree, mem_ctx = talloc_init("tcon"); if (!mem_ctx) { - cli_tree_close(tree); return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c index 70121025d0..41fe1225cc 100644 --- a/source4/libcli/raw/rawfileinfo.c +++ b/source4/libcli/raw/rawfileinfo.c @@ -146,7 +146,6 @@ static NTSTATUS smb_raw_info_backend(struct cli_session *session, case RAW_FILEINFO_STREAM_INFO: case RAW_FILEINFO_STREAM_INFORMATION: - FINFO_CHECK_MIN_SIZE(0); ofs = 0; parms->stream_info.out.num_streams = 0; parms->stream_info.out.streams = NULL; @@ -228,7 +227,6 @@ static NTSTATUS smb_raw_info_backend(struct cli_session *session, return NT_STATUS_OK; case RAW_FILEINFO_UNIX_LINK: - FINFO_CHECK_MIN_SIZE(0); cli_blob_pull_string(session, mem_ctx, blob, &parms->unix_link_info.out.link_dest, 0, 4, STR_UNICODE); return NT_STATUS_OK; diff --git a/source4/libcli/raw/rawnegotiate.c b/source4/libcli/raw/rawnegotiate.c index 78b2e00706..04941f6118 100644 --- a/source4/libcli/raw/rawnegotiate.c +++ b/source4/libcli/raw/rawnegotiate.c @@ -22,7 +22,7 @@ #include "includes.h" static const struct { - int prot; + enum protocol_types prot; const char *name; } prots[] = { {PROTOCOL_CORE,"PC NETWORK PROGRAM 1.0"}, |