summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ssh.c b/ssh.c
index 720604394..21bfc56e3 100644
--- a/ssh.c
+++ b/ssh.c
@@ -253,7 +253,7 @@ main(int ac, char **av)
253 /* Get user data. */ 253 /* Get user data. */
254 pw = getpwuid(original_real_uid); 254 pw = getpwuid(original_real_uid);
255 if (!pw) { 255 if (!pw) {
256 log("You don't exist, go away!"); 256 logit("You don't exist, go away!");
257 exit(1); 257 exit(1);
258 } 258 }
259 /* Take a copy of the returned structure. */ 259 /* Take a copy of the returned structure. */
@@ -559,7 +559,7 @@ again:
559 /* Do not allocate a tty if stdin is not a tty. */ 559 /* Do not allocate a tty if stdin is not a tty. */
560 if (!isatty(fileno(stdin)) && !force_tty_flag) { 560 if (!isatty(fileno(stdin)) && !force_tty_flag) {
561 if (tty_flag) 561 if (tty_flag)
562 log("Pseudo-terminal will not be allocated because stdin is not a terminal."); 562 logit("Pseudo-terminal will not be allocated because stdin is not a terminal.");
563 tty_flag = 0; 563 tty_flag = 0;
564 } 564 }
565 565
@@ -793,7 +793,7 @@ x11_get_proto(char **_proto, char **_data)
793 if (!got_data) { 793 if (!got_data) {
794 u_int32_t rand = 0; 794 u_int32_t rand = 0;
795 795
796 log("Warning: No xauth data; using fake authentication data for X11 forwarding."); 796 logit("Warning: No xauth data; using fake authentication data for X11 forwarding.");
797 strlcpy(proto, "MIT-MAGIC-COOKIE-1", sizeof proto); 797 strlcpy(proto, "MIT-MAGIC-COOKIE-1", sizeof proto);
798 for (i = 0; i < 16; i++) { 798 for (i = 0; i < 16; i++) {
799 if (i % 4 == 0) 799 if (i % 4 == 0)
@@ -873,7 +873,7 @@ ssh_session(void)
873 if (type == SSH_SMSG_SUCCESS) 873 if (type == SSH_SMSG_SUCCESS)
874 packet_start_compression(options.compression_level); 874 packet_start_compression(options.compression_level);
875 else if (type == SSH_SMSG_FAILURE) 875 else if (type == SSH_SMSG_FAILURE)
876 log("Warning: Remote host refused compression."); 876 logit("Warning: Remote host refused compression.");
877 else 877 else
878 packet_disconnect("Protocol error waiting for compression response."); 878 packet_disconnect("Protocol error waiting for compression response.");
879 } 879 }
@@ -912,7 +912,7 @@ ssh_session(void)
912 interactive = 1; 912 interactive = 1;
913 have_tty = 1; 913 have_tty = 1;
914 } else if (type == SSH_SMSG_FAILURE) 914 } else if (type == SSH_SMSG_FAILURE)
915 log("Warning: Remote host failed or refused to allocate a pseudo tty."); 915 logit("Warning: Remote host failed or refused to allocate a pseudo tty.");
916 else 916 else
917 packet_disconnect("Protocol error waiting for pty request response."); 917 packet_disconnect("Protocol error waiting for pty request response.");
918 } 918 }
@@ -930,7 +930,7 @@ ssh_session(void)
930 if (type == SSH_SMSG_SUCCESS) { 930 if (type == SSH_SMSG_SUCCESS) {
931 interactive = 1; 931 interactive = 1;
932 } else if (type == SSH_SMSG_FAILURE) { 932 } else if (type == SSH_SMSG_FAILURE) {
933 log("Warning: Remote host denied X11 forwarding."); 933 logit("Warning: Remote host denied X11 forwarding.");
934 } else { 934 } else {
935 packet_disconnect("Protocol error waiting for X11 forwarding"); 935 packet_disconnect("Protocol error waiting for X11 forwarding");
936 } 936 }
@@ -949,7 +949,7 @@ ssh_session(void)
949 type = packet_read(); 949 type = packet_read();
950 packet_check_eom(); 950 packet_check_eom();
951 if (type != SSH_SMSG_SUCCESS) 951 if (type != SSH_SMSG_SUCCESS)
952 log("Warning: Remote host denied authentication agent forwarding."); 952 logit("Warning: Remote host denied authentication agent forwarding.");
953 } 953 }
954 954
955 /* Initiate port forwardings. */ 955 /* Initiate port forwardings. */
@@ -1017,7 +1017,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
1017 options.remote_forwards[i].host, 1017 options.remote_forwards[i].host,
1018 options.remote_forwards[i].host_port); 1018 options.remote_forwards[i].host_port);
1019 if (type == SSH2_MSG_REQUEST_FAILURE) 1019 if (type == SSH2_MSG_REQUEST_FAILURE)
1020 log("Warning: remote port forwarding failed for listen port %d", 1020 logit("Warning: remote port forwarding failed for listen port %d",
1021 options.remote_forwards[i].port); 1021 options.remote_forwards[i].port);
1022} 1022}
1023 1023