diff options
Diffstat (limited to 'systemd/disable_nss_module.go')
| -rw-r--r-- | systemd/disable_nss_module.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/systemd/disable_nss_module.go b/systemd/disable_nss_module.go index da86582..9a8b388 100644 --- a/systemd/disable_nss_module.go +++ b/systemd/disable_nss_module.go @@ -1,6 +1,6 @@ // Copyright (C) 2006 West Consulting // Copyright (C) 2006-2015 Arthur de Jong -// Copyright (C) 2015 Luke Shumaker <lukeshu@sbcglobal.net> +// Copyright (C) 2015-2016 Luke Shumaker <lukeshu@sbcglobal.net> // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -20,8 +20,10 @@ package nslcd_systemd import ( + "fmt" + "lukeshu.com/git/go/libgnulinux.git/dl" - "lukeshu.com/git/go/libsystemd.git/sd_daemon/logger" + sd "lukeshu.com/git/go/libsystemd.git/sd_daemon" ) //static char *strary(char **ary, unsigned int n) { return ary[n]; } @@ -38,22 +40,22 @@ func disable_nss_module() { if err == nil { defer handle.Close() } else { - logger.Warning("NSS module %s not loaded: %v", nss_module_soname, err) + sd.Log.Warning(fmt.Sprintf("NSS module %s not loaded: %v", nss_module_soname, err)) return } c_version_info, err := handle.Sym(nss_module_sym_version) if err == nil { g_version_info := (**C.char)(c_version_info) - logger.Debug("NSS module %s version %s %s", nss_module_soname, + sd.Log.Debug(fmt.Sprintf("NSS module %s version %s %s", nss_module_soname, C.GoString(C.strary(g_version_info, 0)), - C.GoString(C.strary(g_version_info, 1))) + C.GoString(C.strary(g_version_info, 1)))) } else { - logger.Warning("NSS module %s version missing: %v", nss_module_soname, err) + sd.Log.Warning(fmt.Sprintf("NSS module %s version missing: %v", nss_module_soname, err)) } c_enable_flag, err := handle.Sym(nss_module_sym_enablelookups) if err != nil { - logger.Warning("Unable to disable NSS ldap module for nslcd process: %v", err) + sd.Log.Warning(fmt.Sprintf("Unable to disable NSS ldap module for nslcd process: %v", err)) return } g_enable_flag := (*C.int)(c_enable_flag) |