Deleted Added
full compact
opieftpd.c (39012) opieftpd.c (59121)
1/* opieftpd.c: Main program for an FTP daemon.
2
3%%% portions-copyright-cmetz-96
1/* opieftpd.c: Main program for an FTP daemon.
2
3%%% portions-copyright-cmetz-96
4Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
4Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
5Reserved. The Inner Net License Version 2 applies to these portions of
6the software.
7You should have received a copy of the license with this software. If
8you didn't get a copy, you may request one from <license@inner.net>.
9
10Portions of this software are Copyright 1995 by Randall Atkinson and Dan
11McDonald, All Rights Reserved. All Rights under this copyright are assigned
12to the U.S. Naval Research Laboratory (NRL). The NRL Copyright Notice and
13License Agreement applies to this software.
14
15 History:
16
5Reserved. The Inner Net License Version 2 applies to these portions of
6the software.
7You should have received a copy of the license with this software. If
8you didn't get a copy, you may request one from <license@inner.net>.
9
10Portions of this software are Copyright 1995 by Randall Atkinson and Dan
11McDonald, All Rights Reserved. All Rights under this copyright are assigned
12to the U.S. Naval Research Laboratory (NRL). The NRL Copyright Notice and
13License Agreement applies to this software.
14
15 History:
16
17 Modified by cmetz for OPIE 2.32. Remove include of dirent.h here; it's
18 done already (and conditionally) in opie_cfg.h.
17 Modified by cmetz for OPIE 2.31. Merged in some 4.4BSD-Lite changes.
18 Merged in a security fix to BSD-derived ftpds.
19 Modified by cmetz for OPIE 2.3. Fixed the filename at the top.
20 Moved LS_COMMAND here.
21 Modified by cmetz for OPIE 2.2. Use FUNCTION definition et al.
22 Removed useless strings (I don't think that removing the
23 ucb copyright one is a problem -- please let me know if
24 I'm wrong). Changed default CMASK to 077. Removed random

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

38 Properly handle internal state for anonymous FTP. Unlock
39 user accounts properly if login fails because of /etc/shells.
40 Make sure to close syslog by function to avoid problems with
41 drain bamaged syslog implementations.
42 Modified at NRL for OPIE 2.0.
43 Originally from BSD Net/2.
44
45 There is some really, really ugly code in here.
19 Modified by cmetz for OPIE 2.31. Merged in some 4.4BSD-Lite changes.
20 Merged in a security fix to BSD-derived ftpds.
21 Modified by cmetz for OPIE 2.3. Fixed the filename at the top.
22 Moved LS_COMMAND here.
23 Modified by cmetz for OPIE 2.2. Use FUNCTION definition et al.
24 Removed useless strings (I don't think that removing the
25 ucb copyright one is a problem -- please let me know if
26 I'm wrong). Changed default CMASK to 077. Removed random

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

40 Properly handle internal state for anonymous FTP. Unlock
41 user accounts properly if login fails because of /etc/shells.
42 Make sure to close syslog by function to avoid problems with
43 drain bamaged syslog implementations.
44 Modified at NRL for OPIE 2.0.
45 Originally from BSD Net/2.
46
47 There is some really, really ugly code in here.
48
49$FreeBSD: head/contrib/opie/opieftpd.c 59121 2000-04-10 11:18:54Z kris $
46*/
47/*
48 * Copyright (c) 1985, 1988, 1990 Regents of the University of California.
49 * All rights reserved.
50 *
51 * Redistribution and use in source and binary forms, with or without
52 * modification, are permitted provided that the following conditions
53 * are met:

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

106#include <netinet/ip.h>
107
108#define FTP_NAMES
109#include <arpa/ftp.h>
110#include <arpa/inet.h>
111#include <arpa/telnet.h>
112
113#include <signal.h>
50*/
51/*
52 * Copyright (c) 1985, 1988, 1990 Regents of the University of California.
53 * All rights reserved.
54 *
55 * Redistribution and use in source and binary forms, with or without
56 * modification, are permitted provided that the following conditions
57 * are met:

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

110#include <netinet/ip.h>
111
112#define FTP_NAMES
113#include <arpa/ftp.h>
114#include <arpa/inet.h>
115#include <arpa/telnet.h>
116
117#include <signal.h>
114#include <dirent.h>
115#include <fcntl.h>
116#if HAVE_TIME_H
117#include <time.h>
118#endif /* HAVE_TIME_H */
119#if HAVE_PWD_H
120#include <pwd.h>
121#endif /* HAVE_PWD_H */
122#include <setjmp.h>

--- 1591 unchanged lines hidden ---
118#include <fcntl.h>
119#if HAVE_TIME_H
120#include <time.h>
121#endif /* HAVE_TIME_H */
122#if HAVE_PWD_H
123#include <pwd.h>
124#endif /* HAVE_PWD_H */
125#include <setjmp.h>

--- 1591 unchanged lines hidden ---