diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-08-21 15:26:49 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-08-21 15:26:49 +0000 |
| commit | 8608d38da18c7bcd3c276bd507712aeb73eb5f20 (patch) | |
| tree | fdb0b821002771d9fd2ff6f3b3b46816bd31f03f | |
| parent | 5cc1f78b8262236ac05fea2cc4631e85c1b58508 (diff) | |
| download | gdm-8608d38da18c7bcd3c276bd507712aeb73eb5f20.tar.gz | |
A few more fixes to allow the gdm greeter username to be configured at
2008-08-21 William Jon McCann <jmccann@redhat.com>
* daemon/gdm-display-access-file.c (_create_xauth_file_for_user):
* data/Makefile.am:
* data/gdm.schemas.in.in:
A few more fixes to allow the gdm greeter username to be
configured at build time.
Patch from Patryk Zawadzki <patrys@pld-linux.org>
Fixes #504565
svn path=/trunk/; revision=6408
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | daemon/gdm-display-access-file.c | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/gdm.schemas.in.in | 4 |
4 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,15 @@ 2008-08-21 William Jon McCann <jmccann@redhat.com> + * daemon/gdm-display-access-file.c (_create_xauth_file_for_user): + * data/Makefile.am: + * data/gdm.schemas.in.in: + A few more fixes to allow the gdm greeter username to be + configured at build time. + Patch from Patryk Zawadzki <patrys@pld-linux.org> + Fixes #504565 + +2008-08-21 William Jon McCann <jmccann@redhat.com> + * gui/simple-greeter/Makefile.am: Fix build. diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c index 1f1658c9..05865e78 100644 --- a/daemon/gdm-display-access-file.c +++ b/daemon/gdm-display-access-file.c @@ -254,7 +254,7 @@ _create_xauth_file_for_user (const char *username, } g_chmod (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); - _get_uid_and_gid_for_user ("gdm", &uid, &gid); + _get_uid_and_gid_for_user (GDM_USERNAME, &uid, &gid); if (chown (GDM_XAUTH_DIR, 0, gid) != 0) { g_warning ("Unable to change owner of '%s'", GDM_XAUTH_DIR); diff --git a/data/Makefile.am b/data/Makefile.am index 2938279e..b055d0ca 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -55,6 +55,8 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in sed -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \ -e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \ -e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \ + -e 's,[@]GDM_USERNAME[@],$(GDM_USERNAME),g' \ + -e 's,[@]GDM_GROUPNAME[@],$(GDM_GROUPNAME),g' \ -e 's,[@]HALT_COMMAND[@],$(HALT_COMMAND),g' \ -e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \ -e 's,[@]SOUND_PROGRAM[@],$(SOUND_PROGRAM),g' \ diff --git a/data/gdm.schemas.in.in b/data/gdm.schemas.in.in index 6c508460..ef8a9f49 100644 --- a/data/gdm.schemas.in.in +++ b/data/gdm.schemas.in.in @@ -4,12 +4,12 @@ <schema> <key>daemon/User</key> <signature>s</signature> - <default>gdm</default> + <default>@GDM_USERNAME@</default> </schema> <schema> <key>daemon/Group</key> <signature>s</signature> - <default>gdm</default> + <default>@GDM_GROUPNAME@</default> </schema> <schema> <key>daemon/TimedLoginEnable</key> |