Merge branch 'master' into server

include/freerdp/settings.h

@@ -173,6 +173,7 @@ struct rdp_settings
 	uint32 selected_protocol;
 	uint32 encryption_method;
 	uint32 encryption_level;
+	boolean authentication;
 
 	rdpBlob server_random;
 	rdpBlob server_certificate;

libfreerdp-core/connection.c

@@ -63,7 +63,7 @@ boolean rdp_client_connect(rdpRdp* rdp)
 	rdp->settings->autologon = 1;
 
 	nego_init(rdp->nego);
-	nego_set_target(rdp->nego, rdp->settings->hostname, 3389);
+	nego_set_target(rdp->nego, rdp->settings->hostname, rdp->settings->port);
 	nego_set_cookie(rdp->nego, rdp->settings->username);
 	nego_enable_rdp(rdp->nego, rdp->settings->rdp_security);
 	nego_enable_nla(rdp->nego, rdp->settings->nla_security);

libfreerdp-core/settings.c

@@ -52,6 +52,7 @@ rdpSettings* settings_new()
 		settings->kbd_fn_keys = 0;
 		settings->kbd_layout = 0x409;
 		settings->encryption = False;
+		settings->port = 3389;
 
 		settings->performance_flags =
 				PERF_DISABLE_FULLWINDOWDRAG |
@@ -63,6 +64,8 @@ rdpSettings* settings_new()
 		settings->encryption_method = ENCRYPTION_METHOD_NONE;
 		settings->encryption_level = ENCRYPTION_LEVEL_NONE;
 
+		settings->authentication = True;
+
 		/*
 		settings->order_support[NEG_DSTBLT_INDEX] = True;
 		settings->order_support[NEG_PATBLT_INDEX] = True;

libfreerdp-core/transport.c

@@ -111,6 +111,9 @@ boolean transport_connect_nla(rdpTransport* transport)
 
 	/* Network Level Authentication */
 
+	if (transport->settings->authentication != True)
+		return True;
+
 	if (transport->credssp == NULL)
 		transport->credssp = credssp_new(transport);
 

libfreerdp-utils/args.c

@@ -188,6 +188,10 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
 		{
 			settings->offscreen_bitmap_cache = 0;
 		}
+		else if (strcmp("--no-auth", argv[index]) == 0)
+		{
+			settings->authentication = False;
+		}
 		else if (strcmp("--no-fastpath", argv[index]) == 0)
 		{
 			settings->fastpath_input = False;