diff options
author | Tim Potter <tpot@samba.org> | 2001-08-10 06:00:33 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2001-08-10 06:00:33 +0000 |
commit | 2ccfea3de7b2b7dc0be2438c3adb3f7be82a2dfc (patch) | |
tree | 7c6072ae27cf5ed587989c8006ba948eaa0f59c6 /source3/libsmb/climessage.c | |
parent | 4bbd1ddb274438e00f83fffa2051d8f7d6c2b17c (diff) | |
download | samba-2ccfea3de7b2b7dc0be2438c3adb3f7be82a2dfc.tar.gz samba-2ccfea3de7b2b7dc0be2438c3adb3f7be82a2dfc.tar.bz2 samba-2ccfea3de7b2b7dc0be2438c3adb3f7be82a2dfc.zip |
A rewrite of the error handling in the libsmb client code. I've separated
out the error handling into a bunch of separate functions rather than all
being handled in one big function.
Fetch error codes from the last received packet:
void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *num);
uint32 cli_nt_error(struct cli_state *);
Convert errors to UNIX errno values:
int cli_errno_from_dos(uint8 eclass, uint32 num);
int cli_errno_from_nt(uint32 status);
int cli_errno(struct cli_state *cli);
Detect different kinds of errors:
BOOL cli_is_dos_error(struct cli_state *cli);
BOOL cli_is_nt_error(struct cli_state *cli);
BOOL cli_is_error(struct cli_state *cli);
This also means we now support CAP_STATUS32 as we can decode and understand
NT errors instead of just DOS errors. Yay!
Ported a whole bunch of files in libsmb to use this new API instead of the
just the DOS error.
(This used to be commit 6dbdb0d813f3c7ab20b38baa1223b0b479aadec9)
Diffstat (limited to 'source3/libsmb/climessage.c')
-rw-r--r-- | source3/libsmb/climessage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index e0a308104b..d32c5de042 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -53,7 +53,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); @@ -89,7 +89,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; } @@ -114,7 +114,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; } |