Some code cleanups

[Andrew Bartlett]

On Tue, 2018-02-13 at 12:31 +0100, Andreas Schneider via samba-
technical wrote:
> Hi,
> 
> some patches for cleaning up code while looking into it.
> 
> 
> Please review and push if OK.

The first two I've pushed.  I couldn't quite get my head around the URI
patch so I've left that for now, just to keep moving. 

Thanks,

Andrew Bartlett

-- 
Andrew Bartlett
https://samba.org/~abartlet/
Authentication Developer, Samba Team         https://samba.org
Samba Development and Support, Catalyst IT   
https://catalyst.net.nz/services/samba