memset(input, 0, sizeof(input));
strlcpy((char *)input, addr, 17);
- gettimeofday(&tv, NULL);
+ sys_gettimeofday(&tv);
SIVAL(input, 16, tv.tv_sec);
SIVAL(input, 20, tv.tv_usec);
SIVAL(input, 24, getpid());
if (do_stat(fname, &st) == -1) {
rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
ok = 0;
- } else if ((st.st_mode & 06) != 0) {
- rprintf(FERROR,"secrets file must not be other-accessible\n");
- ok = 0;
- } else if (am_root && (st.st_uid != 0)) {
- rprintf(FERROR,"secrets file must be owned by root when running as root\n");
- 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");
+ 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");
+ ok = 0;
+ }
}
if (!ok) {
rprintf(FERROR,"continuing without secrets file\n");
static char *getpassf(char *filename)
{
char buffer[100];
- int len=0;
int fd=0;
STRUCT_STAT st;
int ok = 1;
if (envpw) rprintf(FERROR,"RSYNC_PASSWORD environment variable ignored\n");
buffer[sizeof(buffer)-1]='\0';
- if ( (len=read(fd,buffer,sizeof(buffer)-1)) > 0)
+ if (read(fd,buffer,sizeof(buffer)-1) > 0)
{
char *p = strtok(buffer,"\n\r");
close(fd);