/* -*- c-file-style: "linux"; -*-
-
- Copyright (C) 1998-2000 by Andrew Tridgell
-
+
+ Copyright (C) 1998-2000 by Andrew Tridgell
+
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
(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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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., 675 Mass Ave, Cambridge, MA 02139, USA.
char input[32];
struct timeval tv;
- memset(input, 0, sizeof(input));
+ memset(input, 0, sizeof input);
strlcpy((char *)input, addr, 17);
sys_gettimeofday(&tv);
SIVAL(input, 20, tv.tv_usec);
SIVAL(input, 24, getpid());
- sum_init();
- sum_update(input, sizeof(input));
+ sum_init(0);
+ sum_update(input, sizeof input);
sum_end(challenge);
}
return 0;
if (do_stat(fname, &st) == -1) {
- rsyserr(FERROR, errno, "stat(%s)", fname);
+ rsyserr(FLOG, errno, "stat(%s)", fname);
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
- rprintf(FERROR,"secrets file must not be other-accessible (see strict modes option)\n");
+ rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
ok = 0;
} else if (am_root && (st.st_uid != 0)) {
- rprintf(FERROR,"secrets file must be owned by root when running as root (see strict modes)\n");
+ rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
ok = 0;
}
}
if (!ok) {
- rprintf(FERROR,"continuing without secrets file\n");
+ rprintf(FLOG, "continuing without secrets file\n");
close(fd);
return 0;
}
if ((fd = open(filename,O_RDONLY)) < 0) {
rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
if (envpw)
- rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
+ rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
-
+
if (do_stat(filename, &st) == -1) {
rsyserr(FERROR, errno, "stat(%s)", filename);
ok = 0;
buffer[n] = '\0';
if ((p = strtok(buffer, "\n\r")) != NULL)
return strdup(p);
- }
+ }
return NULL;
}
{
char buf[16];
- sum_init();
+ sum_init(0);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
sum_end(buf);
base64_encode(buf, 16, out);
}
-/* possible negotiate authentication with the client. Use "leader" to
- start off the auth if necessary
-
- return NULL if authentication failed
-
- return "" if anonymous access
-
- otherwise return username
-*/
+/* Possibly negotiate authentication with the client. Use "leader" to
+ * start off the auth if necessary.
+ *
+ * Return NULL if authentication failed. Return "" if anonymous access.
+ * Otherwise return username.
+ */
char *auth_server(int f_in, int f_out, int module, char *addr, char *leader)
{
char *users = lp_auth_users(module);
char *tok;
/* if no auth list then allow anyone in! */
- if (!users || !*users) return "";
+ if (!users || !*users)
+ return "";
gen_challenge(addr, challenge);
-
+
base64_encode(challenge, 16, b64_challenge);
io_printf(f_out, "%s%s\n", leader, b64_challenge);
- if (!read_line(f_in, line, sizeof(line)-1)) {
+ if (!read_line(f_in, line, sizeof line - 1))
return NULL;
- }
- memset(user, 0, sizeof(user));
- memset(pass, 0, sizeof(pass));
+ memset(user, 0, sizeof user);
+ memset(pass, 0, sizeof pass);
- if (sscanf(line,"%99s %29s", user, pass) != 2) {
+ if (sscanf(line,"%99s %29s", user, pass) != 2)
return NULL;
- }
-
+
users = strdup(users);
- if (!users) return NULL;
+ if (!users)
+ return NULL;
for (tok=strtok(users," ,\t"); tok; tok = strtok(NULL," ,\t")) {
- if (wildmatch(tok, user)) break;
+ if (wildmatch(tok, user))
+ break;
}
free(users);
- if (!tok) {
+ if (!tok)
return NULL;
- }
-
- memset(secret, 0, sizeof(secret));
- if (!get_secret(module, user, secret, sizeof(secret)-1)) {
- memset(secret, 0, sizeof(secret));
+
+ memset(secret, 0, sizeof secret);
+ if (!get_secret(module, user, secret, sizeof secret - 1)) {
+ memset(secret, 0, sizeof secret);
return NULL;
}
generate_hash(secret, b64_challenge, pass2);
- memset(secret, 0, sizeof(secret));
-
+ memset(secret, 0, sizeof secret);
+
if (strcmp(pass, pass2) == 0)
return user;
if (!user || !*user)
user = "nobody";
- if (!(pass=getpassf(password_file)) && !(pass=getenv("RSYNC_PASSWORD"))) {
+ 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.
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff