Call wildmatch(), not fnmatch().

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index 842a59e..ef4f6af 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -1,5 +1,6 @@
-/* 
-   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
@@ -104,8 +105,8 @@ static int get_secret(int module, char *user, char *secret, int len)
 
        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);
@@ -144,7 +145,7 @@ static char *getpassf(char *filename)
        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;
        }
@@ -202,7 +203,7 @@ static void generate_hash(char *in, char *challenge, char *out)
 
    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];
@@ -221,9 +222,9 @@ char *auth_server(int fd, int module, char *addr, char *leader)
        
        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;
        }
 
@@ -233,12 +234,12 @@ char *auth_server(int fd, int module, char *addr, char *leader)
        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);
 
@@ -271,6 +272,15 @@ void auth_client(int fd, char *user, char *challenge)
        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.
+                 *
+                 * 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: ");
        }