summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2010-09-08 14:51:17 -0700
committerNathan Kinder <nkinder@redhat.com>2010-09-09 13:40:36 -0700
commit4145fd409516f6d631ad5dbbc21f3bd3e43887df (patch)
tree5269201cde7101532377fd8e746c33f9cb0c49f9
parent72b41da04e195fff5eeb639efeb380a47352baa6 (diff)
downloadds-4145fd409516f6d631ad5dbbc21f3bd3e43887df.tar.gz
ds-4145fd409516f6d631ad5dbbc21f3bd3e43887df.tar.xz
ds-4145fd409516f6d631ad5dbbc21f3bd3e43887df.zip
Bug 630094 - (cov#15453) Eliminate NULL check for local_newentry
There is no chance for local_newentry to be anything other than NULL when we check it in the call to slapi_log_error() since the check only happens after we're verified that newparent and local_origsdn are not NULL. Since we are guaranteed that local_newentry is NULL, we can just eliminate this check and use the string "local entry" in the message that we print.
-rw-r--r--ldap/servers/plugins/replication/windows_protocol_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index 2d71a55e..ff39fb5b 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -1264,7 +1264,7 @@ process_replay_rename(Private_Repl_Protocol *prp,
slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name,
"process_replay_rename: %s is empty\n",
NULL==newparent?"newparent":NULL==local_origsdn?"local sdn":
- NULL==local_newentry?"local entry":"unknown");
+ "local entry");
goto bail;
}
if (0 == is_user && 0 == is_group) {