mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #319 from proski/misc

Browse Source 
Miscellaneous minor patches, mostly for the build system
This commit is contained in:
Itamar Reis Peixoto 2016-02-13 17:40:33 -02:00
commit 371ad8d90d
28 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitignore vendored
View File

@ -3,6 +3,7 @@ aclocal.m4
AUTHORS
autom4te.cache/
ChangeLog
compile
config_ac.h
config_ac-h.in
config.guess
@ -10,10 +11,11 @@ config.log
config.status
config.sub
configure
compile
depcomp
.deps/
genkeymap/xrdp-genkeymap
install-sh
keygen/xrdp-keygen
*.la
.libs
libtool
@ -22,18 +24,17 @@ ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
NEWS
*.o
README
sesman/chansrv/xrdp-chansrv
sesman/sessvc/xrdp-sessvc
sesman/tools/xrdp-dis
sesman/tools/xrdp-sesadmin
sesman/tools/xrdp-sesrun
sesman/tools/xrdp-sestest
sesman/tools/xrdp-xcon
sesman/xrdp-sesman
stamp-h1
xrdp-chansrv
xrdp-genkeymap
xrdp-keygen
xrdp-sesadmin
xrdp-sesman
xrdp-sesrun
xrdp-sessvc
xrdp-sestest
xrdp-dis
xrdp-xcon
xrdp/xrdp

2
common/Makefile.am
View File

@ -26,7 +26,7 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_LOG_PATH=\"${localstatedir}/log\"
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libcommon.la
libcommon_la_SOURCES = \

4
common/file_loc.h
View File

@ -37,8 +37,8 @@
#define XRDP_SHARE_PATH "/usr/local/share/xrdp"
#endif
#if !defined(XRDP_LIB_PATH)
#define XRDP_LIB_PATH "/usr/local/lib/xrdp"
#if !defined(XRDP_MODULE_PATH)
#define XRDP_MODULE_PATH "/usr/local/lib/xrdp"
#endif
#if !defined(XRDP_LOG_PATH)

8
configure.ac
View File

@ -3,13 +3,16 @@
AC_PREREQ(2.59)
AC_INIT([xrdp], [0.9.0], [xrdp-devel@googlegroups.com])
AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
AM_INIT_AUTOMAKE([1.6 foreign])
AM_INIT_AUTOMAKE([1.7.2 foreign])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
AC_C_CONST
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
# Use silent rules by default if supported by Automake
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
case $host_os in
*linux*)
linux=yes
@ -223,7 +226,8 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h], [],
CFLAGS="$save_CFLAGS"
libdir="${libdir}/xrdp";
AC_SUBST([moduledir], '${libdir}/xrdp')
if test "x${prefix}" = "xNONE" ; then
sysconfdir="/etc";
localstatedir="/var";

1
fontdump/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
!Makefile

28
instfiles/Makefile.am
View File

@ -32,28 +32,28 @@ startscript_DATA = \
#
# platform specific files
#
SUBDIRS=
SUBDIRS =
if LINUX
SUBDIRS+= \
pam.d \
pulse
startscript_DATA+= xrdp.sh
SUBDIRS += \
pam.d \
pulse
startscript_DATA += xrdp.sh
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
xrdp-sesman.service \
xrdp.service
xrdp-sesman.service \
xrdp.service
else
SUBDIRS+= \
default \
init.d
SUBDIRS += \
default \
init.d
endif # HAVE_SYSTEMD
endif # LINUX
if FREEBSD
SUBDIRS+= \
pam.d \
rc.d \
pulse
SUBDIRS += \
pam.d \
rc.d \
pulse
endif
#

2
libxrdp/Makefile.am
View File

@ -37,7 +37,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/common \
$(EXTRA_INCLUDES)
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libxrdp.la
libxrdp_la_SOURCES = \

4
libxrdp/xrdp_rdp.c
View File

@ -98,8 +98,8 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
}
else
{
log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured crypt level is"
"undefined 'high' will be used");
log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured crypt level is "
"undefined, 'high' will be used");
client_info->crypt_level = 3;
}
}

2
mc/Makefile.am
View File

@ -7,7 +7,7 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libmc.la
libmc_la_SOURCES = mc.c

2
neutrinordp/Makefile.am
View File

@ -16,7 +16,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/common \
$(FREERDP_CFLAGS)
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libxrdpneutrinordp.la
libxrdpneutrinordp_la_SOURCES = xrdp-neutrinordp.c xrdp-color.c

2
rdp/Makefile.am
View File

@ -15,7 +15,7 @@ AM_CPPFLAGS = \
$(EXTRA_DEFINES) \
-I$(top_srcdir)/common
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
librdp.la
librdp_la_SOURCES = \

2
sesman/access.c
View File

@ -93,7 +93,7 @@ access_login_mng_allowed(char *user)
if (0 == g_cfg->sec.ts_admins_enable)
{
LOG_DBG("[MNG] Terminal Server Admin group is disabled,"
LOG_DBG("[MNG] Terminal Server Admin group is disabled, "
"allowing authentication", 1);
return 1;
}

1
sesman/chansrv/pcsc/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
!Makefile

1
sesman/chansrv/pulse/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
!Makefile

2
sesman/chansrv/pulse/module-xrdp-sink.c
View File

@ -77,7 +77,7 @@ PA_MODULE_USAGE(
"sink_name=<name for the sink> "
"sink_properties=<properties for the sink> "
"format=<sample format> "
"rate=<sample rate>"
"rate=<sample rate> "
"channels=<number of channels> "
"channel_map=<channel map>");

2
sesman/libscp/Makefile.am
View File

@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libscp.la
libscp_la_SOURCES = \

2
sesman/scp_v1.c
View File

@ -110,7 +110,7 @@ scp_v1_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
if (scount == 0)
{
/* no disconnected sessions - start a new one */
log_message(LOG_LEVEL_DEBUG, "No disconnected sessions for this user"
log_message(LOG_LEVEL_DEBUG, "No disconnected sessions for this user "
"- we create a new one");
if (0 != s->client_ip)

55
sesman/startwm.sh
View File

@ -29,36 +29,34 @@ wm_start()
xterm
}
#Execution sequence for interactive login shell
#Following pseudo code explains the sequence of execution of these files.
#execute /etc/profile
#IF ~/.bash_profile exists THEN
# execute ~/.bash_profile
#ELSE
# IF ~/.bash_login exist THEN
# execute ~/.bash_login
# ELSE
# IF ~/.profile exist THEN
# execute ~/.profile
# END IF
# END IF
#END IF
# Execution sequence for interactive login shell - pseudocode
#
# IF /etc/profile is readable THEN
# execute ~/.bash_profile
# END IF
# IF ~/.bash_profile is readable THEN
# execute ~/.bash_profile
# ELSE
# IF ~/.bash_login is readable THEN
# execute ~/.bash_login
# ELSE
# IF ~/.profile is readable THEN
# execute ~/.profile
# END IF
# END IF
# END IF
pre_start()
{
if [ -f /etc/profile ]
then
if [ -r /etc/profile ]; then
. /etc/profile
fi
if [ -f ~/.bash_profile ]
then
if [ -r ~/.bash_profile ]; then
. ~/.bash_profile
else
if [ -f ~/.bash_login ]
then
if [ -r ~/.bash_login ]; then
. ~/.bash_login
else
if [ -f ~/.profile ]
then
if [ -r ~/.profile ]; then
. ~/.profile
fi
fi
@ -66,15 +64,14 @@ pre_start()
return 0
}
#When you logout of the interactive shell, following is the
#sequence of execution:
#IF ~/.bash_logout exists THEN
# execute ~/.bash_logout
#END IF
# When loging out from the interactive shell, the execution sequence is:
#
# IF ~/.bash_logout exists THEN
# execute ~/.bash_logout
# END IF
post_start()
{
if [ -f ~/.bash_logout ]
then
if [ -r ~/.bash_logout ]; then
. ~/.bash_logout
fi
return 0

1
sesman/tools/xcon.c
View File

@ -19,6 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <X11/Xlib.h>

1
tests/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
!Makefile

2
vnc/Makefile.am
View File

@ -7,7 +7,7 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libvnc.la
libvnc_la_SOURCES = vnc.c

1
xorg/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
!Makefile

2
xrdp/Makefile.am
View File

@ -22,7 +22,7 @@ AM_CPPFLAGS = \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_LIB_PATH=\"${libdir}\" \
-DXRDP_MODULE_PATH=\"${moduledir}\" \
$(EXTRA_DEFINES) \
-I$(top_builddir) \
-I$(top_srcdir)/common \

6
xrdp/xrdp_mm.c
View File

@ -357,7 +357,7 @@ xrdp_mm_setup_mod1(struct xrdp_mm *self)
if (self->mod_handle == 0)
{
g_snprintf(text, 255, "%s/%s", XRDP_LIB_PATH, lib);
g_snprintf(text, 255, "%s/%s", XRDP_MODULE_PATH, lib);
/* Let the main thread load the lib,*/
self->mod_handle = g_xrdp_sync(xrdp_mm_sync_load, (tintptr)text, 0);
@ -1151,7 +1151,7 @@ xrdp_mm_connect_chansrv(struct xrdp_mm *self, char *ip, char *port)
if (!(self->chan_trans_up))
{
log_message(LOG_LEVEL_ERROR,"xrdp_mm_connect_chansrv: error in"
log_message(LOG_LEVEL_ERROR,"xrdp_mm_connect_chansrv: error in "
"trans_connect chan");
}
@ -1164,7 +1164,7 @@ xrdp_mm_connect_chansrv(struct xrdp_mm *self, char *ip, char *port)
}
else
{
log_message(LOG_LEVEL_DEBUG,"xrdp_mm_connect_chansrv: chansrv"
log_message(LOG_LEVEL_DEBUG,"xrdp_mm_connect_chansrv: chansrv "
"connect successful");
}
}

2
xrdpapi/Makefile.am
View File

@ -9,7 +9,7 @@ AM_CPPFLAGS = \
$(EXTRA_DEFINES) \
$(EXTRA_INCLUDES)
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libxrdpapi.la
libxrdpapi_la_SOURCES = \

2
xrdpvr/Makefile.am
View File

@ -9,7 +9,7 @@ AM_CPPFLAGS = \
$(EXTRA_DEFINES) \
$(EXTRA_INCLUDES)
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libxrdpvr.la
libxrdpvr_la_SOURCES = \

2
xup/Makefile.am
View File

@ -7,7 +7,7 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
lib_LTLIBRARIES = \
module_LTLIBRARIES = \
libxup.la
libxup_la_SOURCES = xup.c

2
xup/xup.c
View File

@ -211,7 +211,7 @@ lib_mod_connect(struct mod *mod)
error = -1;
if (trans_connect(mod->trans, mod->ip, con_port, 3000) == 0)
{
LLOGLN(0, ("lib_mod_connect: connected to Xserver"
LLOGLN(0, ("lib_mod_connect: connected to Xserver "
"(Xorg or X11rdp) sck %d", mod->trans->sck));
error = 0;
}