← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gdm/trusty-proposed

« back to all changes in this revision

Viewing changes to daemon/gdm-slave-proxy.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Tim Lunn, Jeremy Bicha, Robert Ancell
  • Date: 2013-05-31 22:36:08 UTC
  • mfrom: (1.4.55)
  • Revision ID: package-import@ubuntu.com-20130531223608-33uo85niksee5460
Tags: 3.8.1.1-0ubuntu1
[ Tim Lunn ]
* New upstream release
* debian/patches/ubuntu_dont_catch_sigsegv.patch:
  - Dropped, obsolete
* debian/rules:
  - Don't rename gdm binary since that's already been
    done in the new version

[ Jeremy Bicha ]
* debian/control.in: Bump minimum glib
* debian/watch: Watch for unstable releases
* debian/patches/00git_logind_check.patch:
  - Dropped, applied in new release
* debian/patches/08_frequent-users_greeter.patch: Refreshed

[ Robert Ancell ]
* New upstream release
* debian/patches/ubuntu_daemon_autologin_tracking.patch:
* debian/patches/ubuntu_ensure_dirs.patch:
* debian/patches/ubuntu_slave-only-set-up-autologin.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/gdm-slave-proxy.c
30
30
#include <errno.h>
31
31
#include <signal.h>
32
32
 
 
33
#ifdef WITH_SYSTEMD
 
34
#include <systemd/sd-daemon.h>
 
35
#endif
 
36
 
33
37
#include <glib.h>
34
38
#include <glib/gi18n.h>
35
39
#include <glib/gstdio.h>
126
130
}
127
131
 
128
132
typedef struct {
 
133
        const char *identifier;
129
134
        const char *log_file;
130
135
} SpawnChildData;
131
136
 
132
137
static void
133
138
spawn_child_setup (SpawnChildData *data)
134
139
{
 
140
#ifdef WITH_SYSTEMD
 
141
        if (sd_booted () > 0) {
 
142
                return;
 
143
        }
 
144
#endif
135
145
 
136
146
        if (data->log_file != NULL) {
137
147
                int logfd;
161
171
        gboolean         ret;
162
172
        gboolean         res;
163
173
        SpawnChildData   data;
 
174
        gboolean         has_journald = FALSE;
164
175
 
165
176
        ret = FALSE;
166
177
 
172
183
                goto out;
173
184
        }
174
185
 
175
 
        data.log_file = log_file;
 
186
        data.identifier = argv[0];
 
187
 
 
188
#ifdef WITH_SYSTEMD
 
189
        if (sd_booted () > 0) {
 
190
                has_journald = TRUE;
 
191
        }
 
192
#endif
 
193
 
 
194
        if (has_journald) {
 
195
                data.log_file = NULL;
 
196
        } else {
 
197
                data.log_file = log_file;
 
198
        }
176
199
 
177
200
        local_error = NULL;
178
201
        res = g_spawn_async (NULL,