summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml14
-rw-r--r--common/trans.h2
-rw-r--r--configure.ac9
-rw-r--r--docs/man/Makefile.am6
-rw-r--r--mc/Makefile.am2
-rw-r--r--mc/mc.c2
-rw-r--r--mc/mc.h2
-rw-r--r--neutrinordp/Makefile.am2
-rw-r--r--neutrinordp/xrdp-neutrinordp.c2
-rw-r--r--neutrinordp/xrdp-neutrinordp.h2
-rw-r--r--rdp/Makefile.am2
-rw-r--r--rdp/rdp.c2
-rw-r--r--rdp/rdp.h2
-rw-r--r--sesman/chansrv/devredir.c6
-rw-r--r--sesman/chansrv/devredir.h2
-rw-r--r--sesman/chansrv/rail.c3
-rw-r--r--sesman/config.c2
-rw-r--r--sesman/libscp/libscp_v1c.c7
-rw-r--r--sesman/libscp/libscp_v1c_mng.h4
-rw-r--r--vnc/Makefile.am2
-rw-r--r--vnc/vnc.c2
-rw-r--r--vnc/vnc.h2
-rw-r--r--xrdp/xrdp_mm.c10
-rw-r--r--xrdp/xrdp_types.h2
-rw-r--r--xrdp/xrdp_wm.c5
-rw-r--r--xup/Makefile.am2
-rw-r--r--xup/xup.c2
-rw-r--r--xup/xup.h2
28 files changed, 49 insertions, 53 deletions
diff --git a/.travis.yml b/.travis.yml
index baf038ee..923e25a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,9 +32,13 @@ addons:
#- g++
#- xutils
+env:
+ - CONF_FLAGS=""
+ - CONF_FLAGS="--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame
+ --enable-pixman --enable-rfxcodec --enable-painter"
+
script:
- # disable librfxcodec as no remotefx for v0.9.1 release
- #- (cd librfxcodec && ./bootstrap && ./configure && make)
- - (./bootstrap && ./configure --enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame --enable-pixman && make && make distcheck)
- # disable x11rdp build as it takes long time and it is to be deprecated
- #- (cd xorg/X11R7.6 && ./buildx.sh default)
+ - ./bootstrap
+ - ./configure $CONF_FLAGS
+ - make CFLAGS="-O2 -Wall -Wwrite-strings -Werror"
+ - make distcheck
diff --git a/common/trans.h b/common/trans.h
index 39fba5c0..53f3203a 100644
--- a/common/trans.h
+++ b/common/trans.h
@@ -128,7 +128,5 @@ int APP_CC
trans_shutdown_tls_mode(struct trans *self);
int APP_CC
trans_tcp_force_read_s(struct trans *self, struct stream *in_s, int size);
-int APP_CC
-trans_force_write_s(struct trans *self, struct stream *out_s);
#endif
diff --git a/configure.ac b/configure.ac
index bbca2c7a..f107dba9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,15 +55,6 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_sy
AC_ARG_ENABLE(pam, AS_HELP_STRING([--disable-pam],
[Build PAM support (default: yes)]),
[], [enable_pam=yes])
-AC_ARG_ENABLE(nopam, AS_HELP_STRING([--enable-nopam],
- [Build no PAM support (default: no, deprecated)]),
- [
- if test "x$enable_nopam" = "xyes"
- then
- enable_pam=no
- AC_MSG_WARN([--enable-nopam option is deprecated. Please use --disable-pam instead.])
- fi
- ])
AM_CONDITIONAL(SESMAN_NOPAM, [test x$enable_pam != xyes])
AC_ARG_ENABLE(ipv6, AS_HELP_STRING([--enable-ipv6],
[Build IPv6 support (default: no, experimental)]),
diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
index 90863842..705def0c 100644
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@@ -19,8 +19,12 @@ SUBST_VARS = sed \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g'
+subst_verbose = $(subst_verbose_@AM_V@)
+subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@)
+subst_verbose_0 = @echo " SUBST $@";
+
SUFFIXES = .in
.in:
- $(SUBST_VARS) $< > $@
+ $(subst_verbose)$(SUBST_VARS) $< > $@
CLEANFILES = $(man_MANS)
diff --git a/mc/Makefile.am b/mc/Makefile.am
index 2171a180..09d07068 100644
--- a/mc/Makefile.am
+++ b/mc/Makefile.am
@@ -18,3 +18,5 @@ libmc_la_SOURCES = \
libmc_la_LIBADD = \
$(top_builddir)/common/libcommon.la
+
+libmc_la_LDFLAGS = -avoid-version -module
diff --git a/mc/mc.c b/mc/mc.c
index 3e0909d4..71d2d9c0 100644
--- a/mc/mc.c
+++ b/mc/mc.c
@@ -75,7 +75,7 @@ lib_mod_end(struct mod *mod)
/******************************************************************************/
/* return error */
int DEFAULT_CC
-lib_mod_set_param(struct mod *mod, const char *name, char *value)
+lib_mod_set_param(struct mod *mod, const char *name, const char *value)
{
return 0;
}
diff --git a/mc/mc.h b/mc/mc.h
index 65297942..319f1a4c 100644
--- a/mc/mc.h
+++ b/mc/mc.h
@@ -37,7 +37,7 @@ struct mod
long param3, long param4);
int (*mod_signal)(struct mod* v);
int (*mod_end)(struct mod* v);
- int (*mod_set_param)(struct mod* v, const char *name, char* value);
+ int (*mod_set_param)(struct mod *v, const char *name, const char *value);
int (*mod_session_change)(struct mod* v, int, int);
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
diff --git a/neutrinordp/Makefile.am b/neutrinordp/Makefile.am
index e15dacc6..673a7885 100644
--- a/neutrinordp/Makefile.am
+++ b/neutrinordp/Makefile.am
@@ -22,3 +22,5 @@ libxrdpneutrinordp_la_SOURCES = \
libxrdpneutrinordp_la_LIBADD = \
$(top_builddir)/common/libcommon.la \
$(FREERDP_LIBS)
+
+libxrdpneutrinordp_la_LDFLAGS = -avoid-version -module
diff --git a/neutrinordp/xrdp-neutrinordp.c b/neutrinordp/xrdp-neutrinordp.c
index 34ed9c2c..37b4eefb 100644
--- a/neutrinordp/xrdp-neutrinordp.c
+++ b/neutrinordp/xrdp-neutrinordp.c
@@ -427,7 +427,7 @@ lxrdp_end(struct mod *mod)
/******************************************************************************/
/* return error */
static int DEFAULT_CC
-lxrdp_set_param(struct mod *mod, const char *name, char *value)
+lxrdp_set_param(struct mod *mod, const char *name, const char *value)
{
rdpSettings *settings;
diff --git a/neutrinordp/xrdp-neutrinordp.h b/neutrinordp/xrdp-neutrinordp.h
index 79bb460d..fd4560d0 100644
--- a/neutrinordp/xrdp-neutrinordp.h
+++ b/neutrinordp/xrdp-neutrinordp.h
@@ -71,7 +71,7 @@ struct mod
long param3, long param4);
int (*mod_signal)(struct mod *v);
int (*mod_end)(struct mod *v);
- int (*mod_set_param)(struct mod *v, const char *name, char *value);
+ int (*mod_set_param)(struct mod *v, const char *name, const char *value);
int (*mod_session_change)(struct mod *v, int, int);
int (*mod_get_wait_objs)(struct mod *v, tbus *read_objs, int *rcount,
tbus *write_objs, int *wcount, int *timeout);
diff --git a/rdp/Makefile.am b/rdp/Makefile.am
index 6b649aab..6065cc11 100644
--- a/rdp/Makefile.am
+++ b/rdp/Makefile.am
@@ -26,3 +26,5 @@ librdp_la_SOURCES = \
librdp_la_LIBADD = \
$(top_builddir)/common/libcommon.la
+
+librdp_la_LDFLAGS = -avoid-version -module
diff --git a/rdp/rdp.c b/rdp/rdp.c
index 5dc13363..6792398f 100644
--- a/rdp/rdp.c
+++ b/rdp/rdp.c
@@ -242,7 +242,7 @@ lib_mod_end(struct mod *mod)
/******************************************************************************/
/* return error */
int DEFAULT_CC
-lib_mod_set_param(struct mod *mod, const char *name, char *value)
+lib_mod_set_param(struct mod *mod, const char *name, const char *value)
{
if (g_strncasecmp(name, "ip", 255) == 0)
{
diff --git a/rdp/rdp.h b/rdp/rdp.h
index ff04fafa..6d919774 100644
--- a/rdp/rdp.h
+++ b/rdp/rdp.h
@@ -262,7 +262,7 @@ struct mod
long param3, long param4);
int (*mod_signal)(struct mod* v);
int (*mod_end)(struct mod* v);
- int (*mod_set_param)(struct mod* v, const char *name, char* value);
+ int (*mod_set_param)(struct mod *v, const char *name, const char *value);
int (*mod_session_change)(struct mod* v, int, int);
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c
index 111ac465..a8377e7d 100644
--- a/sesman/chansrv/devredir.c
+++ b/sesman/chansrv/devredir.c
@@ -46,6 +46,7 @@
#include "parse.h"
#include "os_calls.h"
#include "log.h"
+#include "chansrv.h"
#include "chansrv_fuse.h"
#include "devredir.h"
#include "smartcard.h"
@@ -698,9 +699,8 @@ void devredir_proc_client_devlist_announce_req(struct stream *s)
/* for smart cards, device data len always 0 */
- log_debug("device_type=SMARTCARD device_id=0x%x dosname=%s "
- "device_data_len=%d",
- g_device_id, preferred_dos_name, device_data_len);
+ log_debug("device_type=SMARTCARD device_id=0x%x dosname=%s",
+ g_device_id, preferred_dos_name);
devredir_send_server_device_announce_resp(g_device_id);
scard_device_announce(g_device_id);
diff --git a/sesman/chansrv/devredir.h b/sesman/chansrv/devredir.h
index 76900698..cbe279db 100644
--- a/sesman/chansrv/devredir.h
+++ b/sesman/chansrv/devredir.h
@@ -112,8 +112,6 @@ dev_redir_file_write(void *fusep, tui32 DeviceId, tui32 FileId,
int APP_CC
devredir_rmdir_or_file(void *fusep, tui32 device_id, const char *path, int mode);
-int send_channel_data(int chan_id, char *data, int size);
-
/*
* RDPDR_HEADER definitions
*/
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c
index f7e68b08..e790a76b 100644
--- a/sesman/chansrv/rail.c
+++ b/sesman/chansrv/rail.c
@@ -612,9 +612,6 @@ rail_process_activate(struct stream *s, int size)
LOG(10, ("chansrv::rail_process_activate: calling XSetInputFocus 0x%8.8x", window_id));
XSetInputFocus(g_display, window_id, RevertToParent, CurrentTime);
} else {
- XWindowAttributes window_attributes;
- XGetWindowAttributes(g_display, window_id, &window_attributes);
-
LOG(10, (" window attributes: override_redirect %d",
window_attributes.override_redirect));
add_timeout(200, my_timeout, (void*)(long)g_focus_counter);
diff --git a/sesman/config.c b/sesman/config.c
index 0c169938..39849bc5 100644
--- a/sesman/config.c
+++ b/sesman/config.c
@@ -357,7 +357,7 @@ config_read_sessions(int file, struct config_sessions *se, struct list *param_n,
g_printf("\tX11DisplayOffset: %i\r\n", se->x11_display_offset);
g_printf("\tKillDisconnected: %i\r\n", se->kill_disconnected);
g_printf("\tIdleTimeLimit: %i\r\n", se->max_idle_time);
- g_printf("\tDisconnectedTimeLimit: %i\r\n", se->max_idle_time);
+ g_printf("\tDisconnectedTimeLimit: %i\r\n", se->max_disc_time);
g_printf("\tPolicy: %i\r\n", se->policy);
return 0;
diff --git a/sesman/libscp/libscp_v1c.c b/sesman/libscp/libscp_v1c.c
index 7bc9a1d3..14f3bb0f 100644
--- a/sesman/libscp/libscp_v1c.c
+++ b/sesman/libscp/libscp_v1c.c
@@ -136,13 +136,6 @@ scp_v1c_resend_credentials(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
return _scp_v1c_check_response(c, s);
}
-/* 021 */
-enum SCP_CLIENT_STATES_E
-scp_v1c_pwd_change(struct SCP_CONNECTION *c, char *newpass);
-/* 022 */
-enum SCP_CLIENT_STATES_E
-scp_v1c_pwd_change_cancel(struct SCP_CONNECTION *c);
-
/* 041 */
enum SCP_CLIENT_STATES_E
scp_v1c_get_session_list(struct SCP_CONNECTION *c, int *scount,
diff --git a/sesman/libscp/libscp_v1c_mng.h b/sesman/libscp/libscp_v1c_mng.h
index 126c9113..256ca491 100644
--- a/sesman/libscp/libscp_v1c_mng.h
+++ b/sesman/libscp/libscp_v1c_mng.h
@@ -52,8 +52,4 @@ enum SCP_CLIENT_STATES_E
scp_v1c_mng_get_session_list(struct SCP_CONNECTION* c, int* scount,
struct SCP_DISCONNECTED_SESSION** s);
-/* 044 */
-enum SCP_CLIENT_STATES_E
-scp_v1c_select_session_cancel(struct SCP_CONNECTION* c);
-
#endif
diff --git a/vnc/Makefile.am b/vnc/Makefile.am
index 80e486c3..c4fcf3fc 100644
--- a/vnc/Makefile.am
+++ b/vnc/Makefile.am
@@ -18,3 +18,5 @@ libvnc_la_SOURCES = \
libvnc_la_LIBADD = \
$(top_builddir)/common/libcommon.la
+
+libvnc_la_LDFLAGS = -avoid-version -module
diff --git a/vnc/vnc.c b/vnc/vnc.c
index 1b1ae269..8b50b55c 100644
--- a/vnc/vnc.c
+++ b/vnc/vnc.c
@@ -1415,7 +1415,7 @@ lib_mod_end(struct vnc *v)
/******************************************************************************/
int DEFAULT_CC
-lib_mod_set_param(struct vnc *v, const char *name, char *value)
+lib_mod_set_param(struct vnc *v, const char *name, const char *value)
{
if (g_strcasecmp(name, "username") == 0)
{
diff --git a/vnc/vnc.h b/vnc/vnc.h
index 0bc3835d..3eee4e09 100644
--- a/vnc/vnc.h
+++ b/vnc/vnc.h
@@ -37,7 +37,7 @@ struct vnc
long param3, long param4);
int (*mod_signal)(struct vnc* v);
int (*mod_end)(struct vnc* v);
- int (*mod_set_param)(struct vnc* v, const char *name, char* value);
+ int (*mod_set_param)(struct vnc *v, const char *name, const char *value);
int (*mod_session_change)(struct vnc* v, int, int);
int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index d023305b..6cabe582 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -491,8 +491,8 @@ static int APP_CC
xrdp_mm_setup_mod2(struct xrdp_mm *self, tui8 *guid)
{
char text[256];
- char *name;
- char *value;
+ const char *name;
+ const char *value;
int i;
int rv;
int key_flags;
@@ -562,7 +562,7 @@ xrdp_mm_setup_mod2(struct xrdp_mm *self, tui8 *guid)
/* always set these */
self->mod->mod_set_param(self->mod, "client_info",
- (char *)(self->wm->session->client_info));
+ (const char *) (self->wm->session->client_info));
name = self->wm->session->client_info->hostname;
self->mod->mod_set_param(self->mod, "hostname", name);
@@ -575,8 +575,8 @@ xrdp_mm_setup_mod2(struct xrdp_mm *self, tui8 *guid)
for (i = 0; i < self->login_names->count; i++)
{
- name = (char *)list_get_item(self->login_names, i);
- value = (char *)list_get_item(self->login_values, i);
+ name = (const char *) list_get_item(self->login_names, i);
+ value = (const char *) list_get_item(self->login_values, i);
self->mod->mod_set_param(self->mod, name, value);
}
diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h
index cc0eaa3c..ca59cd1b 100644
--- a/xrdp/xrdp_types.h
+++ b/xrdp/xrdp_types.h
@@ -42,7 +42,7 @@ struct xrdp_mod
long param3, long param4);
int (*mod_signal)(struct xrdp_mod* v);
int (*mod_end)(struct xrdp_mod* v);
- int (*mod_set_param)(struct xrdp_mod* v, const char *name, char* value);
+ int (*mod_set_param)(struct xrdp_mod *v, const char *name, const char *value);
int (*mod_session_change)(struct xrdp_mod* v, int, int);
int (*mod_get_wait_objs)(struct xrdp_mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 065bca5c..9db41c0b 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -602,6 +602,7 @@ xrdp_wm_init(struct xrdp_wm *self)
/* TODO: change this and have an 'autologin'
line in globals section */
file_read_sections(fd, names);
+ section_name[0] = '\0';
for (index = 0; index < names->count; index++)
{
q = (char *)list_get_item(names, index);
@@ -1210,6 +1211,10 @@ xrdp_wm_mouse_click(struct xrdp_wm *self, int x, int y, int but, int down)
{
if (self->mm->mod->mod_event != 0)
{
+ if (down)
+ {
+ self->mm->mod->mod_event(self->mm->mod, WM_MOUSEMOVE, x, y, 0, 0);
+ }
if (but == 1 && down)
{
self->mm->mod->mod_event(self->mm->mod, WM_LBUTTONDOWN, x, y, 0, 0);
diff --git a/xup/Makefile.am b/xup/Makefile.am
index 76fc016a..0d6434c8 100644
--- a/xup/Makefile.am
+++ b/xup/Makefile.am
@@ -18,3 +18,5 @@ libxup_la_SOURCES = \
libxup_la_LIBADD = \
$(top_builddir)/common/libcommon.la
+
+libxup_la_LDFLAGS = -avoid-version -module
diff --git a/xup/xup.c b/xup/xup.c
index e2c34ca8..bff29727 100644
--- a/xup/xup.c
+++ b/xup/xup.c
@@ -1479,7 +1479,7 @@ lib_mod_end(struct mod *mod)
/******************************************************************************/
/* return error */
int DEFAULT_CC
-lib_mod_set_param(struct mod *mod, const char *name, char *value)
+lib_mod_set_param(struct mod *mod, const char *name, const char *value)
{
if (g_strcasecmp(name, "username") == 0)
{
diff --git a/xup/xup.h b/xup/xup.h
index 8c91996d..3e5c8e8d 100644
--- a/xup/xup.h
+++ b/xup/xup.h
@@ -39,7 +39,7 @@ struct mod
tbus param3, tbus param4);
int (*mod_signal)(struct mod* v);
int (*mod_end)(struct mod* v);
- int (*mod_set_param)(struct mod* v, const char *name, char* value);
+ int (*mod_set_param)(struct mod *v, const char *name, const char *value);
int (*mod_session_change)(struct mod* v, int, int);
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-26 00:00:03 +0000