>From d416a056f03bb927bf0e8c5e23a99369c22d6253 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Sun, 6 Jan 2013 11:34:46 -0500 Subject: [PATCH 1/4] SYSDB: Remove duplicate selinux defines --- src/db/sysdb.h | 5 ----- src/db/sysdb_selinux.h | 1 + src/providers/ipa/ipa_opts.h | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 35888977f28b205da51d332d76517908fa364f8a..9db831456d8e228107872bd732f80493ff09b03b 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -100,11 +100,6 @@ #define SYSDB_FQDN "fqdn" #define SYSDB_SERVERHOSTNAME "serverHostname" -#define SYSDB_SELINUX_SEEALSO "seeAlso" -#define SYSDB_SELINUX_USER "selinuxUser" -#define SYSDB_SELINUX_ENABLED "enabled" -#define SYSDB_SELINUX_HOST_PRIORITY "hostPriority" - #define SYSDB_CACHEDPWD "cachedPassword" #define SYSDB_UUID "uniqueID" diff --git a/src/db/sysdb_selinux.h b/src/db/sysdb_selinux.h index 39bb67a1921d8e22d49802b6dd09e51b102f18a5..c7dbbe98c2e76a072a79443ad68322f437e6597a 100644 --- a/src/db/sysdb_selinux.h +++ b/src/db/sysdb_selinux.h @@ -34,6 +34,7 @@ #define SYSDB_SELINUX_ENABLED "enabled" #define SYSDB_SELINUX_DEFAULT_USER "user" #define SYSDB_SELINUX_DEFAULT_ORDER "order" +#define SYSDB_SELINUX_HOST_PRIORITY "hostPriority" enum selinux_entity_type { SELINUX_CONFIG, diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h index 01c32f462919b2b63c6e888b0cd221eab9e344b6..66ca8ba7d1308b9e91e77f01fc309a0ba6a0927d 100644 --- a/src/providers/ipa/ipa_opts.h +++ b/src/providers/ipa/ipa_opts.h @@ -28,6 +28,7 @@ #include "db/sysdb_sudo.h" #include "db/sysdb_autofs.h" #include "db/sysdb_services.h" +#include "db/sysdb_selinux.h" struct dp_option ipa_basic_opts[] = { { "ipa_domain", DP_OPT_STRING, NULL_STRING, NULL_STRING }, -- 1.8.0.2