4c80037896
(cherry picked from commitfa4807ec45) (cherry picked from commit323dbdee02) (cherry picked from commit7e532024f0)
163 lines
5.9 KiB
Diff
163 lines
5.9 KiB
Diff
From 21909d3b620d97e81dd946b959a47efe88d2b7d8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
Date: Mon, 10 Apr 2017 13:00:25 +0200
|
|
Subject: [PATCH 44/93] IPA: Leave only HBAC specific defines in
|
|
ipa_hbac_private.h
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The defines that were moved can and will be used by another backend
|
|
module that will be introduced in the near future.
|
|
|
|
Related:
|
|
https://pagure.io/SSSD/sssd/issue/2995
|
|
|
|
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
|
|
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
---
|
|
src/providers/ipa/ipa_hbac_common.c | 1 +
|
|
src/providers/ipa/ipa_hbac_hosts.c | 1 +
|
|
src/providers/ipa/ipa_hbac_private.h | 11 -----------
|
|
src/providers/ipa/ipa_hbac_rules.c | 1 +
|
|
src/providers/ipa/ipa_hbac_services.c | 1 +
|
|
src/providers/ipa/ipa_hbac_users.c | 1 +
|
|
src/providers/ipa/ipa_rules_common.h | 12 ++++++++++++
|
|
src/providers/ipa/ipa_selinux.c | 1 +
|
|
8 files changed, 18 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c
|
|
index 3866ee2385b262a137c1521ee78a277158777c1a..2dba314962bd76c669b1bdbb33f2bb1858fe43c1 100644
|
|
--- a/src/providers/ipa/ipa_hbac_common.c
|
|
+++ b/src/providers/ipa/ipa_hbac_common.c
|
|
@@ -22,6 +22,7 @@
|
|
|
|
#include "providers/ipa/ipa_hbac_private.h"
|
|
#include "providers/ipa/ipa_common.h"
|
|
+#include "providers/ipa/ipa_rules_common.h"
|
|
|
|
errno_t
|
|
replace_attribute_name(const char *old_name,
|
|
diff --git a/src/providers/ipa/ipa_hbac_hosts.c b/src/providers/ipa/ipa_hbac_hosts.c
|
|
index d331cdfabb489914658487734042086361c7e7b1..74d91e513cb93f936b7ca09149343cee9b7fda82 100644
|
|
--- a/src/providers/ipa/ipa_hbac_hosts.c
|
|
+++ b/src/providers/ipa/ipa_hbac_hosts.c
|
|
@@ -23,6 +23,7 @@
|
|
#include "util/util.h"
|
|
#include "db/sysdb.h"
|
|
#include "providers/ipa/ipa_hbac_private.h"
|
|
+#include "providers/ipa/ipa_rules_common.h"
|
|
#include "providers/ldap/sdap_async.h"
|
|
|
|
/*
|
|
diff --git a/src/providers/ipa/ipa_hbac_private.h b/src/providers/ipa/ipa_hbac_private.h
|
|
index ca0bd4710f40206a7c236f86ec7af01f266317fa..7d8b1ed2f82a5d4502a47f51ddd4f19171430688 100644
|
|
--- a/src/providers/ipa/ipa_hbac_private.h
|
|
+++ b/src/providers/ipa/ipa_hbac_private.h
|
|
@@ -31,29 +31,18 @@
|
|
#define IPA_HBAC_SERVICE "ipaHBACService"
|
|
#define IPA_HBAC_SERVICE_GROUP "ipaHBACServiceGroup"
|
|
|
|
-#define IPA_UNIQUE_ID "ipauniqueid"
|
|
-
|
|
#define IPA_MEMBER "member"
|
|
#define HBAC_HOSTS_SUBDIR "hbac_hosts"
|
|
#define HBAC_HOSTGROUPS_SUBDIR "hbac_hostgroups"
|
|
|
|
-#define OBJECTCLASS "objectclass"
|
|
#define IPA_MEMBEROF "memberOf"
|
|
#define IPA_ACCESS_RULE_TYPE "accessRuleType"
|
|
#define IPA_HBAC_ALLOW "allow"
|
|
-#define IPA_MEMBER_USER "memberUser"
|
|
-#define IPA_USER_CATEGORY "userCategory"
|
|
#define IPA_SERVICE_NAME "serviceName"
|
|
#define IPA_SOURCE_HOST "sourceHost"
|
|
#define IPA_SOURCE_HOST_CATEGORY "sourceHostCategory"
|
|
-#define IPA_EXTERNAL_HOST "externalHost"
|
|
-#define IPA_ENABLED_FLAG "ipaenabledflag"
|
|
-#define IPA_MEMBER_HOST "memberHost"
|
|
-#define IPA_HOST_CATEGORY "hostCategory"
|
|
-#define IPA_CN "cn"
|
|
#define IPA_MEMBER_SERVICE "memberService"
|
|
#define IPA_SERVICE_CATEGORY "serviceCategory"
|
|
-#define IPA_TRUE_VALUE "TRUE"
|
|
|
|
#define IPA_HBAC_BASE_TMPL "cn=hbac,%s"
|
|
#define IPA_SERVICES_BASE_TMPL "cn=hbacservices,cn=accounts,%s"
|
|
diff --git a/src/providers/ipa/ipa_hbac_rules.c b/src/providers/ipa/ipa_hbac_rules.c
|
|
index 7912dbec98f9f4bb5e4c9a64d709196c53e7512b..c860905cc5544100be22ef74379895b3adb94173 100644
|
|
--- a/src/providers/ipa/ipa_hbac_rules.c
|
|
+++ b/src/providers/ipa/ipa_hbac_rules.c
|
|
@@ -21,6 +21,7 @@
|
|
*/
|
|
|
|
#include "util/util.h"
|
|
+#include "providers/ipa/ipa_rules_common.h"
|
|
#include "providers/ipa/ipa_hbac_private.h"
|
|
#include "providers/ipa/ipa_hbac_rules.h"
|
|
#include "providers/ldap/sdap_async.h"
|
|
diff --git a/src/providers/ipa/ipa_hbac_services.c b/src/providers/ipa/ipa_hbac_services.c
|
|
index cf8ce84bf54f2d22bd5cd19d88e647889742a41e..79088ff66d72a9ca575dc8ee9b8d35070526a927 100644
|
|
--- a/src/providers/ipa/ipa_hbac_services.c
|
|
+++ b/src/providers/ipa/ipa_hbac_services.c
|
|
@@ -21,6 +21,7 @@
|
|
*/
|
|
|
|
#include "util/util.h"
|
|
+#include "providers/ipa/ipa_rules_common.h"
|
|
#include "providers/ipa/ipa_hbac_private.h"
|
|
#include "providers/ldap/sdap_async.h"
|
|
|
|
diff --git a/src/providers/ipa/ipa_hbac_users.c b/src/providers/ipa/ipa_hbac_users.c
|
|
index 0881647c25f96008c16d00896d8a4564baaf4a03..af53fa035323a87e4bbaa807db503aab34112e3e 100644
|
|
--- a/src/providers/ipa/ipa_hbac_users.c
|
|
+++ b/src/providers/ipa/ipa_hbac_users.c
|
|
@@ -21,6 +21,7 @@
|
|
*/
|
|
|
|
#include "util/util.h"
|
|
+#include "providers/ipa/ipa_rules_common.h"
|
|
#include "providers/ipa/ipa_hbac_private.h"
|
|
#include "providers/ldap/sdap_async.h"
|
|
|
|
diff --git a/src/providers/ipa/ipa_rules_common.h b/src/providers/ipa/ipa_rules_common.h
|
|
index 38a6ba3a51f1553483e43a0a2dd186077f5089d4..b5e05b039836902ac4ce0bc61b0fbc98648db974 100644
|
|
--- a/src/providers/ipa/ipa_rules_common.h
|
|
+++ b/src/providers/ipa/ipa_rules_common.h
|
|
@@ -25,6 +25,18 @@
|
|
|
|
#include "providers/backend.h"
|
|
|
|
+#define IPA_UNIQUE_ID "ipauniqueid"
|
|
+
|
|
+#define OBJECTCLASS "objectclass"
|
|
+#define IPA_MEMBER_USER "memberUser"
|
|
+#define IPA_USER_CATEGORY "userCategory"
|
|
+#define IPA_EXTERNAL_HOST "externalHost"
|
|
+#define IPA_ENABLED_FLAG "ipaenabledflag"
|
|
+#define IPA_MEMBER_HOST "memberHost"
|
|
+#define IPA_HOST_CATEGORY "hostCategory"
|
|
+#define IPA_CN "cn"
|
|
+#define IPA_TRUE_VALUE "TRUE"
|
|
+
|
|
/* From ipa_rules_common.c */
|
|
errno_t
|
|
ipa_common_entries_and_groups_sysdb_save(struct sss_domain_info *domain,
|
|
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c
|
|
index 6d0778d7817762dc6f314b8ed72ff292486dffd7..e9cc33953ea4f10e1fb4cf0b2db3c2d15777b519 100644
|
|
--- a/src/providers/ipa/ipa_selinux.c
|
|
+++ b/src/providers/ipa/ipa_selinux.c
|
|
@@ -36,6 +36,7 @@
|
|
#include "providers/ipa/ipa_access.h"
|
|
#include "providers/ipa/ipa_selinux_maps.h"
|
|
#include "providers/ipa/ipa_subdomains.h"
|
|
+#include "providers/ipa/ipa_rules_common.h"
|
|
|
|
#ifndef SELINUX_CHILD_DIR
|
|
#ifndef SSSD_LIBEXEC_PATH
|
|
--
|
|
2.14.1
|
|
|