Skip to content

Commit 358eea4

Browse files
Merge pull request #5983 from aleksandrychev/ENT-13573
ENT-13573: Changed ChangePasswordHashUsingChpass logging info
2 parents 9525710 + d950a25 commit 358eea4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cf-agent/verify_users_pam.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,19 +643,19 @@ static bool ExecuteUserCommand(const char *puser, const char *cmd, size_t sizeof
643643
return false;
644644
}
645645

646-
Log(LOG_LEVEL_VERBOSE, "%s user '%s'. (command: '%s')", cap_action_msg, puser, cmd);
646+
Log(LOG_LEVEL_VERBOSE, "ExecuteUserCommand: %s user '%s'.", cap_action_msg, puser);
647647

648648
FILE *fptr = cf_popen(cmd, "w", true);
649649
if (!fptr)
650650
{
651-
Log(LOG_LEVEL_ERR, "Command returned error while %s user '%s'. (Command line: '%s')", action_msg, puser, cmd);
651+
Log(LOG_LEVEL_ERR, "ExecuteUserCommand: returned error while %s user '%s'.", action_msg, puser);
652652
return false;
653653
}
654654

655655
int status = cf_pclose(fptr);
656656
if (status)
657657
{
658-
Log(LOG_LEVEL_ERR, "'%s' returned non-zero status: %i\n", cmd, status);
658+
Log(LOG_LEVEL_ERR, "ExecuteUserCommand: returned non-zero status: %i\n", status);
659659
return false;
660660
}
661661

@@ -673,7 +673,7 @@ static bool ChangePasswordHashUsingChpass(const char *puser, const char *passwor
673673
StringAppend(cmd, "\' ", sizeof(cmd));
674674
StringAppend(cmd, puser, sizeof(cmd));
675675

676-
Log(LOG_LEVEL_VERBOSE, "Changing password hash for user '%s'. (command: '%s')", puser, cmd);
676+
Log(LOG_LEVEL_VERBOSE, "Changing password hash for user '%s' using chpass.", puser);
677677

678678
return ExecuteUserCommand(puser, cmd, sizeof(cmd), "changing", "Changing");
679679
}

0 commit comments

Comments
 (0)