SIVAL(input, 20, tv.tv_usec);
SIVAL(input, 24, getpid());
- sum_init();
+ sum_init(0);
sum_update(input, sizeof input);
sum_end(challenge);
}
return 0;
if (do_stat(fname, &st) == -1) {
- rsyserr(FERROR, errno, "stat(%s)", fname);
+ rsyserr(FLOG, errno, "stat(%s)", safe_fname(fname));
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
- rprintf(FERROR,"secrets file must not be other-accessible (see strict modes option)\n");
+ rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
ok = 0;
} else if (am_root && (st.st_uid != 0)) {
- rprintf(FERROR,"secrets file must be owned by root when running as root (see strict modes)\n");
+ rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
ok = 0;
}
}
if (!ok) {
- rprintf(FERROR,"continuing without secrets file\n");
+ rprintf(FLOG, "continuing without secrets file\n");
close(fd);
return 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) {
- 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");
{
char buf[16];
- sum_init();
+ sum_init(0);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
sum_end(buf);