summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-10-15 16:10:25 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-10-15 16:10:25 +1000
commit072a7b178c5fc52fd249d12519804c60c26da253 (patch)
tree42cb0fbf467723c31fb54ec9b97ae6d60f4e64dd
parent64b77bcb4b40c97eb1da058ee5648da1a34c3b63 (diff)
- markus@cvs.openbsd.org 2003/10/14 19:54:39
[session.c ssh-agent.c] 10X for mkdtemp; djm@
-rw-r--r--ChangeLog5
-rw-r--r--session.c4
-rw-r--r--ssh-agent.c4
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d0201a71..650d611dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
36 - jakob@cvs.openbsd.org 2003/10/14 19:43:23 36 - jakob@cvs.openbsd.org 2003/10/14 19:43:23
37 [README.dns] 37 [README.dns]
38 update 38 update
39 - markus@cvs.openbsd.org 2003/10/14 19:54:39
40 [session.c ssh-agent.c]
41 10X for mkdtemp; djm@
39 42
4020031009 4320031009
41 - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ 44 - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@
@@ -1353,4 +1356,4 @@
1353 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1356 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1354 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1357 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1355 1358
1356$Id: ChangeLog,v 1.3078 2003/10/15 06:07:53 dtucker Exp $ 1359$Id: ChangeLog,v 1.3079 2003/10/15 06:10:25 dtucker Exp $
diff --git a/session.c b/session.c
index 8aa2b9015..2b228906d 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.165 2003/09/23 20:17:11 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.166 2003/10/14 19:54:39 markus Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -144,7 +144,7 @@ auth_input_request_forwarding(struct passwd * pw)
144 /* Allocate a buffer for the socket name, and format the name. */ 144 /* Allocate a buffer for the socket name, and format the name. */
145 auth_sock_name = xmalloc(MAXPATHLEN); 145 auth_sock_name = xmalloc(MAXPATHLEN);
146 auth_sock_dir = xmalloc(MAXPATHLEN); 146 auth_sock_dir = xmalloc(MAXPATHLEN);
147 strlcpy(auth_sock_dir, "/tmp/ssh-XXXXXXXX", MAXPATHLEN); 147 strlcpy(auth_sock_dir, "/tmp/ssh-XXXXXXXXXX", MAXPATHLEN);
148 148
149 /* Create private directory for socket */ 149 /* Create private directory for socket */
150 if (mkdtemp(auth_sock_dir) == NULL) { 150 if (mkdtemp(auth_sock_dir) == NULL) {
diff --git a/ssh-agent.c b/ssh-agent.c
index 0fe877299..d595479f9 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
35 35
36#include "includes.h" 36#include "includes.h"
37#include "openbsd-compat/sys-queue.h" 37#include "openbsd-compat/sys-queue.h"
38RCSID("$OpenBSD: ssh-agent.c,v 1.114 2003/09/23 20:17:11 markus Exp $"); 38RCSID("$OpenBSD: ssh-agent.c,v 1.115 2003/10/14 19:54:39 markus Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41#include <openssl/md5.h> 41#include <openssl/md5.h>
@@ -1100,7 +1100,7 @@ main(int ac, char **av)
1100 1100
1101 if (agentsocket == NULL) { 1101 if (agentsocket == NULL) {
1102 /* Create private directory for agent socket */ 1102 /* Create private directory for agent socket */
1103 strlcpy(socket_dir, "/tmp/ssh-XXXXXXXX", sizeof socket_dir); 1103 strlcpy(socket_dir, "/tmp/ssh-XXXXXXXXXX", sizeof socket_dir);
1104 if (mkdtemp(socket_dir) == NULL) { 1104 if (mkdtemp(socket_dir) == NULL) {
1105 perror("mkdtemp: private socket dir"); 1105 perror("mkdtemp: private socket dir");
1106 exit(1); 1106 exit(1);