Adding more calls to safe_fname().

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index 542f440..ff24028 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -87,7 +87,7 @@ static int get_secret(int module, char *user, char *secret, int len)
                return 0;
 
        if (do_stat(fname, &st) == -1) {
-               rsyserr(FLOG, errno, "stat(%s)", fname);
+               rsyserr(FLOG, errno, "stat(%s)", safe_fname(fname));
                ok = 0;
        } else if (lp_strict_modes(module)) {
                if ((st.st_mode & 06) != 0) {
@@ -156,14 +156,15 @@ static char *getpassf(char *filename)
                return NULL;
 
        if ((fd = open(filename,O_RDONLY)) < 0) {
-               rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
+               rsyserr(FERROR, errno, "could not open password file \"%s\"",
+                       safe_fname(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);
+               rsyserr(FERROR, errno, "stat(%s)", safe_fname(filename));
                ok = 0;
        } else if ((st.st_mode & 06) != 0) {
                rprintf(FERROR,"password file must not be other-accessible\n");