mirror of https://github.com/neutrinolabs/xrdp
Merge pull request #1899 from TOMATO-ONE/neutrinordp_add_channel
Allow common channel settings to be overridden for modules as well as chansrv (#1899)
This commit is contained in:
commit
148000c46b
|
@ -535,6 +535,13 @@ lxrdp_set_param(struct mod *mod, const char *name, const char *value)
|
|||
{
|
||||
/* 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
|
||||
{
|
||||
LOG(LOG_LEVEL_WARNING, "lxrdp_set_param: unknown name [%s] value [%s]", name, value);
|
||||
|
|
|
@ -1798,7 +1798,6 @@ xrdp_mm_process_login_response(struct xrdp_mm *self, struct stream *s)
|
|||
{
|
||||
g_snprintf(port, 255, "%d", 7200 + display);
|
||||
}
|
||||
xrdp_mm_update_allowed_channels(self);
|
||||
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
|
||||
if (use_pam_auth)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue