Update some of the error mapping, based on on-the-wire observations of an NT4 server.

This lets our Win9X clients give sane error messages when you get passwords wrong
and the like.

Andrew Bartlett
(This used to be commit f199e9518226ed57a011113bdf06c85265e49674)

diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c
index 18e70eed3683756ff0341efa6d6cd794b8ca1ac4..f4208e7f5edcfb63472dd33e8390de26e6b3937a 100644 (file)
--- a/source3/libsmb/errormap.c
+++ b/source3/libsmb/errormap.c
@@ -135,10 +135,10 @@ static struct {
        {ERRDOS,        1325,   NT_STATUS_PASSWORD_RESTRICTION},
        {ERRDOS,        ERRlogonfailure, NT_STATUS_LOGON_FAILURE},
        {ERRDOS,        1327,   NT_STATUS_ACCOUNT_RESTRICTION},
        {ERRDOS,        1325,   NT_STATUS_PASSWORD_RESTRICTION},
        {ERRDOS,        ERRlogonfailure, NT_STATUS_LOGON_FAILURE},
        {ERRDOS,        1327,   NT_STATUS_ACCOUNT_RESTRICTION},

-       {ERRDOS,        1328,   NT_STATUS_INVALID_LOGON_HOURS},
-       {ERRDOS,        1329,   NT_STATUS_INVALID_WORKSTATION},
-       {ERRDOS,        1330,   NT_STATUS_PASSWORD_EXPIRED},
-       {ERRDOS,        1331,   NT_STATUS_ACCOUNT_DISABLED},
+       {ERRSRV,        2241,   NT_STATUS_INVALID_LOGON_HOURS},
+       {ERRSRV,        2240,   NT_STATUS_INVALID_WORKSTATION},
+       {ERRSRV,        2242,   NT_STATUS_PASSWORD_EXPIRED},
+       {ERRSRV,        2239,   NT_STATUS_ACCOUNT_DISABLED},

        {ERRDOS,        1332,   NT_STATUS_NONE_MAPPED},
        {ERRDOS,        1333,   NT_STATUS_TOO_MANY_LUIDS_REQUESTED},
        {ERRDOS,        1334,   NT_STATUS_LUIDS_EXHAUSTED},
        {ERRDOS,        1332,   NT_STATUS_NONE_MAPPED},
        {ERRDOS,        1333,   NT_STATUS_TOO_MANY_LUIDS_REQUESTED},
        {ERRDOS,        1334,   NT_STATUS_LUIDS_EXHAUSTED},


@@ -374,7 +374,7 @@ static struct {
        {ERRDOS,        1501,   NT_STATUS_EVENTLOG_CANT_START},
        {ERRDOS,        1790,   NT_STATUS_TRUST_FAILURE},
        {ERRDOS,        1792,   NT_STATUS_NETLOGON_NOT_STARTED},
        {ERRDOS,        1501,   NT_STATUS_EVENTLOG_CANT_START},
        {ERRDOS,        1790,   NT_STATUS_TRUST_FAILURE},
        {ERRDOS,        1792,   NT_STATUS_NETLOGON_NOT_STARTED},

-       {ERRDOS,        1793,   NT_STATUS_ACCOUNT_EXPIRED},
+       {ERRSRV,        2239,   NT_STATUS_ACCOUNT_EXPIRED},

        {ERRDOS,        1131,   NT_STATUS_POSSIBLE_DEADLOCK},
        {ERRDOS,        1219,   NT_STATUS_NETWORK_CREDENTIAL_CONFLICT},
        {ERRDOS,        1220,   NT_STATUS_REMOTE_SESSION_LIMIT},
        {ERRDOS,        1131,   NT_STATUS_POSSIBLE_DEADLOCK},
        {ERRDOS,        1219,   NT_STATUS_NETWORK_CREDENTIAL_CONFLICT},
        {ERRDOS,        1220,   NT_STATUS_REMOTE_SESSION_LIMIT},


@@ -408,14 +408,14 @@ static struct {
        {ERRDOS,        6118,   NT_STATUS_NO_BROWSER_SERVERS_FOUND},
        {ERRDOS,        1132,   NT_STATUS_MAPPED_ALIGNMENT},
        {ERRDOS,        193,    NT_STATUS_IMAGE_CHECKSUM_MISMATCH},
        {ERRDOS,        6118,   NT_STATUS_NO_BROWSER_SERVERS_FOUND},
        {ERRDOS,        1132,   NT_STATUS_MAPPED_ALIGNMENT},
        {ERRDOS,        193,    NT_STATUS_IMAGE_CHECKSUM_MISMATCH},

-       {ERRDOS,        1907,   NT_STATUS_PASSWORD_MUST_CHANGE},
+       {ERRSRV,        2242,   NT_STATUS_PASSWORD_MUST_CHANGE},

        {ERRDOS,        1168,   NT_STATUS_NOT_FOUND},
        {ERRDOS,        554,    NT_STATUS_DUPLICATE_OBJECTID},
        {ERRDOS,        555,    NT_STATUS_OBJECTID_EXISTS},
        {ERRDOS,        1237,   NT_STATUS_RETRY},
        {ERRDOS,        1170,   NT_STATUS_PROPSET_NOT_FOUND},
        {ERRDOS,        1908,   NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND},
        {ERRDOS,        1168,   NT_STATUS_NOT_FOUND},
        {ERRDOS,        554,    NT_STATUS_DUPLICATE_OBJECTID},
        {ERRDOS,        555,    NT_STATUS_OBJECTID_EXISTS},
        {ERRDOS,        1237,   NT_STATUS_RETRY},
        {ERRDOS,        1170,   NT_STATUS_PROPSET_NOT_FOUND},
        {ERRDOS,        1908,   NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND},

-       {ERRDOS,        1909,   NT_STATUS_ACCOUNT_LOCKED_OUT},
+       {ERRDOS,        ERRnoaccess,    NT_STATUS_ACCOUNT_LOCKED_OUT},

        {ERRDOS,        ERRbadfid,      NT_STATUS_HANDLE_NOT_CLOSABLE},
        {ERRDOS,        1225,   NT_STATUS_CONNECTION_REFUSED},
        {ERRDOS,        1226,   NT_STATUS_GRACEFUL_DISCONNECT},
        {ERRDOS,        ERRbadfid,      NT_STATUS_HANDLE_NOT_CLOSABLE},
        {ERRDOS,        1225,   NT_STATUS_CONNECTION_REFUSED},
        {ERRDOS,        1226,   NT_STATUS_GRACEFUL_DISCONNECT},