- detect presence of remsh and use it instead of rsh

- handle directory ownership and permissions much better.

- fix bug where links caused the permissions of files to be
set incorrectly

- override the default umask in setting file permissions

- better handling -o and -D being passed to non-root users

- handle rsync to a destination of /

- fix the handling of mismatched file types at either end of the
link. For example, if the destination is a link and the source is not.

diff --git a/Makefile.in b/Makefile.in
index 33b90a4082ad0f3ff5db75fbc49509720d0a5cd7..b5309be07e48a1b69981d965a04d74fc961cc4cd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,6 @@ CC=@CC@ $(CCOPTFLAGS)
 
 INSTALLCMD=@INSTALL@
 
-
 SRC=@srcdir@
 SHELL=/bin/sh
 

diff --git a/configure.in b/configure.in
index d1cf31d62a92a602cec40ab2c49dfe366caf2464..76f3ed5887b826c823f041ae8029e12359711b03 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,10 +7,13 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_SUBST(SHELL)
 
+AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
+AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH)
+
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(sys/fcntl.h fcntl.h sys/time.h unistd.h utime.h grp.h)
+AC_CHECK_HEADERS(sys/fcntl.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h)
 AC_CHECK_HEADERS(compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h)
 AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h)
 

diff --git a/hlink.c b/hlink.c
index 3213b2ea5e80e85d69a80d709f2b33703f353a47..238fc02bd1bafee85609cf20e6b5a54d0354a33f 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -54,7 +54,9 @@ void init_hard_links(struct file_list *flist)
        (struct file_struct *)malloc(sizeof(hlink_list[0])*flist->count)))
     out_of_memory("init_hard_links");
 
-  bcopy((char *)flist->files,hlink_list,sizeof(hlink_list[0])*flist->count);
+  bcopy((char *)flist->files,
+       (char *)hlink_list,
+       sizeof(hlink_list[0])*flist->count);
 
   qsort(hlink_list,flist->count,
        sizeof(hlink_list[0]),
@@ -113,8 +115,8 @@ void do_hard_links(struct file_list *flist)
        hlink_list[i].inode == hlink_list[i-1].inode) {
       struct stat st1,st2;
 
-      if (stat(hlink_list[i-1].name,&st1) != 0) continue;
-      if (stat(hlink_list[i].name,&st2) != 0) {
+      if (lstat(hlink_list[i-1].name,&st1) != 0) continue;
+      if (lstat(hlink_list[i].name,&st2) != 0) {
        if (!dry_run && link(hlink_list[i-1].name,hlink_list[i].name) != 0) {
          fprintf(FINFO,"link %s => %s : %s\n",
                  hlink_list[i].name,hlink_list[i-1].name,strerror(errno));

diff --git a/main.c b/main.c
index 930f823ee6eff47b9924f9f73e5ab0fbbbba4dab..8ca252fb8b277d29c5cf999b47d6809dc7b24625 100644 (file)
--- a/main.c
+++ b/main.c
@@ -47,6 +47,8 @@ int one_file_system=0;
 int remote_version=0;
 int sparse_files=0;
 int do_compression=0;
+int am_root=0;
+int orig_umask=0;
 
 extern int csum_length;
 
@@ -174,11 +176,20 @@ int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
       args[argc++] = tok;
     }
 
+#if HAVE_REMSH
+    /* remsh (on HPUX) takes the arguments the other way around */
+    args[argc++] = machine;
+    if (user) {
+      args[argc++] = "-l";
+      args[argc++] = user;
+    }
+#else
     if (user) {
       args[argc++] = "-l";
       args[argc++] = user;
     }
     args[argc++] = machine;
+#endif
   }
 
   args[argc++] = rsync_path;
@@ -190,7 +201,10 @@ int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
     p = strrchr(dir,'/');
     if (p) {
       *p = 0;
-      args[argc++] = dir;
+      if (!dir[0])
+       args[argc++] = "/";
+      else
+       args[argc++] = dir;
       p++;
     } else {
       args[argc++] = ".";
@@ -244,7 +258,7 @@ static char *get_local_name(struct file_list *flist,char *name)
   if (!name) 
     return NULL;
 
-  if (mkdir(name,0777) != 0) {
+  if (mkdir(name,0777 & ~orig_umask) != 0) {
     fprintf(FERROR,"mkdir %s : %s\n",name,strerror(errno));
     exit_cleanup(1);
   } else {
@@ -465,6 +479,11 @@ int main(int argc,char *argv[])
     char *local_name = NULL;
 
     starttime = time(NULL);
+    am_root = (getuid() == 0);
+
+    /* we set a 0 umask so that correct file permissions can be
+       carried across */
+    orig_umask = umask(0);
 
     while ((opt = getopt_long(argc, argv, 
                              short_options, long_options, &option_index)) 
@@ -545,12 +564,7 @@ int main(int argc,char *argv[])
          break;
 
        case 'o':
-         if (getuid() == 0) {
-           preserve_uid=1;
-         } else {
-           fprintf(FERROR,"-o only allowed for root\n");
-           exit_cleanup(1);
-         }
+         preserve_uid=1;
          break;
 
        case 'g':
@@ -558,12 +572,7 @@ int main(int argc,char *argv[])
          break;
 
        case 'D':
-         if (getuid() == 0) {
-           preserve_devices=1;
-         } else {
-           fprintf(FERROR,"-D only allowed for root\n");
-           exit_cleanup(1);
-         }
+         preserve_devices=1;
          break;
 
        case 't':
@@ -586,10 +595,10 @@ int main(int argc,char *argv[])
          preserve_perms=1;
          preserve_times=1;
          preserve_gid=1;
-         if (getuid() == 0) {
+         if (am_root) {
            preserve_devices=1;
            preserve_uid=1;
-         }         
+         }
          break;
 
        case OPT_SERVER:

diff --git a/rsync.c b/rsync.c
index b687fdff98e3bbb535187826a92e2b37669850d1..bcb101a9b476875f677b53e68e7153e64fa5a5a7 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -45,6 +45,7 @@ extern int ignore_times;
 extern int recurse;
 extern int delete_mode;
 extern int cvs_exclude;
+extern int am_root;
 
 /*
   free a sums struct
@@ -192,18 +193,18 @@ static struct sum_struct *receive_sums(int f)
 }
 
 
-static void set_perms(char *fname,struct file_struct *file,struct stat *st,
-                     int report)
+static int set_perms(char *fname,struct file_struct *file,struct stat *st,
+                    int report)
 {
   int updated = 0;
   struct stat st2;
 
-  if (dry_run) return;
+  if (dry_run) return 0;
 
   if (!st) {
-    if (stat(fname,&st2) != 0) {
+    if (lstat(fname,&st2) != 0) {
       fprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
-      return;
+      return 0;
     }
     st = &st2;
   }
@@ -214,7 +215,7 @@ static void set_perms(char *fname,struct file_struct *file,struct stat *st,
     if (set_modtime(fname,file->modtime) != 0) {
       fprintf(FERROR,"failed to set times on %s : %s\n",
              fname,strerror(errno));
-      return;
+      return 0;
     }
   }
 
@@ -225,20 +226,20 @@ static void set_perms(char *fname,struct file_struct *file,struct stat *st,
     if (chmod(fname,file->mode) != 0) {
       fprintf(FERROR,"failed to set permissions on %s : %s\n",
              fname,strerror(errno));
-      return;
+      return 0;
     }
   }
 #endif
 
-  if ((preserve_uid && st->st_uid != file->uid) || 
+  if ((am_root && preserve_uid && st->st_uid != file->uid) || 
       (preserve_gid && st->st_gid != file->gid)) {
     updated = 1;
     if (chown(fname,
-             preserve_uid?file->uid:-1,
+             (am_root&&preserve_uid)?file->uid:-1,
              preserve_gid?file->gid:-1) != 0) {
       if (verbose>1 || preserve_uid)
        fprintf(FERROR,"chown %s : %s\n",fname,strerror(errno));
-      return;
+      return updated;
     }
   }
     
@@ -248,6 +249,7 @@ static void set_perms(char *fname,struct file_struct *file,struct stat *st,
     else
       fprintf(FINFO,"%s is uptodate\n",fname);
   }
+  return updated;
 }
 
 
@@ -266,6 +268,22 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 
   statret = lstat(fname,&st);
 
+  if (S_ISDIR(file->mode)) {
+    if (dry_run) return;
+    if (statret == 0 && !S_ISDIR(st.st_mode)) {
+      if (unlink(fname) != 0) {
+       fprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
+       return;
+      }
+      statret = -1;
+    }
+    if (statret != 0 && mkdir(fname,file->mode) != 0 && errno != EEXIST)
+      fprintf(FERROR,"mkdir %s : %s\n",fname,strerror(errno));
+    if (set_perms(fname,file,NULL,0) && verbose) 
+      fprintf(FINFO,"%s/\n",fname);
+    return;
+  }
+
 #if SUPPORT_LINKS
   if (preserve_links && S_ISLNK(file->mode)) {
     char lnk[MAXPATHLEN];
@@ -295,7 +313,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 #endif
 
 #ifdef HAVE_MKNOD
-  if (preserve_devices && IS_DEVICE(file->mode)) {
+  if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
     if (statret != 0 || 
        st.st_mode != file->mode ||
        st.st_rdev != file->rdev) {     
@@ -341,7 +359,21 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   }
 
   if (!S_ISREG(st.st_mode)) {
-    fprintf(FERROR,"%s : not a regular file\n",fname);
+    /* its not a regular file on the receiving end, but it is on the
+       sending end. If its a directory then skip it (too dangerous to
+       do a recursive deletion??) otherwise try to unlink it */
+    if (S_ISDIR(st.st_mode)) {
+      fprintf(FERROR,"ERROR: %s is a directory\n",fname);
+      return;
+    }
+    if (unlink(fname) != 0) {
+      fprintf(FERROR,"%s : not a regular file (generator)\n",fname);
+      return;
+    }
+
+    /* now pretend the file didn't exist */
+    write_int(f_out,i);
+    if (!dry_run) send_sums(NULL,f_out);    
     return;
   }
 
@@ -425,7 +457,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
 
       sum_update(data,i);
 
-      if (write_sparse(fd,data,i) != i) {
+      if (fd != -1 && write_sparse(fd,data,i) != i) {
        fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
        exit_cleanup(1);
       }
@@ -446,7 +478,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
       see_token(map, len);
       sum_update(map,len);
 
-      if (write_sparse(fd,map,len) != len) {
+      if (fd != -1 && write_sparse(fd,map,len) != len) {
        fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
        exit_cleanup(1);
       }
@@ -454,7 +486,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
     }
   }
 
-  if (offset > 0 && sparse_end(fd) != 0) {
+  if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
     fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
     exit_cleanup(1);
   }
@@ -465,7 +497,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
     read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
     if (verbose > 2)
       fprintf(FERROR,"got file_sum\n");
-    if (memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0)
+    if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0)
       return 0;
   }
   return 1;
@@ -582,14 +614,16 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
       if (fd1 != -1 && fstat(fd1,&st) != 0) {
        fprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
+       receive_data(f_in,NULL,-1,NULL);
        close(fd1);
-       return -1;
+       continue;
       }
 
       if (fd1 != -1 && !S_ISREG(st.st_mode)) {
-       fprintf(FERROR,"%s : not a regular file\n",fname);
+       fprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
+       receive_data(f_in,NULL,-1,NULL);
        close(fd1);
-       return -1;
+       continue;
       }
 
       if (fd1 != -1 && st.st_size > 0) {
@@ -604,12 +638,18 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       sprintf(fnametmp,"%s.XXXXXX",fname);
       if (NULL == mktemp(fnametmp)) {
        fprintf(FERROR,"mktemp %s failed\n",fnametmp);
-       return -1;
+       receive_data(f_in,buf,-1,NULL);
+       if (buf) unmap_file(buf);
+       close(fd1);
+       continue;
       }
       fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
       if (fd2 == -1) {
        fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
-       return -1;
+       receive_data(f_in,buf,-1,NULL);
+       if (buf) unmap_file(buf);
+       close(fd1);
+       continue;
       }
       
       cleanup_fname = fnametmp;
@@ -634,7 +674,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
        sprintf(fnamebak,"%s%s",fname,backup_suffix);
        if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
          fprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
-         exit_cleanup(1);
+         continue;
        }
       }
 
@@ -642,6 +682,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       if (rename(fnametmp,fname) != 0) {
        fprintf(FERROR,"rename %s -> %s : %s\n",
                fnametmp,fname,strerror(errno));
+       unlink(fnametmp);
       }
 
       cleanup_fname = NULL;
@@ -657,6 +698,17 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       }
     }
 
+  /* now we need to fix any directory permissions that were 
+     modified during the transfer */
+  if (!am_root) {
+    for (i = 0; i < flist->count; i++) {
+      struct file_struct *file = &flist->files[i];
+      if (!file->name || !S_ISDIR(file->mode)) continue;
+      recv_generator(file->name,flist,i,-1);
+    }
+  }
+  
+
   if (verbose > 2)
     fprintf(FERROR,"recv_files finished\n");
   
@@ -796,18 +848,20 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
 
   for (i = 0; i < flist->count; i++) {
     struct file_struct *file = &flist->files[i];
+    mode_t saved_mode = file->mode;
     if (!file->name) continue;
-    if (S_ISDIR(file->mode)) {
-      if (dry_run) continue;
-      if (mkdir(file->name,file->mode) != 0 &&
-         errno != EEXIST) {
-       fprintf(FERROR,"mkdir %s : %s\n",
-               file->name,strerror(errno));
-      }
-      continue;
+
+    /* we need to ensure that any directories we create have writeable
+       permissions initially so that we can create the files within
+       them. This is then fixed after the files are transferred */
+    if (!am_root && S_ISDIR(file->mode)) {
+      file->mode |= S_IWUSR; /* user write */
     }
+
     recv_generator(local_name?local_name:file->name,
                   flist,i,f);
+
+    file->mode = saved_mode;
   }
 
   phase++;
@@ -821,6 +875,8 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
   write_flush(f);
 
   if (remote_version >= 13) {
+    /* in newer versions of the protocol the files can cycle through
+       the system more than once to catch initial checksum errors */
     for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
       struct file_struct *file = &flist->files[i];
       recv_generator(local_name?local_name:file->name,

diff --git a/rsync.h b/rsync.h
index ce3601853c6ccf84ae46d10626fe1b2eedd69405..6e7210cf075e13b0716e69b9baf0915e75dd5c7e 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -19,7 +19,13 @@
 
 #define BLOCK_SIZE 700
 #define RSYNC_RSH_ENV "RSYNC_RSH"
+
+#if HAVE_REMSH
+#define RSYNC_RSH "remsh"
+#else
 #define RSYNC_RSH "rsh"
+#endif
+
 #define RSYNC_NAME "rsync"
 #define BACKUP_SUFFIX "~"
 
@@ -283,5 +289,21 @@ extern int errno;
 #define EWOULDBLOCK EAGAIN
 #endif
 
+#ifndef STDIN_FILENO
+#define STDIN_FILENO 0
+#endif
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO 2
+#endif
+
+#ifndef S_IWUSR
+#define S_IWUSR 0200
+#endif
+
 #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))