commit xrdp for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package xrdp for openSUSE:Factory checked in at Fri Feb 27 00:49:48 CET 2009. -------- --- xrdp/xrdp.changes 2009-02-11 17:41:10.000000000 +0100 +++ xrdp/xrdp.changes 2009-02-25 18:42:09.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 25 12:29:27 EST 2009 - davidr@novell.com + +- Allow up to 128 simultaneous sessions. (bnc#477376) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdp.spec ++++++ --- /var/tmp/diff_new_pack.o11631/_old 2009-02-27 00:47:49.000000000 +0100 +++ /var/tmp/diff_new_pack.o11631/_new 2009-02-27 00:47:49.000000000 +0100 @@ -21,7 +21,7 @@ Name: xrdp %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Version: 0.4.1 -Release: 26 +Release: 29 License: GPL v2 or later Requires: dbus-1 xorg-x11-libXau xorg-x11-libxcb xorg-x11-server-dmx xorg-x11-server-rdp BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,6 +97,8 @@ %config %{_fwdefdir}/xrdp %changelog +* Wed Feb 25 2009 davidr@novell.com +- Allow up to 128 simultaneous sessions. (bnc#477376) * Wed Feb 11 2009 davidr@novell.com - Fix a number of vulnerabilities. (bnc#442182) (bnc#466373) - Don't reset username/password. (bnc#442293) ++++++ xrdp-NOMAD.diff ++++++ --- /var/tmp/diff_new_pack.o11631/_old 2009-02-27 00:47:49.000000000 +0100 +++ /var/tmp/diff_new_pack.o11631/_new 2009-02-27 00:47:49.000000000 +0100 @@ -9,6 +9,17 @@ - instfiles + instfiles \ + dmx +diff --git a/common/defines.h b/common/defines.h +index 050eb5a..5fb1a42 100644 +--- a/common/defines.h ++++ b/common/defines.h +@@ -89,5 +89,5 @@ + ((((f)->height * (((f)->width + 7) / 8)) + 3) & ~3); + /* use crc for bitmap cache lookups */ + #define USE_CRC +- ++#define MAX_SESSIONS_LIMIT 128 + #endif diff --git a/common/file.c b/common/file.c index cf6f1e6..86aa3b8 100644 --- a/common/file.c @@ -269,7 +280,7 @@ + diff --git a/dmx/dmx.c b/dmx/dmx.c new file mode 100644 -index 0000000..ff2792d +index 0000000..e513f49 --- /dev/null +++ b/dmx/dmx.c @@ -0,0 +1,1651 @@ @@ -922,9 +933,9 @@ + return 1; + } + -+ mod->display = atoi (mod->port) + 10 - 6000; ++ mod->display = atoi (mod->port) + (MAX_SESSIONS_LIMIT * 2) - 6000; + -+ while (mod->display < 200) ++ while (mod->display <= (MAX_SESSIONS_LIMIT * 4)) + { + if (!x_server_running (mod->display)) + break; @@ -932,7 +943,7 @@ + mod->display++; + } + -+ if (mod->display == 200) ++ if (mod->display > (MAX_SESSIONS_LIMIT * 4)) + { + mod->server_msg(mod, "error - no available display offset", 0); + LIB_DEBUG(mod, "out lib_mod_connect error"); @@ -2278,10 +2289,18 @@ xrdp_sessvc_LDADD = \ $(top_srcdir)/common/libcommon.la diff --git a/sesman/config.c b/sesman/config.c -index 4af7b69..587bab5 100644 +index 4af7b69..b48ca29 100644 --- a/sesman/config.c +++ b/sesman/config.c -@@ -88,9 +88,10 @@ config_read(struct config_sesman* cfg) +@@ -29,6 +29,7 @@ + #include "list.h" + #include "file.h" + #include "sesman.h" ++#include "defines.h" + + extern struct config_sesman* g_cfg; + +@@ -88,9 +89,10 @@ config_read(struct config_sesman* cfg) /* read global config */ config_read_globals(fd, cfg, param_n, param_v); @@ -2293,7 +2312,18 @@ /* read logging config */ config_read_logging(fd, &(cfg->log), param_n, param_v); -@@ -421,3 +422,30 @@ config_read_vnc_params(int file, struct config_sesman* cs, struct list* param_n, +@@ -340,6 +342,10 @@ config_read_sessions(int file, struct config_sessions* se, struct list* param_n, + if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_MAX)) + { + se->max_sessions = g_atoi((char*)list_get_item(param_v, i)); ++ if (se->max_sessions > MAX_SESSIONS_LIMIT) ++ se->max_sessions = MAX_SESSIONS_LIMIT; ++ else if (se->max_sessions < 1) ++ se->max_sessions = 1; + } + if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_KILL_DISC)) + { +@@ -421,3 +427,30 @@ config_read_vnc_params(int file, struct config_sesman* cs, struct list* param_n, return 0; } @@ -3020,10 +3050,10 @@ if (!daemon) diff --git a/sesman/sesman.ini b/sesman/sesman.ini -index fd240e7..d812d7b 100644 +index fd240e7..a8de2bd 100644 --- a/sesman/sesman.ini +++ b/sesman/sesman.ini -@@ -25,8 +25,13 @@ SyslogLevel=DEBUG +@@ -25,8 +25,14 @@ SyslogLevel=DEBUG [X11rdp] param1=-bs @@ -3035,15 +3065,16 @@ + +[Xdmx] +param1=-br -+param2=-nolisten -+param3=tcp -+param4=-- -+param5=/usr/bin/Xfake ++param2=-noreset ++param3=-nolisten ++param4=tcp ++param5=-- ++param6=/usr/bin/Xfake diff --git a/sesman/session.c b/sesman/session.c -index 54e02ad..3e4343d 100644 +index 54e02ad..1eab77d 100644 --- a/sesman/session.c +++ b/sesman/session.c -@@ -29,7 +29,19 @@ +@@ -29,12 +29,24 @@ #include "libscp_types.h" #include <errno.h> @@ -3064,6 +3095,13 @@ extern unsigned char g_fixedkey[8]; extern struct config_sesman* g_cfg; /* config.h */ +-struct session_chain* g_sessions; +-int g_session_count; ++struct session_chain* g_sessions = NULL; ++int g_session_count = 0; + + /******************************************************************************/ + struct session_item* DEFAULT_CC @@ -49,14 +61,23 @@ session_get_bydata(char* name, int width, int height, int bpp) while (tmp != 0) @@ -3566,7 +3604,7 @@ + +#ifndef _WIN32 + char auth_file[256]; -+ const char *auth_templ = "/tmp/.Xdmx-auth-XXXXXX"; ++ const char *auth_templ = "/tmp/.xrdp-auth-XXXXXX"; + char auth_data[AUTH_DATA_LEN]; + int auth_fd; + int mask; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de