diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2010-09-08 15:48:21 -0700 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2010-09-09 13:40:36 -0700 |
| commit | 197c1d7381e6eb455210e2a785525c2b45b0e32a (patch) | |
| tree | 2421579e009bd9ede4dd9f2ede14cec3686edb73 | |
| parent | cbe3d10359fa9099820423da9f7d60d91634dcec (diff) | |
| download | ds-197c1d7381e6eb455210e2a785525c2b45b0e32a.tar.gz ds-197c1d7381e6eb455210e2a785525c2b45b0e32a.tar.xz ds-197c1d7381e6eb455210e2a785525c2b45b0e32a.zip | |
Bug 630094 - (cov#15456) Remove NULL check for srdn in import 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 inst is
non-NULL, and the if condition guarantees that either inst or
srdn are NULL.
We can just use the string "srdn" in our log message if inst is
non-NULL.
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/import-threads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c index 12018dbf..7bdf32f7 100644 --- a/ldap/servers/slapd/back-ldbm/import-threads.c +++ b/ldap/servers/slapd/back-ldbm/import-threads.c @@ -3279,7 +3279,7 @@ import_get_and_add_parent_rdns(ImportWorkerInfo *info, if (NULL == inst || NULL == srdn) { slapi_log_error(SLAPI_LOG_FATAL, "ldif2dbm", "import_get_and_add_parent_rdns: Empty %s\n", - NULL==inst?"inst":NULL==srdn?"srdn":"unknown"); + NULL==inst?"inst":"srdn"); return rc; } li = inst->inst_li; |