diff options
| -rw-r--r-- | source3/libsmb/nterr.c | 30 | ||||
| -rw-r--r-- | source4/libcli/util/nterr.c | 18 |
2 files changed, 24 insertions, 24 deletions
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c index 5fa9ade3a5..82bdc4953e 100644 --- a/source3/libsmb/nterr.c +++ b/source3/libsmb/nterr.c @@ -1,18 +1,18 @@ -/* +/* * Unix SMB/CIFS implementation. * RPC Pipe client / server routines * Copyright (C) Luke Kenneth Casson Leighton 1997-2001. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ @@ -630,7 +630,7 @@ nt_err_code_struct nt_err_desc[] = { 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_("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 }, @@ -656,7 +656,7 @@ nt_err_code_struct nt_err_desc[] = { 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 }, - + { N_("License quota exceeded"), NT_STATUS_LICENSE_QUOTA_EXCEEDED }, { N_("No more files"), STATUS_NO_MORE_FILES }, @@ -699,7 +699,7 @@ const char *nt_errstr(NTSTATUS nt_code) /************************************************************************ Print friendler version fo NT error code ***********************************************************************/ - + const char *get_friendly_nt_error_msg(NTSTATUS nt_code) { int idx = 0; @@ -710,9 +710,9 @@ const char *get_friendly_nt_error_msg(NTSTATUS nt_code) } idx++; } - + /* fall back to NT_STATUS_XXX string */ - + return nt_errstr(nt_code); } @@ -726,7 +726,7 @@ const char *get_nt_error_c_code(NTSTATUS nt_code) int idx = 0; while (nt_errs[idx].nt_errstr != NULL) { - if (NT_STATUS_V(nt_errs[idx].nt_errcode) == + if (NT_STATUS_V(nt_errs[idx].nt_errcode) == NT_STATUS_V(nt_code)) { return nt_errs[idx].nt_errstr; } @@ -759,8 +759,8 @@ NTSTATUS nt_status_string_to_code(const char *nt_status_str) /** * Squash an NT_STATUS in line with security requirements. * In an attempt to avoid giving the whole game away when users - * are authenticating, NT replaces both NT_STATUS_NO_SUCH_USER and - * NT_STATUS_WRONG_PASSWORD with NT_STATUS_LOGON_FAILURE in certain situations + * are authenticating, NT replaces both NT_STATUS_NO_SUCH_USER and + * NT_STATUS_WRONG_PASSWORD with NT_STATUS_LOGON_FAILURE in certain situations * (session setups in particular). * * @param nt_status NTSTATUS input for squashing. @@ -770,15 +770,15 @@ NTSTATUS nt_status_string_to_code(const char *nt_status_str) NTSTATUS nt_status_squash(NTSTATUS nt_status) { if NT_STATUS_IS_OK(nt_status) { - return nt_status; + return nt_status; } else if NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER) { /* Match WinXP and don't give the game away */ return NT_STATUS_LOGON_FAILURE; - + } else if NT_STATUS_EQUAL(nt_status, NT_STATUS_WRONG_PASSWORD) { /* Match WinXP and don't give the game away */ return NT_STATUS_LOGON_FAILURE; } else { return nt_status; - } + } } diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c index 82e773c660..45e3bf9eac 100644 --- a/source4/libcli/util/nterr.c +++ b/source4/libcli/util/nterr.c @@ -1,18 +1,18 @@ -/* +/* * Unix SMB/CIFS implementation. * RPC Pipe client / server routines * Copyright (C) Luke Kenneth Casson Leighton 1997-2001. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ @@ -802,7 +802,7 @@ static const nt_err_code_struct nt_err_desc[] = { "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 }, + { "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 }, @@ -828,7 +828,7 @@ static const nt_err_code_struct nt_err_desc[] = { "User session deleted", NT_STATUS_USER_SESSION_DELETED }, { "Insufficient server resources", NT_STATUS_INSUFF_SERVER_RESOURCES }, { "Insufficient logon information", NT_STATUS_INSUFFICIENT_LOGON_INFO }, - + { "License quota exceeded", NT_STATUS_LICENSE_QUOTA_EXCEEDED }, { NULL, NT_STATUS(0) } @@ -843,7 +843,7 @@ const char *nt_errstr(NTSTATUS nt_code) int idx = 0; while (nt_errs[idx].nt_errstr != NULL) { - if (NT_STATUS_V(nt_errs[idx].nt_errcode) == + if (NT_STATUS_V(nt_errs[idx].nt_errcode) == NT_STATUS_V(nt_code)) { return nt_errs[idx].nt_errstr; } @@ -873,7 +873,7 @@ const char *get_friendly_nt_error_msg(NTSTATUS nt_code) } idx++; } - + /* fall back to NT_STATUS_XXX string */ return nt_errstr(nt_code); } @@ -887,7 +887,7 @@ const char *get_nt_error_c_code(NTSTATUS nt_code) int idx = 0; while (nt_errs[idx].nt_errstr != NULL) { - if (NT_STATUS_V(nt_errs[idx].nt_errcode) == + if (NT_STATUS_V(nt_errs[idx].nt_errcode) == NT_STATUS_V(nt_code)) { return nt_errs[idx].nt_errstr; } |