[gdm] drop authdir



commit 16bd10cad82972bead4f760ecfff43a7c25bdd03
Author: Ray Strode <rstrode redhat com>
Date:   Wed Aug 28 09:16:05 2013 -0400

    drop authdir
    
    <Black_Prince> halfline: what's the point of authdir in gdm? (/var/gdm)
    ?
    <Black_Prince> it doesn't appear to be used anywere
    <halfline> no point
    <Black_Prince> there are some references in daemon/main.c, but nothing
    ever gets stored in there
    <Black_Prince> instead, xauthdir is used
    
    https://bugzilla.gnome.org/show_bug.cgi?id=706974

 common/Makefile.am             |    1 -
 configure.ac                   |    1 -
 daemon/Makefile.am             |    1 -
 daemon/gdm-slave.c             |    8 --------
 daemon/main.c                  |    6 ------
 data/Makefile.am               |    8 --------
 gui/simple-chooser/Makefile.am |    1 -
 7 files changed, 0 insertions(+), 26 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 9717db8..b8687da 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
        -I.                                             \
        -I..                                            \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-       -DAUTHDIR=\"$(authdir)\"                        \
        -DBINDIR=\"$(bindir)\"                          \
        -DDATADIR=\"$(datadir)\"                        \
        -DDMCONFDIR=\"$(dmconfdir)\"                    \
diff --git a/configure.ac b/configure.ac
index 1d287a6..99f4161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1039,7 +1039,6 @@ dnl ---------------------------------------------------------------------------
 dnl - Define some variables to represent the directories we use.
 dnl ---------------------------------------------------------------------------
 
-AC_SUBST(authdir, ${localstatedir}/gdm)
 AC_SUBST(gdmlocaledir, ${gdmconfdir})
 AC_SUBST(pixmapdir, ${datadir}/pixmaps)
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index ead9096..eb9f56d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
        -I..                                            \
        -I$(top_srcdir)/common                          \
        -I$(top_builddir)/common                        \
-       -DAUTHDIR=\"$(authdir)\"                        \
        -DBINDIR=\"$(bindir)\"                          \
        -DDATADIR=\"$(datadir)\"                        \
        -DDMCONFDIR=\"$(dmconfdir)\"                    \
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index ba292a3..128a800 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -200,7 +200,6 @@ get_script_environment (GdmSlave   *slave,
         GPtrArray     *env;
         GHashTable    *hash;
         struct passwd *pwent;
-        char          *x_servers_file;
         char          *temp;
 
         env = g_ptr_array_new ();
@@ -243,13 +242,6 @@ get_script_environment (GdmSlave   *slave,
         }
 #endif
 
-        /* some env for use with the Pre and Post scripts */
-        temp = g_strconcat (slave->priv->display_name, ".Xservers", NULL);
-        x_servers_file = g_build_filename (AUTHDIR, temp, NULL);
-        g_free (temp);
-
-        g_hash_table_insert (hash, g_strdup ("X_SERVERS"), x_servers_file);
-
         if (! slave->priv->display_is_local) {
                 g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup 
(slave->priv->display_hostname));
         }
diff --git a/daemon/main.c b/daemon/main.c
index 8176fe3..08f89df 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -189,12 +189,6 @@ gdm_daemon_ensure_dirs (uid_t uid,
                           GDM_RAN_ONCE_MARKER_DIR, error->message);
         }
 
-        /* Set up /var/gdm */
-        if (!ensure_dir_with_perms (AUTHDIR, uid, gid, 0711, &error)) {
-                gdm_fail (_("Failed to create AuthDir %s: %s"),
-                          AUTHDIR, error->message);
-        }
-
         /* Set up /var/log/gdm */
         if (!ensure_dir_with_perms (LOGDIR, 0, gid, 0711, &error)) {
                 gdm_fail (_("Failed to create LogDir %s: %s"),
diff --git a/data/Makefile.am b/data/Makefile.am
index 81eb8ef..d725faa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS =                       \
        $(NULL)
 
 initdir = $(gdmconfdir)/Init
-authdir = $(localstatedir)/gdm
 postdir = $(gdmconfdir)/PostSession
 predir = $(gdmconfdir)/PreSession
 postlogindir = $(gdmconfdir)/PostLogin
@@ -69,7 +68,6 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
                -e 's,[ ]X_XNEST_CONFIG_OPTIONS[@],$(X_XNEST_CONFIG_OPTIONS),g' \
                -e 's,[ ]X_XNEST_UNSCALED_FONTPATH[@],$(X_XNEST_UNSCALED_FONTPATH),g' \
                -e 's,[ ]GDM_RBAC_SYSCMD_KEYS[@],$(GDM_RBAC_SYSCMD_KEYS),g' \
-               -e 's,[ ]authdir[@],$(authdir),g' \
                -e 's,[ ]datadir[@],$(datadir),g' \
                -e 's,[ ]gdmconfdir[@],$(gdmconfdir),g' \
                -e 's,[ ]libdir[@],$(libdir),g' \
@@ -275,12 +273,6 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession 00-upstr
                chown root:root $(DESTDIR)$(logdir) || : ; \
        fi
 
-       if test '!' -d $(DESTDIR)$(authdir); then \
-               $(mkinstalldirs) $(DESTDIR)$(authdir); \
-               chmod 1770 $(DESTDIR)$(authdir); \
-               chown root:gdm $(DESTDIR)$(authdir) || : ; \
-       fi
-
        system=`uname`; \
        if test -f /usr/include/security/pam_appl.h; then \
          if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
diff --git a/gui/simple-chooser/Makefile.am b/gui/simple-chooser/Makefile.am
index 3111b0b..18168e7 100644
--- a/gui/simple-chooser/Makefile.am
+++ b/gui/simple-chooser/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/common                          \
        -I$(top_srcdir)/gui/libgdm                      \
        -I$(top_builddir)/gui/libgdm                    \
-       -DAUTHDIR=\""$(authdir)"\"                      \
        -DDATADIR=\""$(datadir)"\"                      \
        -DGDMCONFDIR=\"$(gdmconfdir)\"                  \
        -DDMCONFDIR=\""$(dmconfdir)"\"                  \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]