Attachment 169616 Details for Bug 209004 – libqb-1.0.diff

[patch] libqb-1.0.diff

libqb-1.0.diff (text/plain), 19.48 KB, created by David Shane Holden on 2016-04-24 00:20:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Shane Holden

Created: 2016-04-24 00:20:33 UTC

Size: 19.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 413583)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libqb
>-PORTVERSION=	0.17.2
>-PORTREVISION=	1
>+PORTVERSION=	1.0
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/ClusterLabs/libqb/releases/download/v${PORTVERSION}/
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 413583)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libqb-0.17.2.tar.xz) = 9a419c649ed51f275dc780da8a15babb8a5d33633567bd9e0cb6193b6e21f4fe
>-SIZE (libqb-0.17.2.tar.xz) = 373540
>+SHA256 (libqb-1.0.tar.xz) = 7ee62e3d0542a39ede943927e1f4c3c9e3b922a175c3b246144ea48166afa01a
>+SIZE (libqb-1.0.tar.xz) = 424436
>Index: files/patch-lib-ipc_int.h
>===================================================================
>--- files/patch-lib-ipc_int.h	(revision 413583)
>+++ files/patch-lib-ipc_int.h	(nonexistent)
>@@ -1,10 +0,0 @@
>---- lib/ipc_int.h.orig	2015-08-18 19:55:43 UTC
>-+++ lib/ipc_int.h
>-@@ -91,6 +91,7 @@ struct qb_ipcc_funcs {
>- struct qb_ipcc_connection {
>- 	char name[NAME_MAX];
>- 	int32_t needs_sock_for_poll;
>-+	gid_t egid;
>- 	struct qb_ipc_one_way setup;
>- 	struct qb_ipc_one_way request;
>- 	struct qb_ipc_one_way response;
>
>Property changes on: files/patch-lib-ipc_int.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-ipc_setup.c
>===================================================================
>--- files/patch-lib-ipc_setup.c	(revision 413583)
>+++ files/patch-lib-ipc_setup.c	(nonexistent)
>@@ -1,341 +0,0 @@
>---- lib/ipc_setup.c.orig	2015-08-18 19:55:43 UTC
>-+++ lib/ipc_setup.c
>-@@ -51,7 +51,10 @@ struct ipc_auth_ugp {
>- struct ipc_auth_data {
>- 	int32_t sock;
>- 	struct qb_ipcs_service *s;
>--	struct qb_ipc_connection_request msg;
>-+	union {
>-+		struct qb_ipc_connection_request req;
>-+		struct qb_ipc_connection_response res;
>-+	} msg;
>- 	struct msghdr msg_recv;
>- 	struct iovec iov_recv;
>- 	struct ipc_auth_ugp ugp;
>-@@ -311,12 +314,138 @@ qb_ipcc_us_sock_close(int32_t sock)
>- 	close(sock);
>- }
>- 
>-+static int32_t
>-+qb_ipc_auth_creds(struct ipc_auth_data *data)
>-+{
>-+	int32_t res = 0;
>-+
>-+	/*
>-+	 * currently support getpeerucred, getpeereid, and SO_PASSCRED credential
>-+	 * retrieval mechanisms for various Platforms
>-+	 */
>-+#ifdef HAVE_GETPEERUCRED
>-+	/*
>-+	 * Solaris and some BSD systems
>-+	 */
>-+	{
>-+		ucred_t *uc = NULL;
>-+
>-+		if (getpeerucred(data->sock, &uc) == 0) {
>-+			res = 0;
>-+			data->ugp.uid = ucred_geteuid(uc);
>-+			data->ugp.gid = ucred_getegid(uc);
>-+			data->ugp.pid = ucred_getpid(uc);
>-+			ucred_free(uc);
>-+		} else {
>-+			res = -errno;
>-+		}
>-+	}
>-+#elif defined(HAVE_GETPEEREID)
>-+	/*
>-+	* Usually MacOSX systems
>-+	*/
>-+	{
>-+		/*
>-+		* TODO get the peer's pid.
>-+		* c->pid = ?;
>-+		*/
>-+		if (getpeereid(data->sock, &data->ugp.uid, &data->ugp.gid) == 0) {
>-+			res = 0;
>-+		} else {
>-+			res = -errno;
>-+		}
>-+	}
>-+
>-+#elif defined(SO_PASSCRED)
>-+	/*
>-+	* Usually Linux systems
>-+	*/
>-+	{
>-+		struct ucred cred;
>-+		struct cmsghdr *cmsg;
>-+
>-+		res = -EINVAL;
>-+		for (cmsg = CMSG_FIRSTHDR(&data->msg_recv); cmsg != NULL;
>-+			cmsg = CMSG_NXTHDR(&data->msg_recv, cmsg)) {
>-+			if (cmsg->cmsg_type != SCM_CREDENTIALS)
>-+				continue;
>-+
>-+			memcpy(&cred, CMSG_DATA(cmsg), sizeof(struct ucred));
>-+			res = 0;
>-+			data->ugp.pid = cred.pid;
>-+			data->ugp.uid = cred.uid;
>-+			data->ugp.gid = cred.gid;
>-+			break;
>-+		}
>-+	}
>-+#else /* no credentials */
>-+	data->ugp.pid = 0;
>-+	data->ugp.uid = 0;
>-+	data->ugp.gid = 0;
>-+	res = -ENOTSUP;
>-+#endif /* no credentials */
>-+
>-+	return res;
>-+}
>-+
>-+static void
>-+destroy_ipc_auth_data(struct ipc_auth_data *data)
>-+{
>-+	if (data->s) {
>-+		qb_ipcs_unref(data->s);
>-+	}
>-+
>-+#ifdef SO_PASSCRED
>-+	free(data->cmsg_cred);
>-+#endif
>-+	free(data);
>-+}
>-+
>-+static struct ipc_auth_data *
>-+init_ipc_auth_data(int sock, size_t len)
>-+{
>-+	struct ipc_auth_data *data = calloc(1, sizeof(struct ipc_auth_data));
>-+
>-+	if (data == NULL) {
>-+		return NULL;
>-+	}
>-+
>-+	data->msg_recv.msg_iov = &data->iov_recv;
>-+	data->msg_recv.msg_iovlen = 1;
>-+	data->msg_recv.msg_name = 0;
>-+	data->msg_recv.msg_namelen = 0;
>-+
>-+#ifdef SO_PASSCRED
>-+	data->cmsg_cred = calloc(1, CMSG_SPACE(sizeof(struct ucred)));
>-+	if (data->cmsg_cred == NULL) {
>-+		destroy_ipc_auth_data(data);
>-+		return NULL;
>-+	}
>-+	data->msg_recv.msg_control = (void *)data->cmsg_cred;
>-+	data->msg_recv.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
>-+#endif
>-+#ifdef QB_SOLARIS
>-+	data->msg_recv.msg_accrights = 0;
>-+	data->msg_recv.msg_accrightslen = 0;
>-+#else
>-+	data->msg_recv.msg_flags = 0;
>-+#endif /* QB_SOLARIS */
>-+
>-+	data->len = len;
>-+	data->iov_recv.iov_base = &data->msg;
>-+	data->iov_recv.iov_len = data->len;
>-+	data->sock = sock;
>-+
>-+	return data;
>-+}
>-+
>- int32_t
>- qb_ipcc_us_setup_connect(struct qb_ipcc_connection *c,
>- 			 struct qb_ipc_connection_response *r)
>- {
>- 	int32_t res;
>- 	struct qb_ipc_connection_request request;
>-+	struct ipc_auth_data *data;
>- #ifdef QB_LINUX
>- 	int off = 0;
>- 	int on = 1;
>-@@ -340,22 +469,33 @@ qb_ipcc_us_setup_connect(struct qb_ipcc_
>- 		qb_ipcc_us_sock_close(c->setup.u.us.sock);
>- 		return res;
>- 	}
>-+
>-+	data = init_ipc_auth_data(c->setup.u.us.sock, sizeof(struct qb_ipc_connection_response));
>-+	if (data == NULL) {
>-+		qb_ipcc_us_sock_close(c->setup.u.us.sock);
>-+		return -ENOMEM;
>-+	}
>-+
>-+	qb_ipc_us_ready(&c->setup, NULL, -1, POLLIN);
>-+	res = qb_ipc_us_recv_msghdr(data);
>-+
>- #ifdef QB_LINUX
>- 	setsockopt(c->setup.u.us.sock, SOL_SOCKET, SO_PASSCRED, &off,
>- 		   sizeof(off));
>- #endif
>- 
>--	res =
>--	    qb_ipc_us_recv(&c->setup, r,
>--			   sizeof(struct qb_ipc_connection_response), -1);
>--	if (res < 0) {
>-+	if (res != data->len) {
>-+		destroy_ipc_auth_data(data);
>- 		return res;
>- 	}
>- 
>--	if (r->hdr.error != 0) {
>--		return r->hdr.error;
>--	}
>--	return 0;
>-+	memcpy(r, &data->msg.res, sizeof(struct qb_ipc_connection_response));
>-+
>-+	qb_ipc_auth_creds(data);
>-+	c->egid = data->ugp.gid;
>-+
>-+	destroy_ipc_auth_data(data);
>-+	return r->hdr.error;
>- }
>- 
>- /*
>-@@ -561,19 +701,6 @@ send_response:
>- 	return res;
>- }
>- 
>--static void
>--destroy_ipc_auth_data(struct ipc_auth_data *data)
>--{
>--	if (data->s) {
>--		qb_ipcs_unref(data->s);
>--	}
>--
>--#ifdef SO_PASSCRED
>--	free(data->cmsg_cred);
>--#endif
>--	free(data);
>--}
>--
>- static int32_t
>- process_auth(int32_t fd, int32_t revents, void *d)
>- {
>-@@ -615,71 +742,7 @@ process_auth(int32_t fd, int32_t revents
>- 		goto cleanup_and_return;
>- 	}
>- 
>--	/*
>--	 * currently support getpeerucred, getpeereid, and SO_PASSCRED credential
>--	 * retrieval mechanisms for various Platforms
>--	 */
>--#ifdef HAVE_GETPEERUCRED
>--	/*
>--	 * Solaris and some BSD systems
>--	 */
>--	{
>--		ucred_t *uc = NULL;
>--
>--		if (getpeerucred(data->sock, &uc) == 0) {
>--			res = 0;
>--			data->ugp.uid = ucred_geteuid(uc);
>--			data->ugp.gid = ucred_getegid(uc);
>--			data->ugp.pid = ucred_getpid(uc);
>--			ucred_free(uc);
>--		} else {
>--			res = -errno;
>--		}
>--	}
>--#elif HAVE_GETPEEREID
>--	/*
>--	 * Usually MacOSX systems
>--	 */
>--	{
>--		/*
>--		 * TODO get the peer's pid.
>--		 * c->pid = ?;
>--		 */
>--		if (getpeereid(data->sock, &data->ugp.uid, &data->ugp.gid) == 0) {
>--			res = 0;
>--		} else {
>--			res = -errno;
>--		}
>--	}
>--
>--#elif SO_PASSCRED
>--	/*
>--	 * Usually Linux systems
>--	 */
>--	{
>--		struct ucred cred;
>--		struct cmsghdr *cmsg;
>--
>--		res = -EINVAL;
>--		for (cmsg = CMSG_FIRSTHDR(&data->msg_recv); cmsg != NULL;
>--		     cmsg = CMSG_NXTHDR(&data->msg_recv, cmsg)) {
>--			if (cmsg->cmsg_type != SCM_CREDENTIALS)
>--				continue;
>--
>--			memcpy(&cred, CMSG_DATA(cmsg), sizeof(struct ucred));
>--			res = 0;
>--			data->ugp.pid = cred.pid;
>--			data->ugp.uid = cred.uid;
>--			data->ugp.gid = cred.gid;
>--			break;
>--		}
>--	}
>--#else /* no credentials */
>--	data->ugp.pid = 0;
>--	data->ugp.uid = 0;
>--	data->ugp.gid = 0;
>--	res = -ENOTSUP;
>--#endif /* no credentials */
>-+	res = qb_ipc_auth_creds(data);
>- 
>- cleanup_and_return:
>- #ifdef SO_PASSCRED
>-@@ -690,7 +753,7 @@ cleanup_and_return:
>- 
>- 	if (res < 0) {
>- 		close(data->sock);
>--	} else if (data->msg.hdr.id == QB_IPC_MSG_AUTHENTICATE) {
>-+	} else if (data->msg.req.hdr.id == QB_IPC_MSG_AUTHENTICATE) {
>- 		(void)handle_new_connection(data->s, res, data->sock, &data->msg, data->len, &data->ugp);
>- 	} else {
>- 		close(data->sock);
>-@@ -709,7 +772,7 @@ qb_ipcs_uc_recv_and_auth(int32_t sock, s
>- 	int on = 1;
>- #endif
>- 
>--	data = calloc(1, sizeof(struct ipc_auth_data));
>-+	data = init_ipc_auth_data(sock, sizeof(struct qb_ipc_connection_request));
>- 	if (data == NULL) {
>- 		close(sock);
>- 		/* -ENOMEM */
>-@@ -719,34 +782,6 @@ qb_ipcs_uc_recv_and_auth(int32_t sock, s
>- 	data->s = s;
>- 	qb_ipcs_ref(data->s);
>- 
>--	data->msg_recv.msg_iov = &data->iov_recv;
>--	data->msg_recv.msg_iovlen = 1;
>--	data->msg_recv.msg_name = 0;
>--	data->msg_recv.msg_namelen = 0;
>--
>--#ifdef SO_PASSCRED
>--	data->cmsg_cred = calloc(1,CMSG_SPACE(sizeof(struct ucred)));
>--	if (data->cmsg_cred == NULL) {
>--		close(sock);
>--		destroy_ipc_auth_data(data);
>--		/* -ENOMEM */
>--		return;
>--	}
>--	data->msg_recv.msg_control = (void *)data->cmsg_cred;
>--	data->msg_recv.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
>--#endif
>--#ifdef QB_SOLARIS
>--	data->msg_recv.msg_accrights = 0;
>--	data->msg_recv.msg_accrightslen = 0;
>--#else
>--	data->msg_recv.msg_flags = 0;
>--#endif /* QB_SOLARIS */
>--
>--	data->len = sizeof(struct qb_ipc_connection_request);
>--	data->iov_recv.iov_base = &data->msg;
>--	data->iov_recv.iov_len = data->len;
>--	data->sock = sock;
>--
>- #ifdef SO_PASSCRED
>- 	setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
>- #endif
>
>Property changes on: files/patch-lib-ipc_setup.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-ipc_socket.c
>===================================================================
>--- files/patch-lib-ipc_socket.c	(revision 413583)
>+++ files/patch-lib-ipc_socket.c	(nonexistent)
>@@ -1,130 +0,0 @@
>---- lib/ipc_socket.c.orig	2015-08-18 19:55:43 UTC
>-+++ lib/ipc_socket.c
>-@@ -60,7 +60,8 @@ set_sock_addr(struct sockaddr_un *addres
>- 
>- static int32_t
>- qb_ipc_dgram_sock_setup(const char *base_name,
>--			const char *service_name, int32_t * sock_pt)
>-+			const char *service_name, int32_t * sock_pt,
>-+			gid_t gid)
>- {
>- 	int32_t request_fd;
>- 	struct sockaddr_un local_address;
>-@@ -84,6 +85,10 @@ qb_ipc_dgram_sock_setup(const char *base
>- #endif
>- 	res = bind(request_fd, (struct sockaddr *)&local_address,
>- 		   sizeof(local_address));
>-+#if !(defined(QB_LINUX) || defined(QB_CYGWIN))
>-+	chmod(local_address.sun_path, 0660);
>-+	chown(local_address.sun_path, -1, gid);
>-+#endif
>- 	if (res < 0) {
>- 		goto error_connect;
>- 	}
>-@@ -107,7 +112,7 @@ set_sock_size(int sockfd, size_t max_msg
>- 
>- 	rc = getsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &optval, &optlen);
>- 
>--	qb_util_log(LOG_TRACE, "%d: getsockopt(%d, needed:%d) actual:%d",
>-+	qb_util_log(LOG_TRACE, "%d: getsockopt(%d, SO_SNDBUF, needed:%d) actual:%d",
>- 		rc, sockfd, max_msg_size, optval);
>- 
>- 	/* The optvat <= max_msg_size check is weird...
>-@@ -121,6 +126,29 @@ set_sock_size(int sockfd, size_t max_msg
>- 		optlen = sizeof(optval);
>- 		rc = setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &optval, optlen);
>- 	}
>-+
>-+	if (rc != 0) {
>-+		return -errno;
>-+	}
>-+
>-+	rc = getsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &optval, &optlen);
>-+
>-+	qb_util_log(LOG_TRACE, "%d: getsockopt(%d, SO_RCVBUF, needed:%d) actual:%d",
>-+		rc, sockfd, max_msg_size, optval);
>-+
>-+	/* Set the sockets receive buffer size to match the send buffer.  Without
>-+	 * this calls to sendto() will result in an ENOBUFS error if the message
>-+	 * is larger than net.local.dgram.recvspace sysctl. */
>-+	if (rc == 0 && optval <= max_msg_size) {
>-+		optval = max_msg_size;
>-+		optlen = sizeof(optval);
>-+		rc = setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &optval, optlen);
>-+	}
>-+
>-+	if (rc != 0) {
>-+		return -errno;
>-+	}
>-+
>- 	return rc;
>- }
>- 
>-@@ -218,12 +246,12 @@ static int32_t
>- qb_ipc_dgram_sock_connect(const char *base_name,
>- 			  const char *local_name,
>- 			  const char *remote_name,
>--			  int32_t max_msg_size, int32_t * sock_pt)
>-+			  int32_t max_msg_size, int32_t * sock_pt, gid_t gid)
>- {
>- 	char sock_path[PATH_MAX];
>- 	struct sockaddr_un remote_address;
>- 	int32_t res = qb_ipc_dgram_sock_setup(base_name, local_name,
>--					      sock_pt);
>-+					      sock_pt, gid);
>- 	if (res < 0) {
>- 		return res;
>- 	}
>-@@ -544,14 +572,14 @@ qb_ipcc_us_connect(struct qb_ipcc_connec
>- 	fd_hdr = -1;
>- 
>- 	res = qb_ipc_dgram_sock_connect(r->response, "response", "request",
>--					r->max_msg_size, &c->request.u.us.sock);
>-+					r->max_msg_size, &c->request.u.us.sock, c->egid);
>- 	if (res != 0) {
>- 		goto cleanup_hdr;
>- 	}
>- 	c->response.u.us.sock = c->request.u.us.sock;
>- 
>- 	res = qb_ipc_dgram_sock_connect(r->response, "event", "event-tx",
>--					r->max_msg_size, &c->event.u.us.sock);
>-+					r->max_msg_size, &c->event.u.us.sock, c->egid);
>- 	if (res != 0) {
>- 		goto cleanup_hdr;
>- 	}
>-@@ -773,10 +801,16 @@ qb_ipcs_us_connect(struct qb_ipcs_servic
>- 
>- 	/* request channel */
>- 	res = qb_ipc_dgram_sock_setup(r->response, "request",
>--				      &c->request.u.us.sock);
>-+				      &c->request.u.us.sock, c->egid);
>- 	if (res < 0) {
>- 		goto cleanup_hdr;
>- 	}
>-+
>-+	res = set_sock_size(c->request.u.us.sock, c->request.max_msg_size);
>-+	if (res != 0) {
>-+		goto cleanup_hdr;
>-+	}
>-+
>- 	c->setup.u.us.sock_name = NULL;
>- 	c->request.u.us.sock_name = NULL;
>- 
>-@@ -787,10 +821,16 @@ qb_ipcs_us_connect(struct qb_ipcs_servic
>- 
>- 	/* event channel */
>- 	res = qb_ipc_dgram_sock_setup(r->response, "event-tx",
>--				      &c->event.u.us.sock);
>-+				      &c->event.u.us.sock, c->egid);
>- 	if (res < 0) {
>- 		goto cleanup_hdr;
>- 	}
>-+
>-+	res = set_sock_size(c->event.u.us.sock, c->event.max_msg_size);
>-+	if (res != 0) {
>-+		goto cleanup_hdr;
>-+	}
>-+
>- 	snprintf(path, PATH_MAX, "%s-%s", r->response, "event");
>- 	c->event.u.us.sock_name = strdup(path);
>- 
>
>Property changes on: files/patch-lib-ipc_socket.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-log.c
>===================================================================
>--- files/patch-lib-log.c	(revision 413583)
>+++ files/patch-lib-log.c	(nonexistent)
>@@ -1,97 +0,0 @@
>---- lib/log.c.orig	2015-08-18 19:55:43 UTC
>-+++ lib/log.c
>-@@ -47,9 +47,15 @@ static int32_t logger_inited = QB_FALSE;
>- static pthread_rwlock_t _listlock;
>- static qb_log_filter_fn _custom_filter_fn = NULL;
>- 
>-+static QB_LIST_DECLARE(dlnames);
>- static QB_LIST_DECLARE(tags_head);
>- static QB_LIST_DECLARE(callsite_sections);
>- 
>-+struct dlname {
>-+	char *dln_name;
>-+	struct qb_list_head list;
>-+};
>-+
>- struct callsite_section {
>- 	struct qb_log_callsite *start;
>- 	struct qb_log_callsite *stop;
>-@@ -739,23 +745,45 @@ qb_log_filter_ctl(int32_t t, enum qb_log
>- }
>- 
>- #ifdef QB_HAVE_ATTRIBUTE_SECTION
>-+/* Some platforms (eg. FreeBSD 10+) don't support calling dlopen() from
>-+ * within a dl_iterate_phdr() callback; so save all of the dlpi_names to
>-+ * a list and iterate over them afterwards. */
>- static int32_t
>- _log_so_walk_callback(struct dl_phdr_info *info, size_t size, void *data)
>- {
>-+	struct dlname *dlname;
>-+
>- 	if (strlen(info->dlpi_name) > 0) {
>--		void *handle;
>--		void *start;
>--		void *stop;
>--		const char *error;
>-+		dlname = calloc(1, sizeof(struct dlname));
>-+		if (!dlname)
>-+			return 0;
>-+		dlname->dln_name = strdup(info->dlpi_name);
>-+		qb_list_add_tail(&dlname->list, &dlnames);
>-+	}
>- 
>--		handle = dlopen(info->dlpi_name, RTLD_LAZY);
>-+	return 0;
>-+}
>-+
>-+static void
>-+_log_so_walk_dlnames(void)
>-+{
>-+	struct dlname *dlname;
>-+	struct qb_list_head *iter;
>-+	struct qb_list_head *next;
>-+
>-+	void *handle;
>-+	void *start;
>-+	void *stop;
>-+	const char *error;
>-+
>-+	qb_list_for_each_safe(iter, next, &dlnames) {
>-+		dlname = qb_list_entry(iter, struct dlname, list);
>-+
>-+		handle = dlopen(dlname->dln_name, RTLD_LAZY);
>- 		error = dlerror();
>- 		if (!handle || error) {
>- 			qb_log(LOG_ERR, "%s", error);
>--			if (handle) {
>--				dlclose(handle);
>--			}
>--			return 0;
>-+			goto done;
>- 		}
>- 
>- 		start = dlsym(handle, "__start___verbose");
>-@@ -773,9 +801,13 @@ _log_so_walk_callback(struct dl_phdr_inf
>- 			qb_log_callsites_register(start, stop);
>- 		}
>- done:
>--		dlclose(handle);
>-+		if (handle)
>-+			dlclose(handle);
>-+		qb_list_del(iter);
>-+		if (dlname->dln_name)
>-+			free(dlname->dln_name);
>-+		free(dlname);
>- 	}
>--	return 0;
>- }
>- #endif /* QB_HAVE_ATTRIBUTE_SECTION */
>- 
>-@@ -823,6 +855,7 @@ qb_log_init(const char *name, int32_t fa
>- #ifdef QB_HAVE_ATTRIBUTE_SECTION
>- 	qb_log_callsites_register(__start___verbose, __stop___verbose);
>- 	dl_iterate_phdr(_log_so_walk_callback, NULL);
>-+	_log_so_walk_dlnames();
>- #endif /* QB_HAVE_ATTRIBUTE_SECTION */
>- 
>- 	conf[QB_LOG_STDERR].state = QB_LOG_STATE_DISABLED;
>
>Property changes on: files/patch-lib-log.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-unix.c
>===================================================================
>--- files/patch-lib-unix.c	(revision 413583)
>+++ files/patch-lib-unix.c	(nonexistent)
>@@ -1,20 +0,0 @@
>---- lib/unix.c.orig	2015-08-18 19:55:43 UTC
>-+++ lib/unix.c
>-@@ -83,7 +83,7 @@ qb_sys_mmap_file_open(char *path, const 
>- #if defined(QB_LINUX) || defined(QB_CYGWIN)
>- 		snprintf(path, PATH_MAX, "/dev/shm/%s", file);
>- #else
>--		snprintf(path, PATH_MAX, LOCALSTATEDIR "/run/%s", file);
>-+		snprintf(path, PATH_MAX, "%s/%s", SOCKETDIR, file);
>- 		is_absolute = path;
>- #endif
>- 	}
>-@@ -91,7 +91,7 @@ qb_sys_mmap_file_open(char *path, const 
>- 	if (fd < 0 && !is_absolute) {
>- 		qb_util_perror(LOG_ERR, "couldn't open file %s", path);
>- 
>--		snprintf(path, PATH_MAX, LOCALSTATEDIR "/run/%s", file);
>-+		snprintf(path, PATH_MAX, "%s/%s", SOCKETDIR, file);
>- 		fd = open_mmap_file(path, file_flags);
>- 		if (fd < 0) {
>- 			res = -errno;
>
>Property changes on: files/patch-lib-unix.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 413583)
>+++ pkg-plist	(working copy)
>@@ -15,10 +15,11 @@
> lib/libqb.a
> lib/libqb.so
> lib/libqb.so.0
>-lib/libqb.so.0.17.2
>+lib/libqb.so.0.18.0
> libdata/pkgconfig/libqb.pc
> %%DOXYGEN%%man/man3/qbarray.h.3.gz
> %%DOXYGEN%%man/man3/qbatomic.h.3.gz
>+%%DOXYGEN%%man/man3/qbdefs.h.3.gz
> %%DOXYGEN%%man/man3/qbhdb.h.3.gz
> %%DOXYGEN%%man/man3/qbipc_common.h.3.gz
> %%DOXYGEN%%man/man3/qbipcc.h.3.gz
>@@ -27,6 +28,7 @@
> %%DOXYGEN%%man/man3/qblog.h.3.gz
> %%DOXYGEN%%man/man3/qbloop.h.3.gz
> %%DOXYGEN%%man/man3/qbmap.h.3.gz
>+%%DOXYGEN%%man/man3/qbrb.h.3.gz
> %%DOXYGEN%%man/man3/qbutil.h.3.gz
> %%DOXYGEN%%man/man8/qb-blackbox.8.gz
> sbin/qb-blackbox

Actions: View | Diff

Attachments on bug 209004: 169616