github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autotools fix and file_loc.h simplified

Browse Source
This commit is contained in:
jsorg71
2009-05-19 04:23:49 +00:00
parent a386eac0f9
commit 23ffdb0c5f
27 changed files with 143 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libxrdp/Makefile.am
+7
View File
@@ -1,3 +1,10 @@
AM_CFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\"
INCLUDES = \
-I$(top_srcdir)/common
libxrdp/xrdp_rdp.c
+3 -1
View File
@@ -62,12 +62,14 @@ xrdp_rdp_read_config(struct xrdp_client_info* client_info)
struct list* values;
char* item;
char* value;
char cfg_file[256];
items = list_create();
items->auto_free = 1;
values = list_create();
values->auto_free = 1;
file_by_name_read_section(XRDP_CFG_FILE, "globals", items, values);
g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
file_by_name_read_section(cfg_file, "globals", items, values);
for (index = 0; index < items->count; index++)
{
item = (char*)list_get_item(items, index);
libxrdp/xrdp_sec.c
+4 -2
View File
@@ -901,6 +901,7 @@ xrdp_sec_incoming(struct xrdp_sec* self)
int index;
char* item;
char* value;
char key_file[256];
DEBUG((" in xrdp_sec_incoming"));
g_random(self->server_random, 32);
@@ -908,10 +909,11 @@ xrdp_sec_incoming(struct xrdp_sec* self)
items->auto_free = 1;
values = list_create();
values->auto_free = 1;
if (file_by_name_read_section(XRDP_KEY_FILE, "keys", items, values) != 0)
g_snprintf(key_file, 255, "%s/rsakeys.ini", XRDP_CFG_PATH);
if (file_by_name_read_section(key_file, "keys", items, values) != 0)
{
/* this is a show stopper */
g_writeln("xrdp_sec_incoming: error reading %s file", XRDP_KEY_FILE);
g_writeln("xrdp_sec_incoming: error reading %s file", key_file);
list_delete(items);
list_delete(values);
return 1;