diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 19:50:08 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 19:50:08 +1000 |
commit | 43e7a358ff9476fb77bc1b475530ce4c6b152ccc (patch) | |
tree | 250c5aa73744f0cb1bacbdf28a6d1c9ea8ef05b8 | |
parent | e6b590e8d40e2b2ab0aab9da1b7d34cd357caf6a (diff) | |
download | openssh-git-43e7a358ff9476fb77bc1b475530ce4c6b152ccc.tar.gz |
- (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
header-order changes to reduce diff vs OpenBSD.
-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 @@ [roaming.h roaming_common.c roaming_dummy.c] Add tags for the benefit of the sync scripts Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. 20090616 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t diff --git a/auth2-jpake.c b/auth2-jpake.c index 6092e31c..5de5506a 100644 --- a/auth2-jpake.c +++ b/auth2-jpake.c @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" -#include "buffer.h" #include "auth.h" +#include "buffer.h" #include "packet.h" #include "dispatch.h" #include "log.h" @@ -35,8 +35,8 @@ #include <string.h> #include <unistd.h> -#include "xmalloc.h" #include "atomicio.h" +#include "xmalloc.h" #include "ssh2.h" #include "packet.h" #include "log.h" @@ -24,6 +24,6 @@ char *get_local_name(int); int get_remote_port(void); int get_local_port(void); int get_sock_port(int, int); -void clear_cached_addr(void); +void clear_cached_addr(void); void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); @@ -715,8 +715,8 @@ do_exec_pty(Session *s, const char *command) * Do common processing for the child, such as execing * the command. */ - do_child(s, command); - /* NOTREACHED */ + do_child(s, command); + /* NOTREACHED */ default: break; } @@ -845,7 +845,7 @@ do_login(Session *s, const char *command) fromlen = sizeof(from); if (packet_connection_is_on_socket()) { if (getpeername(packet_get_connection_in(), - (struct sockaddr *) & from, &fromlen) < 0) { + (struct sockaddr *)&from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); cleanup_exit(255); } |