extern char *bind_address;
extern int default_af_hint;
+#ifdef HAVE_SIGACTION
+static struct sigaction sigact;
+#endif
+
/**
* Establish a proxy connection on an open socket to a web proxy by
* using the CONNECT method. If proxy_user and proxy_pass are not NULL,
proxy_user, ":", proxy_pass, NULL);
len = strlen(buffer);
- if ((len*8 + 5) / 6 >= (int)sizeof authbuf) {
+ if ((len*8 + 5) / 6 >= (int)sizeof authbuf - 3) {
rprintf(FERROR,
"authentication information is too long\n");
return -1;
}
- base64_encode(buffer, len, authbuf);
+ base64_encode(buffer, len, authbuf, 1);
authhdr = "\r\nProxy-Authorization: Basic ";
} else {
*authbuf = '\0';
#ifdef WNOHANG
while (waitpid(-1, NULL, WNOHANG) > 0) {}
#endif
+#ifndef HAVE_SIGACTION
signal(SIGCHLD, sigchld_handler);
+#endif
}
fd_set deffds;
int *sp, maxfd, i;
+#ifdef HAVE_SIGACTION
+ sigact.sa_flags = SA_NOCLDSTOP;
+#endif
+
/* open an incoming socket */
sp = open_socket_in(SOCK_STREAM, port, bind_address, default_af_hint);
if (sp == NULL)
maxfd = sp[i];
}
-
/* now accept incoming connections - forking a new process
* for each incoming connection */
while (1) {
/* close log file before the potentially very long select so
* file can be trimmed by another process instead of growing
* forever */
- log_close();
+ logfile_close();
#ifdef FD_COPY
FD_COPY(&deffds, &fds);
if (fd < 0)
continue;
- signal(SIGCHLD, sigchld_handler);
+ SIGACTION(SIGCHLD, sigchld_handler);
if ((pid = fork()) == 0) {
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
/* Re-open log file in child before possibly giving
- * up privileges (see log_close() above). */
- log_open();
+ * up privileges (see logfile_close() above). */
+ logfile_reopen();
ret = fn(fd, fd);
close_all();
_exit(ret);