diff options
| -rw-r--r-- | common/Makefile.am | 6 | ||||
| -rw-r--r-- | common/log.h | 1 | ||||
| -rw-r--r-- | mc/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/chansrv/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/libscp/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/scp.c | 4 | ||||
| -rw-r--r-- | sesman/sig.c | 10 | ||||
| -rw-r--r-- | sesman/tools/Makefile.am | 6 | ||||
| -rw-r--r-- | vnc/Makefile.am | 6 | ||||
| -rw-r--r-- | vnc/vnc.c | 1 | ||||
| -rw-r--r-- | xup/Makefile.am | 6 |
12 files changed, 56 insertions, 8 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 1bc5851f..15466c9a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -18,6 +18,12 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_LOG_PATH=\"${localstatedir}/log\" +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + AM_CFLAGS = $(OPENSSL_CFLAGS) module_LTLIBRARIES = \ diff --git a/common/log.h b/common/log.h index 33bb41fd..d6a5b8f2 100644 --- a/common/log.h +++ b/common/log.h @@ -22,6 +22,7 @@ #include <pthread.h> #include "arch.h" +#include "defines.h" /* logging buffer size */ #define LOG_BUFFER_SIZE 1024 diff --git a/mc/Makefile.am b/mc/Makefile.am index e705ff0d..eebef8c3 100644 --- a/mc/Makefile.am +++ b/mc/Makefile.am @@ -5,6 +5,12 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + module_LTLIBRARIES = \ libmc.la diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 89b99f54..0cf419da 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -9,6 +9,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/sesman/libscp +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + if SESMAN_NOPAM AUTH_C = verify_user.c AUTH_LIB = -lcrypt diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index 7a2672a8..d89b96fb 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -11,6 +11,12 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + CHANSRV_EXTRA_LIBS = if XRDP_FUSE diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am index 1bb89910..ea4bdd42 100644 --- a/sesman/libscp/Makefile.am +++ b/sesman/libscp/Makefile.am @@ -5,6 +5,12 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + module_LTLIBRARIES = \ libscp.la diff --git a/sesman/scp.c b/sesman/scp.c index d81de0ab..89176dcb 100644 --- a/sesman/scp.c +++ b/sesman/scp.c @@ -54,12 +54,12 @@ scp_process_start(void *sck) if (sdata->version == 0) { /* starts processing an scp v0 connection */ - LOG_DBG("accept ok, go on with scp v0", 0); + LOG_DBG("accept ok, go on with scp v0"); scp_v0_process(&scon, sdata); } else { - LOG_DBG("accept ok, go on with scp v1", 0); + LOG_DBG("accept ok, go on with scp v1"); /*LOG_DBG("user: %s\npass: %s",sdata->username, sdata->password);*/ scp_v1_process(&scon, sdata); } diff --git a/sesman/sig.c b/sesman/sig.c index 579b5876..aeb3aa90 100644 --- a/sesman/sig.c +++ b/sesman/sig.c @@ -167,7 +167,7 @@ sig_handler_thread(void *arg) do { - LOG_DBG(&(g_cfg->log), "calling sigwait()", 0); + LOG_DBG("calling sigwait()"); sigwait(&waitmask, &recv_signal); switch (recv_signal) @@ -175,22 +175,22 @@ sig_handler_thread(void *arg) case SIGHUP: //reload cfg //we must stop & restart logging, or copy logging cfg!!!! - LOG_DBG("sesman received SIGHUP", 0); + LOG_DBG("sesman received SIGHUP"); //return 0; break; case SIGCHLD: /* a session died */ - LOG_DBG("sesman received SIGCHLD", 0); + LOG_DBG("sesman received SIGCHLD"); sig_sesman_session_end(SIGCHLD); break; case SIGINT: /* we die */ - LOG_DBG("sesman received SIGINT", 0); + LOG_DBG("sesman received SIGINT"); sig_sesman_shutdown(recv_signal); break; case SIGTERM: /* we die */ - LOG_DBG("sesman received SIGTERM", 0); + LOG_DBG("sesman received SIGTERM"); sig_sesman_shutdown(recv_signal); break; } diff --git a/sesman/tools/Makefile.am b/sesman/tools/Makefile.am index 44bf068b..7f27f8b1 100644 --- a/sesman/tools/Makefile.am +++ b/sesman/tools/Makefile.am @@ -7,6 +7,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/sesman/libscp \ -I$(top_srcdir)/sesman +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + AM_CFLAGS = $(X_CFLAGS) bin_PROGRAMS = \ diff --git a/vnc/Makefile.am b/vnc/Makefile.am index 453022f4..fc0f8385 100644 --- a/vnc/Makefile.am +++ b/vnc/Makefile.am @@ -5,6 +5,12 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + module_LTLIBRARIES = \ libvnc.la @@ -1388,7 +1388,6 @@ lib_mod_connect(struct vnc *v) trans_delete(v->trans); v->trans = 0; v->server_msg(v, "some problem", 0); - LIB_DEBUG(mod, "out lib_mod_connect error"); return 1; } else diff --git a/xup/Makefile.am b/xup/Makefile.am index cdaca15c..2a4fa0df 100644 --- a/xup/Makefile.am +++ b/xup/Makefile.am @@ -5,6 +5,12 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + module_LTLIBRARIES = \ libxup.la |