]>
Commit | Line | Data |
---|---|---|
6c628e85 JB |
1 | --- xdm-1.1.1/config/Xreset.cpp.orig 2006-11-06 22:02:49.000000000 +0000 |
2 | +++ xdm-1.1.1/config/Xreset.cpp 2006-11-15 08:45:26.669505000 +0000 | |
3 | @@ -2,4 +2,4 @@ | |
4 | XCOMM Deregister a login. (Derived from TakeConsole as follows:) | |
5 | XCOMM | |
6 | BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ | |
7 | - -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER | |
8 | + -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER | |
9 | --- xdm-1.1.1/config/Xstartup.cpp.orig 2006-11-06 22:02:40.000000000 +0000 | |
10 | +++ xdm-1.1.1/config/Xstartup.cpp 2006-11-15 08:45:34.609505000 +0000 | |
11 | @@ -2,4 +2,4 @@ | |
12 | XCOMM Register a login (derived from GiveConsole as follows:) | |
13 | XCOMM | |
14 | BINDIR/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ | |
15 | - -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER | |
16 | + -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER | |
767195a0 JB |
17 | --- xdm-1.1.0/config/Xresources.cpp.orig 2006-08-14 20:12:34.000000000 +0200 |
18 | +++ xdm-1.1.0/config/Xresources.cpp 2006-10-15 02:18:19.860305500 +0200 | |
19 | @@ -78,7 +78,7 @@ | |
20 | #endif /* XPM */ | |
21 | XHASHendif | |
22 | #ifdef XPM | |
23 | -XHASHif PLANES >= 8 | |
24 | +XHASHif PLANES > 8 | |
25 | xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP | |
26 | XHASHelse | |
27 | xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP | |
28 | --- xdm-1.1.0/xdm-xinitrc-0.2/GiveConsole.orig 2000-10-29 20:59:44.000000000 +0100 | |
29 | +++ xdm-1.1.0/xdm-xinitrc-0.2/GiveConsole 2006-10-15 02:18:00.359086750 +0200 | |
30 | @@ -8,4 +8,4 @@ | |
31 | # causing serious grief. | |
32 | # | |
33 | chown $USER /dev/console | |
34 | -/usr/X11R6/bin/sessreg -a -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER | |
35 | +/usr/bin/sessreg -a -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER | |
36 | --- xdm-1.1.0/xdm-xinitrc-0.2/TakeConsole.orig 2000-10-29 20:59:44.000000000 +0100 | |
37 | +++ xdm-1.1.0/xdm-xinitrc-0.2/TakeConsole 2006-10-15 02:18:07.591538750 +0200 | |
38 | @@ -5,4 +5,4 @@ | |
39 | # | |
40 | chmod 622 /dev/console | |
41 | chown root /dev/console | |
42 | -/usr/X11R6/bin/sessreg -d -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER | |
43 | +/usr/bin/sessreg -d -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER | |
44 | --- xdm-1.1.0/configure.ac.orig 2006-10-04 03:11:27.000000000 +0200 | |
45 | +++ xdm-1.1.0/configure.ac 2006-10-15 02:17:10.495970500 +0200 | |
46 | @@ -216,6 +216,11 @@ | |
47 | [XDMPIDDIR="$withval"], [XDMPIDDIR="/var/run"]) | |
48 | AC_SUBST(XDMPIDDIR) | |
49 | ||
50 | +AC_ARG_WITH(xdmauthdir, | |
51 | + AC_HELP_STRING([--with-xdmauthdir=<pathname>], | |
52 | + [specify directory for authentication cookie files (default=configdir)]), | |
53 | + [XDMAUTHDIR="$withval"], [XDMAUTHDIR="$XDMCONFIGDIR"]) | |
54 | + | |
55 | AC_ARG_WITH(default-vt, | |
56 | AC_HELP_STRING([--with-default-vt=<vtname>], | |
57 | [specify default vt to start xdm on (default=none)]), | |
58 | @@ -494,7 +499,7 @@ | |
59 | ||
60 | # -DDEF_AUTH_DIR="$(XDMDIR)" | |
61 | ||
62 | -AC_DEFINE_DIR(DEF_AUTH_DIR, XDMCONFIGDIR, | |
63 | +AC_DEFINE_DIR(DEF_AUTH_DIR, XDMAUTHDIR, | |
64 | [Define to pathname where authentication cookie files should be stored]) | |
65 | ||
66 | # -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so" |