[Pkg-remote-commits] [freerdp] 01/02: Imported Upstream version 1.1.0~git20140921.1.440916e+dfsg

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch upstream
in repository freerdp.

commit 318a44c3424b40fc2eca99a4dec0eead7ebd56aa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 21 21:47:21 2014 +0200

    Imported Upstream version 1.1.0~git20140921.1.440916e+dfsg
---
 ChangeLog                       | 18 +++++++++++++++++-
 client/common/cmdline.c         | 21 ++++++---------------
 winpr/CMakeLists.txt            |  3 ---
 winpr/include/winpr/config.h.in | 32 --------------------------------
 winpr/include/winpr/sspi.h      |  2 --
 5 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d06dd09..15fe2e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,23 @@
+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 at 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) 
 
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 1162122..3d0cc2d 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -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 at corp.net' to be transmitted
+		 * as username 'user at corp.net', domain empty.
+		 */
+		*user = _strdup(username);
+		*domain = NULL;
 	}
 
 	return 0;
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index b4aaf45..93f989f 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -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)
diff --git a/winpr/include/winpr/config.h.in b/winpr/include/winpr/config.h.in
deleted file mode 100644
index 5cd3bc7..0000000
--- a/winpr/include/winpr/config.h.in
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * WinPR: Windows Portable Runtime
- * config.h definitions for installable headers
- *
- * Copyright 2012 Marc-Andre Moreau <marcandre.moreau at 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 */
diff --git a/winpr/include/winpr/sspi.h b/winpr/include/winpr/sspi.h
index f2adcd2..3f2d21b 100644
--- a/winpr/include/winpr/sspi.h
+++ b/winpr/include/winpr/sspi.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>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/freerdp.git