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
Make sure we process a parent patch before a dependent patch.
[rsync/rsync.git]
/
authenticate.c
diff --git
a/authenticate.c
b/authenticate.c
index
c3dabd0
..
afb8554
100644
(file)
--- a/
authenticate.c
+++ b/
authenticate.c
@@
-2,11
+2,11
@@
* Support rsync daemon authentication.
*
* Copyright (C) 1998-2000 Andrew Tridgell
* Support rsync daemon authentication.
*
* Copyright (C) 1998-2000 Andrew Tridgell
- * Copyright (C) 2002
, 2004, 2005, 2006
Wayne Davison
+ * 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 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
- * the Free Software Foundation; either version
2
of the License, or
+ * 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,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-15,13
+15,13
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#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
@@
-58,8
+58,9
@@
void base64_encode(const char *buf, int len, char *out, int pad)
static void gen_challenge(const char *addr, char *challenge)
{
char input[32];
static void gen_challenge(const char *addr, char *challenge)
{
char input[32];
- char
md4_out[MD4_SUM_LENGTH
];
+ char
digest[MAX_DIGEST_LEN
];
struct timeval tv;
struct timeval tv;
+ int len;
memset(input, 0, sizeof input);
memset(input, 0, sizeof input);
@@
-71,9
+72,9
@@
static void gen_challenge(const char *addr, char *challenge)
sum_init(0);
sum_update(input, sizeof input);
sum_init(0);
sum_update(input, sizeof input);
-
sum_end(md4_ou
t);
+
len = sum_end(diges
t);
- base64_encode(
md4_out, MD4_SUM_LENGTH
, challenge, 0);
+ base64_encode(
digest, len
, challenge, 0);
}
}
@@
-166,7
+167,7
@@
static const char *getpassf(const char *filename)
rsyserr(FERROR, errno, "could not open password file \"%s\"",
filename);
if (envpw)
rsyserr(FERROR, errno, "could not open password file \"%s\"",
filename);
if (envpw)
- rprintf(F
ERROR
, "falling back to RSYNC_PASSWORD environment variable.\n");
+ rprintf(F
INFO
, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
return NULL;
}
@@
-174,23
+175,20
@@
static const char *getpassf(const char *filename)
rsyserr(FERROR, errno, "stat(%s)", filename);
ok = 0;
} else if ((st.st_mode & 06) != 0) {
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) {
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) {
ok = 0;
}
if (!ok) {
- rprintf(FERROR,"continuing without password file\n");
- if (envpw)
- rprintf(FERROR, "using RSYNC_PASSWORD environment variable.\n");
close(fd);
close(fd);
+ rprintf(FERROR, "continuing without password file\n");
+ if (envpw)
+ rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
return NULL;
}
- if (envpw)
- rprintf(FERROR, "RSYNC_PASSWORD environment variable ignored\n");
-
n = read(fd, buffer, sizeof buffer - 1);
close(fd);
if (n > 0) {
n = read(fd, buffer, sizeof buffer - 1);
close(fd);
if (n > 0) {
@@
-206,14
+204,15
@@
static const char *getpassf(const char *filename)
* and the challenge string and return it base64-encoded. */
static void generate_hash(const char *in, const char *challenge, char *out)
{
* and the challenge string and return it base64-encoded. */
static void generate_hash(const char *in, const char *challenge, char *out)
{
- char buf[MD4_SUM_LENGTH];
+ char buf[MAX_DIGEST_LEN];
+ int len;
sum_init(0);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
sum_init(0);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
- sum_end(buf);
+
len =
sum_end(buf);
- base64_encode(buf,
MD4_SUM_LENGTH
, out, 0);
+ base64_encode(buf,
len
, out, 0);
}
/* Possibly negotiate authentication with the client. Use "leader" to
}
/* Possibly negotiate authentication with the client. Use "leader" to
@@
-226,10
+225,10
@@
char *auth_server(int f_in, int f_out, int module, const char *host,
const char *addr, const char *leader)
{
char *users = lp_auth_users(module);
const char *addr, const char *leader)
{
char *users = lp_auth_users(module);
- char challenge[M
D4_SUM_LENGTH
*2];
+ char challenge[M
AX_DIGEST_LEN
*2];
char line[BIGPATHBUFLEN];
char secret[512];
char line[BIGPATHBUFLEN];
char secret[512];
- char pass2[M
D4_SUM_LENGTH
*2];
+ char pass2[M
AX_DIGEST_LEN
*2];
char *tok, *pass;
/* if no auth list then allow anyone in! */
char *tok, *pass;
/* if no auth list then allow anyone in! */
@@
-240,7
+239,7
@@
char *auth_server(int f_in, int f_out, int module, const char *host,
io_printf(f_out, "%s%s\n", leader, challenge);
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",
|| (pass = strchr(line, ' ')) == NULL) {
rprintf(FLOG, "auth failed on module %s from %s (%s): "
"invalid challenge response\n",
@@
-290,7
+289,7
@@
char *auth_server(int f_in, int f_out, int module, const char *host,
void auth_client(int fd, const char *user, const char *challenge)
{
const char *pass;
void auth_client(int fd, const char *user, const char *challenge)
{
const char *pass;
- char pass2[M
D4_SUM_LENGTH
*2];
+ char pass2[M
AX_DIGEST_LEN
*2];
if (!user || !*user)
user = "nobody";
if (!user || !*user)
user = "nobody";
@@
-309,6
+308,9
@@
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 = "";