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
We now ignore the SIGXFSZ signal (if it is defined).
[rsync/rsync.git]
/
authenticate.c
diff --git
a/authenticate.c
b/authenticate.c
index
25d2ded
..
ff7eef2
100644
(file)
--- a/
authenticate.c
+++ b/
authenticate.c
@@
-21,7
+21,6
@@
#include "rsync.h"
extern char *password_file;
#include "rsync.h"
extern char *password_file;
-extern int am_root;
/***************************************************************************
encode a buffer using base64 - simple and slow algorithm. null terminates
/***************************************************************************
encode a buffer using base64 - simple and slow algorithm. null terminates
@@
-51,10
+50,11
@@
void base64_encode(char *buf, int len, char *out)
}
}
}
}
-/*
Create a 16-byte challenge buffer
. */
+/*
Generate a challenge buffer and return it base64-encoded
. */
static void gen_challenge(char *addr, char *challenge)
{
char input[32];
static void gen_challenge(char *addr, char *challenge)
{
char input[32];
+ char md4_out[MD4_SUM_LENGTH];
struct timeval tv;
memset(input, 0, sizeof input);
struct timeval tv;
memset(input, 0, sizeof input);
@@
-67,7
+67,9
@@
static void gen_challenge(char *addr, char *challenge)
sum_init(0);
sum_update(input, sizeof input);
sum_init(0);
sum_update(input, sizeof input);
- sum_end(challenge);
+ sum_end(md4_out);
+
+ base64_encode(md4_out, MD4_SUM_LENGTH, challenge);
}
}
@@
-87,13
+89,13
@@
static int get_secret(int module, char *user, char *secret, int len)
return 0;
if (do_stat(fname, &st) == -1) {
return 0;
if (do_stat(fname, &st) == -1) {
- rsyserr(FLOG, errno, "stat(%s)",
safe_fname(fname)
);
+ rsyserr(FLOG, errno, "stat(%s)",
fname
);
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
ok = 0;
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
ok = 0;
- } else if (
am_root && (st.st_uid != 0)
) {
+ } else if (
MY_UID() == 0 && st.st_uid != 0
) {
rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
ok = 0;
}
rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
ok = 0;
}
@@
-157,19
+159,19
@@
static char *getpassf(char *filename)
if ((fd = open(filename,O_RDONLY)) < 0) {
rsyserr(FERROR, errno, "could not open password file \"%s\"",
if ((fd = open(filename,O_RDONLY)) < 0) {
rsyserr(FERROR, errno, "could not open password file \"%s\"",
-
safe_fname(filename)
);
+
filename
);
if (envpw)
rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
if (do_stat(filename, &st) == -1) {
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)",
safe_fname(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");
ok = 0;
ok = 0;
} else if ((st.st_mode & 06) != 0) {
rprintf(FERROR,"password file must not be other-accessible\n");
ok = 0;
- } else if (
am_root
&& st.st_uid != 0) {
+ } else if (
MY_UID() == 0
&& st.st_uid != 0) {
rprintf(FERROR,"password file must be owned by root when running as root\n");
ok = 0;
}
rprintf(FERROR,"password file must be owned by root when running as root\n");
ok = 0;
}
@@
-195,7
+197,8
@@
static char *getpassf(char *filename)
return NULL;
}
return NULL;
}
-/* Generate a 16-byte hash from a password and challenge. */
+/* Generate an MD4 hash created from the combination of the password
+ * and the challenge string and return it base64-encoded. */
static void generate_hash(char *in, char *challenge, char *out)
{
char buf[MD4_SUM_LENGTH];
static void generate_hash(char *in, char *challenge, char *out)
{
char buf[MD4_SUM_LENGTH];
@@
-218,9
+221,8
@@
char *auth_server(int f_in, int f_out, int module, char *host, char *addr,
char *leader)
{
char *users = lp_auth_users(module);
char *leader)
{
char *users = lp_auth_users(module);
- char challenge[MD4_SUM_LENGTH];
- char b64_challenge[MD4_SUM_LENGTH*2];
- char line[MAXPATHLEN];
+ char challenge[MD4_SUM_LENGTH*2];
+ char line[BIGPATHBUFLEN];
char secret[512];
char pass2[MD4_SUM_LENGTH*2];
char *tok, *pass;
char secret[512];
char pass2[MD4_SUM_LENGTH*2];
char *tok, *pass;
@@
-231,9
+233,7
@@
char *auth_server(int f_in, int f_out, int module, char *host, char *addr,
gen_challenge(addr, challenge);
gen_challenge(addr, challenge);
- base64_encode(challenge, MD4_SUM_LENGTH, b64_challenge);
-
- io_printf(f_out, "%s%s\n", leader, b64_challenge);
+ io_printf(f_out, "%s%s\n", leader, challenge);
if (!read_line(f_in, line, sizeof line - 1)
|| (pass = strchr(line, ' ')) == NULL) {
if (!read_line(f_in, line, sizeof line - 1)
|| (pass = strchr(line, ' ')) == NULL) {
@@
-269,7
+269,7
@@
char *auth_server(int f_in, int f_out, int module, char *host, char *addr,
return NULL;
}
return NULL;
}
- generate_hash(secret,
b64_
challenge, pass2);
+ generate_hash(secret, challenge, pass2);
memset(secret, 0, sizeof secret);
if (strcmp(pass, pass2) != 0) {
memset(secret, 0, sizeof secret);
if (strcmp(pass, pass2) != 0) {
@@
-311,5
+311,3
@@
void auth_client(int fd, char *user, char *challenge)
generate_hash(pass, challenge, pass2);
io_printf(fd, "%s %s\n", user, pass2);
}
generate_hash(pass, challenge, pass2);
io_printf(fd, "%s %s\n", user, pass2);
}
-
-