pool/xrdp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 562291 from X11:RemoteDesktop

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/562291
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xrdp?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2018-01-09 13:53:18 +00:00 committed by Git OBS Bridge
commit 84984c008e
8 changed files with 171 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xrdp-0.9.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:059e362db550b58a108117e6538363d90f07edd0a54810affae977a6b0bb6ea7
size 3069778

16
xrdp-0.9.4.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAlnMYCQACgkQn3LNvAG/
EOt/uxAAizV1Qtbo8pRO1hpXSDi2xe2c/r5OHFUumWsBxyfVw8JlaNzt2FujtXFu
/WYb8juMbEAdnzzGypFEXpO52xoNBJdQJUhNEMPUS90ljgnyoS8zdmUkVOeYs1o2
2RdDPV9e9Okc+9o9/Ej3amESVptrCW/hCP66pvVBbqQJmE+fG97jtXwPl1tmvCUQ
kjYlIidq/n1TYabp9vj4wLmUqG/huJmRZuo1JpkcodZhqcE1jMi68P311tQOrCvR
qFYsYTliD5bdjkAQYgD/tBJ+1XJKM+iNV5vjoIB2V9FGrr0+T2kXllJjRulInnlj
9g0NYqITbZGCmKpndBaloI5mAVVotz8Ksk0CkBp6kBuByhr/ZawzqZMJZGX2FUUP
hD64nmUooZ3g7fQOLXdS678IOFHUmTSlVvV0qXbo7wFm8JbyW57iyLQZ+g4Tr/sO
ntXpLdiUN+KVstTEtUCCdBt3XrHaIh0BnKzLj/tT5O3q2PAB2H9zIFJIsgSeW9UP
FurI1oqFzgiEEAFpx6macdyu+kxLtcyOQDia8PqQajXlAB4f+TOIpAO4PWpIOwYq
h54BVxAo0ro28g8SQREfwLWuAbesb62tSNLBwg9pecFIsui3cb7hRDvJvNTxj0vy
SMqXxNpWK7AT1WnPzOTRh/sqSasKpBuIGs0L7z2ZCuJc8Ec1IxQ=
=3aMB
-----END PGP SIGNATURE-----

3
xrdp-0.9.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c66b06204237745be3f0a75bfdd22a2b27de97740490256964bb5082efb0042
size 3082700

16
xrdp-0.9.5.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAlpDsoAACgkQn3LNvAG/
EOteVw/7B0IejeTHWlnk4XZ9bSSX6v6n3QPDbAAPa9tPW4gzS8pIbteOUXmPv4Dx
88LVgn80U3rjU+Dkm3F7unfqV7Ath8xQjzPSS98YkMwYKTKDqMtr0RNY6/+CMKBH
6GN1jSCcKNd+wqCLA4+ySdMO5/llL8r3qmNrOAllSd6THcxyTcVNLF9b73J5RObU
okbTK0lz6KUDHyiCiibHfKbgm0hpowIzsNiKiBzlmaaHdpkNKW1Z93DyT5DXJFse
wjiy3FCGSB/KLv07015ZH72jkNetttgZ/GKGozFWWbdPrl39NjJlJMyzv+LU152x
5tEAYdblyVdGQMDFwxwXMA685EIk1D7ee098d+JmsPhujMy89+GLf1hD/obr2yCk
DrvTgPyTJpK8YXHDomg0NKwGdiilh3oMcv4/IgVKdqqTUqQXOnkcLmm7PSBy6c8Q
tWRVz23xUhqoBbvLTL48REuCx3QyjS2zQnh1UQ/WBNkpwpSSV3ePlgLyqhT3lFNR
kWa0SD6lwODPih2U1VJs9q8J4l905ZjAr9jTNF4v3WFRrIyZANs1je9y+EkCCneS
/sBeo5RaBGEZtufA3XrUiWig8jvMPZssmFcvtqe83KB5sxaNrBmb/eCBHLwcjVdp
5SJjH672FmCGDw0EFwcu9+QGbhajckFjlBVvCS5m9Np8MGKn9xc=
=wQUi
-----END PGP SIGNATURE-----

38
xrdp-default-config.patch
View File

@ -1,8 +1,8 @@
diff --git a/sesman/sesman.ini b/sesman/sesman.ini Index: b/sesman/sesman.ini
index 8225ee44..37c78169 100644 ===================================================================
--- a/sesman/sesman.ini --- a/sesman/sesman.ini 2018-01-04 15:37:57.612073999 +0800
+++ b/sesman/sesman.ini +++ b/sesman/sesman.ini 2018-01-04 15:38:02.957413999 +0800
@@ -18,7 +18,7 @@ AlwaysGroupCheck=false @@ -18,7 +18,7 @@
;; X11DisplayOffset - x11 display number offset ;; X11DisplayOffset - x11 display number offset
; Type: integer ; Type: integer
; Default: 10 ; Default: 10
@ -11,7 +11,7 @@ index 8225ee44..37c78169 100644
;; MaxSessions - maximum number of connections to an xrdp server ;; MaxSessions - maximum number of connections to an xrdp server
; Type: integer ; Type: integer
@@ -50,9 +50,9 @@ Policy=Default @@ -50,9 +50,9 @@
[Logging] [Logging]
LogFile=xrdp-sesman.log LogFile=xrdp-sesman.log
@ -22,13 +22,13 @@ index 8225ee44..37c78169 100644
+EnableSyslog=0 +EnableSyslog=0
+SyslogLevel=ERROR +SyslogLevel=ERROR
[X11rdp] ;
param=X11rdp ; Session definitions - startup command-line parameters for each session type
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini Index: b/xrdp/xrdp.ini
index cb6d7c36..f4c75c88 100644 ===================================================================
--- a/xrdp/xrdp.ini --- a/xrdp/xrdp.ini 2018-01-04 15:37:57.612073999 +0800
+++ b/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini 2018-01-04 15:59:09.282474000 +0800
@@ -74,7 +74,7 @@ grey=dedede @@ -76,7 +76,7 @@
#ls_title=My Login Title #ls_title=My Login Title
; top level window background color in RGB format ; top level window background color in RGB format
@ -37,7 +37,7 @@ index cb6d7c36..f4c75c88 100644
; width and height of login screen ; width and height of login screen
ls_width=350 ls_width=350
@@ -117,9 +117,9 @@ ls_btn_cancel_height=30 @@ -119,9 +119,9 @@
[Logging] [Logging]
LogFile=xrdp.log LogFile=xrdp.log
@ -50,10 +50,10 @@ index cb6d7c36..f4c75c88 100644
; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
[Channels] [Channels]
@@ -148,34 +148,24 @@ tcutils=true @@ -153,34 +153,24 @@
; Session types ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
; ; Startup command-line parameters for the display server are configured
; in sesman.ini. See and configure also sesman.ini.
-[Xorg] -[Xorg]
-name=Xorg -name=Xorg
-lib=libxup.so -lib=libxup.so
@ -93,7 +93,7 @@ index cb6d7c36..f4c75c88 100644
[console] [console]
name=console name=console
@@ -184,28 +174,7 @@ ip=127.0.0.1 @@ -189,28 +179,7 @@
port=5900 port=5900
username=na username=na
password=ask password=ask

196
xrdp-fate318398-change-expired-password.patch
View File

@ -1,19 +1,19 @@
diff --git a/sesman/auth.h b/sesman/auth.h Index: b/sesman/auth.h
index 56f7809..4dd3836 100644 ===================================================================
--- a/sesman/auth.h --- a/sesman/auth.h 2017-10-26 13:30:12.000000000 +0800
+++ b/sesman/auth.h +++ b/sesman/auth.h 2018-01-04 16:40:32.178890000 +0800
@@ -106,4 +106,6 @@ auth_check_pwd_chg(const char *user); @@ -106,4 +106,6 @@
int int
auth_change_pwd(const char *user, const char *newpwd); auth_change_pwd(const char *user, const char *newpwd);
+int +int
+auth_change_pwd_pam(char* user, char* pass, char* newpwd); +auth_change_pwd_pam(char* user, char* pass, char* newpwd);
#endif #endif
diff --git a/sesman/libscp/libscp_session.c b/sesman/libscp/libscp_session.c Index: b/sesman/libscp/libscp_session.c
index 8df34b3..54d08ae 100644 ===================================================================
--- a/sesman/libscp/libscp_session.c --- a/sesman/libscp/libscp_session.c 2017-10-26 13:30:12.000000000 +0800
+++ b/sesman/libscp/libscp_session.c +++ b/sesman/libscp/libscp_session.c 2018-01-04 16:40:32.178890000 +0800
@@ -75,6 +75,10 @@ scp_session_set_type(struct SCP_SESSION *s, tui8 type) @@ -75,6 +75,10 @@
s->type = SCP_GW_AUTHENTICATION; s->type = SCP_GW_AUTHENTICATION;
break; break;
@ -24,10 +24,15 @@ index 8df34b3..54d08ae 100644
case SCP_SESSION_TYPE_MANAGE: case SCP_SESSION_TYPE_MANAGE:
s->type = SCP_SESSION_TYPE_MANAGE; s->type = SCP_SESSION_TYPE_MANAGE;
s->mng = (struct SCP_MNG_DATA *)g_malloc(sizeof(struct SCP_MNG_DATA), 1); s->mng = (struct SCP_MNG_DATA *)g_malloc(sizeof(struct SCP_MNG_DATA), 1);
@@ -236,6 +240,32 @@ scp_session_set_password(struct SCP_SESSION *s, const char *str) @@ -231,6 +235,32 @@
return 1;
}
/*******************************************************************/ + return 0;
int +}
+
+/*******************************************************************/
+int
+scp_session_set_newpass(struct SCP_SESSION *s, char *str) +scp_session_set_newpass(struct SCP_SESSION *s, char *str)
+{ +{
+ if (0 == str) + if (0 == str)
@ -49,18 +54,13 @@ index 8df34b3..54d08ae 100644
+ return 1; + return 1;
+ } + }
+ +
+ return 0; return 0;
+} }
+
+/*******************************************************************/ Index: b/sesman/libscp/libscp_types.h
+int ===================================================================
scp_session_set_domain(struct SCP_SESSION *s, const char *str) --- a/sesman/libscp/libscp_types.h 2017-10-04 12:44:21.000000000 +0800
{ +++ b/sesman/libscp/libscp_types.h 2018-01-04 16:40:32.178890000 +0800
if (0 == str)
diff --git a/sesman/libscp/libscp_types.h b/sesman/libscp/libscp_types.h
index 8cb9166..b4441da 100644
--- a/sesman/libscp/libscp_types.h
+++ b/sesman/libscp/libscp_types.h
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
* XRDP sends this command to let sesman verify if the user is allowed * XRDP sends this command to let sesman verify if the user is allowed
* to use the gateway */ * to use the gateway */
@ -69,7 +69,7 @@ index 8cb9166..b4441da 100644
#define SCP_ADDRESS_TYPE_IPV4 0x00 #define SCP_ADDRESS_TYPE_IPV4 0x00
#define SCP_ADDRESS_TYPE_IPV6 0x01 #define SCP_ADDRESS_TYPE_IPV6 0x01
@@ -77,6 +78,7 @@ struct SCP_SESSION @@ -77,6 +78,7 @@
char locale[18]; char locale[18];
char* username; char* username;
char* password; char* password;
@ -77,11 +77,11 @@ index 8cb9166..b4441da 100644
char* hostname; char* hostname;
tui8 addr_type; tui8 addr_type;
tui32 ipv4addr; tui32 ipv4addr;
diff --git a/sesman/libscp/libscp_v0.c b/sesman/libscp/libscp_v0.c Index: b/sesman/libscp/libscp_v0.c
index 5a0c8bf..4b3fc98 100644 ===================================================================
--- a/sesman/libscp/libscp_v0.c --- a/sesman/libscp/libscp_v0.c 2017-12-27 22:30:25.000000000 +0800
+++ b/sesman/libscp/libscp_v0.c +++ b/sesman/libscp/libscp_v0.c 2018-01-04 17:09:58.859805998 +0800
@@ -317,9 +317,8 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) @@ -329,9 +329,8 @@
} }
} }
} }
@ -92,7 +92,7 @@ index 5a0c8bf..4b3fc98 100644
session = scp_session_create(); session = scp_session_create();
if (0 == session) if (0 == session)
@@ -329,7 +328,7 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) @@ -341,7 +340,7 @@
} }
scp_session_set_version(session, version); scp_session_set_version(session, version);
@ -100,28 +100,32 @@ index 5a0c8bf..4b3fc98 100644
+ scp_session_set_type(session, code); + scp_session_set_type(session, code);
/* reading username */ /* reading username */
in_uint16_be(c->in_s, sz); in_uint16_be(c->in_s, sz);
buf[sz] = '\0'; buf = g_new0(char, sz + 1);
@@ -342,6 +341,19 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) @@ -358,6 +357,23 @@
/* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__);*/
return SCP_SERVER_STATE_INTERNAL_ERR;
} }
g_free(buf);
+ if (code == SCP_GW_CHAUTHTOK) + if (code == SCP_GW_CHAUTHTOK)
+ { + {
+ /* reading new password */ + /* reading new password */
+ in_uint16_be(c->in_s, sz); + in_uint16_be(c->in_s, sz);
+ buf[sz] = '\0'; + buf = g_new0(char, sz + 1);
+ in_uint8a(c->in_s, buf, sz); + in_uint8a(c->in_s, buf, sz);
+ buf[sz] = '\0';
+ +
+ if (0 != scp_session_set_newpass(session, buf)) + if (0 != scp_session_set_newpass(session, buf))
+ { + {
+ scp_session_destroy(session); + scp_session_destroy(session);
+ g_free(buf);
+ return SCP_SERVER_STATE_INTERNAL_ERR; + return SCP_SERVER_STATE_INTERNAL_ERR;
+ } + }
+ g_free(buf);
+ } + }
+
/* reading password */ /* reading password */
in_uint16_be(c->in_s, sz); in_uint16_be(c->in_s, sz);
@@ -417,12 +429,13 @@ scp_v0s_deny_connection(struct SCP_CONNECTION *c) buf = g_new0(char, sz + 1);
@@ -435,12 +451,13 @@
/******************************************************************************/ /******************************************************************************/
enum SCP_SERVER_STATES_E enum SCP_SERVER_STATES_E
@ -137,11 +141,11 @@ index 5a0c8bf..4b3fc98 100644
out_uint16_be(c->out_s, value); /* reply code */ out_uint16_be(c->out_s, value); /* reply code */
out_uint16_be(c->out_s, 0); /* dummy data */ out_uint16_be(c->out_s, 0); /* dummy data */
s_mark_end(c->out_s); s_mark_end(c->out_s);
diff --git a/sesman/libscp/libscp_v0.h b/sesman/libscp/libscp_v0.h Index: b/sesman/libscp/libscp_v0.h
index 21fc16c..ae54619 100644 ===================================================================
--- a/sesman/libscp/libscp_v0.h --- a/sesman/libscp/libscp_v0.h 2017-07-19 12:23:49.000000000 +0800
+++ b/sesman/libscp/libscp_v0.h +++ b/sesman/libscp/libscp_v0.h 2018-01-04 16:40:32.182893999 +0800
@@ -79,6 +79,6 @@ scp_v0s_deny_connection(struct SCP_CONNECTION* c); @@ -79,6 +79,6 @@
* @return * @return
*/ */
enum SCP_SERVER_STATES_E enum SCP_SERVER_STATES_E
@ -149,11 +153,11 @@ index 21fc16c..ae54619 100644
+scp_v0s_replyauthentication(struct SCP_CONNECTION* c, unsigned short int value, tui8 type); +scp_v0s_replyauthentication(struct SCP_CONNECTION* c, unsigned short int value, tui8 type);
#endif #endif
diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c Index: b/sesman/scp_v0.c
index de00068..51f1af7 100644 ===================================================================
--- a/sesman/scp_v0.c --- a/sesman/scp_v0.c 2017-10-26 13:30:12.000000000 +0800
+++ b/sesman/scp_v0.c +++ b/sesman/scp_v0.c 2018-01-04 16:40:32.182893999 +0800
@@ -42,6 +42,13 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) @@ -42,6 +42,13 @@
int errorcode = 0; int errorcode = 0;
bool_t do_auth_end = 1; bool_t do_auth_end = 1;
@ -167,7 +171,7 @@ index de00068..51f1af7 100644
data = auth_userpass(s->username, s->password, &errorcode); data = auth_userpass(s->username, s->password, &errorcode);
if (s->type == SCP_GW_AUTHENTICATION) if (s->type == SCP_GW_AUTHENTICATION)
@@ -53,14 +60,14 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) @@ -53,14 +60,14 @@
if (1 == access_login_allowed(s->username)) if (1 == access_login_allowed(s->username))
{ {
/* the user is member of the correct groups. */ /* the user is member of the correct groups. */
@ -184,7 +188,7 @@ index de00068..51f1af7 100644
log_message(LOG_LEVEL_INFO, "Username okey but group problem for " log_message(LOG_LEVEL_INFO, "Username okey but group problem for "
"user: %s", s->username); "user: %s", s->username);
/* g_writeln("user password ok, but group problem"); */ /* g_writeln("user password ok, but group problem"); */
@@ -71,7 +78,7 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) @@ -71,7 +78,7 @@
/* g_writeln("username or password error"); */ /* g_writeln("username or password error"); */
log_message(LOG_LEVEL_INFO, "Username or password error for user: %s", log_message(LOG_LEVEL_INFO, "Username or password error for user: %s",
s->username); s->username);
@ -193,11 +197,11 @@ index de00068..51f1af7 100644
} }
} }
else if (data) else if (data)
diff --git a/sesman/verify_user_pam.c b/sesman/verify_user_pam.c Index: b/sesman/verify_user_pam.c
index 15174c2..d996470 100644 ===================================================================
--- a/sesman/verify_user_pam.c --- a/sesman/verify_user_pam.c 2017-11-27 09:42:43.000000000 +0800
+++ b/sesman/verify_user_pam.c +++ b/sesman/verify_user_pam.c 2018-01-04 16:40:32.182893999 +0800
@@ -38,6 +38,7 @@ struct t_user_pass @@ -38,6 +38,7 @@
{ {
char user[256]; char user[256];
char pass[256]; char pass[256];
@ -205,7 +209,7 @@ index 15174c2..d996470 100644
}; };
struct t_auth_info struct t_auth_info
@@ -86,6 +87,55 @@ verify_pam_conv(int num_msg, const struct pam_message **msg, @@ -86,6 +87,55 @@
} }
/******************************************************************************/ /******************************************************************************/
@ -261,7 +265,7 @@ index 15174c2..d996470 100644
static void static void
get_service_name(char *service_name) get_service_name(char *service_name)
{ {
@@ -102,6 +152,52 @@ get_service_name(char *service_name) @@ -103,6 +153,52 @@
} }
/******************************************************************************/ /******************************************************************************/
@ -314,11 +318,11 @@ index 15174c2..d996470 100644
/* returns long, zero is no go /* returns long, zero is no go
Stores the detailed error code in the errorcode variable*/ Stores the detailed error code in the errorcode variable*/
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c Index: b/xrdp/xrdp_login_wnd.c
index 49477a1..160a1ef 100644 ===================================================================
--- a/xrdp/xrdp_login_wnd.c --- a/xrdp/xrdp_login_wnd.c 2017-11-27 09:42:43.000000000 +0800
+++ b/xrdp/xrdp_login_wnd.c +++ b/xrdp/xrdp_login_wnd.c 2018-01-04 16:40:32.182893999 +0800
@@ -181,7 +181,14 @@ xrdp_wm_cancel_clicked(struct xrdp_bitmap *wnd) @@ -187,7 +187,14 @@
{ {
if (wnd->wm != 0) if (wnd->wm != 0)
{ {
@ -334,7 +338,7 @@ index 49477a1..160a1ef 100644
{ {
g_set_wait_obj(wnd->wm->pro_layer->self_term_event); g_set_wait_obj(wnd->wm->pro_layer->self_term_event);
} }
@@ -239,7 +246,29 @@ xrdp_wm_ok_clicked(struct xrdp_bitmap *wnd) @@ -245,7 +252,29 @@
} }
else else
{ {
@ -365,7 +369,7 @@ index 49477a1..160a1ef 100644
} }
return 0; return 0;
@@ -516,6 +545,32 @@ xrdp_wm_login_notify(struct xrdp_bitmap *wnd, @@ -545,6 +574,32 @@
return 0; return 0;
} }
@ -398,10 +402,11 @@ index 49477a1..160a1ef 100644
/******************************************************************************/ /******************************************************************************/
static int static int
xrdp_wm_login_fill_in_combo(struct xrdp_wm *self, struct xrdp_bitmap *b) xrdp_wm_login_fill_in_combo(struct xrdp_wm *self, struct xrdp_bitmap *b)
@@ -789,6 +844,103 @@ xrdp_login_wnd_create(struct xrdp_wm *self) @@ -825,6 +880,103 @@
return 0; return 0;
} }
+
+/******************************************************************************/ +/******************************************************************************/
+int +int
+xrdp_newpass_wnd_create(struct xrdp_wm *self) +xrdp_newpass_wnd_create(struct xrdp_wm *self)
@ -498,15 +503,14 @@ index 49477a1..160a1ef 100644
+ +
+ return 0; + return 0;
+} +}
+
/** /**
* Load configuration from xrdp.ini file * Load configuration from xrdp.ini file
* Index: b/xrdp/xrdp_mm.c
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c ===================================================================
index ba4227c..4e15f88 100644 --- a/xrdp/xrdp_mm.c 2017-12-27 22:30:26.000000000 +0800
--- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c 2018-01-04 16:40:32.182893999 +0800
+++ b/xrdp/xrdp_mm.c @@ -1458,7 +1458,7 @@
@@ -1458,7 +1458,7 @@ xrdp_mm_sesman_data_in(struct trans *trans)
/*********************************************************************/ /*********************************************************************/
/* return 0 on success */ /* return 0 on success */
static int static int
@ -515,7 +519,7 @@ index ba4227c..4e15f88 100644
{ {
int reply; int reply;
int rec = 32+1; /* 32 is reserved for PAM failures this means connect failure */ int rec = 32+1; /* 32 is reserved for PAM failures this means connect failure */
@@ -1484,7 +1484,8 @@ access_control(char *username, char *password, char *srv) @@ -1486,7 +1486,8 @@
make_stream(out_s); make_stream(out_s);
init_stream(out_s, 500); init_stream(out_s, 500);
s_push_layer(out_s, channel_hdr, 8); s_push_layer(out_s, channel_hdr, 8);
@ -525,7 +529,7 @@ index ba4227c..4e15f88 100644
index = g_strlen(username); index = g_strlen(username);
out_uint16_be(out_s, index); out_uint16_be(out_s, index);
out_uint8a(out_s, username, index); out_uint8a(out_s, username, index);
@@ -1492,6 +1493,14 @@ access_control(char *username, char *password, char *srv) @@ -1494,6 +1495,14 @@
index = g_strlen(password); index = g_strlen(password);
out_uint16_be(out_s, index); out_uint16_be(out_s, index);
out_uint8a(out_s, password, index); out_uint8a(out_s, password, index);
@ -540,7 +544,7 @@ index ba4227c..4e15f88 100644
s_mark_end(out_s); s_mark_end(out_s);
s_pop_layer(out_s, channel_hdr); s_pop_layer(out_s, channel_hdr);
out_uint32_be(out_s, 0); /* version */ out_uint32_be(out_s, 0); /* version */
@@ -1521,15 +1530,19 @@ access_control(char *username, char *password, char *srv) @@ -1523,15 +1532,19 @@
in_uint16_be(in_s, pAM_errorcode); /* this variable holds the PAM error code if the variable is >32 it is a "invented" code */ in_uint16_be(in_s, pAM_errorcode); /* this variable holds the PAM error code if the variable is >32 it is a "invented" code */
in_uint16_be(in_s, dummy); in_uint16_be(in_s, dummy);
@ -564,7 +568,7 @@ index ba4227c..4e15f88 100644
} }
else else
{ {
@@ -1847,7 +1860,7 @@ xrdp_mm_connect(struct xrdp_mm *self) @@ -1849,7 +1862,7 @@
char port[8]; char port[8];
char chansrvport[256]; char chansrvport[256];
#ifndef USE_NOPAM #ifndef USE_NOPAM
@ -573,7 +577,7 @@ index ba4227c..4e15f88 100644
char pam_auth_sessionIP[256]; char pam_auth_sessionIP[256];
char pam_auth_password[256]; char pam_auth_password[256];
char pam_auth_username[256]; char pam_auth_username[256];
@@ -1887,7 +1900,7 @@ xrdp_mm_connect(struct xrdp_mm *self) @@ -1889,7 +1902,7 @@
#ifndef USE_NOPAM #ifndef USE_NOPAM
else if (g_strcasecmp(name, "pamusername") == 0) else if (g_strcasecmp(name, "pamusername") == 0)
{ {
@ -582,7 +586,7 @@ index ba4227c..4e15f88 100644
g_strncpy(pam_auth_username, value, 255); g_strncpy(pam_auth_username, value, 255);
} }
else if (g_strcasecmp(name, "pamsessionmng") == 0) else if (g_strcasecmp(name, "pamsessionmng") == 0)
@@ -1915,45 +1928,56 @@ xrdp_mm_connect(struct xrdp_mm *self) @@ -1917,45 +1930,56 @@
} }
#ifndef USE_NOPAM #ifndef USE_NOPAM
@ -670,10 +674,11 @@ index ba4227c..4e15f88 100644
} }
#endif #endif
@@ -2047,6 +2071,59 @@ xrdp_mm_connect(struct xrdp_mm *self) @@ -2048,6 +2072,59 @@
return rv;
} }
/*****************************************************************************/ +/*****************************************************************************/
+/* return 0 on success */ +/* return 0 on success */
+int +int
+xrdp_mm_change_expired_password(struct xrdp_mm *self) +xrdp_mm_change_expired_password(struct xrdp_mm *self)
@ -726,15 +731,14 @@ index ba4227c..4e15f88 100644
+ return rv; + return rv;
+} +}
+ +
+/*****************************************************************************/ /*****************************************************************************/
int int
xrdp_mm_get_wait_objs(struct xrdp_mm *self, xrdp_mm_get_wait_objs(struct xrdp_mm *self,
tbus *read_objs, int *rcount, Index: b/xrdp/xrdp_types.h
diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h ===================================================================
index 75c70ee..344e7fc 100644 --- a/xrdp/xrdp_types.h 2017-07-19 12:23:49.000000000 +0800
--- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h 2018-01-04 16:40:32.182893999 +0800
+++ b/xrdp/xrdp_types.h @@ -325,6 +325,7 @@
@@ -325,6 +325,7 @@ struct xrdp_wm
struct xrdp_cache* cache; struct xrdp_cache* cache;
int palette[256]; int palette[256];
struct xrdp_bitmap* login_window; struct xrdp_bitmap* login_window;
@ -742,11 +746,11 @@ index 75c70ee..344e7fc 100644
/* generic colors */ /* generic colors */
int black; int black;
int grey; int grey;
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c Index: b/xrdp/xrdp_wm.c
index 8a6695f..238c5cf 100644 ===================================================================
--- a/xrdp/xrdp_wm.c --- a/xrdp/xrdp_wm.c 2018-01-04 16:40:31.998709999 +0800
+++ b/xrdp/xrdp_wm.c +++ b/xrdp/xrdp_wm.c 2018-01-04 16:40:32.182893999 +0800
@@ -1855,6 +1855,34 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self) @@ -1896,6 +1896,34 @@
self->dragging = 0; self->dragging = 0;
xrdp_wm_set_login_mode(self, 11); xrdp_wm_set_login_mode(self, 11);
} }
@ -781,7 +785,7 @@ index 8a6695f..238c5cf 100644
return 0; return 0;
} }
@@ -1899,11 +1927,19 @@ xrdp_wm_log_wnd_notify(struct xrdp_bitmap *wnd, @@ -1940,11 +1968,19 @@
xrdp_bitmap_invalidate(wm->screen, &rect); xrdp_bitmap_invalidate(wm->screen, &rect);
/* if module is gone, reset the session when ok is clicked */ /* if module is gone, reset the session when ok is clicked */
@ -802,7 +806,7 @@ index 8a6695f..238c5cf 100644
} }
} }
} }
@@ -1965,6 +2001,9 @@ xrdp_wm_show_log(struct xrdp_wm *self) @@ -2006,6 +2042,9 @@
return 0; return 0;
} }

32
xrdp.changes
View File

@ -1,7 +1,37 @@
-------------------------------------------------------------------
Thu Jan 4 08:43:48 UTC 2018 - fezhang@suse.com
- Update to version 0.9.5
+ Security fixes
- Fix local denial of service (CVE-2017-16927) #958 #979
+ New features
- Add a new log level TRACE more verbose than DEBUG #835 #944
- SSH agent forwarding via RDP #867 #868 FreeRDP/FreeRDP#4122
- Support horizontal wheel properly #928
+ Bug fixes
- Avoid use of hard-coded sesman port #895
- Workaround for corrupted display with Windows Server 2008
using NeutrinoRDP #869
- Fix glitch in audio redirection by AAC #910 #936
- Implement vsock support #930 #935 #948
- Avoid 100% CPU usage on SSL accept #956
+ Other changes
- Add US Dvorak keyboard #929
- Suppress some misleading logs #964
- Add Finnish keyboard #972
- Add more user-friendlier description about Xorg config #974
- Renew pulseaudio document #984 #985
- Lots of cleanups and refactoring
+ Known issues
- Audio redirection by MP3 codec doesn't sound with some
client, use AAC instead #965
- Update xrdp-default-config.patch
- Update xrdp-fate318398-change-expired-password.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 23 13:36:58 UTC 2017 - rbrown@suse.com Thu Nov 23 13:36:58 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new - Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468) %_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------

4
xrdp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xrdp # spec file for package xrdp
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,7 +23,7 @@
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
Name: xrdp Name: xrdp
Version: 0.9.4 Version: 0.9.5
Release: 0 Release: 0
Summary: Remote desktop protocol (RDP) server Summary: Remote desktop protocol (RDP) server
License: Apache-2.0 and GPL-2.0+ License: Apache-2.0 and GPL-2.0+