diff options
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 948926064..b89ead6e5 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/fake-queue.h" | 37 | #include "openbsd-compat/fake-queue.h" |
38 | RCSID("$OpenBSD: ssh-agent.c,v 1.90 2002/06/09 13:32:01 markus Exp $"); | 38 | RCSID("$OpenBSD: ssh-agent.c,v 1.91 2002/06/11 05:46:20 mpech Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | #include <openssl/md5.h> | 41 | #include <openssl/md5.h> |
@@ -1043,7 +1043,7 @@ main(int ac, char **av) | |||
1043 | format = c_flag ? "unsetenv %s;\n" : "unset %s;\n"; | 1043 | format = c_flag ? "unsetenv %s;\n" : "unset %s;\n"; |
1044 | printf(format, SSH_AUTHSOCKET_ENV_NAME); | 1044 | printf(format, SSH_AUTHSOCKET_ENV_NAME); |
1045 | printf(format, SSH_AGENTPID_ENV_NAME); | 1045 | printf(format, SSH_AGENTPID_ENV_NAME); |
1046 | printf("echo Agent pid %d killed;\n", pid); | 1046 | printf("echo Agent pid %ld killed;\n", (long)pid); |
1047 | exit(0); | 1047 | exit(0); |
1048 | } | 1048 | } |
1049 | parent_pid = getpid(); | 1049 | parent_pid = getpid(); |
@@ -1055,8 +1055,8 @@ main(int ac, char **av) | |||
1055 | perror("mkdtemp: private socket dir"); | 1055 | perror("mkdtemp: private socket dir"); |
1056 | exit(1); | 1056 | exit(1); |
1057 | } | 1057 | } |
1058 | snprintf(socket_name, sizeof socket_name, "%s/agent.%d", socket_dir, | 1058 | snprintf(socket_name, sizeof socket_name, "%s/agent.%ld", socket_dir, |
1059 | parent_pid); | 1059 | (long)parent_pid); |
1060 | } else { | 1060 | } else { |
1061 | /* Try to use specified agent socket */ | 1061 | /* Try to use specified agent socket */ |
1062 | socket_dir[0] = '\0'; | 1062 | socket_dir[0] = '\0'; |
@@ -1102,7 +1102,7 @@ main(int ac, char **av) | |||
1102 | format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n"; | 1102 | format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n"; |
1103 | printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name, | 1103 | printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name, |
1104 | SSH_AUTHSOCKET_ENV_NAME); | 1104 | SSH_AUTHSOCKET_ENV_NAME); |
1105 | printf("echo Agent pid %d;\n", parent_pid); | 1105 | printf("echo Agent pid %ld;\n", (long)parent_pid); |
1106 | goto skip; | 1106 | goto skip; |
1107 | } | 1107 | } |
1108 | pid = fork(); | 1108 | pid = fork(); |
@@ -1112,14 +1112,14 @@ main(int ac, char **av) | |||
1112 | } | 1112 | } |
1113 | if (pid != 0) { /* Parent - execute the given command. */ | 1113 | if (pid != 0) { /* Parent - execute the given command. */ |
1114 | close(sock); | 1114 | close(sock); |
1115 | snprintf(pidstrbuf, sizeof pidstrbuf, "%d", pid); | 1115 | snprintf(pidstrbuf, sizeof pidstrbuf, "%ld", (long)pid); |
1116 | if (ac == 0) { | 1116 | if (ac == 0) { |
1117 | format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n"; | 1117 | format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n"; |
1118 | printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name, | 1118 | printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name, |
1119 | SSH_AUTHSOCKET_ENV_NAME); | 1119 | SSH_AUTHSOCKET_ENV_NAME); |
1120 | printf(format, SSH_AGENTPID_ENV_NAME, pidstrbuf, | 1120 | printf(format, SSH_AGENTPID_ENV_NAME, pidstrbuf, |
1121 | SSH_AGENTPID_ENV_NAME); | 1121 | SSH_AGENTPID_ENV_NAME); |
1122 | printf("echo Agent pid %d;\n", pid); | 1122 | printf("echo Agent pid %ld;\n", (long)pid); |
1123 | exit(0); | 1123 | exit(0); |
1124 | } | 1124 | } |
1125 | if (setenv(SSH_AUTHSOCKET_ENV_NAME, socket_name, 1) == -1 || | 1125 | if (setenv(SSH_AUTHSOCKET_ENV_NAME, socket_name, 1) == -1 || |