diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-12-12 12:22:30 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-12-12 12:22:30 +0000 |
commit | 60fbc52f285b19ccbc9723cdae135cbb22acfe98 (patch) | |
tree | a5dc6c946b27627d5c3eb3906512f4728c6ea3b9 /gacopyz/gacopyz.c | |
parent | 080cc8f1c899f91f143694f3a3399a159239496b (diff) | |
download | mailfromd-60fbc52f285b19ccbc9723cdae135cbb22acfe98.tar.gz mailfromd-60fbc52f285b19ccbc9723cdae135cbb22acfe98.tar.bz2 |
Reflect recent changes to Mailutils.
git-svn-id: file:///svnroot/mailfromd/trunk@1534 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'gacopyz/gacopyz.c')
-rw-r--r-- | gacopyz/gacopyz.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gacopyz/gacopyz.c b/gacopyz/gacopyz.c index 1fff7edb..24f694e8 100644 --- a/gacopyz/gacopyz.c +++ b/gacopyz/gacopyz.c @@ -152,8 +152,8 @@ do_connect(gacopyz_conn_t conn, { union { struct sockaddr sa; - struct sockaddr_in sin; - struct sockaddr_un sun; + struct sockaddr_in s_in; + struct sockaddr_un s_un; } addr; int socklen; int fd, flags; @@ -171,7 +171,7 @@ do_connect(gacopyz_conn_t conn, return -1; } - if (strlen(path) > sizeof addr.sun.sun_path) { + if (strlen(path) > sizeof addr.s_un.sun_path) { errno = EINVAL; gacopyz_log(conn, SMI_LOG_ERR, _("%s: %s: UNIX socket name too long"), @@ -180,8 +180,8 @@ do_connect(gacopyz_conn_t conn, } addr.sa.sa_family = PF_UNIX; - socklen = sizeof(addr.sun); - strcpy(addr.sun.sun_path, path); + socklen = sizeof(addr.s_un); + strcpy(addr.s_un.sun_path, path); if (stat(path, &st)) { if (errno == ENOENT) { @@ -217,7 +217,7 @@ do_connect(gacopyz_conn_t conn, char *p; addr.sa.sa_family = PF_INET; - socklen = sizeof(addr.sin); + socklen = sizeof(addr.s_in); if (!port) { gacopyz_log(conn, SMI_LOG_ERR, @@ -250,7 +250,7 @@ do_connect(gacopyz_conn_t conn, } if (!path) - addr.sin.sin_addr.s_addr = INADDR_ANY; + addr.s_in.sin_addr.s_addr = INADDR_ANY; else { struct hostent *hp = gethostbyname(path); if (!hp) { @@ -262,8 +262,8 @@ do_connect(gacopyz_conn_t conn, addr.sa.sa_family = hp->h_addrtype; switch (hp->h_addrtype) { case AF_INET: - memmove(&addr.sin.sin_addr, hp->h_addr, 4); - addr.sin.sin_port = pnum; + memmove(&addr.s_in.sin_addr, hp->h_addr, 4); + addr.s_in.sin_port = pnum; break; default: |