Ticket 50308 - Revise memory leak fix
    
    Description;  Turns out the previous commit did not address
                  the changelog leak, and it introduced a compiler
                  warning.  This part of the fix is being reverted.
    
    https://pagure.io/389-ds-base/issue/50308
    (cherry picked from commit 1808f317d5ef240fd0ac3947fcb90a895e46b436)