summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nsswitch/pam_winbind.c2
-rw-r--r--source3/libsmb/nterr.c186
2 files changed, 96 insertions, 92 deletions
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 268939076b..f13e365b87 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1456,7 +1456,7 @@ static bool _pam_check_remark_auth_err(struct pwb_context *ctx,
}
if (e->display_string) {
- _make_remark(ctx, PAM_ERROR_MSG, e->display_string);
+ _make_remark(ctx, PAM_ERROR_MSG, _(e->display_string));
*pam_error = e->pam_error;
return true;
}
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 197d5bd730..328ba3bbe1 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -21,6 +21,10 @@
#include "includes.h"
+#if !defined(N_)
+#define N_(string) string
+#endif
+
typedef struct
{
const char *nt_errstr;
@@ -551,98 +555,98 @@ static const 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 },
- { "Must change password", NT_STATUS_PASSWORD_MUST_CHANGE },
- { "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 },
- { "Memory allocation error", NT_STATUS_NO_MEMORY },
- { "No domain controllers located", NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND },
- { "Named pipe not available", NT_STATUS_PIPE_NOT_AVAILABLE },
- { "Not implemented", NT_STATUS_NOT_IMPLEMENTED },
- { "Invalid information class", NT_STATUS_INVALID_INFO_CLASS },
- { "Information length mismatch", NT_STATUS_INFO_LENGTH_MISMATCH },
- { "Access violation", NT_STATUS_ACCESS_VIOLATION },
- { "Invalid handle", NT_STATUS_INVALID_HANDLE },
- { "Invalid parameter", NT_STATUS_INVALID_PARAMETER },
- { "No memory", NT_STATUS_NO_MEMORY },
- { "Buffer too small", NT_STATUS_BUFFER_TOO_SMALL },
- { "Revision mismatch", NT_STATUS_REVISION_MISMATCH },
- { "No such logon session", NT_STATUS_NO_SUCH_LOGON_SESSION },
- { "No such privilege", NT_STATUS_NO_SUCH_PRIVILEGE },
- { "Procedure not found", NT_STATUS_PROCEDURE_NOT_FOUND },
- { "Server disabled", NT_STATUS_SERVER_DISABLED },
- { "Invalid pipe state", NT_STATUS_INVALID_PIPE_STATE },
- { "Named pipe busy", NT_STATUS_PIPE_BUSY },
- { "Illegal function", NT_STATUS_ILLEGAL_FUNCTION },
- { "Named pipe dicconnected", NT_STATUS_PIPE_DISCONNECTED },
- { "Named pipe closing", NT_STATUS_PIPE_CLOSING },
- { "Remote host not listening", NT_STATUS_REMOTE_NOT_LISTENING },
- { "Duplicate name on network", NT_STATUS_DUPLICATE_NAME },
- { "Print queue is full", NT_STATUS_PRINT_QUEUE_FULL },
- { "No print spool space available", NT_STATUS_NO_SPOOL_SPACE },
- { "The network name cannot be found", NT_STATUS_BAD_NETWORK_NAME },
- { "The connection was refused", NT_STATUS_CONNECTION_REFUSED },
- { "Too many names", NT_STATUS_TOO_MANY_NAMES },
- { "Too many sessions", NT_STATUS_TOO_MANY_SESSIONS },
- { "Invalid server state", NT_STATUS_INVALID_SERVER_STATE },
- { "Invalid domain state", NT_STATUS_INVALID_DOMAIN_STATE },
- { "Invalid domain role", NT_STATUS_INVALID_DOMAIN_ROLE },
- { "No such domain", NT_STATUS_NO_SUCH_DOMAIN },
- { "Domain exists", NT_STATUS_DOMAIN_EXISTS },
- { "Domain limit exceeded", NT_STATUS_DOMAIN_LIMIT_EXCEEDED },
- { "Bad logon session state", NT_STATUS_BAD_LOGON_SESSION_STATE },
- { "Logon session collision", NT_STATUS_LOGON_SESSION_COLLISION },
- { "Invalid logon type", NT_STATUS_INVALID_LOGON_TYPE },
- { "Cancelled", NT_STATUS_CANCELLED },
- { "Invalid computer name", NT_STATUS_INVALID_COMPUTER_NAME },
- { "Logon server conflict", NT_STATUS_LOGON_SERVER_CONFLICT },
- { "Time difference at domain controller", NT_STATUS_TIME_DIFFERENCE_AT_DC },
- { "Pipe broken", NT_STATUS_PIPE_BROKEN },
- { "Registry corrupt", NT_STATUS_REGISTRY_CORRUPT },
- { "Too many secrets", NT_STATUS_TOO_MANY_SECRETS },
- { "Too many SIDs", NT_STATUS_TOO_MANY_SIDS },
- { "Lanmanager cross encryption required", NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED },
- { "Log file full", NT_STATUS_LOG_FILE_FULL },
- { "No trusted LSA secret", NT_STATUS_NO_TRUST_LSA_SECRET },
- { "No trusted SAM account", NT_STATUS_NO_TRUST_SAM_ACCOUNT },
- { "Trusted domain failure", NT_STATUS_TRUSTED_DOMAIN_FAILURE },
- { "Trust relationship failure", NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE },
- { "Trust failure", NT_STATUS_TRUST_FAILURE },
- { "Netlogon service not started", NT_STATUS_NETLOGON_NOT_STARTED },
- { "Account expired", NT_STATUS_ACCOUNT_EXPIRED },
- { "Network credential conflict", NT_STATUS_NETWORK_CREDENTIAL_CONFLICT },
- { "Remote session limit", NT_STATUS_REMOTE_SESSION_LIMIT },
- { "No logon interdomain trust account", NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT },
- { "No logon workstation trust account", NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT },
- { "No logon server trust account", NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT },
- { "Domain trust inconsistent", NT_STATUS_DOMAIN_TRUST_INCONSISTENT },
- { "No user session key available", NT_STATUS_NO_USER_SESSION_KEY },
- { "User session deleted", NT_STATUS_USER_SESSION_DELETED },
- { "Insufficient server resources", NT_STATUS_INSUFF_SERVER_RESOURCES },
- { "Insufficient logon information", NT_STATUS_INSUFFICIENT_LOGON_INFO },
+ { N_("Success"), NT_STATUS_OK },
+ { N_("Undetermined error"), NT_STATUS_UNSUCCESSFUL },
+ { N_("Access denied"), NT_STATUS_ACCESS_DENIED },
+ { N_("Account locked out"), NT_STATUS_ACCOUNT_LOCKED_OUT },
+ { N_("Must change password"), NT_STATUS_PASSWORD_MUST_CHANGE },
+ { N_("Password is too short"), NT_STATUS_PWD_TOO_SHORT },
+ { N_("Password is too recent"), NT_STATUS_PWD_TOO_RECENT },
+ { N_("Password history conflict"), NT_STATUS_PWD_HISTORY_CONFLICT },
+ { N_("No logon servers"), NT_STATUS_NO_LOGON_SERVERS },
+ { N_("Improperly formed account name"), NT_STATUS_INVALID_ACCOUNT_NAME },
+ { N_("User exists"), NT_STATUS_USER_EXISTS },
+ { N_("No such user"), NT_STATUS_NO_SUCH_USER },
+ { N_("Group exists"), NT_STATUS_GROUP_EXISTS },
+ { N_("No such group"), NT_STATUS_NO_SUCH_GROUP },
+ { N_("Member not in group"), NT_STATUS_MEMBER_NOT_IN_GROUP },
+ { N_("Wrong Password"), NT_STATUS_WRONG_PASSWORD },
+ { N_("Ill formed password"), NT_STATUS_ILL_FORMED_PASSWORD },
+ { N_("Password restriction"), NT_STATUS_PASSWORD_RESTRICTION },
+ { N_("Logon failure"), NT_STATUS_LOGON_FAILURE },
+ { N_("Account restriction"), NT_STATUS_ACCOUNT_RESTRICTION },
+ { N_("Invalid logon hours"), NT_STATUS_INVALID_LOGON_HOURS },
+ { N_("Invalid workstation"), NT_STATUS_INVALID_WORKSTATION },
+ { N_("Password expired"), NT_STATUS_PASSWORD_EXPIRED },
+ { N_("Account disabled"), NT_STATUS_ACCOUNT_DISABLED },
+ { N_("Memory allocation error"), NT_STATUS_NO_MEMORY },
+ { N_("No domain controllers located"), NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND },
+ { N_("Named pipe not available"), NT_STATUS_PIPE_NOT_AVAILABLE },
+ { N_("Not implemented"), NT_STATUS_NOT_IMPLEMENTED },
+ { N_("Invalid information class"), NT_STATUS_INVALID_INFO_CLASS },
+ { N_("Information length mismatch"), NT_STATUS_INFO_LENGTH_MISMATCH },
+ { N_("Access violation"), NT_STATUS_ACCESS_VIOLATION },
+ { N_("Invalid handle"), NT_STATUS_INVALID_HANDLE },
+ { N_("Invalid parameter"), NT_STATUS_INVALID_PARAMETER },
+ { N_("No memory"), NT_STATUS_NO_MEMORY },
+ { N_("Buffer too small"), NT_STATUS_BUFFER_TOO_SMALL },
+ { N_("Revision mismatch"), NT_STATUS_REVISION_MISMATCH },
+ { N_("No such logon session"), NT_STATUS_NO_SUCH_LOGON_SESSION },
+ { N_("No such privilege"), NT_STATUS_NO_SUCH_PRIVILEGE },
+ { N_("Procedure not found"), NT_STATUS_PROCEDURE_NOT_FOUND },
+ { N_("Server disabled"), NT_STATUS_SERVER_DISABLED },
+ { N_("Invalid pipe state"), NT_STATUS_INVALID_PIPE_STATE },
+ { N_("Named pipe busy"), NT_STATUS_PIPE_BUSY },
+ { N_("Illegal function"), NT_STATUS_ILLEGAL_FUNCTION },
+ { N_("Named pipe dicconnected"), NT_STATUS_PIPE_DISCONNECTED },
+ { N_("Named pipe closing"), NT_STATUS_PIPE_CLOSING },
+ { N_("Remote host not listening"), NT_STATUS_REMOTE_NOT_LISTENING },
+ { N_("Duplicate name on network"), NT_STATUS_DUPLICATE_NAME },
+ { N_("Print queue is full"), NT_STATUS_PRINT_QUEUE_FULL },
+ { N_("No print spool space available"), NT_STATUS_NO_SPOOL_SPACE },
+ { N_("The network name cannot be found"), NT_STATUS_BAD_NETWORK_NAME },
+ { N_("The connection was refused"), NT_STATUS_CONNECTION_REFUSED },
+ { N_("Too many names"), NT_STATUS_TOO_MANY_NAMES },
+ { N_("Too many sessions"), NT_STATUS_TOO_MANY_SESSIONS },
+ { N_("Invalid server state"), NT_STATUS_INVALID_SERVER_STATE },
+ { N_("Invalid domain state"), NT_STATUS_INVALID_DOMAIN_STATE },
+ { N_("Invalid domain role"), NT_STATUS_INVALID_DOMAIN_ROLE },
+ { N_("No such domain"), NT_STATUS_NO_SUCH_DOMAIN },
+ { N_("Domain exists"), NT_STATUS_DOMAIN_EXISTS },
+ { N_("Domain limit exceeded"), NT_STATUS_DOMAIN_LIMIT_EXCEEDED },
+ { N_("Bad logon session state"), NT_STATUS_BAD_LOGON_SESSION_STATE },
+ { N_("Logon session collision"), NT_STATUS_LOGON_SESSION_COLLISION },
+ { N_("Invalid logon type"), NT_STATUS_INVALID_LOGON_TYPE },
+ { N_("Cancelled"), NT_STATUS_CANCELLED },
+ { N_("Invalid computer name"), NT_STATUS_INVALID_COMPUTER_NAME },
+ { N_("Logon server conflict"), NT_STATUS_LOGON_SERVER_CONFLICT },
+ { N_("Time difference at domain controller"), NT_STATUS_TIME_DIFFERENCE_AT_DC },
+ { N_("Pipe broken"), NT_STATUS_PIPE_BROKEN },
+ { N_("Registry corrupt"), NT_STATUS_REGISTRY_CORRUPT },
+ { N_("Too many secrets"), NT_STATUS_TOO_MANY_SECRETS },
+ { N_("Too many SIDs"), NT_STATUS_TOO_MANY_SIDS },
+ { N_("Lanmanager cross encryption required"), NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED },
+ { N_("Log file full"), NT_STATUS_LOG_FILE_FULL },
+ { N_("No trusted LSA secret"), NT_STATUS_NO_TRUST_LSA_SECRET },
+ { N_("No trusted SAM account"), NT_STATUS_NO_TRUST_SAM_ACCOUNT },
+ { N_("Trusted domain failure"), NT_STATUS_TRUSTED_DOMAIN_FAILURE },
+ { N_("Trust relationship failure"), NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE },
+ { N_("Trust failure"), NT_STATUS_TRUST_FAILURE },
+ { N_("Netlogon service not started"), NT_STATUS_NETLOGON_NOT_STARTED },
+ { N_("Account expired"), NT_STATUS_ACCOUNT_EXPIRED },
+ { N_("Network credential conflict"), NT_STATUS_NETWORK_CREDENTIAL_CONFLICT },
+ { N_("Remote session limit"), NT_STATUS_REMOTE_SESSION_LIMIT },
+ { N_("No logon interdomain trust account"), NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT },
+ { N_("No logon workstation trust account"), NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT },
+ { N_("No logon server trust account"), NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT },
+ { N_("Domain trust inconsistent"), NT_STATUS_DOMAIN_TRUST_INCONSISTENT },
+ { N_("No user session key available"), NT_STATUS_NO_USER_SESSION_KEY },
+ { N_("User session deleted"), NT_STATUS_USER_SESSION_DELETED },
+ { N_("Insufficient server resources"), NT_STATUS_INSUFF_SERVER_RESOURCES },
+ { N_("Insufficient logon information"), NT_STATUS_INSUFFICIENT_LOGON_INFO },
- { "License quota exceeded", NT_STATUS_LICENSE_QUOTA_EXCEEDED },
- { "No more files", STATUS_NO_MORE_FILES },
+ { N_("License quota exceeded"), NT_STATUS_LICENSE_QUOTA_EXCEEDED },
+ { N_("No more files"), STATUS_NO_MORE_FILES },
{ NULL, NT_STATUS(0) }
};