diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-12-21 23:30:56 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-12-21 23:30:56 +0000 |
| commit | 2e833bedc1ddb766b4b4fc18868b620102aef31e (patch) | |
| tree | 0a846f8084736e6cdf692da0fc535a24bd1fb099 /src | |
| parent | 2d54f691867bef2a9bce59efec0608b63fedeb9a (diff) | |
| download | krb5-2e833bedc1ddb766b4b4fc18868b620102aef31e.tar.gz krb5-2e833bedc1ddb766b4b4fc18868b620102aef31e.tar.xz krb5-2e833bedc1ddb766b4b4fc18868b620102aef31e.zip | |
* logwtmp.c (ftp_logwtmp): Rename logwtmp to ftp_logwtmp to avoid
collision with native logwtmp. Also, return void rather than
int.
* ftpd.c: Rename logwtmp to ftp_logwtmp to avoid collision with
native logwtmp.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10341 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/gssftp/ftpd/ChangeLog | 9 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/ftpd.c | 6 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/logwtmp.c | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index 6725f1e1a..2ea1c752a 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,12 @@ +Sun Dec 21 18:17:53 1997 Tom Yu <tlyu@mit.edu> + + * logwtmp.c (ftp_logwtmp): Rename logwtmp to ftp_logwtmp to avoid + collision with native logwtmp. Also, return void rather than + int. + + * ftpd.c: Rename logwtmp to ftp_logwtmp to avoid collision with + native logwtmp. + Thu Dec 11 23:28:07 1997 Tom Yu <tlyu@mit.edu> * ftpd.c: Don't include netdb.h or sys/socket.h if krb.h is diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c index 318d2da4f..b0d1933ed 100644 --- a/src/appl/gssftp/ftpd/ftpd.c +++ b/src/appl/gssftp/ftpd/ftpd.c @@ -700,7 +700,7 @@ end_login() (void) seteuid((uid_t)0); if (logged_in) - logwtmp(ttyline, "", ""); + ftp_logwtmp(ttyline, "", ""); pw = NULL; logged_in = 0; guest = 0; @@ -814,7 +814,7 @@ pass(passwd) /* open wtmp before chroot */ (void)sprintf(ttyline, "ftp%d", getpid()); - logwtmp(ttyline, pw->pw_name, remotehost); + ftp_logwtmp(ttyline, pw->pw_name, remotehost); logged_in = 1; if (guest) { @@ -1684,7 +1684,7 @@ dologout(status) { if (logged_in) { (void) seteuid((uid_t)0); - logwtmp(ttyline, "", ""); + ftp_logwtmp(ttyline, "", ""); } /* beware of flushing buffers after a SIGPIPE */ _exit(status); diff --git a/src/appl/gssftp/ftpd/logwtmp.c b/src/appl/gssftp/ftpd/logwtmp.c index 36f7e1309..846819a8f 100644 --- a/src/appl/gssftp/ftpd/logwtmp.c +++ b/src/appl/gssftp/ftpd/logwtmp.c @@ -59,7 +59,7 @@ static int fd = -1; * after first call, for use with ftp (which may chroot * after login, but before logout). */ -logwtmp(line, name, host) +void ftp_logwtmp(line, name, host) char *line, *name, *host; { struct utmp ut; |