1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-09-19 18:20:40 +03:00

Merge pull request #1086 from jubnzv/sa-fixes

Fix some issues found with Cppcheck static analysis
This commit is contained in:
Ilya Shipitsin 2020-03-27 14:45:43 +05:00 committed by GitHub
commit 5db21a1dc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -4621,7 +4621,7 @@ REDIRECTED:
UINT use_port = 0; UINT use_port = 0;
UINT current_port = c->ServerPort; UINT current_port = c->ServerPort;
UCHAR ticket[SHA1_SIZE]; UCHAR ticket[SHA1_SIZE];
X *server_cert; X *server_cert = NULL;
BUF *b; BUF *b;
// Redirect mode // Redirect mode

View File

@ -114,7 +114,10 @@ bool SmbAuthenticate(char* name, char* password, char* domainname, char* groupna
char buffer[255]; char buffer[255];
char ntlm_timeout[32]; char ntlm_timeout[32];
char* proc_parameter[6]; char* proc_parameter[6];
// DNS Name 255 chars + OU names are limited to 64 characters + cmdline 32 + 1
char requiremember[352];
if (name == NULL || password == NULL || domainname == NULL || groupname == NULL) if (name == NULL || password == NULL || domainname == NULL || groupname == NULL)
{ {
Debug("Sam.c - SmbAuthenticate - wrong password parameter\n"); Debug("Sam.c - SmbAuthenticate - wrong password parameter\n");
@ -156,14 +159,11 @@ bool SmbAuthenticate(char* name, char* password, char* domainname, char* groupna
if (strlen(groupname) > 1) if (strlen(groupname) > 1)
{ {
// DNS Name 255 chars + OU names are limited to 64 characters + cmdline 32 + 1
char requiremember[352];
// Truncate string if unsafe char // Truncate string if unsafe char
EnSafeStr(groupname, '\0'); EnSafeStr(groupname, '\0');
snprintf(requiremember, sizeof(requiremember), "--require-membership-of=%s\\%s", domainname, groupname); snprintf(requiremember, sizeof(requiremember), "--require-membership-of=%s\\%s", domainname, groupname);
proc_parameter[4] = requiremember; proc_parameter[4] = requiremember;
proc_parameter[5] = 0; proc_parameter[5] = 0;
} }