Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only rename a directory with the backup suffix if we're removing
[rsync/rsync.git]
/
authenticate.c
diff --git
a/authenticate.c
b/authenticate.c
index
56be490
..
ff24028
100644
(file)
--- a/
authenticate.c
+++ b/
authenticate.c
@@
-65,7
+65,7
@@
static void gen_challenge(char *addr, char *challenge)
SIVAL(input, 20, tv.tv_usec);
SIVAL(input, 24, getpid());
SIVAL(input, 20, tv.tv_usec);
SIVAL(input, 24, getpid());
- sum_init();
+ sum_init(
0
);
sum_update(input, sizeof input);
sum_end(challenge);
}
sum_update(input, sizeof input);
sum_end(challenge);
}
@@
-87,19
+87,19
@@
static int get_secret(int module, char *user, char *secret, int len)
return 0;
if (do_stat(fname, &st) == -1) {
return 0;
if (do_stat(fname, &st) == -1) {
- rsyserr(F
ERROR, errno, "stat(%s)", fname
);
+ rsyserr(F
LOG, errno, "stat(%s)", safe_fname(fname)
);
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
- rprintf(F
ERROR,
"secrets file must not be other-accessible (see strict modes option)\n");
+ rprintf(F
LOG,
"secrets file must not be other-accessible (see strict modes option)\n");
ok = 0;
} else if (am_root && (st.st_uid != 0)) {
ok = 0;
} else if (am_root && (st.st_uid != 0)) {
- rprintf(F
ERROR,
"secrets file must be owned by root when running as root (see strict modes)\n");
+ rprintf(F
LOG,
"secrets file must be owned by root when running as root (see strict modes)\n");
ok = 0;
}
}
if (!ok) {
ok = 0;
}
}
if (!ok) {
- rprintf(F
ERROR,
"continuing without secrets file\n");
+ rprintf(F
LOG,
"continuing without secrets file\n");
close(fd);
return 0;
}
close(fd);
return 0;
}
@@
-156,14
+156,15
@@
static char *getpassf(char *filename)
return NULL;
if ((fd = open(filename,O_RDONLY)) < 0) {
return NULL;
if ((fd = open(filename,O_RDONLY)) < 0) {
- rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
+ rsyserr(FERROR, errno, "could not open password file \"%s\"",
+ safe_fname(filename));
if (envpw)
rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
if (do_stat(filename, &st) == -1) {
if (envpw)
rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
if (do_stat(filename, &st) == -1) {
- rsyserr(FERROR, errno, "stat(%s)",
filename
);
+ rsyserr(FERROR, errno, "stat(%s)",
safe_fname(filename)
);
ok = 0;
} 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");
@@
-199,7
+200,7
@@
static void generate_hash(char *in, char *challenge, char *out)
{
char buf[16];
{
char buf[16];
- sum_init();
+ sum_init(
0
);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
sum_end(buf);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
sum_end(buf);