[389-commits] 2 commits - ldap/servers

[Noriko Hosoi]

 ldap/servers/plugins/replication/replutil.c |    4 ++--
 ldap/servers/plugins/retrocl/retrocl_trim.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 578f9461a790895e6ce0a0af506a2710f761d194
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Mon Jun 8 17:01:18 2015 -0700

    Ticket #47972 - make parsing of nsslapd-changelogmaxage more fool proof
    
    Description: apply the same fix made on the MMR plug-in to the retrocl
    plug-in, as well.
    
    https://fedorahosted.org/389/ticket/47972
    
    Reviewed by mreynolds at redhat.com (Thanks, Mark!!)

diff --git a/ldap/servers/plugins/retrocl/retrocl_trim.c b/ldap/servers/plugins/retrocl/retrocl_trim.c
index ceb3467..098fc09 100644
--- a/ldap/servers/plugins/retrocl/retrocl_trim.c
+++ b/ldap/servers/plugins/retrocl/retrocl_trim.c
@@ -478,10 +478,10 @@ age_str2time (const char *age)
       ageval *= ( 7 * 24 * 60 * 60 );
       break;
     default:
-      slapi_log_error( SLAPI_LOG_PLUGIN, "retrocl",
+      slapi_log_error( SLAPI_LOG_FATAL, "retrocl",
 		       "age_str2time: unknown unit \"%c\" "
 		       "for maxiumum changelog age\n", unit );
-      ageval = -1;
+      ageval = 0;
     }
 done:
     if ( maxage) {


commit 170f49ce23238ebbe7b814f23ab5c88e4b7ce63a
Author: Jochen Schneider <scne59 at gmail.com>
Date:   Wed Dec 3 17:11:00 2014 +0100

    Fix-for-ticket-47972 - make parsing of nsslapd-changelogmaxage more fault tolerant
    
    When configuring nsslapd-changelogmaxage as a single non numeric character (e.g. "-")
    you end up with a changelog that is completely purged with the next run of the purge
    thread.  The problem is only logged for log level PLUGIN,
    
    As a fix:
    in age_str2time: return 0 if unit cannot be parsed and log the error message as FATAL,
    so you will at least have a default changelogmaxage and may notice the error message.
    
    https://fedorahosted.org/389/ticket/47972
    
    Resolves: Ticket 47972
    Bug Description: make parsing of nsslapd-changelogmaxage more fault tolerant
    Reviewed by: mreynolds at redhat.com, nhosoi at redhat.com
    Branch: master
    Fix Description: return 0 for unparseable values and log as FATAL
    Platforms tested: Centos 6.6
    Flag Day: no
    Doc impact: no

diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index a567832..9b94308 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -290,10 +290,10 @@ age_str2time (const char *age)
 			ageval *= ( 7 * 24 * 60 * 60 );
 			break;
 		default:
-			slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, 
+			slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, 
 							"age_str2time: unknown unit \"%c\" "
 							"for maxiumum changelog age\n", unit );
-			ageval = -1;
+			ageval = 0;
 	}
 
 	return ageval;