cleaning up some friendly error messages

(This used to be commit f978387e789eeaf9b53a21231d4cdc7cf3ea6db3)

1 files changed, 26 insertions, 22 deletions

diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 89ad58b26f..4bb21efaa7 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -542,28 +542,32 @@ static nt_err_code_struct nt_errs[] =
 nt_err_code_struct nt_err_desc[] =
 {
 	{ "Success", NT_STATUS_OK },
-	{ "Undetermined error", NT_STATUS_UNSUCCESSFUL },
-	{ "Access denied", NT_STATUS_ACCESS_DENIED },
-	{ "Account locked out", NT_STATUS_ACCOUNT_LOCKED_OUT },
-	{ "Password is too short", NT_STATUS_PWD_TOO_SHORT },
-	{ "Password is too recent", NT_STATUS_PWD_TOO_RECENT },
-	{ "Password history conflict", NT_STATUS_PWD_HISTORY_CONFLICT },
-	{ "No logon servers", NT_STATUS_NO_LOGON_SERVERS },
-	{ "Invalid account name", NT_STATUS_INVALID_ACCOUNT_NAME },
-	{ "User exists", NT_STATUS_USER_EXISTS },
-	{ "No such user", NT_STATUS_NO_SUCH_USER },
-	{ "Group exists", NT_STATUS_GROUP_EXISTS },
-	{ "No such group", NT_STATUS_NO_SUCH_GROUP },
-	{ "Member not in group", NT_STATUS_MEMBER_NOT_IN_GROUP },
-	{ "Wrong Password", NT_STATUS_WRONG_PASSWORD },
-	{ "Ill formed password", NT_STATUS_ILL_FORMED_PASSWORD },
-	{ "Password restriction", NT_STATUS_PASSWORD_RESTRICTION },
-	{ "Logon failure", NT_STATUS_LOGON_FAILURE },
-	{ "Account restruction", NT_STATUS_ACCOUNT_RESTRICTION },
-	{ "Invalid logon hours", NT_STATUS_INVALID_LOGON_HOURS },
-	{ "Invalid workstation", NT_STATUS_INVALID_WORKSTATION },
-	{ "Password expired", NT_STATUS_PASSWORD_EXPIRED },
-	{ "Account Disabled", NT_STATUS_ACCOUNT_DISABLED },
+	{ "Undetermined error", 		NT_STATUS_UNSUCCESSFUL },
+	{ "Access denied", 			NT_STATUS_ACCESS_DENIED },
+	{ "Account locked out", 		NT_STATUS_ACCOUNT_LOCKED_OUT },
+	{ "Password is too short", 		NT_STATUS_PWD_TOO_SHORT },
+	{ "Password is too recent", 		NT_STATUS_PWD_TOO_RECENT },
+	{ "Password history conflict", 		NT_STATUS_PWD_HISTORY_CONFLICT },
+	{ "No logon servers", 			NT_STATUS_NO_LOGON_SERVERS },
+	{ "Improperly formed account name", 	NT_STATUS_INVALID_ACCOUNT_NAME },
+	{ "User exists", 			NT_STATUS_USER_EXISTS },
+	{ "No such user", 			NT_STATUS_NO_SUCH_USER },
+	{ "Group exists", 			NT_STATUS_GROUP_EXISTS },
+	{ "No such group", 			NT_STATUS_NO_SUCH_GROUP },
+	{ "Member not in group", 		NT_STATUS_MEMBER_NOT_IN_GROUP },
+	{ "Wrong Password", 			NT_STATUS_WRONG_PASSWORD },
+	{ "Ill formed password", 		NT_STATUS_ILL_FORMED_PASSWORD },
+	{ "Password restriction", 		NT_STATUS_PASSWORD_RESTRICTION },
+	{ "Logon failure", 			NT_STATUS_LOGON_FAILURE },
+	{ "Account restriction", 		NT_STATUS_ACCOUNT_RESTRICTION },
+	{ "Invalid logon hours", 		NT_STATUS_INVALID_LOGON_HOURS },
+	{ "Invalid workstation", 		NT_STATUS_INVALID_WORKSTATION },
+	{ "Password expired", 			NT_STATUS_PASSWORD_EXPIRED },
+	{ "Account disabled", 			NT_STATUS_ACCOUNT_DISABLED },
+	{ "Unexpected information received", 	NT_STATUS_INVALID_PARAMETER },
+	{ "Memory allocation error", 		NT_STATUS_NO_MEMORY },
+	{ "No domain controllers located", 	NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND },
+	{ "Account locked out", 		NT_STATUS_ACCOUNT_LOCKED_OUT },
 	{ NULL, NT_STATUS(0) }
 };