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

Provide format for syslog() call to avoid warning/error.

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

12
xrdp-0.6.1-syslog-format.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN xrdp-v0.6.1-orig/common/log.c xrdp-v0.6.1/common/log.c
--- xrdp-v0.6.1-orig/common/log.c 2013-11-10 07:11:15.000000000 +1100
+++ xrdp-v0.6.1/common/log.c 2014-04-01 17:54:49.005574821 +1100
@@ -160,7 +160,7 @@
if (l_cfg->enable_syslog && (lvl <= l_cfg->log_level))
{
/* log to syslog */
- syslog(log_xrdp2syslog(lvl), buff + 20);
+ syslog(log_xrdp2syslog(lvl), "%s", buff + 20);
}
if (lvl <= l_cfg->log_level)

3
xrdp.spec
View File

@ -13,6 +13,7 @@ Patch2: xrdp-pam_session.patch
# https://sourceforge.net/tracker/?group_id=112022&atid=665248 # https://sourceforge.net/tracker/?group_id=112022&atid=665248
# 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
Source1: xrdp.service Source1: xrdp.service
Source2: xrdp-sesman.service Source2: xrdp-sesman.service
@ -48,6 +49,7 @@ terminal server / remote desktop clients.
%patch1 -p2 %patch1 -p2
%patch2 -p1 %patch2 -p1
%patch3 -p1 -b .endian %patch3 -p1 -b .endian
%patch4 -p1 -b .syslog-format
# 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,6 +192,7 @@ fi
%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-1
- try a bump to official 0.6.1 - try a bump to official 0.6.1
- provide format for syslog() 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