diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 05:01:22 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 05:01:22 +0000 |
commit | bba81213b972ce15fbbaca60b9ffabb42371ce8f (patch) | |
tree | e6bd40752969f2b93d179cfb9aaae9074ca45956 /ssh.c | |
parent | 34f91883a6f3123656b0a8017d68b658f7cf2403 (diff) |
- itojun@cvs.openbsd.org 2001/06/23 15:12:20
[auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c
canohost.c channels.c cipher.c clientloop.c deattack.c dh.c
hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c
readpass.c scp.c servconf.c serverloop.c session.c sftp.c
sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c
ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c
ssh-keygen.c ssh-keyscan.c]
more strict prototypes. raise warning level in Makefile.inc.
markus ok'ed
TODO; cleanup headers
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.125 2001/06/22 23:35:21 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.126 2001/06/23 15:12:21 itojun Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -148,7 +148,7 @@ int subsystem_flag = 0; | |||
148 | 148 | ||
149 | /* Prints a help message to the user. This function never returns. */ | 149 | /* Prints a help message to the user. This function never returns. */ |
150 | 150 | ||
151 | void | 151 | static void |
152 | usage(void) | 152 | usage(void) |
153 | { | 153 | { |
154 | fprintf(stderr, "Usage: %s [options] host [command]\n", __progname); | 154 | fprintf(stderr, "Usage: %s [options] host [command]\n", __progname); |
@@ -198,7 +198,7 @@ usage(void) | |||
198 | * Connects to the given host using rsh (or prints an error message and exits | 198 | * Connects to the given host using rsh (or prints an error message and exits |
199 | * if rsh is not available). This function never returns. | 199 | * if rsh is not available). This function never returns. |
200 | */ | 200 | */ |
201 | void | 201 | static void |
202 | rsh_connect(char *host, char *user, Buffer * command) | 202 | rsh_connect(char *host, char *user, Buffer * command) |
203 | { | 203 | { |
204 | char *args[10]; | 204 | char *args[10]; |
@@ -232,9 +232,9 @@ rsh_connect(char *host, char *user, Buffer * command) | |||
232 | exit(1); | 232 | exit(1); |
233 | } | 233 | } |
234 | 234 | ||
235 | int ssh_session(void); | 235 | static int ssh_session(void); |
236 | int ssh_session2(void); | 236 | static int ssh_session2(void); |
237 | void load_public_identity_files(void); | 237 | static void load_public_identity_files(void); |
238 | 238 | ||
239 | /* | 239 | /* |
240 | * Main program for the ssh client. | 240 | * Main program for the ssh client. |
@@ -742,7 +742,7 @@ main(int ac, char **av) | |||
742 | return exit_status; | 742 | return exit_status; |
743 | } | 743 | } |
744 | 744 | ||
745 | void | 745 | static void |
746 | x11_get_proto(char *proto, int proto_len, char *data, int data_len) | 746 | x11_get_proto(char *proto, int proto_len, char *data, int data_len) |
747 | { | 747 | { |
748 | char line[512]; | 748 | char line[512]; |
@@ -781,7 +781,7 @@ x11_get_proto(char *proto, int proto_len, char *data, int data_len) | |||
781 | } | 781 | } |
782 | } | 782 | } |
783 | 783 | ||
784 | void | 784 | static void |
785 | ssh_init_forwarding(void) | 785 | ssh_init_forwarding(void) |
786 | { | 786 | { |
787 | int success = 0; | 787 | int success = 0; |
@@ -815,7 +815,7 @@ ssh_init_forwarding(void) | |||
815 | } | 815 | } |
816 | } | 816 | } |
817 | 817 | ||
818 | void | 818 | static void |
819 | check_agent_present(void) | 819 | check_agent_present(void) |
820 | { | 820 | { |
821 | if (options.forward_agent) { | 821 | if (options.forward_agent) { |
@@ -828,7 +828,7 @@ check_agent_present(void) | |||
828 | } | 828 | } |
829 | } | 829 | } |
830 | 830 | ||
831 | int | 831 | static int |
832 | ssh_session(void) | 832 | ssh_session(void) |
833 | { | 833 | { |
834 | int type; | 834 | int type; |
@@ -966,7 +966,7 @@ ssh_session(void) | |||
966 | options.escape_char : SSH_ESCAPECHAR_NONE, 0); | 966 | options.escape_char : SSH_ESCAPECHAR_NONE, 0); |
967 | } | 967 | } |
968 | 968 | ||
969 | void | 969 | static void |
970 | client_subsystem_reply(int type, int plen, void *ctxt) | 970 | client_subsystem_reply(int type, int plen, void *ctxt) |
971 | { | 971 | { |
972 | int id, len; | 972 | int id, len; |
@@ -981,7 +981,7 @@ client_subsystem_reply(int type, int plen, void *ctxt) | |||
981 | len, buffer_ptr(&command), id); | 981 | len, buffer_ptr(&command), id); |
982 | } | 982 | } |
983 | 983 | ||
984 | void | 984 | static void |
985 | ssh_session2_callback(int id, void *arg) | 985 | ssh_session2_callback(int id, void *arg) |
986 | { | 986 | { |
987 | int len; | 987 | int len; |
@@ -1057,7 +1057,7 @@ ssh_session2_callback(int id, void *arg) | |||
1057 | packet_set_interactive(interactive); | 1057 | packet_set_interactive(interactive); |
1058 | } | 1058 | } |
1059 | 1059 | ||
1060 | int | 1060 | static int |
1061 | ssh_session2_command(void) | 1061 | ssh_session2_command(void) |
1062 | { | 1062 | { |
1063 | Channel *c; | 1063 | Channel *c; |
@@ -1104,7 +1104,7 @@ ssh_session2_command(void) | |||
1104 | return c->self; | 1104 | return c->self; |
1105 | } | 1105 | } |
1106 | 1106 | ||
1107 | int | 1107 | static int |
1108 | ssh_session2(void) | 1108 | ssh_session2(void) |
1109 | { | 1109 | { |
1110 | int id; | 1110 | int id; |
@@ -1123,7 +1123,7 @@ ssh_session2(void) | |||
1123 | options.escape_char : SSH_ESCAPECHAR_NONE, id); | 1123 | options.escape_char : SSH_ESCAPECHAR_NONE, id); |
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | void | 1126 | static void |
1127 | load_public_identity_files(void) | 1127 | load_public_identity_files(void) |
1128 | { | 1128 | { |
1129 | char *filename; | 1129 | char *filename; |