commit cab602eab2c4be4017a969ac021c541918dabd03
author roman <xjanot04@fit.vutbr.cz> Fri Nov 24 11:30:32 2023 +0100
committer Michal Vasko <mvasko@cesnet.cz> Wed Dec 06 11:10:42 2023 +0100
tree ec3da63bfce941644fb0addf42d14ebc67315b11
parent 423cc0d9e111be7c1a162ff6fae2f9a5f575a7e4

session server ssh REFACTOR remove redundant NLs

src/session_server_ssh.c

diff --git a/src/session_server_ssh.c b/src/session_server_ssh.c
index 39b3a82..f79f788 100644
--- a/src/session_server_ssh.c
+++ b/src/session_server_ssh.c
@@ -420,7 +420,7 @@
     /* initialize PAM and see if the given configuration file exists */
     ret = pam_start(server_opts.pam_config_name, client->username, &conv, &pam_h);
     if (ret != PAM_SUCCESS) {
-        ERR(NULL, "PAM error occurred (%s).\n", pam_strerror(pam_h, ret));
+        ERR(NULL, "PAM error occurred (%s).", pam_strerror(pam_h, ret));
         goto cleanup;
     }
 
@@ -428,10 +428,10 @@
     ret = pam_authenticate(pam_h, 0);
     if (ret != PAM_SUCCESS) {
         if (ret == PAM_ABORT) {
-            ERR(NULL, "PAM error occurred (%s).\n", pam_strerror(pam_h, ret));
+            ERR(NULL, "PAM error occurred (%s).", pam_strerror(pam_h, ret));
             goto cleanup;
         } else {
-            VRB(NULL, "PAM error occurred (%s).\n", pam_strerror(pam_h, ret));
+            VRB(NULL, "PAM error occurred (%s).", pam_strerror(pam_h, ret));
             goto cleanup;
         }
     }
@@ -439,18 +439,18 @@
     /* correct token entered, check other requirements(the time of the day, expired token, ...) */
     ret = pam_acct_mgmt(pam_h, 0);
     if ((ret != PAM_SUCCESS) && (ret != PAM_NEW_AUTHTOK_REQD)) {
-        VRB(NULL, "PAM error occurred (%s).\n", pam_strerror(pam_h, ret));
+        VRB(NULL, "PAM error occurred (%s).", pam_strerror(pam_h, ret));
         goto cleanup;
     }
 
     /* if a token has expired a new one will be generated */
     if (ret == PAM_NEW_AUTHTOK_REQD) {
-        VRB(NULL, "PAM warning occurred (%s).\n", pam_strerror(pam_h, ret));
+        VRB(NULL, "PAM warning occurred (%s).", pam_strerror(pam_h, ret));
         ret = pam_chauthtok(pam_h, PAM_CHANGE_EXPIRED_AUTHTOK);
         if (ret == PAM_SUCCESS) {
             VRB(NULL, "The authentication token of user \"%s\" updated successfully.", client->username);
         } else {
-            ERR(NULL, "PAM error occurred (%s).\n", pam_strerror(pam_h, ret));
+            ERR(NULL, "PAM error occurred (%s).", pam_strerror(pam_h, ret));
             goto cleanup;
         }
     }
@@ -458,7 +458,7 @@
 cleanup:
     /* destroy the PAM context */
     if (pam_h && (pam_end(pam_h, ret) != PAM_SUCCESS)) {
-        ERR(NULL, "PAM error occurred (%s).\n", pam_strerror(pam_h, ret));
+        ERR(NULL, "PAM error occurred (%s).", pam_strerror(pam_h, ret));
     }
     return ret;
 }