Ticket #47892 - coverity defects found in 1.3.3.x
    
    Description: fixing compiler warnings reported by covscan on 1.3.3.4.
    https://fedorahosted.org/389/ticket/47892#comment:8
    
    Reviewed by mreynolds@redhat.com (Thank you, Mark!!)
    
    (cherry picked from commit afc8b06f9e9cc045906d6d6fb64fe5d5f9d7c3d5)