From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 11 Jun 2019 21:27:33 +0000 (+0200)
Subject: seccomp: s/seccomp_notif_get_fd/seccomp_notify_fd/g
X-Git-Tag: lxc-3.2.0~34^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da9c8317e855e756e4ea4d9061cf90252557d203;p=thirdparty%2Flxc.git

seccomp: s/seccomp_notif_get_fd/seccomp_notify_fd/g

Align with upstream libseccomp.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/configure.ac b/configure.ac
index 4686872ac..4e10d4f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -363,7 +363,7 @@ AM_COND_IF([ENABLE_CAP],
 OLD_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $SECCOMP_CFLAGS"
 AC_CHECK_TYPES([scmp_filter_ctx], [], [], [[#include <seccomp.h>]])
-AC_CHECK_DECLS([seccomp_notif_get_fd], [], [], [[#include <seccomp.h>]])
+AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include <seccomp.h>]])
 AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include <seccomp.h>]])
 CFLAGS="$OLD_CFLAGS"
 
diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 002e15654..b8ada6168 100644
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -1258,7 +1258,7 @@ int lxc_seccomp_load(struct lxc_conf *conf)
 
 #if HAVE_DECL_SECCOMP_NOTIF_GET_FD
 	if (conf->seccomp.notifier.wants_supervision) {
-		ret = seccomp_notif_get_fd(conf->seccomp.seccomp_ctx);
+		ret = seccomp_notify_fd(conf->seccomp.seccomp_ctx);
 		if (ret < 0) {
 			errno = -ret;
 			return -1;