diff options
| author | tg <tg@FreeBSD.org> | 1997-09-05 11:44:00 +0000 |
|---|---|---|
| committer | tg <tg@FreeBSD.org> | 1997-09-05 11:44:00 +0000 |
| commit | 572d82313f682971f03ba47c832271490846a004 (patch) | |
| tree | b83a634d2eda2115936b2faf828f4c6fc1c1a904 /libexec | |
| parent | ac3b66e27a37035f1c56d55a323e1a29a6105ef4 (diff) | |
| download | FreeBSD-src-572d82313f682971f03ba47c832271490846a004.zip FreeBSD-src-572d82313f682971f03ba47c832271490846a004.tar.gz | |
Hopefully better fix for logwtmp(): rename to a private
version ftpd_logwtmp().
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/extern.h | 3 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 8 | ||||
| -rw-r--r-- | libexec/ftpd/logwtmp.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h index 035b320..f4da903 100644 --- a/libexec/ftpd/extern.h +++ b/libexec/ftpd/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/4/94 - * $Id: extern.h,v 1.9 1997/04/26 12:12:10 davidn Exp $ + * $Id: extern.h,v 1.10 1997/09/05 11:17:22 tg Exp $ */ void blkfree __P((char **)); @@ -40,6 +40,7 @@ void cwd __P((char *)); void delete __P((char *)); void dologout __P((int)); void fatal __P((char *)); +void ftpd_logwtmp __P((char *, char *, char *)); int ftpd_pclose __P((FILE *)); FILE *ftpd_popen __P((char *, char *)); char *getline __P((char *, int, FILE *)); diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 37407a3..d961546 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ftpd.c,v 1.40 1997/05/21 23:24:41 danny Exp $ + * $Id: ftpd.c,v 1.41 1997/07/24 09:26:12 davidn Exp $ */ #if 0 @@ -889,7 +889,7 @@ end_login() (void) seteuid((uid_t)0); if (logged_in) - logwtmp(ttyline, "", ""); + ftpd_logwtmp(ttyline, "", ""); pw = NULL; #ifdef LOGIN_CAP setusercontext(NULL, getpwuid(0), (uid_t)0, @@ -994,7 +994,7 @@ skip: #endif /* open wtmp before chroot */ - logwtmp(ttyline, pw->pw_name, remotehost); + ftpd_logwtmp(ttyline, pw->pw_name, remotehost); logged_in = 1; if (guest && stats && statfd < 0) @@ -1932,7 +1932,7 @@ dologout(status) if (logged_in) { (void) seteuid((uid_t)0); - logwtmp(ttyline, "", ""); + ftpd_logwtmp(ttyline, "", ""); #if defined(KERBEROS) if (!notickets && krbtkfile_env) unlink(krbtkfile_env); diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c index 9562795..25deb506 100644 --- a/libexec/ftpd/logwtmp.c +++ b/libexec/ftpd/logwtmp.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: logwtmp.c,v 1.5 1997/02/22 14:21:29 peter Exp $ */ #ifndef lint @@ -59,7 +59,7 @@ static int fd = -1; * after login, but before logout). */ void -logwtmp(line, name, host) +ftpd_logwtmp(line, name, host) char *line, *name, *host; { struct utmp ut; |
