Group :: System/Servers
RPM: xrdp
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: xrdp_sesman.patch
Download
Download
--- sesman/Makefile 2007-05-28 03:18:14 +0400
+++ sesman/Makefile 2007-08-27 13:17:23 +0400
@@ -16,31 +18,32 @@
-DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
-DSESMAN_SESSVC_FILE=\"sessvc\"
-CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
+CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp
C_OS_FLAGS = $(CFLAGS) -c
+LDADD = -ldl -lpthread -lscp
CC = gcc
-all: libscp_ pam tools
+all: libscp_ pam tools
nopam: libscp_ no-pam tools
kerberos: libscp_ kerberos-base tools
no-pam: $(SESMANOBJ) verify_user.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt $(LDADD)
pam: $(SESMANOBJ) verify_user_pam.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam $(LDADD)
pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass $(LDADD)
kerberos-base: $(SESMANOBJ) verify_user_kerberos.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5 $(LDADD)
sessvc: $(SESSVCOBJ)
- $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ)
+ $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) $(LDADD)
tools: sessvc
make -C tools
--- sesman/sesman.ini.orig 2007-11-04 19:53:10 +0300
+++ sesman/sesman.ini 2007-11-04 20:54:25 +0300
@@ -18,7 +18,7 @@ IdleTimeLimit=0
DisconnectedTimeLimit=0
[Logging]
-LogFile=./sesman.log
+LogFile=/var/log/sesman.log
LogLevel=DEBUG
EnableSyslog=0
SyslogLevel=DEBUG
--- sesman/session.c.orig 2007-05-28 03:13:23 +0400
+++ sesman/session.c 2007-11-05 11:46:26 +0300
@@ -274,8 +274,7 @@ for user %s denied", username);
}
/* if we're here something happened to g_execlp3
so we try running the default window manager */
- g_sprintf(text, "%s/%s", cur_dir, g_cfg.default_wm);
- g_execlp3(text, g_cfg.default_wm, 0);
+ g_execlp3(g_cfg.default_wm, g_cfg.default_wm, 0);
log_message(LOG_LEVEL_ALWAYS,"error starting default wm for user %s - pid %d",
username, g_getpid());
--- xrdp/lang.c.orig Mon Apr 2 00:42:35 2007
+++ xrdp/lang.c Mon Nov 5 20:31:20 2007
@@ -468,7 +468,7 @@
keys_shift = en_us_shift;
keys_altgr = en_us_altgr;
}
- /*g_writeln("%d %d %x", scan_code, device_flags, keylayout);*/
+ g_writeln("SCANCODE: 0x%2X Flag: %3d Client layout: %x", scan_code, device_flags, keylayout);
shift = keys[42] || keys[54];
altgr = keys[56]; /* right alt */
ext = device_flags & 0x0100;