Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print strerror when a system error occurs; add a new function rsyserr
[rsync/rsync.git]
/
authenticate.c
diff --git
a/authenticate.c
b/authenticate.c
index
50c10aa
..
842a59e
100644
(file)
--- 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);
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());
SIVAL(input, 16, tv.tv_sec);
SIVAL(input, 20, tv.tv_usec);
SIVAL(input, 24, getpid());
@@
-85,7
+85,7
@@
static int get_secret(int module, char *user, char *secret, int len)
if (fd == -1) return 0;
if (do_stat(fname, &st) == -1) {
if (fd == -1) return 0;
if (do_stat(fname, &st) == -1) {
- r
printf(FERROR,"stat(%s) : %s\n", fname, strerror(errno)
);
+ r
syserr(FERROR, errno, "stat(%s)", fname
);
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
ok = 0;
} else if (lp_strict_modes(module)) {
if ((st.st_mode & 06) != 0) {
@@
-135,7
+135,6
@@
static int get_secret(int module, char *user, char *secret, int len)
static char *getpassf(char *filename)
{
char buffer[100];
static char *getpassf(char *filename)
{
char buffer[100];
- int len=0;
int fd=0;
STRUCT_STAT st;
int ok = 1;
int fd=0;
STRUCT_STAT st;
int ok = 1;
@@
-151,7
+150,7
@@
static char *getpassf(char *filename)
}
if (do_stat(filename, &st) == -1) {
}
if (do_stat(filename, &st) == -1) {
- r
printf(FERROR,"stat(%s) : %s\n", filename, strerror(errno)
);
+ r
syserr(FERROR, errno, "stat(%s)", filename
);
ok = 0;
} else if ((st.st_mode & 06) != 0) {
rprintf(FERROR,"password file must not be other-accessible\n");
ok = 0;
} else if ((st.st_mode & 06) != 0) {
rprintf(FERROR,"password file must not be other-accessible\n");
@@
-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 (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);
{
char *p = strtok(buffer,"\n\r");
close(fd);