quiet_start.patch

   1 Avoid displaying a lot of information when starting xrdp and sesman
   2
   3 Index: xrdp/sesman/config.c
   4 ===================================================================
   5 --- xrdp.orig/sesman/config.c   2012-09-29 12:51:50.000000000 +0200
   6 +++ xrdp/sesman/config.c        2012-09-29 12:55:57.560560996 +0200
   7 @@ -179,13 +179,13 @@
   8    }
   9
  10    /* showing read config */
  11 -  g_printf("sesman config:\r\n");
  12 +  /* g_printf("sesman config:\r\n");
  13    g_printf("\tListenAddress:            %s\r\n", cf->listen_address);
  14    g_printf("\tListenPort:               %s\r\n", cf->listen_port);
  15    g_printf("\tEnableUserWindowManager:  %i\r\n", cf->enable_user_wm);
  16    g_printf("\tUserWindowManager:        %s\r\n", cf->user_wm);
  17    g_printf("\tDefaultWindowManager:     %s\r\n", cf->default_wm);
  18 -  g_printf("\tAuthFilePath:             %s\r\n", ((cf->auth_file_path) ? (cf->auth_file_path) : ("disabled")));
  19 +  g_printf("\tAuthFilePath:             %s\r\n", ((cf->auth_file_path) ? (cf->auth_file_path) : ("disabled"))); */
  20
  21    return 0;
  22  }
  23 @@ -236,11 +236,11 @@
  24      lc->log_file=g_strdup("./sesman.log");
  25    }
  26
  27 -  g_printf("logging configuration:\r\n");
  28 +  /* g_printf("logging configuration:\r\n");
  29    g_printf("\tLogFile:       %s\r\n",lc->log_file);
  30    g_printf("\tLogLevel:      %i\r\n", lc->log_level);
  31    g_printf("\tEnableSyslog:  %i\r\n", lc->enable_syslog);
  32 -  g_printf("\tSyslogLevel:   %i\r\n", lc->syslog_level);
  33 +  g_printf("\tSyslogLevel:   %i\r\n", lc->syslog_level); */
  34
  35    return 0;
  36  }
  37 @@ -295,7 +295,7 @@
  38    }
  39
  40    /* printing security config */
  41 -  g_printf("security configuration:\r\n");
  42 +  /* g_printf("security configuration:\r\n");
  43    g_printf("\tAllowRootLogin:       %i\r\n",sc->allow_root);
  44    g_printf("\tMaxLoginRetry:        %i\r\n",sc->login_retry);
  45    if (sc->ts_users_enable)
  46 @@ -313,7 +313,7 @@
  47    else
  48    {
  49      g_printf("\tNo TSAdminsGroup defined\r\n");
  50 -  }
  51 +    } */
  52
  53    return 0;
  54  }
  55 @@ -363,12 +363,12 @@
  56    }
  57
  58    /* printing security config */
  59 -  g_printf("session configuration:\r\n");
  60 +  /* g_printf("session configuration:\r\n");
  61    g_printf("\tMaxSessions:                 %i\r\n", se->max_sessions);
  62    g_printf("\tX11DisplayOffset:            %i\r\n", se->x11_display_offset);
  63    g_printf("\tKillDisconnected:            %i\r\n", se->kill_disconnected);
  64    g_printf("\tIdleTimeLimit:               %i\r\n", se->max_idle_time);
  65 -  g_printf("\tDisconnectedTimeLimit:       %i\r\n", se->max_idle_time);
  66 +  g_printf("\tDisconnectedTimeLimit:       %i\r\n", se->max_idle_time); */
  67
  68    return 0;
  69  }
  70 @@ -392,11 +392,11 @@
  71    }
  72
  73    /* printing security config */
  74 -  g_printf("X11rdp parameters:\r\n");
  75 +  /* g_printf("X11rdp parameters:\r\n");
  76    for (i = 0; i < cs->rdp_params->count; i++)
  77    {
  78      g_printf("\tParameter %02d                   %s\r\n", i, (char*)list_get_item(cs->rdp_params, i));
  79 -  }
  80 +    } */
  81
  82    return 0;
  83  }
  84 @@ -420,11 +420,11 @@
  85    }
  86
  87    /* printing security config */
  88 -  g_printf("Xvnc parameters:\r\n");
  89 +  /* g_printf("Xvnc parameters:\r\n");
  90    for (i = 0; i < cs->vnc_params->count; i++)
  91    {
  92      g_printf("\tParameter %02d                   %s\r\n", i, (char*)list_get_item(cs->vnc_params, i));
  93 -  }
  94 +    } */
  95
  96    return 0;
  97  }
  98 Index: xrdp/sesman/sesman.c
  99 ===================================================================
 100 --- xrdp.orig/sesman/sesman.c   2012-09-29 12:51:50.000000000 +0200
 101 +++ xrdp/sesman/sesman.c        2012-09-29 12:55:11.103556585 +0200
 102 @@ -143,7 +143,7 @@
 103    if (1 == argc)
 104    {
 105      /* no options on command line. normal startup */
 106 -    g_printf("starting sesman...\n");
 107 +    /* g_printf("starting sesman...\n"); */
 108      daemon = 1;
 109    }
 110    else if ((2 == argc) && ((0 == g_strcasecmp(argv[1], "--nodaemon")) ||
 111 Index: xrdp/xrdp/xrdp.c
 112 ===================================================================
 113 --- xrdp.orig/xrdp/xrdp.c       2012-09-29 12:51:50.000000000 +0200
 114 +++ xrdp/xrdp/xrdp.c    2012-09-29 12:55:11.103556585 +0200
 115 @@ -383,7 +383,7 @@
 116      }
 117      if (0 != pid)
 118      {
 119 -      g_writeln("process %d started ok", pid);
 120 +      /* g_writeln("process %d started ok", pid); */
 121        /* exit, this is the main process */
 122        g_deinit();
 123        g_exit(0);
 124 Index: xrdp/sesman/libscp/libscp_init.c
 125 ===================================================================
 126 --- xrdp.orig/sesman/libscp/libscp_init.c       2012-09-29 12:51:50.111200358 +0200
 127 +++ xrdp/sesman/libscp/libscp_init.c    2012-09-29 12:55:11.103556585 +0200
 128 @@ -42,8 +42,6 @@
 129
 130    scp_lock_init();
 131
 132 -  log_message(s_log, LOG_LEVEL_WARNING, "[init:%d] libscp initialized", __LINE__);
 133 -
 134    return 0;
 135  }
 136