Merge pull request #2725 from akallabeth/warning_fixes_more_more_more

Warning fixes more more more
This commit is contained in:
Hardening 2015-06-23 19:32:26 +02:00
commit e5008d4b1b
2 changed files with 5 additions and 6 deletions

View File

@ -969,7 +969,6 @@ int freerdp_parse_username(char* username, char** user, char** domain)
int length = 0;
p = strchr(username, '\\');
u = strrchr(username, '@');
*user = NULL;
*domain = NULL;
@ -1002,10 +1001,6 @@ int freerdp_parse_username(char* username, char** user, char** domain)
if (!*user)
return -1;
/* If only username is given, prefix that with 'TARGET'
* otherwise set the domain to an empty string.
* NOTE: Domain NULL will result in undefined behavior.
*/
*domain = _strdup("\0");
if (!*domain)

View File

@ -35,17 +35,20 @@
static wLog* g_Log = NULL;
static BOOL g_Initialized = FALSE;
#if defined(WITH_NATIVE_SSPI)
static HMODULE g_SspiModule = NULL;
#endif
static SecurityFunctionTableW* g_SspiW = NULL;
static SecurityFunctionTableA* g_SspiA = NULL;
static BOOL ShouldUseNativeSspi(void);
#if defined(WITH_NATIVE_SSPI)
static BOOL ShouldUseNativeSspi(void);
static BOOL InitializeSspiModule_Native(void);
#endif
static void InitializeSspiModule(DWORD flags);
#if defined(WITH_NATIVE_SSPI)
BOOL ShouldUseNativeSspi(void)
{
BOOL status = FALSE;
@ -72,6 +75,7 @@ BOOL ShouldUseNativeSspi(void)
#endif
return status;
}
#endif
#if defined(WITH_NATIVE_SSPI)
BOOL InitializeSspiModule_Native(void)