Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a typo that Andrea Gelmini pointed out.
[rsync/rsync.git]
/
authenticate.c
diff --git
a/authenticate.c
b/authenticate.c
index
afb8554
..
3af7337
100644
(file)
--- a/
authenticate.c
+++ b/
authenticate.c
@@
-2,7
+2,7
@@
* Support rsync daemon authentication.
*
* Copyright (C) 1998-2000 Andrew Tridgell
* Support rsync daemon authentication.
*
* Copyright (C) 1998-2000 Andrew Tridgell
- * Copyright (C) 2002-200
7
Wayne Davison
+ * Copyright (C) 2002-200
9
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-21,7
+21,6
@@
#include "rsync.h"
extern char *password_file;
#include "rsync.h"
extern char *password_file;
-extern int log_got_error;
/***************************************************************************
encode a buffer using base64 - simple and slow algorithm. null terminates
/***************************************************************************
encode a buffer using base64 - simple and slow algorithm. null terminates
@@
-164,7
+163,7
@@
static const char *getpassf(const char *filename)
return NULL;
if ((fd = open(filename,O_RDONLY)) < 0) {
return NULL;
if ((fd = open(filename,O_RDONLY)) < 0) {
- rsyserr(F
ERROR
, errno, "could not open password file \"%s\"",
+ rsyserr(F
WARNING
, errno, "could not open password file \"%s\"",
filename);
if (envpw)
rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
filename);
if (envpw)
rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
@@
-172,18
+171,18
@@
static const char *getpassf(const char *filename)
}
if (do_stat(filename, &st) == -1) {
}
if (do_stat(filename, &st) == -1) {
- rsyserr(F
ERROR
, errno, "stat(%s)", filename);
+ rsyserr(F
WARNING
, errno, "stat(%s)", filename);
ok = 0;
} else if ((st.st_mode & 06) != 0) {
ok = 0;
} else if ((st.st_mode & 06) != 0) {
- rprintf(F
ERROR
, "password file must not be other-accessible\n");
+ rprintf(F
WARNING
, "password file must not be other-accessible\n");
ok = 0;
} else if (MY_UID() == 0 && st.st_uid != 0) {
ok = 0;
} else if (MY_UID() == 0 && st.st_uid != 0) {
- rprintf(F
ERROR
, "password file must be owned by root when running as root\n");
+ rprintf(F
WARNING
, "password file must be owned by root when running as root\n");
ok = 0;
}
if (!ok) {
close(fd);
ok = 0;
}
if (!ok) {
close(fd);
- rprintf(F
ERROR
, "continuing without password file\n");
+ rprintf(F
WARNING
, "continuing without password file\n");
if (envpw)
rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
if (envpw)
rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
@@
-308,9
+307,6
@@
void auth_client(int fd, const char *user, const char *challenge)
pass = getpass("Password: ");
}
pass = getpass("Password: ");
}
- /* Any errors output during password handling aren't transfer errors. */
- log_got_error = 0;
-
if (!pass)
pass = "";
if (!pass)
pass = "";