metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix a memset() call.

Browse Source
This commit is contained in:
Bojan Smojver 2014-04-01 18:57:56 +11:00
parent 27e24144d6
commit e71625c8d1
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xrdp-0.6.1-memset.patch Normal file
View File

@ -0,0 +1,16 @@
diff -ruN xrdp-v0.6.1-orig/common/os_calls.c xrdp-v0.6.1/common/os_calls.c
--- xrdp-v0.6.1-orig/common/os_calls.c 2013-11-10 07:11:15.000000000 +1100
+++ xrdp-v0.6.1/common/os_calls.c 2014-04-01 18:29:15.585633769 +1100
@@ -567,10 +567,10 @@
{
struct sockaddr_in s;
struct in_addr in;
- int len;
+ socklen_t len;
int ip_port;
- memset(&s,0,sizeof(&s));
+ memset(&s,0,sizeof(s));
len = sizeof(s);
getpeername(rcv_sck,(struct sockaddr*)&s, &len);

7
xrdp.spec
View File

@ -1,7 +1,7 @@
Summary: Open source remote desktop protocol (RDP) server Summary: Open source remote desktop protocol (RDP) server
Name: xrdp Name: xrdp
Version: 0.6.1 Version: 0.6.1
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ with exceptions License: GPLv2+ with exceptions
Group: Applications/Internet Group: Applications/Internet
URL: http://xrdp.sourceforge.net/ URL: http://xrdp.sourceforge.net/
@ -14,6 +14,7 @@ Patch2: xrdp-pam_session.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=905411 # https://bugzilla.redhat.com/show_bug.cgi?id=905411
Patch3: xrdp-endian.patch Patch3: xrdp-endian.patch
Patch4: xrdp-0.6.1-syslog-format.patch Patch4: xrdp-0.6.1-syslog-format.patch
Patch5: xrdp-0.6.1-memset.patch
Source1: xrdp.service Source1: xrdp.service
Source2: xrdp-sesman.service Source2: xrdp-sesman.service
@ -50,6 +51,7 @@ terminal server / remote desktop clients.
%patch2 -p1 %patch2 -p1
%patch3 -p1 -b .endian %patch3 -p1 -b .endian
%patch4 -p1 -b .syslog-format %patch4 -p1 -b .syslog-format
%patch5 -p1 -b .memset
# remove unused modules from xrdp login combobox # remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@ -190,9 +192,10 @@ fi
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
%changelog %changelog
* Tue Apr 1 2014 Bojan Smojver <bojan@rexursive.com> - 0.6.1-1 * Tue Apr 1 2014 Bojan Smojver <bojan@rexursive.com> - 0.6.1-2
- try a bump to official 0.6.1 - try a bump to official 0.6.1
- provide format for syslog() call - provide format for syslog() call
- fix memset() call
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.8 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild