1 From 75c4852e47217ab85d6840b488ab4b3688091856 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
3 Date: Fri, 8 Jan 2016 16:53:46 +0100
4 Subject: [PATCH 1/2] socket-manager: removes tizen specific call
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 The function 'smack_fgetlabel' is specific to Tizen
10 and is no more maintained upstream.
12 Upstream-Status: Accepted [https://review.tizen.org/gerrit/#/c/56507/]
14 Change-Id: I3802742b1758efe37b33e6d968ff727d68f2fd1f
15 Signed-off-by: José Bollo <jobol@nonadev.net>
17 src/server/main/socket-manager.cpp | 7 ++++---
18 1 file changed, 4 insertions(+), 3 deletions(-)
20 diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
21 index 0366186..c5cec18 100644
22 --- a/src/server/main/socket-manager.cpp
23 +++ b/src/server/main/socket-manager.cpp
25 #include <sys/types.h>
26 #include <sys/socket.h>
27 #include <sys/smack.h>
28 +#include <linux/xattr.h>
32 @@ -500,9 +501,9 @@ int SocketManager::CreateDomainSocketHelp(
34 LogInfo("Set up smack label: " << desc.smackLabel);
36 - if (0 != smack_fsetlabel(sockfd, desc.smackLabel.c_str(), SMACK_LABEL_IPIN)) {
37 - LogError("Error in smack_fsetlabel");
38 - ThrowMsg(Exception::InitFailed, "Error in smack_fsetlabel");
39 + if (0 != smack_set_label_for_file(sockfd, XATTR_NAME_SMACKIPIN, desc.smackLabel.c_str())) {
40 + LogError("Error in smack_set_label_for_file");
41 + ThrowMsg(Exception::InitFailed, "Error in smack_set_label_for_file");
44 LogInfo("No smack on platform. Socket won't be securied with smack label!");