about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Modules/tcp.c2
-rw-r--r--Src/Modules/zftp.c6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 89d29e708..12294b8f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-18  Peter Stephenson  <pws@csr.com>
+
+	* 17011: Src/Modules/tcp.c, Src/Modules/zftp.c: restore
+	freehostent() incorrectly removed in 16172.
+
 2002-04-17  Peter Stephenson  <pws@csr.com>
 
 	* Alexandre Duret-Lutz: 16930: Src/cond.c, Test/C02cond.ztst:
diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c
index 9109ca7c1..eb4685b39 100644
--- a/Src/Modules/tcp.c
+++ b/Src/Modules/tcp.c
@@ -194,7 +194,7 @@ zsh_getipnodebyname(char const *name, int af, int flags, int *errorp)
 
 /**/
 mod_export void
-zfreehostent(struct hostent *ptr)
+freehostent(struct hostent *ptr)
 {
 }
 
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index 9408c7a1f..6ee0f0156 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -1793,7 +1793,7 @@ zftp_open(char *name, char **args, int flags)
 		tcp_close(zfsess->control);
 		zfsess->control = NULL;
 	    }
-	    zfreehostent(zhostp);
+	    freehostent(zhostp);
 	    zfunsetparam("ZFTP_HOST");
 	    FAILED();
 	    zwarnnam(name, "socket failed: %e", NULL, errno);
@@ -1821,7 +1821,7 @@ zftp_open(char *name, char **args, int flags)
 	}
 
 	if (err) {
-	    zfreehostent(zhostp);
+	    freehostent(zhostp);
 	    zfclose(0);
 	    FAILED();
 	    zwarnnam(name, "connect failed: %e", NULL, errno);
@@ -1842,7 +1842,7 @@ zftp_open(char *name, char **args, int flags)
 	zsh_inet_ntop(af, *addrp, pbuf, sizeof(pbuf));
 	zfsetparam("ZFTP_IP", ztrdup(pbuf), ZFPM_READONLY);
     }
-    zfreehostent(zhostp);
+    freehostent(zhostp);
     /* now we can talk to the control connection */
     zcfinish = 0;