← Back to branch summary

~jamesodhunt/upstart/bug-1123588-gcc-malloc-attribute

« back to all changes in this revision

Viewing changes to init/main.c

  • Committer: James Hunt
  • Date: 2013-02-26 16:45:33 UTC
  • mfrom: (1436.1.1 upstart-fix-env-test)
  • Revision ID: james.hunt@ubuntu.com-20130226164533-q6cxi3x0fir5ekfg
Merge of lp:~stgraber/upstart/upstart-fix-env-test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/main.c
210
210
 
211
211
        control_handle_bus_type ();
212
212
 
 
213
        if (! user_mode)
 
214
                no_inherit_env = TRUE;
 
215
 
213
216
#ifndef DEBUG
214
217
        if (use_session_bus == FALSE && user_mode == FALSE) {
215
218