|
 |
26521d |
From addb07130e93bf8acb32178190451ba7cc9cc888 Mon Sep 17 00:00:00 2001
|
|
|
26521d |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
26521d |
Date: Tue, 12 Mar 2019 16:03:29 -0400
|
|
|
26521d |
Subject: [PATCH] Ticket 50077 - Do not automatically turn automember postop
|
|
|
26521d |
modifies on
|
|
|
26521d |
|
|
|
26521d |
Description: Although we have set the new postop processing on by
|
|
|
26521d |
default in the template-dse.ldif, we do not want to
|
|
|
26521d |
enable it by default for upgrades (only new installs).
|
|
|
26521d |
|
|
|
26521d |
So if the attribute is not set, it is assumed "off".
|
|
|
26521d |
|
|
|
26521d |
https://pagure.io/389-ds-base/issue/50077
|
|
|
26521d |
|
|
|
26521d |
Reviewed by: firstyear(Thanks!)
|
|
|
26521d |
|
|
|
26521d |
(cherry picked from commit d318d060f49b67ed1b10f22b52f98e038afa356a)
|
|
|
26521d |
---
|
|
|
26521d |
ldap/servers/plugins/automember/automember.c | 7 +++----
|
|
|
26521d |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
26521d |
|
|
|
26521d |
diff --git a/ldap/servers/plugins/automember/automember.c b/ldap/servers/plugins/automember/automember.c
|
|
|
26521d |
index abd6df805..bb6ff1f8e 100644
|
|
|
26521d |
--- a/ldap/servers/plugins/automember/automember.c
|
|
|
26521d |
+++ b/ldap/servers/plugins/automember/automember.c
|
|
|
26521d |
@@ -90,7 +90,7 @@ static void automember_task_export_destructor(Slapi_Task *task);
|
|
|
26521d |
static void automember_task_map_destructor(Slapi_Task *task);
|
|
|
26521d |
|
|
|
26521d |
#define DEFAULT_FILE_MODE PR_IRUSR | PR_IWUSR
|
|
|
26521d |
-static uint64_t plugin_do_modify = 1;
|
|
|
26521d |
+static uint64_t plugin_do_modify = 0;
|
|
|
26521d |
static uint64_t plugin_is_betxn = 0;
|
|
|
26521d |
|
|
|
26521d |
/*
|
|
|
26521d |
@@ -345,15 +345,14 @@ automember_start(Slapi_PBlock *pb)
|
|
|
26521d |
}
|
|
|
26521d |
|
|
|
26521d |
/* Check and set if we should process modify operations */
|
|
|
26521d |
- plugin_do_modify = 1; /* default is "on" */
|
|
|
26521d |
if ((slapi_pblock_get(pb, SLAPI_ADD_ENTRY, &plugin_entry) == 0) && plugin_entry){
|
|
|
26521d |
if ((do_modify = slapi_fetch_attr(plugin_entry, AUTOMEMBER_DO_MODIFY, NULL)) ) {
|
|
|
26521d |
if (strcasecmp(do_modify, "on") && strcasecmp(do_modify, "off")) {
|
|
|
26521d |
slapi_log_err(SLAPI_LOG_ERR, AUTOMEMBER_PLUGIN_SUBSYSTEM,
|
|
|
26521d |
"automember_start - %s: invalid value \"%s\". Valid values are \"on\" or \"off\". Using default of \"on\"\n",
|
|
|
26521d |
AUTOMEMBER_DO_MODIFY, do_modify);
|
|
|
26521d |
- } else if (strcasecmp(do_modify, "off") == 0 ){
|
|
|
26521d |
- plugin_do_modify = 0;
|
|
|
26521d |
+ } else if (strcasecmp(do_modify, "on") == 0 ){
|
|
|
26521d |
+ plugin_do_modify = 1;
|
|
|
26521d |
}
|
|
|
26521d |
}
|
|
|
26521d |
}
|
|
|
26521d |
--
|
|
|
26521d |
2.17.2
|
|
|
26521d |
|