diff options
| -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', |