Merge pull request #611 from volth/support-enable-xrdpdebug=yes-2
fix build with --enable-xrdpdebug=yes
This commit is contained in:
commit
5194311d9d
@ -18,6 +18,10 @@ AM_CPPFLAGS = \
|
|||||||
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
||||||
-DXRDP_LOG_PATH=\"${localstatedir}/log\"
|
-DXRDP_LOG_PATH=\"${localstatedir}/log\"
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
AM_CFLAGS = $(OPENSSL_CFLAGS)
|
AM_CFLAGS = $(OPENSSL_CFLAGS)
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = \
|
||||||
|
@ -57,7 +57,7 @@ enum logReturns
|
|||||||
/* enable threading */
|
/* enable threading */
|
||||||
/*#define LOG_ENABLE_THREAD*/
|
/*#define LOG_ENABLE_THREAD*/
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef XRDP_DEBUG
|
||||||
#define LOG_DBG(args...) log_message(LOG_LEVEL_DEBUG, args);
|
#define LOG_DBG(args...) log_message(LOG_LEVEL_DEBUG, args);
|
||||||
#else
|
#else
|
||||||
#define LOG_DBG(args...)
|
#define LOG_DBG(args...)
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
#define GOOD_RECT(rect) ((rect)->x1 < (rect)->x2 && (rect)->y1 < (rect)->y2)
|
#define GOOD_RECT(rect) ((rect)->x1 < (rect)->x2 && (rect)->y1 < (rect)->y2)
|
||||||
#define BAD_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) \
|
#define GOOD(reg) \
|
||||||
do \
|
do \
|
||||||
|
@ -14,8 +14,6 @@ LIBXRDP_EXTRA_LIBS =
|
|||||||
|
|
||||||
if XRDP_DEBUG
|
if XRDP_DEBUG
|
||||||
AM_CPPFLAGS += -DXRDP_DEBUG
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
else
|
|
||||||
AM_CPPFLAGS += -DXRDP_NODEBUG
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if XRDP_NEUTRINORDP
|
if XRDP_NEUTRINORDP
|
||||||
|
@ -5,6 +5,10 @@ AM_CPPFLAGS = \
|
|||||||
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
||||||
-I$(top_srcdir)/common
|
-I$(top_srcdir)/common
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = \
|
||||||
libmc.la
|
libmc.la
|
||||||
|
|
||||||
|
@ -8,8 +8,6 @@ AM_CPPFLAGS = \
|
|||||||
|
|
||||||
if XRDP_DEBUG
|
if XRDP_DEBUG
|
||||||
AM_CPPFLAGS += -DXRDP_DEBUG
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
else
|
|
||||||
AM_CPPFLAGS += -DXRDP_NODEBUG
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = \
|
||||||
|
@ -7,8 +7,6 @@ AM_CPPFLAGS = \
|
|||||||
|
|
||||||
if XRDP_DEBUG
|
if XRDP_DEBUG
|
||||||
AM_CPPFLAGS += -DXRDP_DEBUG
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
else
|
|
||||||
AM_CPPFLAGS += -DXRDP_NODEBUG
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = \
|
||||||
|
@ -9,6 +9,10 @@ AM_CPPFLAGS = \
|
|||||||
-I$(top_srcdir)/common \
|
-I$(top_srcdir)/common \
|
||||||
-I$(top_srcdir)/sesman/libscp
|
-I$(top_srcdir)/sesman/libscp
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
if SESMAN_NOPAM
|
if SESMAN_NOPAM
|
||||||
AUTH_C = verify_user.c
|
AUTH_C = verify_user.c
|
||||||
AUTH_LIB = -lcrypt
|
AUTH_LIB = -lcrypt
|
||||||
|
@ -11,6 +11,10 @@ AM_CPPFLAGS = \
|
|||||||
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
||||||
-I$(top_srcdir)/common
|
-I$(top_srcdir)/common
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
CHANSRV_EXTRA_LIBS =
|
CHANSRV_EXTRA_LIBS =
|
||||||
|
|
||||||
if XRDP_FUSE
|
if XRDP_FUSE
|
||||||
|
@ -5,6 +5,10 @@ AM_CPPFLAGS = \
|
|||||||
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
||||||
-I$(top_srcdir)/common
|
-I$(top_srcdir)/common
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = \
|
||||||
libscp.la
|
libscp.la
|
||||||
|
|
||||||
|
@ -54,12 +54,12 @@ scp_process_start(void *sck)
|
|||||||
if (sdata->version == 0)
|
if (sdata->version == 0)
|
||||||
{
|
{
|
||||||
/* starts processing an scp v0 connection */
|
/* 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);
|
scp_v0_process(&scon, sdata);
|
||||||
}
|
}
|
||||||
else
|
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);*/
|
/*LOG_DBG("user: %s\npass: %s",sdata->username, sdata->password);*/
|
||||||
scp_v1_process(&scon, sdata);
|
scp_v1_process(&scon, sdata);
|
||||||
}
|
}
|
||||||
|
10
sesman/sig.c
10
sesman/sig.c
@ -167,7 +167,7 @@ sig_handler_thread(void *arg)
|
|||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
LOG_DBG(&(g_cfg->log), "calling sigwait()", 0);
|
LOG_DBG("calling sigwait()");
|
||||||
sigwait(&waitmask, &recv_signal);
|
sigwait(&waitmask, &recv_signal);
|
||||||
|
|
||||||
switch (recv_signal)
|
switch (recv_signal)
|
||||||
@ -175,22 +175,22 @@ sig_handler_thread(void *arg)
|
|||||||
case SIGHUP:
|
case SIGHUP:
|
||||||
//reload cfg
|
//reload cfg
|
||||||
//we must stop & restart logging, or copy logging cfg!!!!
|
//we must stop & restart logging, or copy logging cfg!!!!
|
||||||
LOG_DBG("sesman received SIGHUP", 0);
|
LOG_DBG("sesman received SIGHUP");
|
||||||
//return 0;
|
//return 0;
|
||||||
break;
|
break;
|
||||||
case SIGCHLD:
|
case SIGCHLD:
|
||||||
/* a session died */
|
/* a session died */
|
||||||
LOG_DBG("sesman received SIGCHLD", 0);
|
LOG_DBG("sesman received SIGCHLD");
|
||||||
sig_sesman_session_end(SIGCHLD);
|
sig_sesman_session_end(SIGCHLD);
|
||||||
break;
|
break;
|
||||||
case SIGINT:
|
case SIGINT:
|
||||||
/* we die */
|
/* we die */
|
||||||
LOG_DBG("sesman received SIGINT", 0);
|
LOG_DBG("sesman received SIGINT");
|
||||||
sig_sesman_shutdown(recv_signal);
|
sig_sesman_shutdown(recv_signal);
|
||||||
break;
|
break;
|
||||||
case SIGTERM:
|
case SIGTERM:
|
||||||
/* we die */
|
/* we die */
|
||||||
LOG_DBG("sesman received SIGTERM", 0);
|
LOG_DBG("sesman received SIGTERM");
|
||||||
sig_sesman_shutdown(recv_signal);
|
sig_sesman_shutdown(recv_signal);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,10 @@ AM_CPPFLAGS = \
|
|||||||
-I$(top_srcdir)/sesman/libscp \
|
-I$(top_srcdir)/sesman/libscp \
|
||||||
-I$(top_srcdir)/sesman
|
-I$(top_srcdir)/sesman
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
AM_CFLAGS = $(X_CFLAGS)
|
AM_CFLAGS = $(X_CFLAGS)
|
||||||
|
|
||||||
bin_PROGRAMS = \
|
bin_PROGRAMS = \
|
||||||
|
@ -5,6 +5,10 @@ AM_CPPFLAGS = \
|
|||||||
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
||||||
-I$(top_srcdir)/common
|
-I$(top_srcdir)/common
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = \
|
||||||
libvnc.la
|
libvnc.la
|
||||||
|
|
||||||
|
@ -1388,7 +1388,6 @@ lib_mod_connect(struct vnc *v)
|
|||||||
trans_delete(v->trans);
|
trans_delete(v->trans);
|
||||||
v->trans = 0;
|
v->trans = 0;
|
||||||
v->server_msg(v, "some problem", 0);
|
v->server_msg(v, "some problem", 0);
|
||||||
LIB_DEBUG(mod, "out lib_mod_connect error");
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -17,8 +17,6 @@ XRDP_EXTRA_LIBS =
|
|||||||
|
|
||||||
if XRDP_DEBUG
|
if XRDP_DEBUG
|
||||||
AM_CPPFLAGS += -DXRDP_DEBUG
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
else
|
|
||||||
AM_CPPFLAGS += -DXRDP_NODEBUG
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if XRDP_RFXCODEC
|
if XRDP_RFXCODEC
|
||||||
|
@ -5,6 +5,10 @@ AM_CPPFLAGS = \
|
|||||||
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
|
||||||
-I$(top_srcdir)/common
|
-I$(top_srcdir)/common
|
||||||
|
|
||||||
|
if XRDP_DEBUG
|
||||||
|
AM_CPPFLAGS += -DXRDP_DEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = \
|
||||||
libxup.la
|
libxup.la
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user