diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2010-01-18 23:28:25 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2010-01-18 23:28:25 +0000 |
| commit | 9f37b1a2b4ce5b2e8a1654ce3b08dbacf05d5752 (patch) | |
| tree | 3d7ae6e665c9d60ca180e51a118a53d6511e1ed3 /libexec | |
| parent | 12a91a43876a60c1da51cf2e7081168a80d661c1 (diff) | |
Notes
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 13 | ||||
| -rw-r--r-- | libexec/ftpd/logwtmp.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 681fdc342881a..119c575431056 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1178,8 +1178,8 @@ end_login(void) #endif (void) seteuid(0); - if (logged_in && dowtmp && !dochroot) - ftpd_logwtmp(wtmpid, "", NULL); + if (logged_in && dowtmp) + ftpd_logwtmp(wtmpid, NULL, NULL); pw = NULL; #ifdef LOGIN_CAP setusercontext(NULL, getpwuid(0), 0, @@ -1482,7 +1482,10 @@ skip: ; chrootdir = NULL; - if (dowtmp && !dochroot) + /* Disable wtmp logging when chrooting. */ + if (dochroot || guest) + dowtmp = 0; + if (dowtmp) ftpd_logwtmp(wtmpid, pw->pw_name, (struct sockaddr *)&his_addr); logged_in = 1; @@ -2730,9 +2733,9 @@ void dologout(int status) { - if (logged_in && dowtmp && !dochroot) { + if (logged_in && dowtmp) { (void) seteuid(0); - ftpd_logwtmp(wtmpid, "", NULL); + ftpd_logwtmp(wtmpid, NULL, NULL); } /* beware of flushing buffers after a SIGPIPE */ _exit(status); diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c index 3d810dd4b649a..82683f53530bc 100644 --- a/libexec/ftpd/logwtmp.c +++ b/libexec/ftpd/logwtmp.c @@ -60,7 +60,7 @@ ftpd_logwtmp(char *id, char *user, struct sockaddr *addr) memset(&ut, 0, sizeof(ut)); - if (*user != '\0') { + if (user != NULL) { /* Log in. */ ut.ut_type = USER_PROCESS; (void)strncpy(ut.ut_user, user, sizeof(ut.ut_user)); |