* Run a client connected to an rsyncd. The alternative to this
* function for remote-shell connections is do_cmd().
*
- * After initial server startup, hands over to client_run().
+ * After negotiating which module to use and reading the server's
+ * motd, this hands over to client_run(). Telling the server the
+ * module will cause it to chroot/setuid/etc.
+ *
+ * Instead of doing a transfer, the client may at this stage instead
+ * get a listing of remote modules and exit.
*
* @return -1 for error in startup, or the result of client_run().
+ * Either way, it eventually gets passed to exit_cleanup().
**/
int start_socket_client(char *host, char *path, int argc, char *argv[])
{
* See http://lists.samba.org/pipermail/rsync/2000-September/002744.html
*/
if (shell_cmd) {
- rprintf(FERROR, "WARNING: --rsh or -e option ignored when "
+ rprintf(FINFO, "WARNING: --rsh or -e option ignored when "
"connecting to rsync daemon\n");
/* continue */
}
if (strcmp(line,"@RSYNCD: OK") == 0) break;
- if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0);
+ if (strcmp(line,"@RSYNCD: EXIT") == 0) {
+ /* This is sent by recent versions of the
+ * server to terminate the listing of modules.
+ * We don't want to go on and transfer
+ * anything; just exit. */
+ exit(0);
+ }
- if (strncmp(line, "@ERROR", 6) == 0)
+ if (strncmp(line, "@ERROR", 6) == 0) {
rprintf(FERROR,"%s\n", line);
- else
+ /* This is always fatal; the server will now
+ * close the socket. */
+ return RERR_STARTCLIENT;
+ } else {
rprintf(FINFO,"%s\n", line);
+ }
}
kludge_around_eof = False;
if (am_root) {
p = lp_uid(i);
if (!name_to_uid(p, &uid)) {
- if (!isdigit(*p)) {
+ if (!isdigit(* (unsigned char *) p)) {
rprintf(FERROR,"Invalid uid %s\n", p);
io_printf(fd,"@ERROR: invalid uid %s\n", p);
return -1;
p = lp_gid(i);
if (!name_to_gid(p, &gid)) {
- if (!isdigit(*p)) {
+ if (!isdigit(* (unsigned char *) p)) {
rprintf(FERROR,"Invalid gid %s\n", p);
io_printf(fd,"@ERROR: invalid gid %s\n", p);
return -1;