xenodm does not use Xsetup if autoLogin is set

[chohag]

The lack of Xsetup might be desired functionality but that's contrary
to xenodm(1):

     After resetting the X server, xenodm runs the Xsetup script
     to assist in setting up the screen the user sees along with
     the xlogin widget.

     The xlogin widget, which xenodm presents, offers the familiar
     login and password prompts, unless autoLogin is set.

     After the user logs in, xenodm runs the Xstartup script as
     root.

The patch below makes this happen as per the documentation. Note
that for anybody using autoLogin this will have a material change
to their desktop environment as the default Xsetup script runs
xconsole (and xsetroot).

Incidentally the reason for 'if (!d->grabServer)' is explained in
GreetUser() that's used when autoLogin is NOT set but I felt it
wasn't necessary to duplicate the comment.

Matthew


Index: greeter/greet.c
===================================================================
RCS file: /src/datum/openbsd/cvs/xenocara/app/xenodm/greeter/greet.c,v
retrieving revision 1.9
diff -u -p -r1.9 greet.c
--- greeter/greet.c 11 Jul 2018 16:20:20 -0000 1.9
+++ greeter/greet.c 20 Feb 2021 20:17:26 -0000
@@ -359,6 +359,9 @@ greet_user_rtn AutoLogin(
     struct greet_info       *greet)
 {
 
+    if (!d->grabServer)
+ SetupDisplay (d);
+
     if (!autoLoginEnv(d, verify, greet)) {
         LogError("Autologin %s failed\n", d->autoLogin);
         SessionExit(d, UNMANAGE_DISPLAY, true);

[Matthieu Herrb-3]

On Sat, Feb 20, 2021 at 08:23:17PM +0000, [hidden email] wrote:

> The lack of Xsetup might be desired functionality but that's contrary
> to xenodm(1):
>
>      After resetting the X server, xenodm runs the Xsetup script
>      to assist in setting up the screen the user sees along with
>      the xlogin widget.
>
>      The xlogin widget, which xenodm presents, offers the familiar
>      login and password prompts, unless autoLogin is set.
>
>      After the user logs in, xenodm runs the Xstartup script as
>      root.
>
> The patch below makes this happen as per the documentation. Note
> that for anybody using autoLogin this will have a material change
> to their desktop environment as the default Xsetup script runs
> xconsole (and xsetroot).
>
> Incidentally the reason for 'if (!d->grabServer)' is explained in
> GreetUser() that's used when autoLogin is NOT set but I felt it
> wasn't necessary to duplicate the comment.

I would prefer to fix the manual page to explain that in the autologin
case, the Xsetup script is not run.


Index: man/xenodm.man
===================================================================
RCS file: /cvs/OpenBSD/xenocara/app/xenodm/man/xenodm.man,v
retrieving revision 1.12
diff -u -p -u -r1.12 xenodm.man
--- man/xenodm.man 8 Mar 2021 17:54:28 -0000 1.12
+++ man/xenodm.man 13 Mar 2021 09:58:09 -0000
@@ -102,20 +102,23 @@ own login window, can be affected by set
 .Pa Xresources
 file.
 .Pp
-After resetting the X server,
+If
+.Ic autoLogin
+is not set (the default), after resetting the X server,
 .Nm
 runs the
 .Pa Xsetup
 script to assist in setting up the screen the user sees along with the
-xlogin widget.
-.Pp
-The xlogin widget, which
+xlogin widget which
 .Nm
-presents, offers the familiar login and password prompts, unless
+presents.
+The xlogin widget offers the familiar login and password prompts.
+.PP
+If
 .Ic autoLogin
-is set.
+is set the designated user is automatically logged in.
 .Pp
-After the user logs in,
+After the user logged in,
 .Nm
 runs the
 .Pa Xstartup

--
Matthieu Herrb