From 05516d81b477dd437c22c9f67f4862d0283f7b6c Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 19 Mar 2012 08:03:32 +0100
Subject: [PATCH 2/2] Save alias of the primary name, too

---
 src/db/sysdb.c                      |   12 +++++++++---
 src/responder/nss/nsssrv_services.c |   22 ++++++++++++++--------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index 1bf189238ab2761136fe2e039287b8b6f8cce536..5436fb832f13247064ee7739f2254dcfa2aafda4 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -1731,7 +1731,7 @@ errno_t sysdb_attrs_get_aliases(TALLOC_CTX *mem_ctx,
 {
     TALLOC_CTX *tmp_ctx = NULL;
     struct ldb_message_element *sysdb_name_el;
-    size_t i, ai;
+    size_t i, j, ai;
     errno_t ret;
     const char **aliases = NULL;
     const char *name;
@@ -1776,8 +1776,14 @@ errno_t sysdb_attrs_get_aliases(TALLOC_CTX *mem_ctx,
                 goto done;
             }
 
-            if (sss_utf8_case_eq((const uint8_t *) primary,
-                                 (const uint8_t *) lower) == ENOMATCH) {
+            for (j=0; j < ai; j++) {
+                if (sss_utf8_case_eq((const uint8_t *) aliases[j],
+                                     (const uint8_t *) lower) == ENOMATCH) {
+                    break;
+                }
+            }
+
+            if (ai == 0 || j < ai) {
                 aliases[ai] = talloc_strdup(aliases, lower);
                 if (!aliases[ai]) {
                     ret = ENOMEM;
diff --git a/src/responder/nss/nsssrv_services.c b/src/responder/nss/nsssrv_services.c
index 1b58986c44e800c44ace1de1136638572adec7e6..0739362c4d17368e023226028a995b4ea594345a 100644
--- a/src/responder/nss/nsssrv_services.c
+++ b/src/responder/nss/nsssrv_services.c
@@ -596,9 +596,9 @@ fill_service(struct sss_packet *packet,
 {
     errno_t ret;
     unsigned int msg_count = *count;
-    size_t rzero, rsize;
+    size_t rzero, rsize, aptr;
     unsigned int num, i, j;
-    uint32_t num_aliases;
+    uint32_t num_aliases, written_aliases;
     struct ldb_message *msg;
     struct ldb_message_element *el;
     TALLOC_CTX *tmp_ctx = NULL;
@@ -710,8 +710,9 @@ fill_service(struct sss_packet *packet,
             num_aliases = el->num_values;
         }
 
-        /* Store the alias count */
-        SAFEALIGN_SET_UINT32(&body[rzero + rsize], num_aliases, &rsize);
+        /* We'll store the alias count here */
+        aptr = rzero+rsize;
+        rsize += sizeof(uint32_t);
 
         /* Store the primary name */
         safealign_memcpy(&body[rzero + rsize],
@@ -725,11 +726,14 @@ fill_service(struct sss_packet *packet,
                          cased_proto.len,
                          &rsize);
 
+        written_aliases = 0;
         for (j = 0; j < num_aliases; j++) {
-            tmpstr = sss_get_cased_name(tmp_ctx,
-                                        (const char *)el->values[j].data,
-                                        dom->case_sensitive);
-            to_sized_string(&alias, tmpstr);
+            if (sss_string_equal(dom->case_sensitive,
+                             (const char *)el->values[j].data,
+                             cased_name.str)) {
+                continue;
+            }
+            to_sized_string(&alias, (const char *)el->values[j].data);
 
             ret = sss_packet_grow(packet, alias.len);
             if (ret != EOK) {
@@ -744,8 +748,10 @@ fill_service(struct sss_packet *packet,
                              alias.len,
                              &rsize);
 
+            written_aliases++;
             talloc_zfree(tmpstr);
         }
+        SAFEALIGN_SET_UINT32(&body[aptr], written_aliases, &rsize);
 
         num++;
     }
-- 
1.7.7.6