From 3f655ca08d1d59d274978d99da18e8cc691db6b3 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 14 Oct 2007 21:20:31 +0000 Subject: [PATCH] If the user told us to use a password file and we used it, there's no need to comment if a RSYNC_PASSWORD environment variable is set. --- authenticate.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/authenticate.c b/authenticate.c index 8991ac43..b8f63acd 100644 --- a/authenticate.c +++ b/authenticate.c @@ -166,7 +166,7 @@ static const char *getpassf(const char *filename) rsyserr(FERROR, errno, "could not open password file \"%s\"", filename); if (envpw) - rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n"); + rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n"); return NULL; } @@ -174,23 +174,20 @@ static const char *getpassf(const char *filename) 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"); + rprintf(FERROR, "password file must not be other-accessible\n"); ok = 0; } else if (MY_UID() == 0 && st.st_uid != 0) { - rprintf(FERROR,"password file must be owned by root when running as root\n"); + 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); + rprintf(FERROR, "continuing without password file\n"); + if (envpw) + rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n"); return NULL; } - if (envpw) - rprintf(FERROR, "RSYNC_PASSWORD environment variable ignored\n"); - n = read(fd, buffer, sizeof buffer - 1); close(fd); if (n > 0) { -- 2.34.1