diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2010-07-08 11:03:36 -0700 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2010-07-23 13:40:38 -0700 |
| commit | 00b81fed600b1ccef6bc87fcdaf562283e183002 (patch) | |
| tree | 92a18cfec2e2c3bf0f13e01630e14663017fd101 /ldap/servers/slapd/modrdn.c | |
| parent | 603c5fcc52201d9eca690c5bef29e4e39e340f56 (diff) | |
| download | ds-00b81fed600b1ccef6bc87fcdaf562283e183002.tar.gz ds-00b81fed600b1ccef6bc87fcdaf562283e183002.tar.xz ds-00b81fed600b1ccef6bc87fcdaf562283e183002.zip | |
610281 - fix coverity Defect Type: Control flow issues
https://bugzilla.redhat.com/show_bug.cgi?id=610281
11832 DEADCODE Triaged Unassigned Bug Minor Fix Required
do_modrdn() ds/ldap/servers/slapd/modrdn.c
Comment:
At the line 201 and 212, the condition "rawnewsuperior" cannot be false.
201 rawnewsuperior?rawnewsuperior:"",
212 rawnewsuperior?rawnewsuperior:"",
This patch is removing the checks.
Diffstat (limited to 'ldap/servers/slapd/modrdn.c')
| -rw-r--r-- | ldap/servers/slapd/modrdn.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ldap/servers/slapd/modrdn.c b/ldap/servers/slapd/modrdn.c index 6951fb05..b721fc79 100644 --- a/ldap/servers/slapd/modrdn.c +++ b/ldap/servers/slapd/modrdn.c @@ -197,8 +197,7 @@ do_modrdn( Slapi_PBlock *pb ) /* check that the dn is formatted correctly */ err = slapi_dn_syntax_check(pb, rawnewsuperior, 1); if (err) { /* syntax check failed */ - op_shared_log_error_access(pb, "MODRDN", - rawnewsuperior?rawnewsuperior:"", + op_shared_log_error_access(pb, "MODRDN", rawnewsuperior, "strict: invalid new superior"); send_ldap_result(pb, LDAP_INVALID_DN_SYNTAX, NULL, "invalid new superior", 0, NULL); @@ -208,8 +207,7 @@ do_modrdn( Slapi_PBlock *pb ) } err = slapi_dn_normalize_ext(rawnewsuperior, 0, &newsuperior, &dnlen); if (err < 0) { - op_shared_log_error_access(pb, "MODRDN", - rawnewsuperior?rawnewsuperior:"", + op_shared_log_error_access(pb, "MODRDN", rawnewsuperior, "invalid new superior"); send_ldap_result(pb, LDAP_INVALID_DN_SYNTAX, NULL, "invalid new superior", 0, NULL); |