extern int am_client;
extern int am_sender;
+ if (*path == '/') {
+ rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
+ return -1;
+ }
+
p = strchr(host, '@');
if (p) {
user = host;
char *name = lp_name(i);
char *user;
int start_glob=0;
+ int ret;
char *request=NULL;
extern int am_sender;
extern int remote_version;
}
if (!claim_connection(lp_lock_file(), lp_max_connections())) {
- rprintf(FERROR,"max connections (%d) reached\n",
- lp_max_connections());
- io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+ if (errno) {
+ rprintf(FERROR,"failed to open lock file %s : %s\n",
+ lp_lock_file(), strerror(errno));
+ io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
+ lp_lock_file(), strerror(errno));
+ } else {
+ rprintf(FERROR,"max connections (%d) reached\n",
+ lp_max_connections());
+ io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+ }
return -1;
}
}
}
- parse_arguments(argc, argv);
+ ret = parse_arguments(argc, argv);
if (request) {
if (*user) {
free(request);
}
+#if !TRIDGE
/* don't allow the logs to be flooded too fast */
if (verbose > 1) verbose = 1;
+#endif
argc -= optind;
argp = argv + optind;
if (remote_version > 17 && am_sender)
io_start_multiplex_out(fd);
+ if (!ret) {
+ rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
+ exit_cleanup(1);
+ }
+
start_server(fd, fd, argc, argp);
return 0;
push_dir("/", 0);
if (is_a_socket(STDIN_FILENO)) {
- /* we are running via inetd */
+ int i;
+
+ /* 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++) {
+ close(i);
+ open("/dev/null", O_RDWR);
+ }
+
+ set_nonblocking(STDIN_FILENO);
+
return start_daemon(STDIN_FILENO);
}