Bump up to 0.9.13.
This commit is contained in:
Bojan Smojver
parent
566c5fb28e
commit
862707ff82
1
.gitignore
vendored
1
.gitignore
vendored
@ -15,3 +15,4 @@ xrdp-cvs-03-17-2010.tar.gz
|
||||
/xrdp-0.9.10.tar.gz
|
||||
/xrdp-0.9.11.tar.gz
|
||||
/xrdp-0.9.12.tar.gz
|
||||
/xrdp-0.9.13.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (xrdp-0.9.12.tar.gz) = c4052008c7574a91f702fa3c4a83c3b00011d2c5ff9d2c18cc09d72334635c4e990f08e67a6b2854a8616b60a287c294abd94551f004c4d5ebbfbf72933842a9
|
||||
SHA512 (xrdp-0.9.13.tar.gz) = d153de2546f4cb53007f46827e9d74a93c17e20ed1d7caf867c0f6a2a7c517b9778cf3dcb3bc5e2d2bd6e5698e1b9bc2c68631f9bd629e33ce6ddb3949957177
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 72bece526bb5863d99a52546374c0c3b1561a61a Mon Sep 17 00:00:00 2001
|
||||
From: Derek Schrock <dereks@lifeofadishwasher.com>
|
||||
Date: Mon, 27 Jan 2020 21:11:38 -0500
|
||||
Subject: [PATCH] return from xfs_delete_xfs_fs if NULL
|
||||
|
||||
---
|
||||
sesman/chansrv/chansrv_xfs.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sesman/chansrv/chansrv_xfs.c b/sesman/chansrv/chansrv_xfs.c
|
||||
index a63c1604b..feff7e2b3 100644
|
||||
--- a/sesman/chansrv/chansrv_xfs.c
|
||||
+++ b/sesman/chansrv/chansrv_xfs.c
|
||||
@@ -387,7 +387,12 @@ xfs_create_xfs_fs(mode_t umask, uid_t uid, gid_t gid)
|
||||
void
|
||||
xfs_delete_xfs_fs(struct xfs_fs *xfs)
|
||||
{
|
||||
- if (xfs != NULL && xfs->inode_table != NULL)
|
||||
+ if (xfs == NULL)
|
||||
+ {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (xfs->inode_table != NULL)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0 ; i < xfs->inode_count; ++i)
|
||||
@ -1,144 +0,0 @@
|
||||
From ebd0510a7d4dab906b6e01570205dfa530d1f7bf Mon Sep 17 00:00:00 2001
|
||||
From: speidy <speidy@gmail.com>
|
||||
Date: Wed, 22 Nov 2017 02:32:28 +0200
|
||||
Subject: [PATCH] sesman: scpv0, accept variable length data fields
|
||||
|
||||
---
|
||||
sesman/libscp/libscp_v0.c | 32 +++++++++++++++++++++++++-------
|
||||
1 file changed, 25 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/sesman/libscp/libscp_v0.c b/sesman/libscp/libscp_v0.c
|
||||
index 5a0c8bfa0..569340786 100644
|
||||
--- a/sesman/libscp/libscp_v0.c
|
||||
+++ b/sesman/libscp/libscp_v0.c
|
||||
@@ -161,7 +161,7 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
|
||||
struct SCP_SESSION *session = 0;
|
||||
tui16 sz;
|
||||
tui32 code = 0;
|
||||
- char buf[257];
|
||||
+ char *buf = 0;
|
||||
|
||||
if (!skipVchk)
|
||||
{
|
||||
@@ -226,27 +226,31 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
|
||||
|
||||
/* reading username */
|
||||
in_uint16_be(c->in_s, sz);
|
||||
- buf[sz] = '\0';
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
-
|
||||
+ buf[sz] = '\0';
|
||||
if (0 != scp_session_set_username(session, buf))
|
||||
{
|
||||
scp_session_destroy(session);
|
||||
log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__);
|
||||
+ g_free(buf);
|
||||
return SCP_SERVER_STATE_INTERNAL_ERR;
|
||||
}
|
||||
+ g_free(buf);
|
||||
|
||||
/* reading password */
|
||||
in_uint16_be(c->in_s, sz);
|
||||
- buf[sz] = '\0';
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
-
|
||||
+ buf[sz] = '\0';
|
||||
if (0 != scp_session_set_password(session, buf))
|
||||
{
|
||||
scp_session_destroy(session);
|
||||
log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__);
|
||||
+ g_free(buf);
|
||||
return SCP_SERVER_STATE_INTERNAL_ERR;
|
||||
}
|
||||
+ g_free(buf);
|
||||
|
||||
/* width */
|
||||
in_uint16_be(c->in_s, sz);
|
||||
@@ -272,9 +276,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
|
||||
|
||||
if (sz > 0)
|
||||
{
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
buf[sz] = '\0';
|
||||
scp_session_set_domain(session, buf);
|
||||
+ g_free(buf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -285,9 +291,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
|
||||
|
||||
if (sz > 0)
|
||||
{
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
buf[sz] = '\0';
|
||||
scp_session_set_program(session, buf);
|
||||
+ g_free(buf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -298,9 +306,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
|
||||
|
||||
if (sz > 0)
|
||||
{
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
buf[sz] = '\0';
|
||||
scp_session_set_directory(session, buf);
|
||||
+ g_free(buf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -311,9 +321,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
|
||||
|
||||
if (sz > 0)
|
||||
{
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
buf[sz] = '\0';
|
||||
scp_session_set_client_ip(session, buf);
|
||||
+ g_free(buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -332,29 +344,35 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
|
||||
scp_session_set_type(session, SCP_GW_AUTHENTICATION);
|
||||
/* reading username */
|
||||
in_uint16_be(c->in_s, sz);
|
||||
- buf[sz] = '\0';
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
+ buf[sz] = '\0';
|
||||
|
||||
/* g_writeln("Received user name: %s",buf); */
|
||||
if (0 != scp_session_set_username(session, buf))
|
||||
{
|
||||
scp_session_destroy(session);
|
||||
/* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__);*/
|
||||
+ g_free(buf);
|
||||
return SCP_SERVER_STATE_INTERNAL_ERR;
|
||||
}
|
||||
+ g_free(buf);
|
||||
|
||||
/* reading password */
|
||||
in_uint16_be(c->in_s, sz);
|
||||
- buf[sz] = '\0';
|
||||
+ buf = g_new0(char, sz);
|
||||
in_uint8a(c->in_s, buf, sz);
|
||||
+ buf[sz] = '\0';
|
||||
|
||||
/* g_writeln("Received password: %s",buf); */
|
||||
if (0 != scp_session_set_password(session, buf))
|
||||
{
|
||||
scp_session_destroy(session);
|
||||
/* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__); */
|
||||
+ g_free(buf);
|
||||
return SCP_SERVER_STATE_INTERNAL_ERR;
|
||||
}
|
||||
+ g_free(buf);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -12,8 +12,8 @@
|
||||
Summary: Open source remote desktop protocol (RDP) server
|
||||
Name: xrdp
|
||||
Epoch: 1
|
||||
Version: 0.9.12
|
||||
Release: 6%{?dist}
|
||||
Version: 0.9.13
|
||||
Release: 1%{?dist}
|
||||
License: ASL 2.0 and GPLv2+ and MIT
|
||||
URL: http://www.xrdp.org/
|
||||
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
|
||||
@ -30,7 +30,6 @@ Patch2: xrdp-0.9.4-service.patch
|
||||
Patch3: xrdp-0.9.2-setpriv.patch
|
||||
Patch4: xrdp-0.9.10-scripts-libexec.patch
|
||||
Patch5: xrdp-0.9.6-script-interpreter.patch
|
||||
Patch6: xrdp-0.9.12-segfault.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libX11-devel
|
||||
@ -274,6 +273,9 @@ fi
|
||||
%{_datadir}/selinux/*/%{name}.pp
|
||||
|
||||
%changelog
|
||||
* Wed Mar 11 2020 Bojan Smojver <bojan@rexurive.com> - 1:0.9.13-1
|
||||
- Bump up to 0.9.13
|
||||
|
||||
* Sat Feb 22 2020 Bojan Smojver <bojan@rexursive.com> - 1:0.9.12-6
|
||||
- patch a segfault
|
||||
- issue #1487 and #1501, pointed out by oden dot eriksson at vattenfall dot com
|
||||
|
||||
Loading…
Reference in New Issue
Block a user