undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imap-send: use run-command API for tunneling

Browse Source 
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Erik Faye-Lund 2009-10-19 17:42:04 +02:00 committed by Junio C Hamano
parent 7a7796e9a7
commit c94d2dd080
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
imap-send.c
View File

@ -24,6 +24,7 @@
#include "cache.h"
#include "exec_cmd.h"
#include "run-command.h"
#ifdef NO_OPENSSL
typedef void *SSL;
#endif
@ -940,8 +941,7 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
struct imap_store *ctx;
struct imap *imap;
char *arg, *rsp;
int s = -1, a[2], preauth;
pid_t pid;
int s = -1, preauth;
ctx = xcalloc(sizeof(*ctx), 1);
@ -952,29 +952,24 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
/* open connection to IMAP server */
if (srvc->tunnel) {
const char *argv[4];
struct child_process tunnel = {0};
imap_info("Starting tunnel '%s'... ", srvc->tunnel);
if (socketpair(PF_UNIX, SOCK_STREAM, 0, a)) {
perror("socketpair");
exit(1);
}
argv[0] = "sh";
argv[1] = "-c";
argv[2] = srvc->tunnel;
argv[3] = NULL;
pid = fork();
if (pid < 0)
_exit(127);
if (!pid) {
if (dup2(a[0], 0) == -1 || dup2(a[0], 1) == -1)
_exit(127);
close(a[0]);
close(a[1]);
execl("/bin/sh", "sh", "-c", srvc->tunnel, NULL);
_exit(127);
}
tunnel.argv = argv;
tunnel.in = -1;
tunnel.out = -1;
if (start_command(&tunnel))
die("cannot start proxy %s", argv[0]);
close(a[0]);
imap->buf.sock.fd[0] = a[1];
imap->buf.sock.fd[1] = dup(a[1]);
imap->buf.sock.fd[0] = tunnel.out;
imap->buf.sock.fd[1] = tunnel.in;
imap_info("ok\n");
} else {