Add and correct some WERROR codes.

Michael

diff --git a/source/include/doserr.h b/source/include/doserr.h
index 08f5b3e39dc7e43a76af584aab2d68de0542bc6b..546d06926a84b9f0f0c146204f5eb17c34ac92a0 100644 (file)
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -213,12 +213,17 @@
 #define WERR_SERVER_UNAVAILABLE W_ERROR(1722)
 #define WERR_INVALID_FORM_NAME W_ERROR(1902)
 #define WERR_INVALID_FORM_SIZE W_ERROR(1903)
+#define WERR_PASSWORD_MUST_CHANGE W_ERROR(1907)
+#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(1908)
+#define WERR_ACCOUNT_LOCKED_OUT W_ERROR(1909)
+
+/* should these go down to NERR_BASE ? */
 #define WERR_BUF_TOO_SMALL W_ERROR(2123)
 #define WERR_JOB_NOT_FOUND W_ERROR(2151)
 #define WERR_DEST_NOT_FOUND W_ERROR(2152)
 #define WERR_USER_EXISTS W_ERROR(2224)
 #define WERR_NOT_LOCAL_DOMAIN W_ERROR(2320)
-#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(2453)
+#define WERR_DC_NOT_FOUND W_ERROR(2453)
 
 #define WERR_SETUP_ALREADY_JOINED W_ERROR(2691)
 #define WERR_SETUP_NOT_JOINED W_ERROR(2692)

diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index 79445a241057e1a683f4fe0c7bd7bbeaa9e53b4a..174db312c83366159a82f0ca4e057faf50e9b5b3 100644 (file)
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -74,7 +74,7 @@ werror_code_struct dos_errs[] =
        { "WERR_DFS_INTERNAL_ERROR", WERR_DFS_INTERNAL_ERROR },
        { "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT },
        { "WERR_MACHINE_LOCKED", WERR_MACHINE_LOCKED },
-       { "WERR_DOMAIN_CONTROLLER_NOT_FOUND", WERR_DOMAIN_CONTROLLER_NOT_FOUND },
+       { "WERR_DC_NOT_FOUND", WERR_DC_NOT_FOUND },
        { "WERR_SETUP_NOT_JOINED", WERR_SETUP_NOT_JOINED },
        { "WERR_SETUP_ALREADY_JOINED", WERR_SETUP_ALREADY_JOINED },
        { "WERR_SETUP_DOMAIN_CONTROLLER", WERR_SETUP_DOMAIN_CONTROLLER },
@@ -96,6 +96,9 @@ werror_code_struct dos_errs[] =
        { "WERR_SERVICE_DISABLED", WERR_SERVICE_DISABLED },
        { "WERR_CAN_NOT_COMPLETE", WERR_CAN_NOT_COMPLETE},
        { "WERR_INVALID_FLAGS", WERR_INVALID_FLAGS},
+       { "WERR_PASSWORD_MUST_CHANGE", WERR_PASSWORD_MUST_CHANGE },
+       { "WERR_DOMAIN_CONTROLLER_NOT_FOUND", WERR_DOMAIN_CONTROLLER_NOT_FOUND },
+       { "WERR_ACCOUNT_LOCKED_OUT", WERR_ACCOUNT_LOCKED_OUT },
        { NULL, W_ERROR(0) }
 };
 
@@ -109,11 +112,14 @@ werror_str_struct dos_err_strs[] = {
        { WERR_NO_LOGON_SERVERS, "No logon servers found" },
        { WERR_NO_SUCH_LOGON_SESSION, "No such logon session" },
        { WERR_DOMAIN_CONTROLLER_NOT_FOUND, "A domain controller could not be found" },
+       { WERR_DC_NOT_FOUND, "A domain controller could not be found" },
        { WERR_SETUP_NOT_JOINED, "Join failed" },
        { WERR_SETUP_ALREADY_JOINED, "Machine is already joined" },
        { WERR_SETUP_DOMAIN_CONTROLLER, "Machine is a Domain Controller" },
        { WERR_LOGON_FAILURE, "Invalid logon credentials" },
        { WERR_USER_EXISTS, "User account already exists" },
+       { WERR_PASSWORD_MUST_CHANGE, "The password must be changed" },
+       { WERR_ACCOUNT_LOCKED_OUT, "Account locked out" },
 };
 
 /*****************************************************************************