diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | auth2-jpake.c | 2 | ||||
-rw-r--r-- | auth2.c | 2 | ||||
-rw-r--r-- | canohost.h | 2 | ||||
-rw-r--r-- | session.c | 6 |
5 files changed, 8 insertions, 6 deletions
@@ -105,6 +105,8 @@ | |||
105 | [roaming.h roaming_common.c roaming_dummy.c] | 105 | [roaming.h roaming_common.c roaming_dummy.c] |
106 | Add tags for the benefit of the sync scripts | 106 | Add tags for the benefit of the sync scripts |
107 | Also: pull in the changes for 1.1->1.2 missed in the previous sync. | 107 | Also: pull in the changes for 1.1->1.2 missed in the previous sync. |
108 | - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and | ||
109 | header-order changes to reduce diff vs OpenBSD. | ||
108 | 110 | ||
109 | 20090616 | 111 | 20090616 |
110 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t | 112 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t |
diff --git a/auth2-jpake.c b/auth2-jpake.c index 6092e31c0..5de5506a6 100644 --- a/auth2-jpake.c +++ b/auth2-jpake.c | |||
@@ -42,8 +42,8 @@ | |||
42 | #include "ssh2.h" | 42 | #include "ssh2.h" |
43 | #include "key.h" | 43 | #include "key.h" |
44 | #include "hostfile.h" | 44 | #include "hostfile.h" |
45 | #include "buffer.h" | ||
46 | #include "auth.h" | 45 | #include "auth.h" |
46 | #include "buffer.h" | ||
47 | #include "packet.h" | 47 | #include "packet.h" |
48 | #include "dispatch.h" | 48 | #include "dispatch.h" |
49 | #include "log.h" | 49 | #include "log.h" |
@@ -35,8 +35,8 @@ | |||
35 | #include <string.h> | 35 | #include <string.h> |
36 | #include <unistd.h> | 36 | #include <unistd.h> |
37 | 37 | ||
38 | #include "xmalloc.h" | ||
39 | #include "atomicio.h" | 38 | #include "atomicio.h" |
39 | #include "xmalloc.h" | ||
40 | #include "ssh2.h" | 40 | #include "ssh2.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
42 | #include "log.h" | 42 | #include "log.h" |
diff --git a/canohost.h b/canohost.h index 64000f5eb..4c8636f42 100644 --- a/canohost.h +++ b/canohost.h | |||
@@ -24,6 +24,6 @@ char *get_local_name(int); | |||
24 | int get_remote_port(void); | 24 | int get_remote_port(void); |
25 | int get_local_port(void); | 25 | int get_local_port(void); |
26 | int get_sock_port(int, int); | 26 | int get_sock_port(int, int); |
27 | void clear_cached_addr(void); | 27 | void clear_cached_addr(void); |
28 | 28 | ||
29 | void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); | 29 | void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); |
@@ -715,8 +715,8 @@ do_exec_pty(Session *s, const char *command) | |||
715 | * Do common processing for the child, such as execing | 715 | * Do common processing for the child, such as execing |
716 | * the command. | 716 | * the command. |
717 | */ | 717 | */ |
718 | do_child(s, command); | 718 | do_child(s, command); |
719 | /* NOTREACHED */ | 719 | /* NOTREACHED */ |
720 | default: | 720 | default: |
721 | break; | 721 | break; |
722 | } | 722 | } |
@@ -845,7 +845,7 @@ do_login(Session *s, const char *command) | |||
845 | fromlen = sizeof(from); | 845 | fromlen = sizeof(from); |
846 | if (packet_connection_is_on_socket()) { | 846 | if (packet_connection_is_on_socket()) { |
847 | if (getpeername(packet_get_connection_in(), | 847 | if (getpeername(packet_get_connection_in(), |
848 | (struct sockaddr *) & from, &fromlen) < 0) { | 848 | (struct sockaddr *)&from, &fromlen) < 0) { |
849 | debug("getpeername: %.100s", strerror(errno)); | 849 | debug("getpeername: %.100s", strerror(errno)); |
850 | cleanup_exit(255); | 850 | cleanup_exit(255); |
851 | } | 851 | } |