~ubuntu-dev/ubuntu/lucid/dovecot/lucid-201002101901

« back to all changes in this revision

Viewing changes to src/deliver/deliver.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-05-26 09:51:01 UTC
  • mto: (4.1.1 lenny) (1.11.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: james.westby@ubuntu.com-20080526095101-qgoz480srtn2rf89
Tags: upstream-1.0.13
ImportĀ upstreamĀ versionĀ 1.0.13

Show diffs side-by-side

added added

removed removed

Lines of Context:
616
616
        /* Clean up environment. */
617
617
        env_tz = getenv("TZ");
618
618
        home = getenv("HOME");
 
619
        user = getenv("USER");
619
620
        env_clean();
620
621
        if (env_tz != NULL)
621
622
                env_put(t_strconcat("TZ=", env_tz, NULL));
683
684
                        user = t_strdup(pw->pw_name);
684
685
                        if (getenv("HOME") == NULL)
685
686
                                env_put(t_strconcat("HOME=", pw->pw_dir, NULL));
686
 
                } else {
687
 
                        i_fatal("Couldn't lookup our username (uid=%s)",
688
 
                                dec2str(process_euid));
 
687
                } else if (user == NULL) {
 
688
                        i_fatal_status(EX_USAGE,
 
689
                                       "Couldn't lookup our username (uid=%s)",
 
690
                                       dec2str(process_euid));
689
691
                }
690
692
        } else {
691
693
                i_fatal_status(EX_USAGE,