diff options
| author | norrarvid <norrarvid@gmail.com> | 2012-06-18 10:23:09 +0200 |
|---|---|---|
| committer | norrarvid <norrarvid@gmail.com> | 2012-06-18 10:23:09 +0200 |
| commit | 318e09fd470d177dd017e063ce434c9726f28ef7 (patch) | |
| tree | c8c1c4626873a26aed91b32a84edcdc1227f4e76 /sesman/libscp/libscp_session.c | |
| parent | e87ec5072169e201c41bfb1ad70f78b549fc2767 (diff) | |
| parent | 42edcbb6c193e5e825e7600a6784bd48fa9bf503 (diff) | |
| download | xrdp-proprietary-318e09fd470d177dd017e063ce434c9726f28ef7.tar.gz xrdp-proprietary-318e09fd470d177dd017e063ce434c9726f28ef7.zip | |
fix merge conflics
Diffstat (limited to 'sesman/libscp/libscp_session.c')
| -rw-r--r-- | sesman/libscp/libscp_session.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sesman/libscp/libscp_session.c b/sesman/libscp/libscp_session.c index 244f188a..3ed5070a 100644 --- a/sesman/libscp/libscp_session.c +++ b/sesman/libscp/libscp_session.c @@ -60,6 +60,9 @@ scp_session_set_type(struct SCP_SESSION* s, tui8 type) case SCP_SESSION_TYPE_XRDP: s->type = SCP_SESSION_TYPE_XRDP; break; + case SCP_GW_AUTHENTICATION: + s->type = SCP_GW_AUTHENTICATION; + break; case SCP_SESSION_TYPE_MANAGE: s->type = SCP_SESSION_TYPE_MANAGE; s->mng = (struct SCP_MNG_DATA*)g_malloc(sizeof(struct SCP_MNG_DATA), 1); |