Deleted Added
full compact
ftpd.c (27650) ftpd.c (29140)
1/*
2 * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*
2 * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $Id: ftpd.c,v 1.40 1997/05/21 23:24:41 danny Exp $
33 * $Id: ftpd.c,v 1.41 1997/07/24 09:26:12 davidn Exp $
34 */
35
36#if 0
37#ifndef lint
38static char copyright[] =
39"@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994\n\
40 The Regents of the University of California. All rights reserved.\n";
41#endif /* not lint */

--- 842 unchanged lines hidden (view full) ---

884 * used when USER command is given or login fails.
885 */
886static void
887end_login()
888{
889
890 (void) seteuid((uid_t)0);
891 if (logged_in)
34 */
35
36#if 0
37#ifndef lint
38static char copyright[] =
39"@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994\n\
40 The Regents of the University of California. All rights reserved.\n";
41#endif /* not lint */

--- 842 unchanged lines hidden (view full) ---

884 * used when USER command is given or login fails.
885 */
886static void
887end_login()
888{
889
890 (void) seteuid((uid_t)0);
891 if (logged_in)
892 logwtmp(ttyline, "", "");
892 ftpd_logwtmp(ttyline, "", "");
893 pw = NULL;
894#ifdef LOGIN_CAP
895 setusercontext(NULL, getpwuid(0), (uid_t)0,
896 LOGIN_SETPRIORITY|LOGIN_SETRESOURCES|LOGIN_SETUMASK);
897#endif
898 logged_in = 0;
899 guest = 0;
900 dochroot = 0;

--- 88 unchanged lines hidden (view full) ---

989 }
990 setusercontext(lc, pw, (uid_t)0,
991 LOGIN_SETGROUP|LOGIN_SETPRIORITY|LOGIN_SETRESOURCES|LOGIN_SETUMASK);
992#else
993 (void) initgroups(pw->pw_name, pw->pw_gid);
994#endif
995
996 /* open wtmp before chroot */
893 pw = NULL;
894#ifdef LOGIN_CAP
895 setusercontext(NULL, getpwuid(0), (uid_t)0,
896 LOGIN_SETPRIORITY|LOGIN_SETRESOURCES|LOGIN_SETUMASK);
897#endif
898 logged_in = 0;
899 guest = 0;
900 dochroot = 0;

--- 88 unchanged lines hidden (view full) ---

989 }
990 setusercontext(lc, pw, (uid_t)0,
991 LOGIN_SETGROUP|LOGIN_SETPRIORITY|LOGIN_SETRESOURCES|LOGIN_SETUMASK);
992#else
993 (void) initgroups(pw->pw_name, pw->pw_gid);
994#endif
995
996 /* open wtmp before chroot */
997 logwtmp(ttyline, pw->pw_name, remotehost);
997 ftpd_logwtmp(ttyline, pw->pw_name, remotehost);
998 logged_in = 1;
999
1000 if (guest && stats && statfd < 0)
1001#ifdef VIRTUAL_HOSTING
1002 if ((statfd = open(thishost->statfile, O_WRONLY|O_APPEND)) < 0)
1003#else
1004 if ((statfd = open(_PATH_FTPDSTATFILE, O_WRONLY|O_APPEND)) < 0)
1005#endif

--- 921 unchanged lines hidden (view full) ---

1927 /*
1928 * Prevent reception of SIGURG from resulting in a resumption
1929 * back to the main program loop.
1930 */
1931 transflag = 0;
1932
1933 if (logged_in) {
1934 (void) seteuid((uid_t)0);
998 logged_in = 1;
999
1000 if (guest && stats && statfd < 0)
1001#ifdef VIRTUAL_HOSTING
1002 if ((statfd = open(thishost->statfile, O_WRONLY|O_APPEND)) < 0)
1003#else
1004 if ((statfd = open(_PATH_FTPDSTATFILE, O_WRONLY|O_APPEND)) < 0)
1005#endif

--- 921 unchanged lines hidden (view full) ---

1927 /*
1928 * Prevent reception of SIGURG from resulting in a resumption
1929 * back to the main program loop.
1930 */
1931 transflag = 0;
1932
1933 if (logged_in) {
1934 (void) seteuid((uid_t)0);
1935 logwtmp(ttyline, "", "");
1935 ftpd_logwtmp(ttyline, "", "");
1936#if defined(KERBEROS)
1937 if (!notickets && krbtkfile_env)
1938 unlink(krbtkfile_env);
1939#endif
1940 }
1941 /* beware of flushing buffers after a SIGPIPE */
1942 _exit(status);
1943}

--- 347 unchanged lines hidden ---
1936#if defined(KERBEROS)
1937 if (!notickets && krbtkfile_env)
1938 unlink(krbtkfile_env);
1939#endif
1940 }
1941 /* beware of flushing buffers after a SIGPIPE */
1942 _exit(status);
1943}

--- 347 unchanged lines hidden ---