Commit fd9fc6dc authored by Mike Gabriel's avatar Mike Gabriel

Imported Upstream version 1.1.0~git20140921.1.440916e+dfsg

parent 8cffb13b
2014-08-25 09:52:43 -0400 Marc-André Moreau (440916e)
* Merge pull request #2061 from bmiklautz/remove_winpr_configh (HEAD,
origin/stable-1.1)
2014-08-24 14:31:13 +0200 Bernhard Miklautz (6d2d377)
* Get rid of winpr/config.h
2014-08-18 13:07:30 -0400 Marc-André Moreau (6fc97c7)
* Merge pull request #2040 from dpoe/stable-1.1
2014-08-15 15:45:06 -0600 Daryl Poe (248c918)
* handle user@corp.net username correctly
2014-08-09 21:06:40 +0200 Bernhard Miklautz (b07a5c1)
* Merge pull request #2031 from bmiklautz/fix/stable-1.1/ffmpeg2
(HEAD, origin/stable-1.1)
2014-08-08 16:04:49 +0200 Bernhard Miklautz (dc7f6ab)
......
......@@ -706,21 +706,12 @@ int freerdp_parse_username(char* username, char** user, char** domain)
}
else
{
p = strchr(username, '@');
if (p)
{
length = p - username;
*user = (char*) malloc(length + 1);
strncpy(*user, username, length);
(*user)[length] = '\0';
*domain = _strdup(&p[1]);
}
else
{
*user = _strdup(username);
*domain = NULL;
}
/* Do not break up the name for '@'; both credSSP and the
* ClientInfo PDU expect 'user@corp.net' to be transmitted
* as username 'user@corp.net', domain empty.
*/
*user = _strdup(username);
*domain = NULL;
}
return 0;
......
......@@ -69,9 +69,6 @@ else()
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/winpr/config.h)
add_subdirectory(include)
add_subdirectory(libwinpr)
......
/**
* WinPR: Windows Portable Runtime
* config.h definitions for installable headers
*
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef WINPR_CONFIG_H
#define WINPR_CONFIG_H
/*
* This generated config.h header is meant for installation, which is why
* all definitions MUST be prefixed to avoid conflicting with third-party
* libraries. Only add configurable definitions which really must be used
* from installable headers, such as the base type definition types.
*/
#cmakedefine WITH_NATIVE_SSPI
#endif /* WINPR_CONFIG_H */
......@@ -20,8 +20,6 @@
#ifndef WINPR_SSPI_H
#define WINPR_SSPI_H
#include <winpr/config.h>
#include <wchar.h>
#include <winpr/winpr.h>
#include <winpr/wtypes.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment