[389-ds-base] branch master updated (dda766a -> dfc8896)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

firstyear pushed a change to branch master
in repository 389-ds-base.

from  dda766a   Ticket 49328 - Cleanup source code
       new  dfc8896   Issue 49329 - Descriptive error msg for USN cleanup task

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Summary of changes:
 ldap/servers/plugins/usn/usn_cleanup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

[389-ds-base] 01/01: Issue 49329 - Descriptive error msg for USN cleanup task

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

firstyear pushed a commit to branch master
in repository 389-ds-base.

commit dfc8896036516c070f6c298a622f944e59c1465c
Author: Ilias Stamatis 
Date:   Fri Jul 21 03:37:57 2017 +0300

Issue 49329 - Descriptive error msg for USN cleanup task

Bug Description: Providing either a suffix or backend attribute is necessary
    in order for a USN tombstone cleanup task entry to be created, otherwise
    the server will not accept the operation. However in this case it just
    returns a generic error message which is not helpful for adressing the
    issue; "Bad parameter to an ldap routine (-9)".

Fix Description: Provide an additional descriptive message in this case.

https://pagure.io/389-ds-base/issue/49329

Author: Ilias95

Review by: wibrown (thanks for this!)
---
 ldap/servers/plugins/usn/usn_cleanup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ldap/servers/plugins/usn/usn_cleanup.c b/ldap/servers/plugins/usn/usn_cleanup.c
index 2c3ec22..868dfd0 100644
--- a/ldap/servers/plugins/usn/usn_cleanup.c
+++ b/ldap/servers/plugins/usn/usn_cleanup.c
@@ -233,7 +233,7 @@ usn_cleanup_add(Slapi_PBlock *pb,
                 Slapi_Entry *e,
                 Slapi_Entry *eAfter __attribute__((unused)),
                 int *returncode,
-                char *returntext __attribute__((unused)),
+                char *returntext,
                 void *arg)
 {
     PRThread *thread = NULL;
@@ -271,6 +271,8 @@ usn_cleanup_add(Slapi_PBlock *pb,
     if (!suffix && !backend) {
         slapi_log_err(SLAPI_LOG_ERR, USN_PLUGIN_SUBSYSTEM,
                       "usn_cleanup_add - Both suffix and backend are missing.\n");
+        snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE,
+                 "USN cleanup task entry requires either a 'suffix' or 'backend' attribute to be provided");
         *returncode = LDAP_PARAM_ERROR;
         rv = SLAPI_DSE_CALLBACK_ERROR;
         goto bail;