diff options
| author | Andreas Schneider <asn@samba.org> | 2014-05-21 14:06:05 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-09-01 09:48:53 +0200 |
| commit | bb76c424e29b17398c342cf64cadfe96ced7b997 (patch) | |
| tree | 6839a7a82e302a96b1fce2a7c82a4df359a973da /src/socket_wrapper.c | |
| parent | 2b587c81f8e29118206a40a20422d0f08f61da5c (diff) | |
| download | socket_wrapper-bb76c424e29b17398c342cf64cadfe96ced7b997.tar.gz socket_wrapper-bb76c424e29b17398c342cf64cadfe96ced7b997.tar.xz socket_wrapper-bb76c424e29b17398c342cf64cadfe96ced7b997.zip | |
swrap: Use a sockaddr_un for the unix path in socket_info.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'src/socket_wrapper.c')
| -rw-r--r-- | src/socket_wrapper.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index b6f86eb..b5c5b46 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -242,7 +242,8 @@ struct socket_info int defer_connect; int pktinfo; - char *tmp_path; + /* The unix path so we can unlink it on close() */ + struct sockaddr_un un_addr; struct sockaddr *bindname; socklen_t bindname_len; @@ -2739,7 +2740,8 @@ static int swrap_auto_bind(int fd, struct socket_info *si, int family) ret = libc_bind(fd, &un_addr.sa.s, un_addr.sa_socklen); if (ret == -1) return ret; - si->tmp_path = strdup(un_addr.sa.un.sun_path); + si->un_addr = un_addr.sa.un; + si->bound = 1; autobind_start = port + 1; break; @@ -4789,9 +4791,9 @@ static int swrap_close(int fd) if (si->myname) free(si->myname); if (si->peername) free(si->peername); - if (si->tmp_path) { - unlink(si->tmp_path); - free(si->tmp_path); + + if (si->un_addr.sun_path[0] != '\0') { + unlink(si->un_addr.sun_path); } free(si); |