char *addr = client_addr(fd);
char *host = client_name(fd);
char *auth;
+ char *name = lp_name(i);
+ int start_glob=0;
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
- lp_name(i), client_name(fd), client_addr(fd));
+ name, client_name(fd), client_addr(fd));
io_printf(fd,"@ERROR: access denied to %s from %s (%s)\n",
- lp_name(i), client_name(fd), client_addr(fd));
+ name, client_name(fd), client_addr(fd));
return -1;
}
if (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
- lp_name(i), client_name(fd), client_addr(fd));
- io_printf(fd,"@ERROR: auth failed on module %s\n",lp_name(i));
+ name, client_name(fd), client_addr(fd));
+ io_printf(fd,"@ERROR: auth failed on module %s\n",name);
return -1;
}
}
rprintf(FINFO,"rsync on module %s from %s (%s)\n",
- lp_name(i), host, addr);
+ name, host, addr);
module_id = i;
if (!*line) break;
- argv[argc] = strdup(line);
+ p = line;
+
+ if (start_glob && strncmp(p, name, strlen(name)) == 0) {
+ p += strlen(name);
+ if (!*p) p = ".";
+ }
+
+ argv[argc] = strdup(p);
if (!argv[argc]) {
return -1;
}
- argc++;
+ if (start_glob) {
+ glob_expand(argv, &argc, MAX_ARGS);
+ } else {
+ argc++;
+ }
+
+ if (strcmp(line,".") == 0) {
+ start_glob = 1;
+ }
+
if (argc == MAX_ARGS) {
return -1;
}
AC_FUNC_UTIME_NULL
AC_CHECK_FUNCS(waitpid strtok pipe getcwd mkdir strdup strerror chown chmod mknod)
AC_CHECK_FUNCS(fchmod fstat strchr bcopy bzero readlink link utime utimes)
-AC_CHECK_FUNCS(memmove getopt_long lchown setlinebuf vsnprintf setsid)
+AC_CHECK_FUNCS(memmove getopt_long lchown setlinebuf vsnprintf setsid glob)
echo $ac_n "checking for working fnmatch... $ac_c"
AC_TRY_RUN([#include <fnmatch.h>
argv[i] += l+1;
}
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc == 0 && recurse) {
argc=1;
argv--;
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int i, l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc > 0) {
dir = argv[0];
argc--;
return fcntl(fd,F_SETLK,&lock) == 0;
}
+
+
+void glob_expand(char **argv, int *argc, int maxargs)
+{
+#ifndef HAVE_GLOB
+ (*argc)++;
+ return;
+#else
+ glob_t globbuf;
+ int i;
+
+ rprintf(FINFO,"glob(%s) -> %d\n", argv[*argc], globbuf.gl_pathc);
+ memset(&globbuf, 0, sizeof(globbuf));
+ glob(argv[*argc], 0, NULL, &globbuf);
+ if (globbuf.gl_pathc == 0) {
+ (*argc)++;
+ globfree(&globbuf);
+ return;
+ }
+ for (i=0; i<(maxargs - (*argc)) && i<globbuf.gl_pathc;i++) {
+ if (i == 0) free(argv[*argc]);
+ argv[(*argc) + i] = strdup(globbuf.gl_pathv[i]);
+ if (!argv[(*argc) + i]) out_of_memory("glob_expand");
+ }
+ globfree(&globbuf);
+ (*argc) += i;
+#endif
+}