Permalink
Browse files

MERGE: -c 61735 /trunk/Platform -> /branches/Platform-6.1

Fix bug 9292 - domainjoin says "user" when it means "machine"

Use the more generic term, account, instead of user so the message can refer to machine and user accounts.

(lwadvapi: r61736)
  • Loading branch information...
1 parent 4add1e5 commit 90340891510ddc3e5e2d3a385fc1c189ce466461 Kyle Stemen committed with gitsync Sep 2, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 lwadvapi/include/public/lwerror-table.h
View
4 lwadvapi/include/public/lwerror-table.h
@@ -47,7 +47,7 @@ S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_DNS_RESOLUTION_FAILED, -1, "Failed to
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_FAILED_TIME_CONVERSION, -1, "Failed to convert the time" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_INVALID_SID, -1, "The security identifier (SID) is invalid" )
// Triggered by passing a bad password for a valid username to domainjoin
-S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_PASSWORD_MISMATCH, -1, "The password is incorrect for the given username" )
+S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_PASSWORD_MISMATCH, -1, "The password is incorrect for the given account" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_UNEXPECTED_DB_RESULT, -1, "Unexpected cached data found" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_PASSWORD_EXPIRED, -1, "Password expired" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_ACCOUNT_EXPIRED, -1, "Account expired" )
@@ -81,7 +81,7 @@ S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_FAILED_CREATE_HOMEDIR, -1, "Failed to
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_PASSWORD_TOO_WEAK, -1, "The specified password is not strong enough" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_INVALID_SID_REVISION, -1, "The security descriptor (SID) has an invalid revision" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_ACCOUNT_LOCKED, -1, "The user account is locked" )
-S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_ACCOUNT_DISABLED, -1, "The user account is disabled" )
+S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_ACCOUNT_DISABLED, -1, "The account is disabled" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_USER_CANNOT_CHANGE_PASSWD, -1, "The user is not allowed to change his/her password" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_LOAD_LIBRARY_FAILED, -1, "Failed to dynamically load a library" )
S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_LOOKUP_SYMBOL_FAILED, -1, "Failed to lookup a symbol in a dynamic library" )

0 comments on commit 9034089

Please sign in to comment.