summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp_mm.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2011-08-24 21:54:30 -0700
committerJay Sorg <jay.sorg@gmail.com>2011-08-24 21:54:30 -0700
commitb7aecf16b0f54a799854abba26b4be402c7aef4d (patch)
treefd6d126ad7d178c13f29c9bc91c281128f44dc6b /xrdp/xrdp_mm.c
parent3ada04b8ca6142ecf78a29cb8ada9eec0e7117f4 (diff)
downloadxrdp-proprietary-b7aecf16b0f54a799854abba26b4be402c7aef4d.tar.gz
xrdp-proprietary-b7aecf16b0f54a799854abba26b4be402c7aef4d.zip
move disconnect to X11rdp
Diffstat (limited to 'xrdp/xrdp_mm.c')
-rw-r--r--xrdp/xrdp_mm.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 1e32663c..cd3c1ebd 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -99,10 +99,6 @@ xrdp_mm_delete(struct xrdp_mm* self)
self->sesman_trans_up = 0;
list_delete(self->login_names);
list_delete(self->login_values);
- if (self->dis_wo > 0)
- {
- g_delete_wait_obj(self->dis_wo);
- }
g_free(self);
}
@@ -151,10 +147,6 @@ xrdp_mm_send_login(struct xrdp_mm* self)
xrdp_wm_log_msg(self->wm, "Error finding username and password");
return 1;
}
- else
- {
- g_strncpy(self->username, username, 255);
- }
s = trans_get_out_s(self->sesman_trans, 8192);
s_push_layer(s, channel_hdr, 8);
@@ -734,17 +726,6 @@ xrdp_mm_process_login_response(struct xrdp_mm* self, struct stream* s)
}
}
}
- g_snprintf(text, 255, "xrdp_disconnect_display_%d", self->display);
- self->dis_wo = g_create_wait_obj(text);
- if (self->dis_wo > 0)
- {
- g_snprintf(text, 255, "/tmp/xrdp_disconnect_display_%d",
- self->display);
- if (g_getuser_info(self->username, &uid, &gid, 0, 0, 0) == 0)
- {
- g_chown(text, uid, gid);
- }
- }
}
else
{
@@ -1030,11 +1011,6 @@ xrdp_mm_get_wait_objs(struct xrdp_mm* self,
{
trans_get_wait_objs(self->chan_trans, read_objs, rcount, timeout);
}
- if (self->dis_wo > 0)
- {
- read_objs[*rcount] = self->dis_wo;
- (*rcount)++;
- }
if (self->mod != 0)
{
if (self->mod->mod_get_wait_objs != 0)
@@ -1072,15 +1048,6 @@ xrdp_mm_check_wait_objs(struct xrdp_mm* self)
self->delete_chan_trans = 1;
}
}
- if (self->dis_wo > 0)
- {
- if (g_is_wait_obj_set(self->dis_wo))
- {
- g_writeln("xrdp_mm_check_wait_objs: disconnecting per user request");
- g_reset_wait_obj(self->dis_wo);
- return 1;
- }
- }
if (self->mod != 0)
{
if (self->mod->mod_check_wait_objs != 0)