--- dropbear-git/cli-auth.c
+++ dropbear-patch/cli-auth.c
@@ -40,7 +40,7 @@
 
 /* Send a "none" auth request to get available methods */
 void cli_auth_getmethods() {
-	TRACE(("enter cli_auth_getmethods"))
+	TRACELEVEL2((2,"enter cli_auth_getmethods"))
 	CHECKCLEARTOWRITE();
 	buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);
 	buf_putstring(ses.writepayload, cli_opts.username,
@@ -167,7 +167,7 @@
 	TRACE(("enter recv_msg_userauth_failure"))
 
 	if (ses.authstate.authdone) {
-		TRACE(("leave recv_msg_userauth_failure, already authdone."))
+		TRACELEVEL2((2,"leave recv_msg_userauth_failure, already authdone."))
 		return;
 	}
 
@@ -199,7 +199,7 @@
 		 * keyboard interactive again */
 		if (cli_ses.lastauthtype == AUTH_TYPE_INTERACT
 				&& !cli_ses.interact_request_received) {
-			TRACE(("setting auth_interact_failed = 1"))
+			TRACELEVEL2((2,"setting auth_interact_failed = 1"))
 			cli_ses.auth_interact_failed = 1;
 		}
 #endif
@@ -217,7 +217,7 @@
 		ses.authstate.failcount++;
 	}
 
-	TRACE(("Methods (len %d): '%s'", methlen, methods))
+	TRACELEVEL1((1,"Methods (len %d): '%s'", methlen, methods))
 
 	ses.authstate.authdone=0;
 	ses.authstate.authtypes=0;
@@ -266,7 +266,7 @@
 	/* This function can validly get called multiple times
 	if DROPBEAR_CLI_IMMEDIATE_AUTH is set */
 
-	TRACE(("received msg_userauth_success"))
+	TRACELEVEL2((2,"received msg_userauth_success"))
 	/* Note: in delayed-zlib mode, setting authdone here 
 	 * will enable compression in the transport layer */
 	ses.authstate.authdone = 1;
@@ -281,7 +281,7 @@
 int cli_auth_try() {
 
 	int finished = 0;
-	TRACE(("enter cli_auth_try"))
+	TRACELEVEL2((2,"enter cli_auth_try"))
 
 	CHECKCLEARTOWRITE();
 	
@@ -320,13 +320,13 @@
 	}
 #endif
 
-	TRACE(("cli_auth_try lastauthtype %d", cli_ses.lastauthtype))
+	TRACELEVEL2((2,"cli_auth_try lastauthtype %d", cli_ses.lastauthtype))
 
 	if (finished) {
 		TRACE(("leave cli_auth_try success"))
 		return DROPBEAR_SUCCESS;
 	}
-	TRACE(("leave cli_auth_try failure"))
+	TRACELEVEL1((1,"leave cli_auth_try failure"))
 	return DROPBEAR_FAILURE;
 }