From b1e718f101fe6788b64b2deab09d2001bf8e0b2f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 1 Mar 2015 11:43:01 +0000 Subject: nsswitch: Simplify winbind_named_pipe_sock() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Mon Jun 8 19:48:18 CEST 2015 on sn-devel-104 --- nsswitch/wb_common.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'nsswitch/wb_common.c') diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c index 036557a2d6d..3194df197b7 100644 --- a/nsswitch/wb_common.c +++ b/nsswitch/wb_common.c @@ -220,10 +220,10 @@ static int winbind_named_pipe_sock(const char *dir) { struct sockaddr_un sunaddr; struct stat st; - char *path = NULL; int fd; int wait_time; int slept; + int ret; /* Check permissions on unix socket directory */ @@ -244,25 +244,24 @@ static int winbind_named_pipe_sock(const char *dir) /* Connect to socket */ - if (asprintf(&path, "%s/%s", dir, WINBINDD_SOCKET_NAME) < 0) { + sunaddr = (struct sockaddr_un) { .sun_family = AF_UNIX }; + + ret = snprintf(sunaddr.sun_path, sizeof(sunaddr.sun_path), + "%s/%s", dir, WINBINDD_SOCKET_NAME); + if ((ret == -1) || (ret >= sizeof(sunaddr.sun_path))) { + errno = ENAMETOOLONG; return -1; } - ZERO_STRUCT(sunaddr); - sunaddr.sun_family = AF_UNIX; - strncpy(sunaddr.sun_path, path, sizeof(sunaddr.sun_path) - 1); - /* If socket file doesn't exist, don't bother trying to connect with retry. This is an attempt to make the system usable when the winbindd daemon is not running. */ - if (lstat(path, &st) == -1) { + if (lstat(sunaddr.sun_path, &st) == -1) { errno = ENOENT; - SAFE_FREE(path); return -1; } - SAFE_FREE(path); /* Check permissions on unix socket file */ /* @@ -290,7 +289,6 @@ static int winbind_named_pipe_sock(const char *dir) for (wait_time = 0; connect(fd, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1; wait_time += slept) { struct pollfd pfd; - int ret; int connect_errno = 0; socklen_t errnosize; -- cgit v1.2.1