diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-02-19 11:39:46 +1300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-03-05 18:34:48 +0100 |
| commit | 9ed7555c82b4c7c14e12ab08483707e68080e152 (patch) | |
| tree | e736b83809e0bfa2f15fdc02b5949ba30df50b15 | |
| parent | f580a7c4ffe6ba5e414cc6382e28751aab77277f (diff) | |
| download | samba-9ed7555c82b4c7c14e12ab08483707e68080e152.tar.gz samba-9ed7555c82b4c7c14e12ab08483707e68080e152.tar.xz samba-9ed7555c82b4c7c14e12ab08483707e68080e152.zip | |
nsswitch: Remove fallback setting of WINBINDD_SOCKET_DIR
This is the original cause of the wbc NT_STATUS_OBJECT_NAME_NOT_FOUND issues in recent git master, as the
build was able to progress without the correct path being set as an override.
Andrew Bartlett
Change-Id: I1dbc7350695756356e869199b589eb781eb5c673
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Mar 5 18:34:48 CET 2014 on sn-devel-104
| -rw-r--r-- | nsswitch/winbind_struct_protocol.h | 14 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h index 69728b6231..fc7aa6c93d 100644 --- a/nsswitch/winbind_struct_protocol.h +++ b/nsswitch/winbind_struct_protocol.h @@ -25,12 +25,16 @@ typedef char fstring[FSTRING_LEN]; #define WINBINDD_SOCKET_NAME "pipe" /* Name of PF_UNIX socket */ -/* Let the build environment override the public winbindd socket location. This - * is needed for launchd support -- jpeach. +/* We let the build environment set the public winbindd socket + * location. Therefore we no longer set + * + * #define WINBINDD_SOCKET_DIR "/tmp/.winbindd" + * + * A number of different distributions set different paths, and so it + * needs to come from configure in Samba. External users of this header will + * need to know where the path is on their system by some other + * mechanism. */ -#ifndef WINBINDD_SOCKET_DIR -#define WINBINDD_SOCKET_DIR "/tmp/.winbindd" /* Name of PF_UNIX dir */ -#endif /* * when compiled with socket_wrapper support diff --git a/source3/wscript_build b/source3/wscript_build index 9d3071a74c..ad833180aa 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1231,6 +1231,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3, NDR_OPEN_FILES idmap ''', + cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR, install=False) bld.SAMBA3_BINARY('smbconftort', |