- merged PLD changes, updated to 0.9.15

[packages/xrdp.git] / quiet.patch

diff --git a/quiet.patch b/quiet.patch
index 95ccf883451355ba25923069c17767f133f4e403..185ad9fb51f91b4b57320bcd225efb0f3ff4fd13 100644 (file)
--- a/quiet.patch
+++ b/quiet.patch
@@ -1,33 +1,28 @@
-diff -ur xrdp-0.9.11.orig/common/log.c xrdp-0.9.11/common/log.c
---- xrdp-0.9.11.orig/common/log.c      2019-03-25 03:34:16.000000000 +0100
-+++ xrdp-0.9.11/common/log.c   2019-08-21 23:15:55.763000000 +0200
-@@ -382,11 +382,11 @@
-     /* try to create path if not exist */
-     g_create_path(lc->log_file);
+diff -ur xrdp-0.9.15.orig/common/log.c xrdp-0.9.15/common/log.c
+--- xrdp-0.9.15.orig/common/log.c      2020-12-28 15:03:43.000000000 +0100
++++ xrdp-0.9.15/common/log.c   2021-01-04 00:24:03.750416646 +0100
+@@ -304,7 +304,7 @@
+     lc->console_level = LOG_LEVEL_INFO;
+     lc->enable_syslog = 0;
+     lc->syslog_level = LOG_LEVEL_INFO;
+-    lc->dump_on_start = 1;
++    lc->dump_on_start = 0;
+     lc->enable_pid = 0;
  
--    g_printf("logging configuration:\r\n");
-+    /*g_printf("logging configuration:\r\n");
-     g_printf("\tLogFile:       %s\r\n", lc->log_file);
-     g_printf("\tLogLevel:      %i\r\n", lc->log_level);
-     g_printf("\tEnableSyslog:  %i\r\n", lc->enable_syslog);
--    g_printf("\tSyslogLevel:   %i\r\n", lc->syslog_level);
-+    g_printf("\tSyslogLevel:   %i\r\n", lc->syslog_level);*/
-     return LOG_STARTUP_OK;
- }
+     g_snprintf(section_name, 511, "%s%s", section_prefix, SESMAN_CFG_LOGGING);
+diff -ur xrdp-0.9.15.orig/xrdp/xrdp.c xrdp-0.9.15/xrdp/xrdp.c
+--- xrdp-0.9.15.orig/xrdp/xrdp.c       2020-12-28 15:03:43.000000000 +0100
++++ xrdp-0.9.15/xrdp/xrdp.c    2021-01-04 00:12:20.438416646 +0100
+@@ -503,7 +503,7 @@
  
-diff -ur xrdp-0.9.11.orig/xrdp/xrdp.c xrdp-0.9.11/xrdp/xrdp.c
---- xrdp-0.9.11.orig/xrdp/xrdp.c       2019-08-19 17:39:17.000000000 +0200
-+++ xrdp-0.9.11/xrdp/xrdp.c    2019-08-21 23:16:41.256000000 +0200
-@@ -475,7 +475,7 @@
- 
-     if (startup_params->kill)
+     if (startup_params.kill)
      {
 -        g_writeln("stopping xrdp");
 +        /*g_writeln("stopping xrdp");*/
          /* read the xrdp.pid file */
          fd = -1;
  
-@@ -493,7 +493,7 @@
+@@ -521,7 +521,7 @@
              g_memset(text, 0, 32);
              g_file_read(fd, text, 31);
              pid = g_atoi(text);
@@ -36,7 +31,7 @@ diff -ur xrdp-0.9.11.orig/xrdp/xrdp.c xrdp-0.9.11/xrdp/xrdp.c
  
              if (pid > 0)
              {
-@@ -597,7 +597,7 @@
+@@ -626,7 +626,7 @@
  
          if (0 != pid)
          {