-/*
- Copyright (C) Andrew Tridgell 1998
+/* -*- c-file-style: "linux"; -*-
+
+ 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
encode a buffer using base64 - simple and slow algorithm. null terminates
the result.
***************************************************************************/
-static void base64_encode(char *buf, int len, char *out)
+void base64_encode(char *buf, int len, char *out)
{
char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
int bit_offset, byte_offset, idx, i;
memset(out, 0, bytes+1);
- for (i=0;i<bytes;i++) {
+ for (i = 0; i < bytes; i++) {
byte_offset = (i*6)/8;
bit_offset = (i*6)%8;
if (bit_offset < 3) {
if (fd == -1) return 0;
if (do_stat(fname, &st) == -1) {
- rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
+ rsyserr(FERROR, errno, "stat(%s)", fname);
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 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 (!filename) return NULL;
if ( (fd=open(filename,O_RDONLY)) == -1) {
- rprintf(FERROR,"could not open password file \"%s\"\n",filename);
+ rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
if (envpw) rprintf(FERROR,"falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
if (do_stat(filename, &st) == -1) {
- rprintf(FERROR,"stat(%s) : %s\n", filename, strerror(errno));
+ 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");
otherwise return username
*/
-char *auth_server(int fd, 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];
base64_encode(challenge, 16, b64_challenge);
- io_printf(fd,"%s%s\n", leader, b64_challenge);
+ io_printf(f_out, "%s%s\n", leader, b64_challenge);
- if (!read_line(fd, line, sizeof(line)-1)) {
+ if (!read_line(f_in, line, sizeof(line)-1)) {
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")) {
- if (strcmp(tok, user) == 0) break;
+ if (wildmatch(tok, user)) break;
}
free(users);
char pass2[30];
extern char *password_file;
- if (!user || !*user) return;
+ if (!user || !*user)
+ user = "nobody";
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.
+ *
+ * Andrew Klein says that getpassphrase() is present
+ * on Solaris and reads up to 256 characters.
+ *
+ * OpenBSD has a readpassphrase() that might be more suitable.
+ */
pass = getpass("Password: ");
}