[389-commits] Branch '389-ds-base-1.3.2' - ldap/servers

[Mark Reynolds]

 ldap/servers/plugins/replication/repl5_agmtlist.c       |   10 ----------
 ldap/servers/plugins/replication/repl5_replica_config.c |    2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 862f0d6765ba03068d558cdc1e8eb66d1678ea80
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Mon Dec 16 09:48:12 2013 -0500

    Ticket 47620 - Fix logically dead code.
    
    Coverity issues:  12419 & 12420
    
    https://fedorahosted.org/389/ticket/47620
    
    Reviewed by: rmeggins(Thanks!)
    (cherry picked from commit 080cb44f5eaa794375a8e69b6e1ac09fcae9a961)

diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 6b33607..18540b4 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -278,16 +278,6 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
                 }
 
                 /* Start replica initialization */
-                if (val == NULL)
-                {
-                    PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "No value supplied for attr (%s)", mods[i]->mod_type);
-                    slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: %s\n",
-                                    errortext);	  
-                    *returncode = LDAP_UNWILLING_TO_PERFORM;
-                    rc = SLAPI_DSE_CALLBACK_ERROR;
-                    break;
-                }
-            
                 if (strcasecmp (val, "start") == 0)
                 {                        
                     start_initialize = 1;
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 7ba6eaa..4e24c7b 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -496,7 +496,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
                     *returncode = LDAP_SUCCESS;
                 }
                 else if (strcasecmp (config_attr, type_replicaProtocolTimeout) == 0 ){
-                    if (apply_mods && config_attr_value && config_attr_value[0])
+                    if (apply_mods)
                     {
                         long ptimeout = 0;