envelope.c (42575) | envelope.c (43730) |
---|---|
1/* 2 * Copyright (c) 1998 Sendmail, Inc. All rights reserved. 3 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 4 * Copyright (c) 1988, 1993 5 * The Regents of the University of California. All rights reserved. 6 * 7 * By using this file, you agree to the terms and conditions set 8 * forth in the LICENSE file which can be found at the top level of 9 * the sendmail distribution. 10 * 11 */ 12 13#ifndef lint | 1/* 2 * Copyright (c) 1998 Sendmail, Inc. All rights reserved. 3 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 4 * Copyright (c) 1988, 1993 5 * The Regents of the University of California. All rights reserved. 6 * 7 * By using this file, you agree to the terms and conditions set 8 * forth in the LICENSE file which can be found at the top level of 9 * the sendmail distribution. 10 * 11 */ 12 13#ifndef lint |
14static char sccsid[] = "@(#)envelope.c 8.121 (Berkeley) 12/18/1998"; | 14static char sccsid[] = "@(#)envelope.c 8.122 (Berkeley) 1/25/1999"; |
15#endif /* not lint */ 16 17#include "sendmail.h" 18 19/* 20** NEWENVELOPE -- allocate a new envelope 21** 22** Supports inheritance. --- 772 unchanged lines hidden (view full) --- 795 } 796 else 797 { 798 e->e_from.q_home = "/no/such/directory"; 799 } 800 if (FullName != NULL && !internal) 801 define('x', FullName, e); 802 } | 15#endif /* not lint */ 16 17#include "sendmail.h" 18 19/* 20** NEWENVELOPE -- allocate a new envelope 21** 22** Supports inheritance. --- 772 unchanged lines hidden (view full) --- 795 } 796 else 797 { 798 e->e_from.q_home = "/no/such/directory"; 799 } 800 if (FullName != NULL && !internal) 801 define('x', FullName, e); 802 } |
803 else if (!internal && OpMode != MD_DAEMON) | 803 else if (!internal && OpMode != MD_DAEMON && OpMode != MD_SMTP) |
804 { 805 if (e->e_from.q_home == NULL) 806 { 807 e->e_from.q_home = getenv("HOME"); 808 if (e->e_from.q_home != NULL && 809 strcmp(e->e_from.q_home, "/") == 0) 810 e->e_from.q_home++; 811 } --- 127 unchanged lines hidden --- | 804 { 805 if (e->e_from.q_home == NULL) 806 { 807 e->e_from.q_home = getenv("HOME"); 808 if (e->e_from.q_home != NULL && 809 strcmp(e->e_from.q_home, "/") == 0) 810 e->e_from.q_home++; 811 } --- 127 unchanged lines hidden --- |