Print strerror when a system error occurs; add a new function rsyserr

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index ba83a89..842a59e 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -56,7 +56,7 @@ static void gen_challenge(char *addr, char *challenge)
        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());
@@ -85,14 +85,16 @@ static int get_secret(int module, char *user, char *secret, int len)
        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");
@@ -130,6 +132,54 @@ static int get_secret(int module, char *user, char *secret, int len)
        return 1;
 }
 
+static char *getpassf(char *filename)
+{
+       char buffer[100];
+       int fd=0;
+       STRUCT_STAT st;
+       int ok = 1;
+       extern int am_root;
+       char *envpw=getenv("RSYNC_PASSWORD");
+
+       if (!filename) return NULL;
+
+       if ( (fd=open(filename,O_RDONLY)) == -1) {
+               rprintf(FERROR,"could not open password file \"%s\"\n",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);
+               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)) {
+               rprintf(FERROR,"password file must be owned by root when running as root\n");
+               ok = 0;
+       }
+       if (!ok) {
+               rprintf(FERROR,"continuing without password file\n");
+               if (envpw) rprintf(FERROR,"using RSYNC_PASSWORD environment variable.\n");
+               close(fd);
+               return NULL;
+       }
+
+       if (envpw) rprintf(FERROR,"RSYNC_PASSWORD environment variable ignored\n");
+
+       buffer[sizeof(buffer)-1]='\0';
+       if (read(fd,buffer,sizeof(buffer)-1) > 0)
+       {
+               char *p = strtok(buffer,"\n\r");
+               close(fd);
+               if (p) p = strdup(p);
+               return p;
+       }       
+
+       return NULL;
+}
+
 /* generate a 16 byte hash from a password and challenge */
 static void generate_hash(char *in, char *challenge, char *out)
 {
@@ -216,10 +266,11 @@ void auth_client(int fd, char *user, char *challenge)
 {
        char *pass;
        char pass2[30];
+       extern char *password_file;
 
        if (!user || !*user) return;
 
-       if (!(pass=getenv("RSYNC_PASSWORD"))) {
+       if (!(pass=getpassf(password_file)) && !(pass=getenv("RSYNC_PASSWORD"))) {
                pass = getpass("Password: ");
        }
 
@@ -228,7 +279,7 @@ void auth_client(int fd, char *user, char *challenge)
        }
 
        generate_hash(pass, challenge, pass2);
-       
        io_printf(fd, "%s %s\n", user, pass2);
 }
 
+