Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e1f385
)
Some superficial code tweaks.
author
Wayne Davison
<wayned@samba.org>
Sat, 5 Jun 2004 19:59:03 +0000
(19:59 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 5 Jun 2004 19:59:03 +0000
(19:59 +0000)
clientserver.c
patch
|
blob
|
blame
|
history
diff --git
a/clientserver.c
b/clientserver.c
index
a1e15c0
..
697d026
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-70,7
+70,7
@@
char *auth_user;
int start_socket_client(char *host, char *path, int argc, char *argv[])
{
int fd, ret;
int start_socket_client(char *host, char *path, int argc, char *argv[])
{
int fd, ret;
- char *p, *user
=
NULL;
+ char *p, *user
=
NULL;
/* this is redundant with code in start_inband_exchange(), but
* this short-circuits a problem before we open a socket, and
/* this is redundant with code in start_inband_exchange(), but
* this short-circuits a problem before we open a socket, and
@@
-113,8
+113,10
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
return -1;
}
return -1;
}
- if (!user) user = getenv("USER");
- if (!user) user = getenv("LOGNAME");
+ if (!user)
+ user = getenv("USER");
+ if (!user)
+ user = getenv("LOGNAME");
/* set daemon_over_rsh to false since we need to build the
* true set of args passed through the rsh/ssh connection;
/* set daemon_over_rsh to false since we need to build the
* true set of args passed through the rsh/ssh connection;
@@
-131,7
+133,7
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
- if (!read_line(f_in, line, sizeof
(line)-
1)) {
+ if (!read_line(f_in, line, sizeof
line -
1)) {
rprintf(FERROR, "rsync: did not see server greeting\n");
return -1;
}
rprintf(FERROR, "rsync: did not see server greeting\n");
return -1;
}
@@
-155,7
+157,7
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
kludge_around_eof = list_only && (protocol_version < 25);
while (1) {
kludge_around_eof = list_only && (protocol_version < 25);
while (1) {
- if (!read_line(f_in, line, sizeof
(line)-
1)) {
+ if (!read_line(f_in, line, sizeof
line -
1)) {
rprintf(FERROR, "rsync: didn't get server startup line\n");
return -1;
}
rprintf(FERROR, "rsync: didn't get server startup line\n");
return -1;
}
@@
-165,7
+167,8
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
continue;
}
continue;
}
- if (strcmp(line,"@RSYNCD: OK") == 0) break;
+ if (strcmp(line,"@RSYNCD: OK") == 0)
+ break;
if (strcmp(line,"@RSYNCD: EXIT") == 0) {
/* This is sent by recent versions of the
if (strcmp(line,"@RSYNCD: EXIT") == 0) {
/* This is sent by recent versions of the
@@
-203,7
+206,7
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
static int rsync_module(int f_in, int f_out, int i)
{
static int rsync_module(int f_in, int f_out, int i)
{
- int argc
=
0;
+ int argc
=
0;
char *argv[MAX_ARGS];
char **argp;
char line[MAXPATHLEN];
char *argv[MAX_ARGS];
char **argp;
char line[MAXPATHLEN];
@@
-214,9
+217,9
@@
static int rsync_module(int f_in, int f_out, int i)
char *host = client_name(f_in);
char *name = lp_name(i);
int use_chroot = lp_use_chroot(i);
char *host = client_name(f_in);
char *name = lp_name(i);
int use_chroot = lp_use_chroot(i);
- int start_glob
=
0;
+ int start_glob
=
0;
int ret;
int ret;
- char *request
=
NULL;
+ char *request
=
NULL;
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@
-246,7
+249,6
@@
static int rsync_module(int f_in, int f_out, int i)
return -1;
}
return -1;
}
-
auth_user = auth_server(f_in, f_out, i, addr, "@RSYNCD: AUTHREQD ");
if (!auth_user) {
auth_user = auth_server(f_in, f_out, i, addr, "@RSYNCD: AUTHREQD ");
if (!auth_user) {
@@
-263,7
+265,7
@@
static int rsync_module(int f_in, int f_out, int i)
if (am_root) {
p = lp_uid(i);
if (!name_to_uid(p, &uid)) {
if (am_root) {
p = lp_uid(i);
if (!name_to_uid(p, &uid)) {
- if (!isdigit(*
(unsigned char *)
p)) {
+ if (!isdigit(*
(unsigned char *)
p)) {
rprintf(FERROR,"Invalid uid %s\n", p);
io_printf(f_out, "@ERROR: invalid uid %s\n", p);
return -1;
rprintf(FERROR,"Invalid uid %s\n", p);
io_printf(f_out, "@ERROR: invalid uid %s\n", p);
return -1;
@@
-273,7
+275,7
@@
static int rsync_module(int f_in, int f_out, int i)
p = lp_gid(i);
if (!name_to_gid(p, &gid)) {
p = lp_gid(i);
if (!name_to_gid(p, &gid)) {
- if (!isdigit(*
(unsigned char *)
p)) {
+ if (!isdigit(*
(unsigned char *)
p)) {
rprintf(FERROR,"Invalid gid %s\n", p);
io_printf(f_out, "@ERROR: invalid gid %s\n", p);
return -1;
rprintf(FERROR,"Invalid gid %s\n", p);
io_printf(f_out, "@ERROR: invalid gid %s\n", p);
return -1;
@@
-358,7
+360,7
@@
static int rsync_module(int f_in, int f_out, int i)
* all their supplementary groups. */
if (setgid(gid)) {
* all their supplementary groups. */
if (setgid(gid)) {
- rsyserr(FERROR, errno, "setgid %d failed", (int)
gid);
+ rsyserr(FERROR, errno, "setgid %d failed", (int)gid);
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
@@
-373,7
+375,7
@@
static int rsync_module(int f_in, int f_out, int i)
#endif
if (setuid(uid)) {
#endif
if (setuid(uid)) {
- rsyserr(FERROR, errno, "setuid %d failed", (int)
uid);
+ rsyserr(FERROR, errno, "setuid %d failed", (int)uid);
io_printf(f_out, "@ERROR: setuid failed\n");
return -1;
}
io_printf(f_out, "@ERROR: setuid failed\n");
return -1;
}
@@
-386,18
+388,16
@@
static int rsync_module(int f_in, int f_out, int i)
argv[argc++] = "rsyncd";
while (1) {
argv[argc++] = "rsyncd";
while (1) {
- if (!read_line(f_in, line, sizeof
(line)-1)) {
+ if (!read_line(f_in, line, sizeof
line - 1))
return -1;
return -1;
- }
- if (!*line) break;
+ if (!*line)
+ break;
p = line;
p = line;
- argv[argc] = strdup(p);
- if (!argv[argc]) {
+ if (!(argv[argc] = strdup(p)))
return -1;
return -1;
- }
if (start_glob) {
if (start_glob == 1) {
if (start_glob) {
if (start_glob == 1) {
@@
-405,17
+405,14
@@
static int rsync_module(int f_in, int f_out, int i)
start_glob++;
}
glob_expand(name, argv, &argc, MAX_ARGS);
start_glob++;
}
glob_expand(name, argv, &argc, MAX_ARGS);
- } else
{
+ } else
argc++;
argc++;
- }
- if (strcmp(line,
".") == 0) {
+ if (strcmp(line,
".") == 0)
start_glob = 1;
start_glob = 1;
- }
- if (argc == MAX_ARGS)
{
+ if (argc == MAX_ARGS)
return -1;
return -1;
- }
}
argp = argv;
}
argp = argv;
@@
-461,9
+458,8
@@
static int rsync_module(int f_in, int f_out, int i)
exit_cleanup(RERR_UNSUPPORTED);
}
exit_cleanup(RERR_UNSUPPORTED);
}
- if (lp_timeout(i))
{
+ if (lp_timeout(i))
io_timeout = lp_timeout(i);
io_timeout = lp_timeout(i);
- }
start_server(f_in, f_out, argc, argp);
start_server(f_in, f_out, argc, argp);
@@
-477,7
+473,7
@@
static void send_listing(int fd)
int n = lp_numservices();
int i;
int n = lp_numservices();
int i;
- for (i
=0;i<n;
i++)
+ for (i
= 0; i < n;
i++)
if (lp_list(i))
io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
if (lp_list(i))
io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
@@
-494,9
+490,8
@@
int start_daemon(int f_in, int f_out)
char *motd;
int i = -1;
char *motd;
int i = -1;
- if (!lp_load(config_file, 0))
{
+ if (!lp_load(config_file, 0))
exit_cleanup(RERR_SYNTAX);
exit_cleanup(RERR_SYNTAX);
- }
log_init();
log_init();
@@
-512,19
+507,19
@@
int start_daemon(int f_in, int f_out)
if (motd && *motd) {
FILE *f = fopen(motd,"r");
while (f && !feof(f)) {
if (motd && *motd) {
FILE *f = fopen(motd,"r");
while (f && !feof(f)) {
- int len = fread(line, 1, sizeof
(line)-
1, f);
+ int len = fread(line, 1, sizeof
line -
1, f);
if (len > 0) {
line[len] = 0;
io_printf(f_out, "%s", line);
}
}
if (len > 0) {
line[len] = 0;
io_printf(f_out, "%s", line);
}
}
- if (f) fclose(f);
+ if (f)
+ fclose(f);
io_printf(f_out, "\n");
}
io_printf(f_out, "\n");
}
- if (!read_line(f_in, line, sizeof
(line)-1)) {
+ if (!read_line(f_in, line, sizeof
line - 1))
return -1;
return -1;
- }
if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
io_printf(f_out, "@ERROR: protocol startup error\n");
if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
io_printf(f_out, "@ERROR: protocol startup error\n");
@@
-535,11
+530,10
@@
int start_daemon(int f_in, int f_out)
while (i == -1) {
line[0] = 0;
while (i == -1) {
line[0] = 0;
- if (!read_line(f_in, line, sizeof
(line)-1)) {
+ if (!read_line(f_in, line, sizeof
line - 1))
return -1;
return -1;
- }
- if (!*line || strcmp(line,"#list")
==
0) {
+ if (!*line || strcmp(line,"#list")
==
0) {
send_listing(f_out);
return -1;
}
send_listing(f_out);
return -1;
}
@@
-571,7
+565,7
@@
int daemon_main(void)
/* we are running via inetd - close off stdout and
* stderr so that library functions (and getopt) don't
* try to use them. Redirect them to /dev/null */
/* we are running via inetd - close off stdout and
* stderr so that library functions (and getopt) don't
* try to use them. Redirect them to /dev/null */
- for (i
=1;i<3;
i++) {
+ for (i
= 1; i < 3;
i++) {
close(i);
open("/dev/null", O_RDWR);
}
close(i);
open("/dev/null", O_RDWR);
}
@@
-582,9
+576,8
@@
int daemon_main(void)
if (!no_detach)
become_daemon();
if (!no_detach)
become_daemon();
- if (!lp_load(config_file, 1))
{
+ if (!lp_load(config_file, 1))
exit_cleanup(RERR_SYNTAX);
exit_cleanup(RERR_SYNTAX);
- }
log_init();
log_init();