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

Merge pull request #1899 from TOMATO-ONE/neutrinordp_add_channel

Browse Source 
Allow common channel settings to be overridden for modules as well as chansrv (#1899)
This commit is contained in:
matt335672 2021-05-28 11:22:08 +01:00 committed by GitHub
commit 148000c46b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutrinordp/xrdp-neutrinordp.c
View File

@ -535,6 +535,13 @@ lxrdp_set_param(struct mod *mod, const char *name, const char *value)
{ {
/* Valid (but unused) parameters not logged */ /* Valid (but unused) parameters not logged */
} }
else if (g_strcmp(name, "channel.rdpdr") == 0 ||
g_strcmp(name, "channel.rdpsnd") == 0 ||
g_strcmp(name, "channel.cliprdr") == 0 ||
g_strcmp(name, "channel.drdynvc") == 0)
{
/* Valid (but unused) parameters not logged */
}
else else
{ {
LOG(LOG_LEVEL_WARNING, "lxrdp_set_param: unknown name [%s] value [%s]", name, value); LOG(LOG_LEVEL_WARNING, "lxrdp_set_param: unknown name [%s] value [%s]", name, value);

3
xrdp/xrdp_mm.c
View File

@ -1798,7 +1798,6 @@ xrdp_mm_process_login_response(struct xrdp_mm *self, struct stream *s)
{ {
g_snprintf(port, 255, "%d", 7200 + display); g_snprintf(port, 255, "%d", 7200 + display);
} }
xrdp_mm_update_allowed_channels(self);
xrdp_mm_connect_chansrv(self, ip, port); xrdp_mm_connect_chansrv(self, ip, port);
} }
} }
@ -2493,6 +2492,8 @@ xrdp_mm_connect(struct xrdp_mm *self)
} }
} }
xrdp_mm_update_allowed_channels(self);
#ifdef USE_PAM #ifdef USE_PAM
if (use_pam_auth) if (use_pam_auth)
{ {