X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3ca8e68f58e7ffeac5b8b969ef26bffc2069f113..c48b22c8583f6d6c55c6a6f6001cf4fdcc20aed1:/authenticate.c diff --git a/authenticate.c b/authenticate.c index 50c10aae..30bc53db 100644 --- a/authenticate.c +++ b/authenticate.c @@ -56,7 +56,7 @@ static void gen_challenge(char *addr, char *challenge) memset(input, 0, sizeof(input)); strlcpy((char *)input, addr, 17); - gettimeofday(&tv, NULL); + sys_gettimeofday(&tv); SIVAL(input, 16, tv.tv_sec); SIVAL(input, 20, tv.tv_usec); SIVAL(input, 24, getpid()); @@ -135,7 +135,6 @@ static int get_secret(int module, char *user, char *secret, int len) static char *getpassf(char *filename) { char buffer[100]; - int len=0; int fd=0; STRUCT_STAT st; int ok = 1; @@ -170,7 +169,7 @@ static char *getpassf(char *filename) if (envpw) rprintf(FERROR,"RSYNC_PASSWORD environment variable ignored\n"); buffer[sizeof(buffer)-1]='\0'; - if ( (len=read(fd,buffer,sizeof(buffer)-1)) > 0) + if (read(fd,buffer,sizeof(buffer)-1) > 0) { char *p = strtok(buffer,"\n\r"); close(fd);