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)

1 files changed, 14 insertions, 10 deletions

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 458532cb2e..f6ee78c567 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -55,8 +55,6 @@ static BOOL cli_issue_read(struct cli_state *cli, int fnum, off_t offset,
 
 ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size)
 {
-	uint32 ecode;
-	uint8 eclass;
 	char *p;
 	int size2;
 	int readsize;
@@ -83,15 +81,21 @@ ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_
 		if (!cli_receive_smb(cli))
 			return -1;
 
-		/*
-		 * Check for error.  Because the client library doesn't support
-		 * STATUS32, we need to check for and ignore the more data error
-		 * for pipe support.
-		 */
+		/* Check for error.  Make sure to check for DOS and NT
+                   errors. */
 
-		if (cli_error(cli, &eclass, &ecode, NULL) &&
-			(eclass != ERRDOS && ecode != ERRmoredata)) {
-			return -1;
+                if (cli_is_error(cli)) {
+                        uint32 status = 0;
+                        uint8 eclass = 0;
+
+                        if (cli_is_nt_error(cli))
+                                status = cli_nt_error(cli);
+                        else
+                                cli_dos_error(cli, &eclass, &status);
+
+                        if ((eclass == ERRDOS && status == ERRmoredata) ||
+                            status == STATUS_MORE_ENTRIES)
+                                return -1;
 		}
 
 		size2 = SVAL(cli->inbuf, smb_vwv5);