summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth2-none.c4
-rw-r--r--monitor.c4
-rw-r--r--sftp-client.c4
4 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b2d8477..beef5339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
- deraadt@cvs.openbsd.org 2002/06/27 09:08:00
[monitor.c]
improve mm_zalloc check; markus ok
+ - deraadt@cvs.openbsd.org 2002/06/27 10:35:47
+ [auth2-none.c monitor.c sftp-client.c]
+ use xfree()
20020702
- (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@@ -1217,4 +1220,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2317 2002/07/04 00:05:06 mouring Exp $
+$Id: ChangeLog,v 1.2318 2002/07/04 00:06:15 mouring Exp $
diff --git a/auth2-none.c b/auth2-none.c
index 720d3c10..c07b2dd8 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.3 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.4 2002/06/27 10:35:47 deraadt Exp $");
#include "auth.h"
#include "xmalloc.h"
@@ -61,7 +61,7 @@ auth2_read_banner(void)
close(fd);
if (n != len) {
- free(banner);
+ xfree(banner);
return (NULL);
}
banner[n] = '\0';
diff --git a/monitor.c b/monitor.c
index 1ac22782..148b02e5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.20 2002/06/27 09:08:00 deraadt Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.21 2002/06/27 10:35:47 deraadt Exp $");
#include <openssl/dh.h>
@@ -559,7 +559,7 @@ int mm_answer_auth2_read_banner(int socket, Buffer *m)
mm_request_send(socket, MONITOR_ANS_AUTH2_READ_BANNER, m);
if (banner != NULL)
- free(banner);
+ xfree(banner);
return (0);
}
diff --git a/sftp-client.c b/sftp-client.c
index 10b7992d..c797482a 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -28,7 +28,7 @@
/* XXX: copy between two remote sites */
#include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.33 2002/06/23 09:30:14 deraadt Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.34 2002/06/27 10:35:47 deraadt Exp $");
#include "openbsd-compat/fake-queue.h"
@@ -1095,7 +1095,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
debug3("In write loop, ack for %u %u bytes at %llu",
ack->id, ack->len, (unsigned long long)ack->offset);
++ackid;
- free(ack);
+ xfree(ack);
}
offset += len;
}