mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-20 04:51:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check MY_UID() directly instead of accessing am_root.

Browse Source
This commit is contained in:
Wayne Davison committed 2006-01-26 11:01:00 +00:00
1 parent 8778174936
commit 351f5e2f6c
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
authenticate.c
+2 -3
View File
@@ -21,7 +21,6 @@
#include "rsync.h"
extern char *password_file;
extern int am_root;
/***************************************************************************
encode a buffer using base64 - simple and slow algorithm. null terminates
@@ -96,7 +95,7 @@ static int get_secret(int module, char *user, char *secret, int len)
if ((st.st_mode & 06) != 0) {
rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
ok = 0;
} else if (am_root && (st.st_uid != 0)) {
} else if (MY_UID() == 0 && st.st_uid != 0) {
rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
ok = 0;
}
@@ -172,7 +171,7 @@ static char *getpassf(char *filename)
} else if ((st.st_mode & 06) != 0) {
rprintf(FERROR,"password file must not be other-accessible\n");
ok = 0;
} else if (am_root && st.st_uid != 0) {
} else if (MY_UID() == 0 && st.st_uid != 0) {
rprintf(FERROR,"password file must be owned by root when running as root\n");
ok = 0;
}