-/*
- Copyright (C) Andrew Tridgell 1998
+/* -*- c-file-style: "linux"; -*-
+
+ Copyright (C) 1998-2000 by Andrew Tridgell
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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 (fd == -1) return 0;
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");
+ rsyserr(FERROR, errno, "stat(%s)", 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");
+ 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");
while (!found) {
int i = 0;
- memset(line, 0, sizeof(line));
- while (i<(sizeof(line)-1)) {
+ memset(line, 0, sizeof line);
+ while ((size_t) i < (sizeof(line)-1)) {
if (read(fd, &line[i], 1) != 1) {
memset(line, 0, sizeof(line));
close(fd);
static char *getpassf(char *filename)
{
char buffer[100];
- int len=0;
int fd=0;
STRUCT_STAT st;
int ok = 1;
if (!filename) return NULL;
if ( (fd=open(filename,O_RDONLY)) == -1) {
- rprintf(FERROR,"could not open password file \"%s\"\n",filename);
+ rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
if (envpw) rprintf(FERROR,"falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
if (do_stat(filename, &st) == -1) {
- rprintf(FERROR,"stat(%s) : %s\n", filename, strerror(errno));
+ rsyserr(FERROR, errno, "stat(%s)", filename);
ok = 0;
} else if ((st.st_mode & 06) != 0) {
rprintf(FERROR,"password file must not be other-accessible\n");
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);
- return strdup(strtok(buffer,"\n\r"));
+ if (p) p = strdup(p);
+ return p;
}
return NULL;
otherwise return username
*/
-char *auth_server(int fd, int module, char *addr, char *leader)
+char *auth_server(int f_in, int f_out, int module, char *addr, char *leader)
{
char *users = lp_auth_users(module);
char challenge[16];
base64_encode(challenge, 16, b64_challenge);
- io_printf(fd,"%s%s\n", leader, b64_challenge);
+ io_printf(f_out, "%s%s\n", leader, b64_challenge);
- if (!read_line(fd, line, sizeof(line)-1)) {
+ if (!read_line(f_in, line, sizeof(line)-1)) {
return NULL;
}
if (sscanf(line,"%99s %29s", user, pass) != 2) {
return NULL;
}
-
+
users = strdup(users);
if (!users) return NULL;
for (tok=strtok(users," ,\t"); tok; tok = strtok(NULL," ,\t")) {
- if (strcmp(tok, user) == 0) break;
+ if (fnmatch(tok, user, 0) == 0) break;
}
free(users);
if (!user || !*user) return;
if (!(pass=getpassf(password_file)) && !(pass=getenv("RSYNC_PASSWORD"))) {
+ /* XXX: cyeoh says that getpass is deprecated, because
+ it may return a truncated password on some systems,
+ and it is not in the LSB. */
pass = getpass("Password: ");
}