[SSSD] [sssd PR#26][synchronized] KRB5: Fixing FQ name of user in krb5_setup()

2016-09-21 Thread celestian 
   URL: https://github.com/SSSD/sssd/pull/26
Author: celestian
 Title: #26: KRB5: Fixing FQ name of user in krb5_setup()
Action: synchronized

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/26/head:pr26
git checkout pr26
From d26ab1eae2ae3cff593a08ffd11227afdabfb797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Wed, 14 Sep 2016 09:00:06 -0400
Subject: [PATCH] KRB5: Fixing FQ name of user in krb5_setup()

This patch fixes creation of FQ username if krb5_map_user option
ise used.

Resolves:
https://fedorahosted.org/sssd/ticket/3188
---
 src/providers/krb5/krb5_auth.c|  8 +++-
 src/providers/krb5/krb5_init_shared.c |  1 +
 src/providers/krb5/krb5_utils.c   | 26 +-
 src/providers/krb5/krb5_utils.h   |  4 +++-
 src/tests/krb5_utils-tests.c  | 33 -
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index f0f2280..a5ecb24 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -207,7 +207,13 @@ errno_t krb5_setup(TALLOC_CTX *mem_ctx,
 if (ret == EOK) {
 DEBUG(SSSDBG_TRACE_FUNC, "Setting mapped name to: %s\n", mapped_name);
 kr->user = mapped_name;
-kr->kuserok_user = mapped_name;
+
+kr->kuserok_user = sss_output_name(kr, kr->user,
+   dom->case_sensitive, 0);
+if (kr->kuserok_user == NULL) {
+ret = ENOMEM;
+goto done;
+}
 } else if (ret == ENOENT) {
 DEBUG(SSSDBG_TRACE_ALL, "No mapping for: %s\n", pd->user);
 kr->user = pd->user;
diff --git a/src/providers/krb5/krb5_init_shared.c b/src/providers/krb5/krb5_init_shared.c
index 767291c..c8fd859 100644
--- a/src/providers/krb5/krb5_init_shared.c
+++ b/src/providers/krb5/krb5_init_shared.c
@@ -94,6 +94,7 @@ errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx,
 ret = parse_krb5_map_user(krb5_auth_ctx,
   dp_opt_get_cstring(krb5_auth_ctx->opts,
  KRB5_MAP_USER),
+  bectx->domain->name,
   _auth_ctx->name_to_primary);
 if (ret != EOK) {
 DEBUG(SSSDBG_OP_FAILURE, "parse_krb5_map_user failed: %s:[%d]\n",
diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c
index 0ac60da..e968dfa 100644
--- a/src/providers/krb5/krb5_utils.c
+++ b/src/providers/krb5/krb5_utils.c
@@ -521,7 +521,9 @@ fill_name_to_primary_map(TALLOC_CTX *mem_ctx, char **map,
 }
 
 errno_t
-parse_krb5_map_user(TALLOC_CTX *mem_ctx, const char *krb5_map_user,
+parse_krb5_map_user(TALLOC_CTX *mem_ctx,
+const char *krb5_map_user,
+const char *dom_name,
 struct map_id_name_to_krb_primary **_name_to_primary)
 {
 int size;
@@ -570,6 +572,28 @@ parse_krb5_map_user(TALLOC_CTX *mem_ctx, const char *krb5_map_user,
 }
 }
 
+/* conversion names to fully-qualified names */
+for (int i = 0; i < size; i++) {
+name_to_primary[i].id_name = sss_create_internal_fqname(
+ name_to_primary,
+ name_to_primary[i].id_name,
+ dom_name);
+if (name_to_primary[i].id_name == NULL) {
+DEBUG(SSSDBG_OP_FAILURE, "sss_create_internal_fqname failed\n");
+ret = ENOMEM;
+goto done;
+}
+
+name_to_primary[i].krb_primary = sss_create_internal_fqname(
+ name_to_primary,
+ name_to_primary[i].krb_primary,
+ dom_name);
+if (name_to_primary[i].krb_primary == NULL) {
+DEBUG(SSSDBG_OP_FAILURE, "sss_create_internal_fqname failed\n");
+ret = ENOMEM;
+goto done;
+}
+}
 ret = EOK;
 
 done:
diff --git a/src/providers/krb5/krb5_utils.h b/src/providers/krb5/krb5_utils.h
index 75b93c3..3051a99 100644
--- a/src/providers/krb5/krb5_utils.h
+++ b/src/providers/krb5/krb5_utils.h
@@ -51,7 +51,9 @@ errno_t get_domain_or_subdomain(struct be_ctx *be_ctx,
 struct sss_domain_info **dom);
 
 errno_t
-parse_krb5_map_user(TALLOC_CTX *mem_ctx, const char *krb5_map_user,
+parse_krb5_map_user(TALLOC_CTX *mem_ctx,
+const char *krb5_map_user,
+const char *dom_name,
 struct map_id_name_to_krb_primary **_name_to_primary);
 
 #endif /* __KRB5_UTILS_H__ */
diff --git a/src/tests/krb5_utils-tests.c b/src/tests/krb5_utils-tests.c
index 515a194..6d03a30 100644
--- a/src/tests/krb5_utils-tests.c
+++

[SSSD] [sssd PR#26][synchronized] KRB5: Fixing FQ name of user in krb5_setup()

2016-09-21 Thread celestian 
   URL: https://github.com/SSSD/sssd/pull/26
Author: celestian
 Title: #26: KRB5: Fixing FQ name of user in krb5_setup()
Action: synchronized

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/26/head:pr26
git checkout pr26
From ae40f498030fb2247da0120c9ae10e944a7811a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Wed, 14 Sep 2016 09:00:06 -0400
Subject: [PATCH] KRB5: Fixing FQ name of user in krb5_setup()

This patch fixes creation of FQ username if krb5_map_user option
ise used.

Resolves:
https://fedorahosted.org/sssd/ticket/3188
---
 src/providers/krb5/krb5_auth.c|  8 +++-
 src/providers/krb5/krb5_init_shared.c |  1 +
 src/providers/krb5/krb5_utils.c   | 29 -
 src/providers/krb5/krb5_utils.h   |  4 +++-
 src/tests/krb5_utils-tests.c  | 33 -
 5 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index f0f2280..a5ecb24 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -207,7 +207,13 @@ errno_t krb5_setup(TALLOC_CTX *mem_ctx,
 if (ret == EOK) {
 DEBUG(SSSDBG_TRACE_FUNC, "Setting mapped name to: %s\n", mapped_name);
 kr->user = mapped_name;
-kr->kuserok_user = mapped_name;
+
+kr->kuserok_user = sss_output_name(kr, kr->user,
+   dom->case_sensitive, 0);
+if (kr->kuserok_user == NULL) {
+ret = ENOMEM;
+goto done;
+}
 } else if (ret == ENOENT) {
 DEBUG(SSSDBG_TRACE_ALL, "No mapping for: %s\n", pd->user);
 kr->user = pd->user;
diff --git a/src/providers/krb5/krb5_init_shared.c b/src/providers/krb5/krb5_init_shared.c
index 767291c..c8fd859 100644
--- a/src/providers/krb5/krb5_init_shared.c
+++ b/src/providers/krb5/krb5_init_shared.c
@@ -94,6 +94,7 @@ errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx,
 ret = parse_krb5_map_user(krb5_auth_ctx,
   dp_opt_get_cstring(krb5_auth_ctx->opts,
  KRB5_MAP_USER),
+  bectx->domain->name,
   _auth_ctx->name_to_primary);
 if (ret != EOK) {
 DEBUG(SSSDBG_OP_FAILURE, "parse_krb5_map_user failed: %s:[%d]\n",
diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c
index 0ac60da..256e639 100644
--- a/src/providers/krb5/krb5_utils.c
+++ b/src/providers/krb5/krb5_utils.c
@@ -521,7 +521,9 @@ fill_name_to_primary_map(TALLOC_CTX *mem_ctx, char **map,
 }
 
 errno_t
-parse_krb5_map_user(TALLOC_CTX *mem_ctx, const char *krb5_map_user,
+parse_krb5_map_user(TALLOC_CTX *mem_ctx,
+const char *krb5_map_user,
+const char *dom_name,
 struct map_id_name_to_krb_primary **_name_to_primary)
 {
 int size;
@@ -529,6 +531,7 @@ parse_krb5_map_user(TALLOC_CTX *mem_ctx, const char *krb5_map_user,
 errno_t ret;
 TALLOC_CTX *tmp_ctx;
 struct map_id_name_to_krb_primary *name_to_primary;
+char *fq_name;
 
 tmp_ctx = talloc_new(NULL);
 if (tmp_ctx == NULL) {
@@ -570,6 +573,30 @@ parse_krb5_map_user(TALLOC_CTX *mem_ctx, const char *krb5_map_user,
 }
 }
 
+/* conversion names to fully-qualified names */
+for (int i = 0; i < size; i++) {
+fq_name = sss_create_internal_fqname(tmp_ctx,
+ name_to_primary[i].id_name,
+ dom_name);
+if (fq_name == NULL) {
+DEBUG(SSSDBG_OP_FAILURE,
+  "sss_create_internal_fqname failed\n");
+ret = ENOMEM;
+goto done;
+}
+name_to_primary[i].id_name = talloc_steal(name_to_primary, fq_name);
+
+fq_name = sss_create_internal_fqname(tmp_ctx,
+ name_to_primary[i].krb_primary,
+ dom_name);
+if (fq_name == NULL) {
+DEBUG(SSSDBG_OP_FAILURE,
+  "sss_create_internal_fqname failed\n");
+ret = ENOMEM;
+goto done;
+}
+name_to_primary[i].krb_primary = talloc_steal(name_to_primary, fq_name);
+}
 ret = EOK;
 
 done:
diff --git a/src/providers/krb5/krb5_utils.h b/src/providers/krb5/krb5_utils.h
index 75b93c3..3051a99 100644
--- a/src/providers/krb5/krb5_utils.h
+++ b/src/providers/krb5/krb5_utils.h
@@ -51,7 +51,9 @@ errno_t get_domain_or_subdomain(struct be_ctx *be_ctx,
 struct sss_domain_info **dom);
 
 errno_t
-parse_krb5_map_user(TALLOC_CTX *mem_ctx, const char *krb5_map_user,
+parse_krb5_map_user(TALLOC_CTX *mem_ctx,
+const char *krb5_map_user,
+const char *dom_name,

[SSSD] [sssd PR#26][synchronized] KRB5: Fixing FQ name of user in krb5_setup()

2016-09-20 Thread celestian 
   URL: https://github.com/SSSD/sssd/pull/26
Author: celestian
 Title: #26: KRB5: Fixing FQ name of user in krb5_setup()
Action: synchronized

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/26/head:pr26
git checkout pr26
From 5880847788892a64c6e1befb93c2358a7c77335a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Mon, 19 Sep 2016 06:28:57 -0400
Subject: [PATCH 1/3] TESTS: Fixing of 'const' warnings in sbus tests

---
 src/tests/sbus_codegen_tests.c | 13 +++--
 src/tests/sbus_tests.c |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/tests/sbus_codegen_tests.c b/src/tests/sbus_codegen_tests.c
index 55d4657..262bfd4 100644
--- a/src/tests/sbus_codegen_tests.c
+++ b/src/tests/sbus_codegen_tests.c
@@ -634,7 +634,7 @@ static int pilot_test_server_init(struct sbus_connection *server, void *unused)
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable, "/test/leela",
-   "Crash into the billboard");
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -645,7 +645,8 @@ static int special_test_server_init(struct sbus_connection *server, void *unused
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable,
-   "/test/special", "Crash into the billboard");
+   "/test/special",
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -673,8 +674,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t v_int64[] = { INT64_C(-), INT64_C() };
 dbus_uint64_t v_uint64[] = { UINT64_C(), INT64_C(88) };
 double v_double[] = { 1.1, 2.2, 3.3 };
-char *v_string[] = { "bears", "bears", "bears" };
-char *v_object_path[] = { "/original", "/original" };
+const char *v_string[] = { "bears", "bears", "bears" };
+const char *v_object_path[] = { "/original", "/original" };
 
 unsigned char *arr_byte = v_byte;
 dbus_int16_t *arr_int16 = v_int16;
@@ -684,8 +685,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t *arr_int64 = v_int64;
 dbus_uint64_t *arr_uint64 = v_uint64;
 double *arr_double = v_double;
-char **arr_string = v_string;
-char **arr_object_path = v_object_path;
+char **arr_string = discard_const(v_string);
+char **arr_object_path = discard_const(v_object_path);
 
 int len_byte = N_ELEMENTS(v_byte);
 int len_int16 = N_ELEMENTS(v_int16);
diff --git a/src/tests/sbus_tests.c b/src/tests/sbus_tests.c
index b472659..6bf71dc 100644
--- a/src/tests/sbus_tests.c
+++ b/src/tests/sbus_tests.c
@@ -201,12 +201,12 @@ static int pilot_test_server_init(struct sbus_connection *server, void *unused)
 int ret;
 
 ret = sbus_conn_register_iface(server, _impl.vtable, "/test/leela",
-   "Crash into the billboard");
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 
 ret = sbus_conn_register_iface(server, _impl.vtable, "/test/fry",
-   "Don't crash");
+   discard_const("Don't crash"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;

From 4742f4f133c90567e1523dafc208b9dcd8e87f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Thu, 15 Sep 2016 09:54:18 -0400
Subject: [PATCH 2/3] MAKEFILE: Fixing CFLAGS in some tests

---
 Makefile.am | 5 +
 1 file changed, 5 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index f89af5a..f792ed6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1828,6 +1828,7 @@ refcount_tests_SOURCES = \
 src/tests/refcount-tests.c \
 $(NULL)
 refcount_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 refcount_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -1840,6 +1841,7 @@ fail_over_tests_SOURCES = \
 $(SSSD_FAILOVER_OBJ) \
 $(NULL)
 fail_over_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 fail_over_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -2044,6 +2046,7 @@ sbus_tests_SOURCES = \
src/tests/common_dbus.c \
src/tests/sbus_tests.c
 sbus_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 sbus_tests_LDADD = \
 $(SSSD_INTERNAL_LTLIBS) \
@@ -2056,6 +2059,7 @@ sbus_codegen_tests_SOURCES = \
 src/tests/sbus_codegen_tests_generated.c \
 $(NULL)
 sbus_codegen_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 sbus_codegen_tests_LDADD = \
 $(SSSD_INTERNAL_LTLIBS) \
@@ -2468,6 +2472,7 @@ ad_common_tests_SOURCES = \
 src/providers/ldap/sdap_async_initgroups_ad.c \
 $(NULL)
 ad_common_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(NDR_NBT_CFLAGS) \
 $(NDR_KRB5PAC_CFLAGS) \
 $(NULL)

From

[SSSD] [sssd PR#26][synchronized] KRB5: Fixing FQ name of user in krb5_setup()

2016-09-19 Thread celestian 
   URL: https://github.com/SSSD/sssd/pull/26
Author: celestian
 Title: #26: KRB5: Fixing FQ name of user in krb5_setup()
Action: synchronized

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/26/head:pr26
git checkout pr26
From 5880847788892a64c6e1befb93c2358a7c77335a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Mon, 19 Sep 2016 06:28:57 -0400
Subject: [PATCH 1/3] TESTS: Fixing of 'const' warnings in sbus tests

---
 src/tests/sbus_codegen_tests.c | 13 +++--
 src/tests/sbus_tests.c |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/tests/sbus_codegen_tests.c b/src/tests/sbus_codegen_tests.c
index 55d4657..262bfd4 100644
--- a/src/tests/sbus_codegen_tests.c
+++ b/src/tests/sbus_codegen_tests.c
@@ -634,7 +634,7 @@ static int pilot_test_server_init(struct sbus_connection *server, void *unused)
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable, "/test/leela",
-   "Crash into the billboard");
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -645,7 +645,8 @@ static int special_test_server_init(struct sbus_connection *server, void *unused
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable,
-   "/test/special", "Crash into the billboard");
+   "/test/special",
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -673,8 +674,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t v_int64[] = { INT64_C(-), INT64_C() };
 dbus_uint64_t v_uint64[] = { UINT64_C(), INT64_C(88) };
 double v_double[] = { 1.1, 2.2, 3.3 };
-char *v_string[] = { "bears", "bears", "bears" };
-char *v_object_path[] = { "/original", "/original" };
+const char *v_string[] = { "bears", "bears", "bears" };
+const char *v_object_path[] = { "/original", "/original" };
 
 unsigned char *arr_byte = v_byte;
 dbus_int16_t *arr_int16 = v_int16;
@@ -684,8 +685,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t *arr_int64 = v_int64;
 dbus_uint64_t *arr_uint64 = v_uint64;
 double *arr_double = v_double;
-char **arr_string = v_string;
-char **arr_object_path = v_object_path;
+char **arr_string = discard_const(v_string);
+char **arr_object_path = discard_const(v_object_path);
 
 int len_byte = N_ELEMENTS(v_byte);
 int len_int16 = N_ELEMENTS(v_int16);
diff --git a/src/tests/sbus_tests.c b/src/tests/sbus_tests.c
index b472659..6bf71dc 100644
--- a/src/tests/sbus_tests.c
+++ b/src/tests/sbus_tests.c
@@ -201,12 +201,12 @@ static int pilot_test_server_init(struct sbus_connection *server, void *unused)
 int ret;
 
 ret = sbus_conn_register_iface(server, _impl.vtable, "/test/leela",
-   "Crash into the billboard");
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 
 ret = sbus_conn_register_iface(server, _impl.vtable, "/test/fry",
-   "Don't crash");
+   discard_const("Don't crash"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;

From 4742f4f133c90567e1523dafc208b9dcd8e87f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Thu, 15 Sep 2016 09:54:18 -0400
Subject: [PATCH 2/3] MAKEFILE: Fixing CFLAGS in some tests

---
 Makefile.am | 5 +
 1 file changed, 5 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index f89af5a..f792ed6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1828,6 +1828,7 @@ refcount_tests_SOURCES = \
 src/tests/refcount-tests.c \
 $(NULL)
 refcount_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 refcount_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -1840,6 +1841,7 @@ fail_over_tests_SOURCES = \
 $(SSSD_FAILOVER_OBJ) \
 $(NULL)
 fail_over_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 fail_over_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -2044,6 +2046,7 @@ sbus_tests_SOURCES = \
src/tests/common_dbus.c \
src/tests/sbus_tests.c
 sbus_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 sbus_tests_LDADD = \
 $(SSSD_INTERNAL_LTLIBS) \
@@ -2056,6 +2059,7 @@ sbus_codegen_tests_SOURCES = \
 src/tests/sbus_codegen_tests_generated.c \
 $(NULL)
 sbus_codegen_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 sbus_codegen_tests_LDADD = \
 $(SSSD_INTERNAL_LTLIBS) \
@@ -2468,6 +2472,7 @@ ad_common_tests_SOURCES = \
 src/providers/ldap/sdap_async_initgroups_ad.c \
 $(NULL)
 ad_common_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(NDR_NBT_CFLAGS) \
 $(NDR_KRB5PAC_CFLAGS) \
 $(NULL)

From

[SSSD] [sssd PR#26][synchronized] KRB5: Fixing FQ name of user in krb5_setup()

2016-09-19 Thread celestian 
   URL: https://github.com/SSSD/sssd/pull/26
Author: celestian
 Title: #26: KRB5: Fixing FQ name of user in krb5_setup()
Action: synchronized

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/26/head:pr26
git checkout pr26
From 645e39c150fe33fbbc1cc1018cc4fad88d2df1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Mon, 19 Sep 2016 06:28:57 -0400
Subject: [PATCH 1/3] TESTS: Fixing of 'const' warnings in sbus tests

---
 src/tests/sbus_codegen_tests.c | 17 +
 src/tests/sbus_tests.c |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/tests/sbus_codegen_tests.c b/src/tests/sbus_codegen_tests.c
index 55d4657..ffa4fff 100644
--- a/src/tests/sbus_codegen_tests.c
+++ b/src/tests/sbus_codegen_tests.c
@@ -634,7 +634,7 @@ static int pilot_test_server_init(struct sbus_connection *server, void *unused)
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable, "/test/leela",
-   "Crash into the billboard");
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -645,7 +645,8 @@ static int special_test_server_init(struct sbus_connection *server, void *unused
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable,
-   "/test/special", "Crash into the billboard");
+   "/test/special",
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -673,8 +674,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t v_int64[] = { INT64_C(-), INT64_C() };
 dbus_uint64_t v_uint64[] = { UINT64_C(), INT64_C(88) };
 double v_double[] = { 1.1, 2.2, 3.3 };
-char *v_string[] = { "bears", "bears", "bears" };
-char *v_object_path[] = { "/original", "/original" };
+const char *v_string[] = { "bears", "bears", "bears" };
+const char *v_object_path[] = { "/original", "/original" };
 
 unsigned char *arr_byte = v_byte;
 dbus_int16_t *arr_int16 = v_int16;
@@ -684,8 +685,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t *arr_int64 = v_int64;
 dbus_uint64_t *arr_uint64 = v_uint64;
 double *arr_double = v_double;
-char **arr_string = v_string;
-char **arr_object_path = v_object_path;
+const char **arr_string = v_string;
+const char **arr_object_path = v_object_path;
 
 int len_byte = N_ELEMENTS(v_byte);
 int len_int16 = N_ELEMENTS(v_int16);
@@ -818,12 +819,12 @@ START_TEST(test_marshal_basic_types)
 ck_assert_int_eq(len_string, 2);
 ck_assert_str_eq(arr_string[0], "beets");
 ck_assert_str_eq(arr_string[1], "beets");
-dbus_free_string_array(arr_string);
+dbus_free_string_array(discard_const(arr_string));
 
 ck_assert_int_eq(len_object_path, 2);
 ck_assert_str_eq(arr_object_path[0], "/changed");
 ck_assert_str_eq(arr_object_path[1], "/changed");
-dbus_free_string_array(arr_object_path);
+dbus_free_string_array(discard_const(arr_object_path));
 
 dbus_message_unref (reply);
 talloc_free(ctx);
diff --git a/src/tests/sbus_tests.c b/src/tests/sbus_tests.c
index b472659..6bf71dc 100644
--- a/src/tests/sbus_tests.c
+++ b/src/tests/sbus_tests.c
@@ -201,12 +201,12 @@ static int pilot_test_server_init(struct sbus_connection *server, void *unused)
 int ret;
 
 ret = sbus_conn_register_iface(server, _impl.vtable, "/test/leela",
-   "Crash into the billboard");
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 
 ret = sbus_conn_register_iface(server, _impl.vtable, "/test/fry",
-   "Don't crash");
+   discard_const("Don't crash"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;

From 10df41d063a6f1c0fac099c18655aae53887854d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Thu, 15 Sep 2016 09:54:18 -0400
Subject: [PATCH 2/3] MAKEFILE: Fixing CFLAGS in some tests

---
 Makefile.am | 5 +
 1 file changed, 5 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index f89af5a..f792ed6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1828,6 +1828,7 @@ refcount_tests_SOURCES = \
 src/tests/refcount-tests.c \
 $(NULL)
 refcount_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 refcount_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -1840,6 +1841,7 @@ fail_over_tests_SOURCES = \
 $(SSSD_FAILOVER_OBJ) \
 $(NULL)
 fail_over_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 fail_over_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -2044,6 +2046,7 @@ sbus_tests_SOURCES = \
src/tests/common_dbus.c \
src/tests/sbus_tests.c

[SSSD] [sssd PR#26][synchronized] KRB5: Fixing FQ name of user in krb5_setup()

2016-09-19 Thread celestian 
   URL: https://github.com/SSSD/sssd/pull/26
Author: celestian
 Title: #26: KRB5: Fixing FQ name of user in krb5_setup()
Action: synchronized

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/26/head:pr26
git checkout pr26
From e0518f9dc83a29c5de3e60f9f9ea5fa272dac12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Thu, 15 Sep 2016 09:54:18 -0400
Subject: [PATCH 1/3] MAKEFILE: Fixing CFLAGS in some tests

---
 Makefile.am | 5 +
 1 file changed, 5 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index f89af5a..f792ed6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1828,6 +1828,7 @@ refcount_tests_SOURCES = \
 src/tests/refcount-tests.c \
 $(NULL)
 refcount_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 refcount_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -1840,6 +1841,7 @@ fail_over_tests_SOURCES = \
 $(SSSD_FAILOVER_OBJ) \
 $(NULL)
 fail_over_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 fail_over_tests_LDADD = \
 $(SSSD_LIBS) \
@@ -2044,6 +2046,7 @@ sbus_tests_SOURCES = \
src/tests/common_dbus.c \
src/tests/sbus_tests.c
 sbus_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 sbus_tests_LDADD = \
 $(SSSD_INTERNAL_LTLIBS) \
@@ -2056,6 +2059,7 @@ sbus_codegen_tests_SOURCES = \
 src/tests/sbus_codegen_tests_generated.c \
 $(NULL)
 sbus_codegen_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(CHECK_CFLAGS)
 sbus_codegen_tests_LDADD = \
 $(SSSD_INTERNAL_LTLIBS) \
@@ -2468,6 +2472,7 @@ ad_common_tests_SOURCES = \
 src/providers/ldap/sdap_async_initgroups_ad.c \
 $(NULL)
 ad_common_tests_CFLAGS = \
+$(AM_CFLAGS) \
 $(NDR_NBT_CFLAGS) \
 $(NDR_KRB5PAC_CFLAGS) \
 $(NULL)

From d774c11d38717adc1a74784cc5f7a6a5282d15a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= 
Date: Mon, 19 Sep 2016 06:28:57 -0400
Subject: [PATCH 2/3] TESTS: Fixing of 'const' warnings in sbus tests

---
 src/tests/sbus_codegen_tests.c | 17 +
 src/tests/sbus_tests.c |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/tests/sbus_codegen_tests.c b/src/tests/sbus_codegen_tests.c
index 55d4657..ffa4fff 100644
--- a/src/tests/sbus_codegen_tests.c
+++ b/src/tests/sbus_codegen_tests.c
@@ -634,7 +634,7 @@ static int pilot_test_server_init(struct sbus_connection *server, void *unused)
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable, "/test/leela",
-   "Crash into the billboard");
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -645,7 +645,8 @@ static int special_test_server_init(struct sbus_connection *server, void *unused
 int ret;
 
 ret = sbus_conn_register_iface(server, _iface.vtable,
-   "/test/special", "Crash into the billboard");
+   "/test/special",
+   discard_const("Crash into the billboard"));
 ck_assert_int_eq(ret, EOK);
 
 return EOK;
@@ -673,8 +674,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t v_int64[] = { INT64_C(-), INT64_C() };
 dbus_uint64_t v_uint64[] = { UINT64_C(), INT64_C(88) };
 double v_double[] = { 1.1, 2.2, 3.3 };
-char *v_string[] = { "bears", "bears", "bears" };
-char *v_object_path[] = { "/original", "/original" };
+const char *v_string[] = { "bears", "bears", "bears" };
+const char *v_object_path[] = { "/original", "/original" };
 
 unsigned char *arr_byte = v_byte;
 dbus_int16_t *arr_int16 = v_int16;
@@ -684,8 +685,8 @@ START_TEST(test_marshal_basic_types)
 dbus_int64_t *arr_int64 = v_int64;
 dbus_uint64_t *arr_uint64 = v_uint64;
 double *arr_double = v_double;
-char **arr_string = v_string;
-char **arr_object_path = v_object_path;
+const char **arr_string = v_string;
+const char **arr_object_path = v_object_path;
 
 int len_byte = N_ELEMENTS(v_byte);
 int len_int16 = N_ELEMENTS(v_int16);
@@ -818,12 +819,12 @@ START_TEST(test_marshal_basic_types)
 ck_assert_int_eq(len_string, 2);
 ck_assert_str_eq(arr_string[0], "beets");
 ck_assert_str_eq(arr_string[1], "beets");
-dbus_free_string_array(arr_string);
+dbus_free_string_array(discard_const(arr_string));
 
 ck_assert_int_eq(len_object_path, 2);
 ck_assert_str_eq(arr_object_path[0], "/changed");
 ck_assert_str_eq(arr_object_path[1], "/changed");
-dbus_free_string_array(arr_object_path);
+dbus_free_string_array(discard_const(arr_object_path));
 
 dbus_message_unref (reply);
 talloc_free(ctx);
diff --git a/src/tests/sbus_tests.c b/src/tests/sbus_tests.c
index b472659..6bf71dc 100644
--- a/src/tests/sbus_tests.c
+++ b/src/tests/sbus_tests.c
@@ -201,12 +201,12 @@