summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2014-11-07 21:33:36 +0100
committerJakub Hrozek <jhrozek@redhat.com>2014-11-20 10:52:48 +0100
commit933326b4180b72636af84643d4811f6ad645fbe8 (patch)
treecfd96b3d421b10ff85d082c85f28d99938895ff8
parent7964d2bd7ea6a0f5bf5acdf94279d72122eca6ad (diff)
downloadsssd-933326b4180b72636af84643d4811f6ad645fbe8.zip
sssd-933326b4180b72636af84643d4811f6ad645fbe8.tar.gz
sssd-933326b4180b72636af84643d4811f6ad645fbe8.tar.xz
LDAP: always store UUID if available
Related to https://fedorahosted.org/sssd/ticket/2481 Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r--src/providers/ldap/sdap_async_groups.c42
-rw-r--r--src/providers/ldap/sdap_async_users.c23
2 files changed, 52 insertions, 13 deletions
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index a82d2aa..8cf7f7f 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -511,6 +511,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
bool posix_group;
bool use_id_mapping;
char *sid_str;
+ const char *uuid;
struct sss_domain_info *subdomain;
int32_t ad_group_type;
@@ -534,7 +535,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
ret = sysdb_attrs_add_string(group_attrs, SYSDB_SID_STR, sid_str);
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE, "Could not add SID string: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
} else if (ret == ENOENT) {
@@ -543,10 +544,29 @@ static int sdap_save_group(TALLOC_CTX *memctx,
sid_str = NULL;
} else {
DEBUG(SSSDBG_MINOR_FAILURE, "Could not identify objectSID: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
sid_str = NULL;
}
+ /* Always store UUID if available */
+ ret = sysdb_attrs_get_string(attrs,
+ opts->group_map[SDAP_AT_GROUP_UUID].sys_name,
+ &uuid);
+ if (ret == EOK) {
+ ret = sysdb_attrs_add_string(group_attrs, SYSDB_UUID, uuid);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_MINOR_FAILURE, "Could not add UUID string: [%s]\n",
+ sss_strerror(ret));
+ goto done;
+ }
+ } else if (ret == ENOENT) {
+ DEBUG(SSSDBG_TRACE_ALL, "UUID not available for group [%s].\n",
+ group_name);
+ } else {
+ DEBUG(SSSDBG_MINOR_FAILURE, "Could not identify UUID [%s]\n",
+ sss_strerror(ret));
+ }
+
/* If this object has a SID available, we will determine the correct
* domain by its SID. */
if (sid_str != NULL) {
@@ -633,7 +653,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
} else if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Could not convert SID string: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
@@ -652,7 +672,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
} else if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Error reading posix attribute: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
@@ -662,7 +682,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Error setting posix attribute: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
@@ -695,7 +715,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Error setting original DN: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
@@ -706,7 +726,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Error setting mod timestamp: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
@@ -715,7 +735,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
if (ret) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Error looking up group USN: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
if (el->num_values == 0) {
@@ -728,7 +748,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
if (ret) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Error setting group USN: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
usn_value = talloc_strdup(tmpctx, (const char*)el->values[0].data);
@@ -759,7 +779,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
if (ret) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Could not store group with GID: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
@@ -775,7 +795,7 @@ done:
DEBUG(SSSDBG_MINOR_FAILURE,
"Failed to save group [%s]: [%s]\n",
group_name ? group_name : "Unknown",
- strerror(ret));
+ sss_strerror(ret));
}
talloc_free(tmpctx);
return ret;
diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c
index 2331ba9..367e3d7 100644
--- a/src/providers/ldap/sdap_async_users.c
+++ b/src/providers/ldap/sdap_async_users.c
@@ -140,6 +140,7 @@ int sdap_save_user(TALLOC_CTX *memctx,
TALLOC_CTX *tmpctx = NULL;
bool use_id_mapping;
char *sid_str;
+ const char *uuid;
char *dom_sid_str = NULL;
struct sss_domain_info *subdomain;
@@ -165,7 +166,7 @@ int sdap_save_user(TALLOC_CTX *memctx,
ret = sysdb_attrs_add_string(user_attrs, SYSDB_SID_STR, sid_str);
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE, "Could not add SID string: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
goto done;
}
} else if (ret == ENOENT) {
@@ -173,10 +174,28 @@ int sdap_save_user(TALLOC_CTX *memctx,
sid_str = NULL;
} else {
DEBUG(SSSDBG_MINOR_FAILURE, "Could not identify objectSID: [%s]\n",
- strerror(ret));
+ sss_strerror(ret));
sid_str = NULL;
}
+ /* Always store UUID if available */
+ ret = sysdb_attrs_get_string(attrs,
+ opts->user_map[SDAP_AT_USER_UUID].sys_name,
+ &uuid);
+ if (ret == EOK) {
+ ret = sysdb_attrs_add_string(user_attrs, SYSDB_UUID, uuid);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_MINOR_FAILURE, "Could not add UUID string: [%s]\n",
+ sss_strerror(ret));
+ goto done;
+ }
+ } else if (ret == ENOENT) {
+ DEBUG(SSSDBG_TRACE_ALL, "UUID not available for user.\n");
+ } else {
+ DEBUG(SSSDBG_MINOR_FAILURE, "Could not identify UUID [%s]\n",
+ sss_strerror(ret));
+ }
+
/* If this object has a SID available, we will determine the correct
* domain by its SID. */
if (sid_str != NULL) {