Remove tempname length problem and files-from from TODO.

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index 2b98119..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;
-               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);
@@ -203,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];
@@ -222,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;
        }