Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8778174
)
Check MY_UID() directly instead of accessing am_root.
author
Wayne Davison
<wayned@samba.org>
Thu, 26 Jan 2006 11:01:00 +0000
(11:01 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 26 Jan 2006 11:01:00 +0000
(11:01 +0000)
authenticate.c
patch
|
blob
|
blame
|
history
diff --git
a/authenticate.c
b/authenticate.c
index
55ed269
..
ff7eef2
100644
(file)
--- a/
authenticate.c
+++ b/
authenticate.c
@@
-21,7
+21,6
@@
#include "rsync.h"
extern char *password_file;
#include "rsync.h"
extern char *password_file;
-extern int am_root;
/***************************************************************************
encode a buffer using base64 - simple and slow algorithm. null terminates
/***************************************************************************
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;
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;
}
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 ((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;
}
rprintf(FERROR,"password file must be owned by root when running as root\n");
ok = 0;
}