Skip to content
Snippets Groups Projects
Commit 6a09fa23 authored by Matt Johnston's avatar Matt Johnston
Browse files

Get rid of spurious newlines in pam log messages

parent 142a0f8a
No related merge requests found
...@@ -212,14 +212,14 @@ void svr_auth_pam() { ...@@ -212,14 +212,14 @@ void svr_auth_pam() {
/* Init pam */ /* Init pam */
if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s\n", dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s",
rc, pam_strerror(pamHandlep, rc)); rc, pam_strerror(pamHandlep, rc));
goto cleanup; goto cleanup;
} }
/* just to set it to something */ /* just to set it to something */
if ((rc = pam_set_item(pamHandlep, PAM_TTY, "ssh") != PAM_SUCCESS)) { if ((rc = pam_set_item(pamHandlep, PAM_TTY, "ssh") != PAM_SUCCESS)) {
dropbear_log(LOG_WARNING, "pam_set_item() failed, rc=%d, %s\n", dropbear_log(LOG_WARNING, "pam_set_item() failed, rc=%d, %s",
rc, pam_strerror(pamHandlep, rc)); rc, pam_strerror(pamHandlep, rc));
goto cleanup; goto cleanup;
} }
...@@ -232,7 +232,7 @@ void svr_auth_pam() { ...@@ -232,7 +232,7 @@ void svr_auth_pam() {
/* (void) pam_set_item(pamHandlep, PAM_FAIL_DELAY, (void*) pamDelayFunc); */ /* (void) pam_set_item(pamHandlep, PAM_FAIL_DELAY, (void*) pamDelayFunc); */
if ((rc = pam_authenticate(pamHandlep, 0)) != PAM_SUCCESS) { if ((rc = pam_authenticate(pamHandlep, 0)) != PAM_SUCCESS) {
dropbear_log(LOG_WARNING, "pam_authenticate() failed, rc=%d, %s\n", dropbear_log(LOG_WARNING, "pam_authenticate() failed, rc=%d, %s",
rc, pam_strerror(pamHandlep, rc)); rc, pam_strerror(pamHandlep, rc));
dropbear_log(LOG_WARNING, dropbear_log(LOG_WARNING,
"Bad PAM password attempt for '%s' from %s", "Bad PAM password attempt for '%s' from %s",
...@@ -243,7 +243,7 @@ void svr_auth_pam() { ...@@ -243,7 +243,7 @@ void svr_auth_pam() {
} }
if ((rc = pam_acct_mgmt(pamHandlep, 0)) != PAM_SUCCESS) { if ((rc = pam_acct_mgmt(pamHandlep, 0)) != PAM_SUCCESS) {
dropbear_log(LOG_WARNING, "pam_acct_mgmt() failed, rc=%d, %s\n", dropbear_log(LOG_WARNING, "pam_acct_mgmt() failed, rc=%d, %s",
rc, pam_strerror(pamHandlep, rc)); rc, pam_strerror(pamHandlep, rc));
dropbear_log(LOG_WARNING, dropbear_log(LOG_WARNING,
"Bad PAM password attempt for '%s' from %s", "Bad PAM password attempt for '%s' from %s",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment