IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa-sidgen: make internal fetch_attr helper really internal

Browse Source 
With 389-ds landing a change for
https://pagure.io/389-ds-base/issue/49950, fetch_attr() helper function
is exposed in slapi-plugin.h. However, in order to be able to build
FreeIPA plugins against older 389-ds versions, prefer using a local
variant of it.

Rename fetch_attr() to ipa_sidgen_fetch_attr() so that it doesn't
conflict at all.

Fixes: https://pagure.io/freeipa/issue/7811
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Alexander Bokovoy
2018-12-14 14:02:26 +02:00
committed by Christian Heimes
parent caffe2e8dd
commit e62eb0007b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen_task.c
View File

@@ -63,7 +63,7 @@ struct worker_ctx {
struct range_info **ranges;
};
static const char *fetch_attr(Slapi_Entry *e, const char *attrname,
static const char *ipa_sidgen_fetch_attr(Slapi_Entry *e, const char *attrname,
const char *default_val)
{
Slapi_Attr *attr;
@@ -242,7 +242,7 @@ int sidgen_task_add(Slapi_PBlock *pb, Slapi_Entry *e,
worker_ctx->plugin_id = global_sidgen_plugin_id;
str = fetch_attr(e, "delay", NULL);
str = ipa_sidgen_fetch_attr(e, "delay", NULL);
if (str != NULL) {
errno = 0;
worker_ctx->delay = strtol(str, &endptr, 10);
@@ -255,7 +255,7 @@ int sidgen_task_add(Slapi_PBlock *pb, Slapi_Entry *e,
}
LOG("delay is [%li].\n", worker_ctx->delay);
str = fetch_attr(e, "nsslapd-basedn", NULL);
str = ipa_sidgen_fetch_attr(e, "nsslapd-basedn", NULL);
if (str == NULL) {
LOG_FATAL("Missing nsslapd-basedn!\n");
*returncode = LDAP_CONSTRAINT_VIOLATION;