* 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

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 6725f1e1a6ddade2c6a85380bf041ee2c230cb3c..2ea1c752a44a5cf57ae5bfd4f24a1a62039d5990 100644 (file)
--- 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 318d2da4fdbb6624965f3a07dcfd6578d4d9865d..b0d1933ed229014bfd5f1af7e3f35c4c0fee7853 100644 (file)
--- 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 36f7e1309bc7df0ed7feda0dbb3d37960c4df716..846819a8f526abec7ac99a1e69a057e55a2098f8 100644 (file)
--- 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;