summaryrefslogtreecommitdiffstats
path: root/xrdp
diff options
context:
space:
mode:
Diffstat (limited to 'xrdp')
-rw-r--r--xrdp/funcs.c2
-rw-r--r--xrdp/lang.c6
-rw-r--r--xrdp/xrdp.c10
-rw-r--r--xrdp/xrdp.h2
-rw-r--r--xrdp/xrdp.ini3
-rw-r--r--xrdp/xrdp_bitmap.c2
-rw-r--r--xrdp/xrdp_cache.c2
-rw-r--r--xrdp/xrdp_font.c2
-rw-r--r--xrdp/xrdp_listen.c2
-rw-r--r--xrdp/xrdp_login_wnd.c4
-rw-r--r--xrdp/xrdp_painter.c2
-rw-r--r--xrdp/xrdp_process.c2
-rw-r--r--xrdp/xrdp_region.c2
-rw-r--r--xrdp/xrdp_wm.c2
-rw-r--r--xrdp/xrdpwin.c2
15 files changed, 23 insertions, 22 deletions
diff --git a/xrdp/funcs.c b/xrdp/funcs.c
index 82662fa9..cd2ccf16 100644
--- a/xrdp/funcs.c
+++ b/xrdp/funcs.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/lang.c b/xrdp/lang.c
index 29031ea2..24dafb6a 100644
--- a/xrdp/lang.c
+++ b/xrdp/lang.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,9 +71,9 @@ get_key_info_from_scan_code(int device_flags, int scan_code, int *keys,
int ext;
int index;
- ext = device_flags &KBD_FLAG_EXT; /* 0x0100 */
+ ext = device_flags & KBD_FLAG_EXT; /* 0x0100 */
shift = keys[42] || keys[54];
- altgr = keys[56] &KBD_FLAG_EXT; /* right alt */
+ altgr = keys[56] & KBD_FLAG_EXT; /* right alt */
rv = 0;
scan_code = scan_code & 0x7f;
index = ext ? g_map[scan_code].code2 : g_map[scan_code].code1;
diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index 2ed2c8fd..0c340e55 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -306,9 +306,9 @@ main(int argc, char **argv)
g_init("xrdp");
ssl_init();
- for (test=0;test<argc; test++)
+ for (test = 0; test < argc; test++)
{
- DEBUG(("Argument %i - %s",test,argv[test]));
+ DEBUG(("Argument %i - %s", test, argv[test]));
}
/* check compiled endian with actual endian */
@@ -435,7 +435,7 @@ main(int argc, char **argv)
{
g_writeln("");
g_writeln("xrdp: A Remote Desktop Protocol server.");
- g_writeln("Copyright (C) Jay Sorg 2004-2011");
+ g_writeln("Copyright (C) Jay Sorg 2004-2013");
g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln("");
g_writeln("Usage: xrdp [options]");
@@ -453,7 +453,7 @@ main(int argc, char **argv)
{
g_writeln("");
g_writeln("xrdp: A Remote Desktop Protocol server.");
- g_writeln("Copyright (C) Jay Sorg 2004-2011");
+ g_writeln("Copyright (C) Jay Sorg 2004-2013");
g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln("Version %s", PACKAGE_VERSION);
g_writeln("");
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h
index ed653741..99d5743b 100644
--- a/xrdp/xrdp.h
+++ b/xrdp/xrdp.h
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index 7b2e33a8..ea6576cb 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini
@@ -27,6 +27,7 @@ tcp_keepalive=yes
#bulk_compression=yes
# You can set the PAM error text in a gateway setup (MAX 256 chars)
#pamerrortxt=change your password according to policy at http://url
+#new_cursors=no
[Logging]
LogFile=xrdp.log
@@ -36,7 +37,7 @@ SyslogLevel=DEBUG
# LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
[channels]
-# Channel names not listed here will be blocket by XRDP.
+# Channel names not listed here will be blocked by XRDP.
# You can block any channel by setting its value to false.
# IMPORTANT! All channels are not supported in all use
# cases even if you set all values to true.
diff --git a/xrdp/xrdp_bitmap.c b/xrdp/xrdp_bitmap.c
index d60cc920..19620c40 100644
--- a/xrdp/xrdp_bitmap.c
+++ b/xrdp/xrdp_bitmap.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp_cache.c b/xrdp/xrdp_cache.c
index 35e2f5f3..cac7f114 100644
--- a/xrdp/xrdp_cache.c
+++ b/xrdp/xrdp_cache.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp_font.c b/xrdp/xrdp_font.c
index 18e6c21f..1b7271ee 100644
--- a/xrdp/xrdp_font.c
+++ b/xrdp/xrdp_font.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c
index 6a4e44e2..965aa50d 100644
--- a/xrdp/xrdp_listen.c
+++ b/xrdp/xrdp_listen.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c
index 08abfedb..e7066798 100644
--- a/xrdp/xrdp_login_wnd.c
+++ b/xrdp/xrdp_login_wnd.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -325,7 +325,7 @@ xrdp_wm_show_edits(struct xrdp_wm *self, struct xrdp_bitmap *combo)
g_strncpy(b->caption1, &self->session->client_info->domain[1], 255);
b->edit_pos = g_mbstowcs(0, b->caption1, 0);
}
-
+
}
if (g_strncmp(name, "username", 255) == 0)
{
diff --git a/xrdp/xrdp_painter.c b/xrdp/xrdp_painter.c
index 8ba33825..4457fee8 100644
--- a/xrdp/xrdp_painter.c
+++ b/xrdp/xrdp_painter.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp_process.c b/xrdp/xrdp_process.c
index 070dc697..228bf630 100644
--- a/xrdp/xrdp_process.c
+++ b/xrdp/xrdp_process.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp_region.c b/xrdp/xrdp_region.c
index 8dc6854b..c66994f7 100644
--- a/xrdp/xrdp_region.c
+++ b/xrdp/xrdp_region.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 4badf44d..bfcc7548 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -573,7 +573,7 @@ xrdp_wm_init(struct xrdp_wm *self)
q = (char *)list_get_item(names, index);
if ((g_strncasecmp("globals", q, 8) != 0) &&
(g_strncasecmp("Logging", q, 8) != 0) &&
- (g_strncasecmp("channels", q, 8) != 0))
+ (g_strncasecmp("channels", q, 9) != 0))
{
g_strncpy(section_name, q, 255);
break;
diff --git a/xrdp/xrdpwin.c b/xrdp/xrdpwin.c
index b6bf8fc8..da9ba9e0 100644
--- a/xrdp/xrdpwin.c
+++ b/xrdp/xrdpwin.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-05 17:49:18 +0000