diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 14:07:26 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 14:07:26 +1100 |
commit | 9096740f6c39bbd91f2484c8cf58b4996dd8564f (patch) | |
tree | 5205c22ccf2d6bd2765ff7662c7efe24620ca754 | |
parent | 91d4b12fcb045d93034b2609aaf56a4b41e6eb4f (diff) |
- deraadt@cvs.openbsd.org 2006/03/20 18:26:55
[channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
[ssh-rsa.c ssh.c sshlogin.c]
annoying spacing fixes getting in the way of real diffs
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | channels.c | 2 | ||||
-rw-r--r-- | monitor.c | 2 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 7 | ||||
-rw-r--r-- | ssh-rsa.c | 1 | ||||
-rw-r--r-- | ssh.c | 4 | ||||
-rw-r--r-- | sshlogin.c | 2 |
9 files changed, 19 insertions, 13 deletions
@@ -82,6 +82,10 @@ | |||
82 | [auth1.c auth2.c sshd.c] | 82 | [auth1.c auth2.c sshd.c] |
83 | sprinkle some ARGSUSED for table driven functions (which sometimes | 83 | sprinkle some ARGSUSED for table driven functions (which sometimes |
84 | must ignore their args) | 84 | must ignore their args) |
85 | - deraadt@cvs.openbsd.org 2006/03/20 18:26:55 | ||
86 | [channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c] | ||
87 | [ssh-rsa.c ssh.c sshlogin.c] | ||
88 | annoying spacing fixes getting in the way of real diffs | ||
85 | 89 | ||
86 | 20060325 | 90 | 20060325 |
87 | - OpenBSD CVS Sync | 91 | - OpenBSD CVS Sync |
@@ -4339,4 +4343,4 @@ | |||
4339 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4343 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4340 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4344 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4341 | 4345 | ||
4342 | $Id: ChangeLog,v 1.4265 2006/03/26 03:05:20 djm Exp $ | 4346 | $Id: ChangeLog,v 1.4266 2006/03/26 03:07:26 djm Exp $ |
diff --git a/channels.c b/channels.c index 6cb88ad44..d16493001 100644 --- a/channels.c +++ b/channels.c | |||
@@ -2877,7 +2877,7 @@ connect_local_xsocket(u_int dnr) | |||
2877 | memset(&addr, 0, sizeof(addr)); | 2877 | memset(&addr, 0, sizeof(addr)); |
2878 | addr.sun_family = AF_UNIX; | 2878 | addr.sun_family = AF_UNIX; |
2879 | snprintf(addr.sun_path, sizeof addr.sun_path, _PATH_UNIX_X, dnr); | 2879 | snprintf(addr.sun_path, sizeof addr.sun_path, _PATH_UNIX_X, dnr); |
2880 | if (connect(sock, (struct sockaddr *) & addr, sizeof(addr)) == 0) | 2880 | if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) |
2881 | return sock; | 2881 | return sock; |
2882 | close(sock); | 2882 | close(sock); |
2883 | error("connect %.100s: %.100s", addr.sun_path, strerror(errno)); | 2883 | error("connect %.100s: %.100s", addr.sun_path, strerror(errno)); |
@@ -1226,7 +1226,7 @@ mm_record_login(Session *s, struct passwd *pw) | |||
1226 | fromlen = sizeof(from); | 1226 | fromlen = sizeof(from); |
1227 | if (packet_connection_is_on_socket()) { | 1227 | if (packet_connection_is_on_socket()) { |
1228 | if (getpeername(packet_get_connection_in(), | 1228 | if (getpeername(packet_get_connection_in(), |
1229 | (struct sockaddr *) & from, &fromlen) < 0) { | 1229 | (struct sockaddr *)&from, &fromlen) < 0) { |
1230 | debug("getpeername: %.100s", strerror(errno)); | 1230 | debug("getpeername: %.100s", strerror(errno)); |
1231 | cleanup_exit(255); | 1231 | cleanup_exit(255); |
1232 | } | 1232 | } |
@@ -186,7 +186,7 @@ auth_input_request_forwarding(struct passwd * pw) | |||
186 | sunaddr.sun_family = AF_UNIX; | 186 | sunaddr.sun_family = AF_UNIX; |
187 | strlcpy(sunaddr.sun_path, auth_sock_name, sizeof(sunaddr.sun_path)); | 187 | strlcpy(sunaddr.sun_path, auth_sock_name, sizeof(sunaddr.sun_path)); |
188 | 188 | ||
189 | if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) | 189 | if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) < 0) |
190 | packet_disconnect("bind: %.100s", strerror(errno)); | 190 | packet_disconnect("bind: %.100s", strerror(errno)); |
191 | 191 | ||
192 | /* Restore the privileged uid. */ | 192 | /* Restore the privileged uid. */ |
@@ -643,7 +643,7 @@ do_pre_login(Session *s) | |||
643 | fromlen = sizeof(from); | 643 | fromlen = sizeof(from); |
644 | if (packet_connection_is_on_socket()) { | 644 | if (packet_connection_is_on_socket()) { |
645 | if (getpeername(packet_get_connection_in(), | 645 | if (getpeername(packet_get_connection_in(), |
646 | (struct sockaddr *) & from, &fromlen) < 0) { | 646 | (struct sockaddr *)&from, &fromlen) < 0) { |
647 | debug("getpeername: %.100s", strerror(errno)); | 647 | debug("getpeername: %.100s", strerror(errno)); |
648 | cleanup_exit(255); | 648 | cleanup_exit(255); |
649 | } | 649 | } |
diff --git a/ssh-agent.c b/ssh-agent.c index 17914410c..7feb898dd 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -887,7 +887,7 @@ after_select(fd_set *readset, fd_set *writeset) | |||
887 | if (FD_ISSET(sockets[i].fd, readset)) { | 887 | if (FD_ISSET(sockets[i].fd, readset)) { |
888 | slen = sizeof(sunaddr); | 888 | slen = sizeof(sunaddr); |
889 | sock = accept(sockets[i].fd, | 889 | sock = accept(sockets[i].fd, |
890 | (struct sockaddr *) &sunaddr, &slen); | 890 | (struct sockaddr *)&sunaddr, &slen); |
891 | if (sock < 0) { | 891 | if (sock < 0) { |
892 | error("accept from AUTH_SOCKET: %s", | 892 | error("accept from AUTH_SOCKET: %s", |
893 | strerror(errno)); | 893 | strerror(errno)); |
@@ -1134,7 +1134,7 @@ main(int ac, char **av) | |||
1134 | sunaddr.sun_family = AF_UNIX; | 1134 | sunaddr.sun_family = AF_UNIX; |
1135 | strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path)); | 1135 | strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path)); |
1136 | prev_mask = umask(0177); | 1136 | prev_mask = umask(0177); |
1137 | if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) { | 1137 | if (bind(sock, (struct sockaddr *) &sunaddr, sizeof(sunaddr)) < 0) { |
1138 | perror("bind"); | 1138 | perror("bind"); |
1139 | *socket_name = '\0'; /* Don't unlink any existing file */ | 1139 | *socket_name = '\0'; /* Don't unlink any existing file */ |
1140 | umask(prev_mask); | 1140 | umask(prev_mask); |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 126556466..e8a1d4b4b 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -105,7 +105,7 @@ ask_filename(struct passwd *pw, const char *prompt) | |||
105 | 105 | ||
106 | if (key_type_name == NULL) | 106 | if (key_type_name == NULL) |
107 | name = _PATH_SSH_CLIENT_ID_RSA; | 107 | name = _PATH_SSH_CLIENT_ID_RSA; |
108 | else | 108 | else { |
109 | switch (key_type_from_name(key_type_name)) { | 109 | switch (key_type_from_name(key_type_name)) { |
110 | case KEY_RSA1: | 110 | case KEY_RSA1: |
111 | name = _PATH_SSH_CLIENT_IDENTITY; | 111 | name = _PATH_SSH_CLIENT_IDENTITY; |
@@ -121,7 +121,7 @@ ask_filename(struct passwd *pw, const char *prompt) | |||
121 | exit(1); | 121 | exit(1); |
122 | break; | 122 | break; |
123 | } | 123 | } |
124 | 124 | } | |
125 | snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); | 125 | snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); |
126 | fprintf(stderr, "%s (%s): ", prompt, identity_file); | 126 | fprintf(stderr, "%s (%s): ", prompt, identity_file); |
127 | if (fgets(buf, sizeof(buf), stdin) == NULL) | 127 | if (fgets(buf, sizeof(buf), stdin) == NULL) |
@@ -316,7 +316,7 @@ get_line(FILE *fp, char *line, size_t len) | |||
316 | fprintf(stderr, "input line too long.\n"); | 316 | fprintf(stderr, "input line too long.\n"); |
317 | exit(1); | 317 | exit(1); |
318 | } | 318 | } |
319 | switch(c) { | 319 | switch (c) { |
320 | case '\r': | 320 | case '\r': |
321 | c = fgetc(fp); | 321 | c = fgetc(fp); |
322 | if (c != EOF && c != '\n' && ungetc(c, fp) == EOF) { | 322 | if (c != EOF && c != '\n' && ungetc(c, fp) == EOF) { |
@@ -1144,6 +1144,7 @@ main(int ac, char **av) | |||
1144 | break; | 1144 | break; |
1145 | case 'D': | 1145 | case 'D': |
1146 | download = 1; | 1146 | download = 1; |
1147 | /*FALLTHROUGH*/ | ||
1147 | case 'U': | 1148 | case 'U': |
1148 | reader_id = optarg; | 1149 | reader_id = optarg; |
1149 | break; | 1150 | break; |
@@ -61,6 +61,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp, | |||
61 | 61 | ||
62 | if (ok != 1) { | 62 | if (ok != 1) { |
63 | int ecode = ERR_get_error(); | 63 | int ecode = ERR_get_error(); |
64 | |||
64 | error("ssh_rsa_sign: RSA_sign failed: %s", | 65 | error("ssh_rsa_sign: RSA_sign failed: %s", |
65 | ERR_error_string(ecode, NULL)); | 66 | ERR_error_string(ecode, NULL)); |
66 | xfree(sig); | 67 | xfree(sig); |
@@ -1041,7 +1041,7 @@ ssh_control_listener(void) | |||
1041 | fatal("%s socket(): %s", __func__, strerror(errno)); | 1041 | fatal("%s socket(): %s", __func__, strerror(errno)); |
1042 | 1042 | ||
1043 | old_umask = umask(0177); | 1043 | old_umask = umask(0177); |
1044 | if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { | 1044 | if (bind(control_fd, (struct sockaddr *)&addr, addr_len) == -1) { |
1045 | control_fd = -1; | 1045 | control_fd = -1; |
1046 | if (errno == EINVAL || errno == EADDRINUSE) | 1046 | if (errno == EINVAL || errno == EADDRINUSE) |
1047 | fatal("ControlSocket %s already exists", | 1047 | fatal("ControlSocket %s already exists", |
@@ -1299,7 +1299,7 @@ control_client(const char *path) | |||
1299 | if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) | 1299 | if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) |
1300 | fatal("%s socket(): %s", __func__, strerror(errno)); | 1300 | fatal("%s socket(): %s", __func__, strerror(errno)); |
1301 | 1301 | ||
1302 | if (connect(sock, (struct sockaddr*)&addr, addr_len) == -1) { | 1302 | if (connect(sock, (struct sockaddr *)&addr, addr_len) == -1) { |
1303 | if (mux_command != SSHMUX_COMMAND_OPEN) { | 1303 | if (mux_command != SSHMUX_COMMAND_OPEN) { |
1304 | fatal("Control socket connect(%.100s): %s", path, | 1304 | fatal("Control socket connect(%.100s): %s", path, |
1305 | strerror(errno)); | 1305 | strerror(errno)); |
diff --git a/sshlogin.c b/sshlogin.c index 718c9c412..95b850acb 100644 --- a/sshlogin.c +++ b/sshlogin.c | |||
@@ -102,7 +102,7 @@ store_lastlog_message(const char *user, uid_t uid) | |||
102 | */ | 102 | */ |
103 | void | 103 | void |
104 | record_login(pid_t pid, const char *tty, const char *user, uid_t uid, | 104 | record_login(pid_t pid, const char *tty, const char *user, uid_t uid, |
105 | const char *host, struct sockaddr * addr, socklen_t addrlen) | 105 | const char *host, struct sockaddr *addr, socklen_t addrlen) |
106 | { | 106 | { |
107 | struct logininfo *li; | 107 | struct logininfo *li; |
108 | 108 | ||