Skip to content

Commit a60ebbf

Browse files
authored
common: Print octal mode correctly (#910)
After the codebase was unified to handling mode bits as octal, the printf specifiers were not updated to handle that. Fix this. Signed-off-by: Jeremi Piotrowski <[email protected]>
1 parent 6ee3dd0 commit a60ebbf

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

src/common/commonutils/FileUtils.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static bool InternalSecureSaveToFile(const char* fileName, const char* mode, con
195195
char* fileContents = NULL;
196196
unsigned int ownerId = 0;
197197
unsigned int groupId = 0;
198-
unsigned int access = 644;
198+
unsigned int access = 0644;
199199
int status = 0;
200200
bool result = false;
201201

@@ -219,7 +219,7 @@ static bool InternalSecureSaveToFile(const char* fileName, const char* mode, con
219219
{
220220
if (0 == GetDirectoryAccess(fileDirectory, &ownerId, &groupId, &access, log))
221221
{
222-
OsConfigLogInfo(log, "InternalSecureSaveToFile: directory '%s' exists, is owned by user (%u, %u) and has access mode %u",
222+
OsConfigLogInfo(log, "InternalSecureSaveToFile: directory '%s' exists, is owned by user (%u, %u) and has access mode %03o",
223223
fileDirectory, ownerId, groupId, access);
224224
}
225225
}
@@ -606,19 +606,19 @@ static int CheckAccess(bool directory, const char* name, int desiredOwnerId, int
606606

607607
if (currentMode != desiredMode)
608608
{
609-
OsConfigLogInfo(log, "CheckAccess: access to '%s' (%d) does not match expected (%d)", name, currentMode, desiredMode);
610-
OsConfigCaptureReason(reason, "Access to '%s' (%d) does not match expected (%d)", name, currentMode, desiredMode);
609+
OsConfigLogInfo(log, "CheckAccess: access to '%s' (%03o) does not match expected (%03o)", name, currentMode, desiredMode);
610+
OsConfigCaptureReason(reason, "Access to '%s' (%03o) does not match expected (%03o)", name, currentMode, desiredMode);
611611
result = ENOENT;
612612
}
613613
else
614614
{
615615
// Special case for the MPI Client
616616
if (NULL != log)
617617
{
618-
OsConfigLogInfo(log, "CheckAccess: access to '%s' (%d) matches expected (%d)", name, currentMode, desiredMode);
618+
OsConfigLogInfo(log, "CheckAccess: access to '%s' (%03o) matches expected (%03o)", name, currentMode, desiredMode);
619619
}
620620

621-
OsConfigCaptureSuccessReason(reason, "'%s' has required access (%d) and ownership (uid: %d, gid: %u)", name, desiredMode, desiredOwnerId, desiredGroupId);
621+
OsConfigCaptureSuccessReason(reason, "'%s' has required access (%03o) and ownership (uid: %d, gid: %u)", name, desiredMode, desiredOwnerId, desiredGroupId);
622622
result = 0;
623623
}
624624
}
@@ -659,7 +659,7 @@ static int SetAccess(bool directory, const char* name, unsigned int desiredOwner
659659
{
660660
if (0 == (result = CheckAccess(directory, name, desiredOwnerId, desiredGroupId, desiredAccess, false, NULL, log)))
661661
{
662-
OsConfigLogInfo(log, "SetAccess: desired '%s' ownership (owner %u, group %u with access %u) already set",
662+
OsConfigLogInfo(log, "SetAccess: desired '%s' ownership (owner %u, group %u with access %03o) already set",
663663
name, desiredOwnerId, desiredGroupId, desiredAccess);
664664
result = 0;
665665
}
@@ -671,12 +671,12 @@ static int SetAccess(bool directory, const char* name, unsigned int desiredOwner
671671

672672
if (0 == (result = chmod(name, desiredAccess)))
673673
{
674-
OsConfigLogInfo(log, "SetAccess: successfully set access to '%s' to %u", name, desiredAccess);
674+
OsConfigLogInfo(log, "SetAccess: successfully set access to '%s' to %03o", name, desiredAccess);
675675
}
676676
else
677677
{
678678
result = errno ? errno : ENOENT;
679-
OsConfigLogInfo(log, "SetAccess: 'chmod %d %s' failed with %d", desiredAccess, name, result);
679+
OsConfigLogInfo(log, "SetAccess: 'chmod %03o %s' failed with %d", desiredAccess, name, result);
680680
}
681681
}
682682
else
@@ -922,7 +922,7 @@ int RenameFileWithOwnerAndAccess(const char* original, const char* target, OsCon
922922
}
923923
else
924924
{
925-
OsConfigLogDebug(log, "RenameFileWithOwnerAndAccess: '%s' renamed to '%s' with restored original owner %u, group %u and access mode %u",
925+
OsConfigLogDebug(log, "RenameFileWithOwnerAndAccess: '%s' renamed to '%s' with restored original owner %u, group %u and access mode %03o",
926926
original, target, ownerId, groupId, mode);
927927
}
928928

@@ -1920,11 +1920,11 @@ int DisablePostfixNetworkListening(OsConfigLogHandle log)
19201920
OsConfigLogInfo(log, "DisablePostfixNetworkListening: directory '%s' does not exist", etcPostfix);
19211921
if (0 == (status = mkdir(etcPostfix, mode)))
19221922
{
1923-
OsConfigLogInfo(log, "DisablePostfixNetworkListening: created directory '%s' with %d access", etcPostfix, mode);
1923+
OsConfigLogInfo(log, "DisablePostfixNetworkListening: created directory '%s' with %03o access", etcPostfix, mode);
19241924
}
19251925
else
19261926
{
1927-
OsConfigLogInfo(log, "DisablePostfixNetworkListening: cannot create directory '%s' with %d access (%d)", etcPostfix, mode, errno);
1927+
OsConfigLogInfo(log, "DisablePostfixNetworkListening: cannot create directory '%s' with %d access (%03o)", etcPostfix, mode, errno);
19281928
}
19291929
}
19301930

src/common/commonutils/SshUtils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ static int SetSshWarningBanner(unsigned int desiredBannerFileAccess, const char*
826826
{
827827
if (0 != (status = SetFileAccess(g_sshBannerFile, 0, 0, desiredBannerFileAccess, log)))
828828
{
829-
OsConfigLogInfo(log, "SetSshWarningBanner: failed to set desired access %u on banner file %s (%d)", desiredBannerFileAccess, g_sshBannerFile, status);
829+
OsConfigLogInfo(log, "SetSshWarningBanner: failed to set desired access %03o on banner file %s (%d)", desiredBannerFileAccess, g_sshBannerFile, status);
830830
}
831831
}
832832
else

src/common/commonutils/UserUtils.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,7 @@ int CheckRestrictedUserHomeDirectories(unsigned int* modes, unsigned int numberO
17341734
{
17351735
if (0 == CheckDirectoryAccess(userList[i].home, userList[i].userId, userList[i].groupId, modes[j], true, NULL, log))
17361736
{
1737-
OsConfigLogInfo(log, "CheckRestrictedUserHomeDirectories: user '%s' (%u, %u) has proper restricted access (%u) for their assigned home directory '%s'",
1737+
OsConfigLogInfo(log, "CheckRestrictedUserHomeDirectories: user '%s' (%u, %u) has proper restricted access (%03o) for their assigned home directory '%s'",
17381738
userList[i].username, userList[i].userId, userList[i].groupId, modes[j], userList[i].home);
17391739
oneGoodMode = true;
17401740
break;
@@ -1797,7 +1797,7 @@ int SetRestrictedUserHomeDirectories(unsigned int* modes, unsigned int numberOfM
17971797
{
17981798
if (0 == CheckDirectoryAccess(userList[i].home, userList[i].userId, userList[i].groupId, modes[j], true, NULL, log))
17991799
{
1800-
OsConfigLogInfo(log, "SetRestrictedUserHomeDirectories: user '%s' (%u, %u) already has proper restricted access (%u) for their assigned home directory '%s'",
1800+
OsConfigLogInfo(log, "SetRestrictedUserHomeDirectories: user '%s' (%u, %u) already has proper restricted access (%03o) for their assigned home directory '%s'",
18011801
userList[i].username, userList[i].userId, userList[i].groupId, modes[j], userList[i].home);
18021802
oneGoodMode = true;
18031803
break;
@@ -1808,12 +1808,12 @@ int SetRestrictedUserHomeDirectories(unsigned int* modes, unsigned int numberOfM
18081808
{
18091809
if (0 == (_status = SetDirectoryAccess(userList[i].home, userList[i].userId, userList[i].groupId, userList[i].isRoot ? modeForRoot : modeForOthers, log)))
18101810
{
1811-
OsConfigLogInfo(log, "SetRestrictedUserHomeDirectories: user '%s' (%u, %u) has now proper restricted access (%u) for their assigned home directory '%s'",
1811+
OsConfigLogInfo(log, "SetRestrictedUserHomeDirectories: user '%s' (%u, %u) has now proper restricted access (%03o) for their assigned home directory '%s'",
18121812
userList[i].username, userList[i].userId, userList[i].groupId, userList[i].isRoot ? modeForRoot : modeForOthers, userList[i].home);
18131813
}
18141814
else
18151815
{
1816-
OsConfigLogInfo(log, "SetRestrictedUserHomeDirectories: cannot set restricted access (%u) for user '%s' (%u, %u) assigned home directory '%s' (%d)",
1816+
OsConfigLogInfo(log, "SetRestrictedUserHomeDirectories: cannot set restricted access (%03o) for user '%s' (%u, %u) assigned home directory '%s' (%d)",
18171817
userList[i].isRoot ? modeForRoot : modeForOthers, userList[i].username, userList[i].userId, userList[i].groupId, userList[i].home, _status);
18181818

18191819
if (0 == status)
@@ -2877,7 +2877,7 @@ int CheckUsersRestrictedDotFiles(unsigned int* modes, unsigned int numberOfModes
28772877
{
28782878
if (0 == CheckFileAccess(path, userList[i].userId, userList[i].groupId, modes[j], NULL, log))
28792879
{
2880-
OsConfigLogInfo(log, "CheckUsersRestrictedDotFiles: user '%s' (%u, %u) has proper restricted access (%u) for their dot file '%s'",
2880+
OsConfigLogInfo(log, "CheckUsersRestrictedDotFiles: user '%s' (%u, %u) has proper restricted access (%03o) for their dot file '%s'",
28812881
userList[i].username, userList[i].userId, userList[i].groupId, modes[j], path);
28822882
oneGoodMode = true;
28832883
break;
@@ -2967,7 +2967,7 @@ int SetUsersRestrictedDotFiles(unsigned int* modes, unsigned int numberOfModes,
29672967
{
29682968
if (0 == CheckFileAccess(path, userList[i].userId, userList[i].groupId, modes[j], NULL, log))
29692969
{
2970-
OsConfigLogInfo(log, "SetUsersRestrictedDotFiles: user '%s' (%u, %u) already has proper restricted access (%u) set for their dot file '%s'",
2970+
OsConfigLogInfo(log, "SetUsersRestrictedDotFiles: user '%s' (%u, %u) already has proper restricted access (%03o) set for their dot file '%s'",
29712971
userList[i].username, userList[i].userId, userList[i].groupId, modes[j], path);
29722972
oneGoodMode = true;
29732973
break;
@@ -2978,7 +2978,7 @@ int SetUsersRestrictedDotFiles(unsigned int* modes, unsigned int numberOfModes,
29782978
{
29792979
if (0 == (_status = SetFileAccess(path, userList[i].userId, userList[i].groupId, mode, log)))
29802980
{
2981-
OsConfigLogInfo(log, "SetUsersRestrictedDotFiles: user '%s' (%u, %u) now has restricted access (%u) set for their dot file '%s'",
2981+
OsConfigLogInfo(log, "SetUsersRestrictedDotFiles: user '%s' (%u, %u) now has restricted access (%03o) set for their dot file '%s'",
29822982
userList[i].username, userList[i].userId, userList[i].groupId, mode, path);
29832983
}
29842984
else

0 commit comments

Comments
 (0)