>From 1c6f8fb2088f4a93d1b21acaeec7e9f2406c857a Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Tue, 22 Jul 2014 10:50:44 +0200
Subject: [PATCH 5/7] Remove macro IPA_UNIQUE_ID

---
 src/providers/ipa/ipa_access.c        |  3 +--
 src/providers/ipa/ipa_hbac_private.h  |  2 --
 src/providers/ipa/ipa_hbac_rules.c    | 27 +++++++++++++--------------
 src/providers/ipa/ipa_hbac_services.c |  9 ++++-----
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c
index bb8e45cf9df6169ac71609d566456ac307914654..1f5211ec491c1de4a01544041cb226c579293c3b 100644
--- a/src/providers/ipa/ipa_access.c
+++ b/src/providers/ipa/ipa_access.c
@@ -574,7 +574,7 @@ static void hbac_sysdb_save(struct tevent_req *req)
     }
     /* Save the rules */
     ret = ipa_hbac_sysdb_save(domain,
-                              HBAC_RULES_SUBDIR, IPA_UNIQUE_ID,
+                              HBAC_RULES_SUBDIR, IPA_CN,
                               hbac_ctx->rule_count,
                               hbac_ctx->rules,
                               NULL, NULL, 0, NULL);
@@ -684,7 +684,6 @@ errno_t hbac_get_cached_rules(TALLOC_CTX *mem_ctx,
     const char *attrs[] = { OBJECTCLASS,
                             IPA_CN,
                             SYSDB_ORIG_DN,
-                            IPA_UNIQUE_ID,
                             IPA_ENABLED_FLAG,
                             IPA_ACCESS_RULE_TYPE,
                             IPA_MEMBER_USER,
diff --git a/src/providers/ipa/ipa_hbac_private.h b/src/providers/ipa/ipa_hbac_private.h
index c831cd5c6dd2ed1ff2bc0d649a25ae1212548dda..ed46a5cad0f06b5ebb4b0caf1bb27b5348fbfd28 100644
--- a/src/providers/ipa/ipa_hbac_private.h
+++ b/src/providers/ipa/ipa_hbac_private.h
@@ -31,8 +31,6 @@
 #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"
diff --git a/src/providers/ipa/ipa_hbac_rules.c b/src/providers/ipa/ipa_hbac_rules.c
index 571b90c5813b9b1a7d38d70c4c61604b6e64f0e4..59673add908a46a79d5911d63898f7bfbaf852e8 100644
--- a/src/providers/ipa/ipa_hbac_rules.c
+++ b/src/providers/ipa/ipa_hbac_rules.c
@@ -95,26 +95,25 @@ ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx,
     state->opts = opts;
     state->search_bases = search_bases;
     state->search_base_iter = 0;
-    state->attrs = talloc_zero_array(state, const char *, 15);
+    state->attrs = talloc_zero_array(state, const char *, 14);
     if (state->attrs == NULL) {
         ret = ENOMEM;
         goto immediate;
     }
     state->attrs[0] = OBJECTCLASS;
     state->attrs[1] = IPA_CN;
-    state->attrs[2] = IPA_UNIQUE_ID;
-    state->attrs[3] = IPA_ENABLED_FLAG;
-    state->attrs[4] = IPA_ACCESS_RULE_TYPE;
-    state->attrs[5] = IPA_MEMBER_USER;
-    state->attrs[6] = IPA_USER_CATEGORY;
-    state->attrs[7] = IPA_MEMBER_SERVICE;
-    state->attrs[8] = IPA_SERVICE_CATEGORY;
-    state->attrs[9] = IPA_SOURCE_HOST;
-    state->attrs[10] = IPA_SOURCE_HOST_CATEGORY;
-    state->attrs[11] = IPA_EXTERNAL_HOST;
-    state->attrs[12] = IPA_MEMBER_HOST;
-    state->attrs[13] = IPA_HOST_CATEGORY;
-    state->attrs[14] = NULL;
+    state->attrs[2] = IPA_ENABLED_FLAG;
+    state->attrs[3] = IPA_ACCESS_RULE_TYPE;
+    state->attrs[4] = IPA_MEMBER_USER;
+    state->attrs[5] = IPA_USER_CATEGORY;
+    state->attrs[6] = IPA_MEMBER_SERVICE;
+    state->attrs[7] = IPA_SERVICE_CATEGORY;
+    state->attrs[8] = IPA_SOURCE_HOST;
+    state->attrs[9] = IPA_SOURCE_HOST_CATEGORY;
+    state->attrs[10] = IPA_EXTERNAL_HOST;
+    state->attrs[11] = IPA_MEMBER_HOST;
+    state->attrs[12] = IPA_HOST_CATEGORY;
+    state->attrs[13] = NULL;
 
     if (get_deny_rules) {
         rule_filter = talloc_asprintf(tmp_ctx,
diff --git a/src/providers/ipa/ipa_hbac_services.c b/src/providers/ipa/ipa_hbac_services.c
index 3040ce68a68520d7eee0ec478ee0adbfb80eb083..62caeee6893c8c4f070f806d24513f972cda237d 100644
--- a/src/providers/ipa/ipa_hbac_services.c
+++ b/src/providers/ipa/ipa_hbac_services.c
@@ -90,7 +90,7 @@ ipa_hbac_service_info_send(TALLOC_CTX *mem_ctx,
     state->service_filter = service_filter;
     state->cur_filter = NULL;
 
-    state->attrs = talloc_array(state, const char *, 6);
+    state->attrs = talloc_array(state, const char *, 5);
     if (state->attrs == NULL) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               "Failed to allocate service attribute list.\n");
@@ -99,10 +99,9 @@ ipa_hbac_service_info_send(TALLOC_CTX *mem_ctx,
     }
     state->attrs[0] = OBJECTCLASS;
     state->attrs[1] = IPA_CN;
-    state->attrs[2] = IPA_UNIQUE_ID;
-    state->attrs[3] = IPA_MEMBER;
-    state->attrs[4] = IPA_MEMBEROF;
-    state->attrs[5] = NULL;
+    state->attrs[2] = IPA_MEMBER;
+    state->attrs[3] = IPA_MEMBEROF;
+    state->attrs[4] = NULL;
 
     ret = ipa_hbac_service_info_next(req, state);
     if (ret == EOK) {
-- 
1.9.3