Import OpenSSH 3.6.1p2.

1 files changed, 11 insertions, 11 deletions

diff --git a/sshconnect1.c b/sshconnect1.c
index 491b4f67d..2fc9a981a 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -122,7 +122,7 @@ try_agent_authentication(void)
                          * although it advertised it supports this.  Just
                          * return a wrong value.
                          */
-                        logit("Authentication agent failed to decrypt challenge.");
+                        log("Authentication agent failed to decrypt challenge.");
                         memset(response, 0, sizeof(response));
                 }
                 key_free(key);
@@ -890,7 +890,7 @@ try_challenge_response_authentication(void)
                 if (i != 0)
                         error("Permission denied, please try again.");
                 if (options.cipher == SSH_CIPHER_NONE)
-                        logit("WARNING: Encryption is disabled! "
+                        log("WARNING: Encryption is disabled! "
                             "Response will be transmitted in clear text.");
                 response = read_passphrase(prompt, 0);
                 if (strcmp(response, "") == 0) {
@@ -925,7 +925,7 @@ try_password_authentication(char *prompt)
 
         debug("Doing password authentication.");
         if (options.cipher == SSH_CIPHER_NONE)
-                logit("WARNING: Encryption is disabled! Password will be transmitted in clear text.");
+                log("WARNING: Encryption is disabled! Password will be transmitted in clear text.");
         for (i = 0; i < options.number_of_password_prompts; i++) {
                 if (i != 0)
                         error("Permission denied, please try again.");
@@ -981,9 +981,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
 
         rbits = BN_num_bits(server_key->rsa->n);
         if (bits != rbits) {
-                logit("Warning: Server lies about size of server public key: "
+                log("Warning: Server lies about size of server public key: "
                     "actual size is %d bits vs. announced %d.", rbits, bits);
-                logit("Warning: This may be due to an old implementation of ssh.");
+                log("Warning: This may be due to an old implementation of ssh.");
         }
         /* Get the host key. */
         host_key = key_new(KEY_RSA1);
@@ -993,9 +993,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
 
         rbits = BN_num_bits(host_key->rsa->n);
         if (bits != rbits) {
-                logit("Warning: Server lies about size of server host key: "
+                log("Warning: Server lies about size of server host key: "
                     "actual size is %d bits vs. announced %d.", rbits, bits);
-                logit("Warning: This may be due to an old implementation of ssh.");
+                log("Warning: This may be due to an old implementation of ssh.");
         }
 
         /* Get protocol flags. */
@@ -1086,7 +1086,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
                         options.cipher = ssh_cipher_default;
         } else if (options.cipher == SSH_CIPHER_ILLEGAL ||
             !(cipher_mask_ssh1(1) & (1 << options.cipher))) {
-                logit("No valid SSH1 cipher, using %.100s instead.",
+                log("No valid SSH1 cipher, using %.100s instead.",
                     cipher_name(ssh_cipher_default));
                 options.cipher = ssh_cipher_default;
         }
@@ -1276,7 +1276,7 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
         if ((supported_authentications & (1 << SSH_PASS_KERBEROS_TGT)) &&
             options.kerberos_tgt_passing && context && auth_context) {
                 if (options.cipher == SSH_CIPHER_NONE)
-                        logit("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
+                        log("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
                 send_krb5_tgt(context, auth_context);
         }
         if (auth_context)
@@ -1290,14 +1290,14 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
         if ((supported_authentications & (1 << SSH_PASS_KERBEROS_TGT)) &&
             options.kerberos_tgt_passing) {
                 if (options.cipher == SSH_CIPHER_NONE)
-                        logit("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
+                        log("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
                 send_krb4_tgt();
         }
         /* Try AFS token passing if the server supports it. */
         if ((supported_authentications & (1 << SSH_PASS_AFS_TOKEN)) &&
             options.afs_token_passing && k_hasafs()) {
                 if (options.cipher == SSH_CIPHER_NONE)
-                        logit("WARNING: Encryption is disabled! Token will be transmitted in the clear!");
+                        log("WARNING: Encryption is disabled! Token will be transmitted in the clear!");
                 send_afs_tokens();
         }
 #endif /* AFS */