mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2008 from matt335672/cppcheck_26 

Bump cppcheck version to 2.6
This commit is contained in:
metalefty 2021-10-05 13:03:54 +09:00 committed by GitHub
parent 0c8ac11f09 cda6c60748
commit f01c3d6be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -127,7 +127,7 @@ jobs:
CC: gcc
# This is required to use a version of cppcheck other than that
# supplied with the operating system
CPPCHECK_VER: 2.5
CPPCHECK_VER: 2.6
CPPCHECK_REPO: https://github.com/danmar/cppcheck.git
steps:
# This is currently the only way to get a version into

9
xrdp/xrdp_mm.c
View File

@ -2191,9 +2191,6 @@ getPAMError(const int pamError, char *text, int text_bytes)
return "Error connecting to PAM";
case 32 + 3:
return "Username okey but group problem";
default:
g_snprintf(text, text_bytes, "Not defined PAM error:%d", pamError);
return text;
#elif defined(OPENPAM)
case PAM_SUCCESS: /* 0 */
return "Success";
@ -2255,10 +2252,10 @@ getPAMError(const int pamError, char *text, int text_bytes)
return "Module is unknown";
case PAM_DOMAIN_UNKNOWN: /* 29 */
return "Unknown authentication domain";
#endif
default:
g_snprintf(text, text_bytes, "Not defined PAM error:%d", pamError);
return text;
#endif
}
}
@ -2309,8 +2306,6 @@ getPAMAdditionalErrorInfo(const int pamError, struct xrdp_mm *self)
{
return "Authentication error - Verify that user/password is valid";
}
default:
return "No expected error";
#elif defined(OPENPAM)
case PAM_SUCCESS: /* 0 */
return NULL;
@ -2351,9 +2346,9 @@ getPAMAdditionalErrorInfo(const int pamError, struct xrdp_mm *self)
{
return "Authentication error - Verify that user/password is valid";
}
#endif
default:
return "No expected error";
#endif
}
}
#endif