If there is no lchown(), don't try to set the user & group of a symlink.

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index 56be490..542f440 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -65,7 +65,7 @@ static void gen_challenge(char *addr, char *challenge)
        SIVAL(input, 20, tv.tv_usec);
        SIVAL(input, 24, getpid());
 
-       sum_init();
+       sum_init(0);
        sum_update(input, sizeof input);
        sum_end(challenge);
 }
@@ -87,19 +87,19 @@ static int get_secret(int module, char *user, char *secret, int len)
                return 0;
 
        if (do_stat(fname, &st) == -1) {
-               rsyserr(FERROR, errno, "stat(%s)", fname);
+               rsyserr(FLOG, 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");
+                       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;
        }
@@ -199,7 +199,7 @@ static void generate_hash(char *in, char *challenge, char *out)
 {
        char buf[16];
 
-       sum_init();
+       sum_init(0);
        sum_update(in, strlen(in));
        sum_update(challenge, strlen(challenge));
        sum_end(buf);