summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/Makefile.am4
-rw-r--r--common/log.h2
-rw-r--r--common/pixman-region.c2
-rw-r--r--libxrdp/Makefile.am2
-rw-r--r--mc/Makefile.am4
-rw-r--r--neutrinordp/Makefile.am2
-rw-r--r--rdp/Makefile.am2
-rw-r--r--sesman/Makefile.am4
-rw-r--r--sesman/chansrv/Makefile.am4
-rw-r--r--sesman/libscp/Makefile.am4
-rw-r--r--sesman/scp.c4
-rw-r--r--sesman/sig.c10
-rw-r--r--sesman/tools/Makefile.am4
-rw-r--r--vnc/Makefile.am4
-rw-r--r--vnc/vnc.c1
-rw-r--r--xrdp/Makefile.am2
-rw-r--r--xup/Makefile.am4
17 files changed, 41 insertions, 18 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 1bc5851f..0af033a3 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -18,6 +18,10 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_LOG_PATH=\"${localstatedir}/log\"
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+endif
+
AM_CFLAGS = $(OPENSSL_CFLAGS)
module_LTLIBRARIES = \
diff --git a/common/log.h b/common/log.h
index 33bb41fd..d1552ccb 100644
--- a/common/log.h
+++ b/common/log.h
@@ -57,7 +57,7 @@ enum logReturns
/* enable threading */
/*#define LOG_ENABLE_THREAD*/
-#ifdef DEBUG
+#ifdef XRDP_DEBUG
#define LOG_DBG(args...) log_message(LOG_LEVEL_DEBUG, args);
#else
#define LOG_DBG(args...)
diff --git a/common/pixman-region.c b/common/pixman-region.c
index b1949950..2d199de8 100644
--- a/common/pixman-region.c
+++ b/common/pixman-region.c
@@ -79,7 +79,7 @@
#define GOOD_RECT(rect) ((rect)->x1 < (rect)->x2 && (rect)->y1 < (rect)->y2)
#define BAD_RECT(rect) ((rect)->x1 > (rect)->x2 || (rect)->y1 > (rect)->y2)
-#ifdef DEBUG
+#ifdef XRDP_DEBUG
#define GOOD(reg) \
do \
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index 0452c1da..3812de9c 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -14,8 +14,6 @@ LIBXRDP_EXTRA_LIBS =
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
endif
if XRDP_NEUTRINORDP
diff --git a/mc/Makefile.am b/mc/Makefile.am
index e705ff0d..2171a180 100644
--- a/mc/Makefile.am
+++ b/mc/Makefile.am
@@ -5,6 +5,10 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+endif
+
module_LTLIBRARIES = \
libmc.la
diff --git a/neutrinordp/Makefile.am b/neutrinordp/Makefile.am
index fb5bf030..e15dacc6 100644
--- a/neutrinordp/Makefile.am
+++ b/neutrinordp/Makefile.am
@@ -8,8 +8,6 @@ AM_CPPFLAGS = \
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
endif
module_LTLIBRARIES = \
diff --git a/rdp/Makefile.am b/rdp/Makefile.am
index 30368156..6b649aab 100644
--- a/rdp/Makefile.am
+++ b/rdp/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
endif
module_LTLIBRARIES = \
diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 89b99f54..207890ac 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -9,6 +9,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/common \
-I$(top_srcdir)/sesman/libscp
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+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..05ca50f5 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -11,6 +11,10 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+endif
+
CHANSRV_EXTRA_LIBS =
if XRDP_FUSE
diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am
index 1bb89910..fc382b43 100644
--- a/sesman/libscp/Makefile.am
+++ b/sesman/libscp/Makefile.am
@@ -5,6 +5,10 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+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..9d6d6f9e 100644
--- a/sesman/tools/Makefile.am
+++ b/sesman/tools/Makefile.am
@@ -7,6 +7,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/sesman/libscp \
-I$(top_srcdir)/sesman
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+endif
+
AM_CFLAGS = $(X_CFLAGS)
bin_PROGRAMS = \
diff --git a/vnc/Makefile.am b/vnc/Makefile.am
index 453022f4..80e486c3 100644
--- a/vnc/Makefile.am
+++ b/vnc/Makefile.am
@@ -5,6 +5,10 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+endif
+
module_LTLIBRARIES = \
libvnc.la
diff --git a/vnc/vnc.c b/vnc/vnc.c
index 3a91ea9d..1b1ae269 100644
--- a/vnc/vnc.c
+++ b/vnc/vnc.c
@@ -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/xrdp/Makefile.am b/xrdp/Makefile.am
index f39610a0..3765f203 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -17,8 +17,6 @@ XRDP_EXTRA_LIBS =
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
endif
if XRDP_RFXCODEC
diff --git a/xup/Makefile.am b/xup/Makefile.am
index cdaca15c..76fc016a 100644
--- a/xup/Makefile.am
+++ b/xup/Makefile.am
@@ -5,6 +5,10 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+endif
+
module_LTLIBRARIES = \
libxup.la
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-02 17:29:53 +0000