diff options
| author | Andreas Schneider <asn@samba.org> | 2014-02-20 10:34:49 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-17 14:56:06 +0200 |
| commit | 2522bb80902d2e7677a25a85fa597022f20f1147 (patch) | |
| tree | 190e9a597dda6cbc104659e141762ac3e7d781e6 /nsswitch | |
| parent | c29fb2e6157c90e7f0c6b37e9923152d999e76dc (diff) | |
| download | samba-2522bb80902d2e7677a25a85fa597022f20f1147.tar.gz samba-2522bb80902d2e7677a25a85fa597022f20f1147.tar.xz samba-2522bb80902d2e7677a25a85fa597022f20f1147.zip | |
selftest: Rename WINBINDD_SOCKET_DIR environment variable.
It is very confusing if the env var uses the same name as the define in
the source code. So prefix it with SELFTEST.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/wb_common.c | 2 | ||||
| -rw-r--r-- | nsswitch/winbind_struct_protocol.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c index 291e9c7824..f4a31a95fe 100644 --- a/nsswitch/wb_common.c +++ b/nsswitch/wb_common.c @@ -320,7 +320,7 @@ static const char *winbindd_socket_dir(void) if (nss_wrapper_enabled()) { const char *env_dir; - env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR); + env_dir = getenv("SELFTEST_WINBINDD_SOCKET_DIR"); if (env_dir != NULL) { return env_dir; } diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h index fc7aa6c93d..0dffa4be52 100644 --- a/nsswitch/winbind_struct_protocol.h +++ b/nsswitch/winbind_struct_protocol.h @@ -36,13 +36,6 @@ typedef char fstring[FSTRING_LEN]; * mechanism. */ -/* - * when compiled with socket_wrapper support - * the location of the WINBINDD_SOCKET_DIR - * can be overwritten via an environment variable - */ -#define WINBINDD_SOCKET_DIR_ENVVAR "WINBINDD_SOCKET_DIR" - #define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lock_directory() to hold the 'privileged' pipe */ #define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */ #define WINBINDD_DONT_ENV "_NO_WINBINDD" |