New logging categories added to allow differentiation between

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index e1591ea..dd74b68 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -162,34 +163,31 @@ static const char *getpassf(const char *filename)
                return NULL;
 
        if ((fd = open(filename,O_RDONLY)) < 0) {
-               rsyserr(FERROR, errno, "could not open password file \"%s\"",
+               rsyserr(FWARNING, 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;
        }
 
        if (do_stat(filename, &st) == -1) {
-               rsyserr(FERROR, errno, "stat(%s)", filename);
+               rsyserr(FWARNING, errno, "stat(%s)", filename);
                ok = 0;
        } else if ((st.st_mode & 06) != 0) {
-               rprintf(FERROR,"password file must not be other-accessible\n");
+               rprintf(FWARNING, "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(FWARNING, "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(FWARNING, "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) {
@@ -240,7 +238,7 @@ char *auth_server(int f_in, int f_out, int module, const char *host,
 
        io_printf(f_out, "%s%s\n", leader, challenge);
 
-       if (!read_line(f_in, line, sizeof line - 1)
+       if (!read_line_old(f_in, line, sizeof line)
         || (pass = strchr(line, ' ')) == NULL) {
                rprintf(FLOG, "auth failed on module %s from %s (%s): "
                        "invalid challenge response\n",