diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2010-09-09 08:13:23 -0700 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2010-09-09 13:40:36 -0700 |
| commit | edf42814c56604b083eb3cf244289ae1a6db9fdb (patch) | |
| tree | c19c442c228d7b31a5b0286c6a59462e6b11983f | |
| parent | 0612f012834852d05f2a650596035e6e24e36a84 (diff) | |
| download | ds-edf42814c56604b083eb3cf244289ae1a6db9fdb.tar.gz ds-edf42814c56604b083eb3cf244289ae1a6db9fdb.tar.xz ds-edf42814c56604b083eb3cf244289ae1a6db9fdb.zip | |
Bug 630094 - (cov#15459) Remove NULL check for srdn in ldif2ldbm code
In the call to slapi_log_error(), we are guaranteed that srdn is
NULL if we are checking it for NULL due to the way the conditions
are nested. The only time we check if srdn is NULL is if be is
non-NULL, and the if condition guarantees that either be or srdn
are NULL.
We can just use the string "srdn" in our log message if be is
non-NULL.
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c index f1b50ae3..25cc265c 100644 --- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c +++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c @@ -3052,7 +3052,7 @@ _get_and_add_parent_rdns(backend *be, if (NULL == be || NULL == srdn) { slapi_log_error(SLAPI_LOG_FATAL, "ldif2dbm", "_get_and_add_parent_rdns: Empty %s\n", - NULL==be?"be":NULL==srdn?"srdn":"unknown"); + NULL==be?"be":"srdn"); return rc; } |