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
Add news item about fix of --copy-unsafe-links
[rsync/rsync.git]
/
authenticate.c
diff --git
a/authenticate.c
b/authenticate.c
index
9aae72d
..
7d44da6
100644
(file)
--- a/
authenticate.c
+++ b/
authenticate.c
@@
-105,8
+105,8
@@
static int get_secret(int module, char *user, char *secret, int len)
while (!found) {
int i = 0;
while (!found) {
int i = 0;
- memset(line, 0, sizeof
(line)
);
- while (
i<
(sizeof(line)-1)) {
+ memset(line, 0, sizeof
line
);
+ while (
(size_t) i <
(sizeof(line)-1)) {
if (read(fd, &line[i], 1) != 1) {
memset(line, 0, sizeof(line));
close(fd);
if (read(fd, &line[i], 1) != 1) {
memset(line, 0, sizeof(line));
close(fd);
@@
-203,7
+203,7
@@
static void generate_hash(char *in, char *challenge, char *out)
otherwise return username
*/
otherwise return username
*/
-char *auth_server(int f
d
, int module, char *addr, char *leader)
+char *auth_server(int f
_in, int f_out
, int module, char *addr, char *leader)
{
char *users = lp_auth_users(module);
char challenge[16];
{
char *users = lp_auth_users(module);
char challenge[16];
@@
-222,9
+222,9
@@
char *auth_server(int fd, int module, char *addr, char *leader)
base64_encode(challenge, 16, b64_challenge);
base64_encode(challenge, 16, b64_challenge);
- io_printf(f
d,
"%s%s\n", leader, b64_challenge);
+ io_printf(f
_out,
"%s%s\n", leader, b64_challenge);
- if (!read_line(f
d
, line, sizeof(line)-1)) {
+ if (!read_line(f
_in
, line, sizeof(line)-1)) {
return NULL;
}
return NULL;
}
@@
-234,12
+234,12
@@
char *auth_server(int fd, int module, char *addr, char *leader)
if (sscanf(line,"%99s %29s", user, pass) != 2) {
return NULL;
}
if (sscanf(line,"%99s %29s", user, pass) != 2) {
return NULL;
}
-
+
users = strdup(users);
if (!users) return NULL;
for (tok=strtok(users," ,\t"); tok; tok = strtok(NULL," ,\t")) {
users = strdup(users);
if (!users) return NULL;
for (tok=strtok(users," ,\t"); tok; tok = strtok(NULL," ,\t")) {
- if (
strcmp(tok, user
) == 0) break;
+ if (
fnmatch(tok, user, 0
) == 0) break;
}
free(users);
}
free(users);
@@
-272,6
+272,9
@@
void auth_client(int fd, char *user, char *challenge)
if (!user || !*user) return;
if (!(pass=getpassf(password_file)) && !(pass=getenv("RSYNC_PASSWORD"))) {
if (!user || !*user) return;
if (!(pass=getpassf(password_file)) && !(pass=getenv("RSYNC_PASSWORD"))) {
+ /* XXX: cyeoh says that getpass is deprecated, because
+ it may return a truncated password on some systems,
+ and it is not in the LSB. */
pass = getpass("Password: ");
}
pass = getpass("Password: ");
}