cf9439e Added merge auth code, and brought back "ldapcertdir".

Authored and Committed by mreynolds 8 years ago
    Added merge auth code, and brought back "ldapcertdir".
    Also added gethostname() for default host if none specified
    
        
file modified
+32 -34