License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#define SOCKET_WRAPPER_NOT_REPLACE
-
#include "replace.h"
#include "system/network.h"
#endif /* HAVE_LINUX_IPV6_V6ONLY_26 */
#endif /* HAVE_IPV6 */
-#ifdef SOCKET_WRAPPER
-#ifndef SOCKET_WRAPPER_DISABLE
-#ifndef SOCKET_WRAPPER_NOT_REPLACE
-#define SOCKET_WRAPPER_REPLACE
-#endif /* SOCKET_WRAPPER_NOT_REPLACE */
-#include "../socket_wrapper/socket_wrapper.h"
-#endif /* SOCKET_WRAPPER_DISABLE */
-#endif /* SOCKET_WRAPPER */
-
#endif
#define %s 1
#define NO_CONFIG_H 1
#define AUTOCONF_TEST 1
- #define SOCKET_WRAPPER_NOT_REPLACE
#include "replace.c"
#include "inet_ntop.c"
#include "snprintf.c"
REPLACE_HOSTCC_SOURCE,
use_hostcc=True,
use_global_deps=False,
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+ cflags='-D_SAMBA_HOSTCC_',
group='compiler_libraries',
deps = extra_libs
)
#undef SIZEOF_LONG
#endif
-/*
- * we don't need socket wrapper
- * nor nss wrapper here and we don't
- * want to depend on swrap_close()
- * so we better disable both
- */
-#define SOCKET_WRAPPER_NOT_REPLACE
-
/* Include header files from data in config.h file */
#ifndef NO_CONFIG_H
bld.SAMBA_LIBRARY('winbind-client',
source='wb_common.c',
deps='replace',
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+ cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
private_library=True
)
DEBUG(10, ("Opening connection to LDAP server '%s:%d', timeout "
"%u seconds\n", server, port, to));
-#if defined(HAVE_LDAP_INIT_FD) && defined(SOCKET_WRAPPER)
- /* Only use this private LDAP function if we are in make test,
- * as this is the best way to get the emulated TCP socket into
- * OpenLDAP */
- if (socket_wrapper_dir() != NULL) {
- int fd, ldap_err;
- NTSTATUS status;
- char *uri;
-
- status = open_socket_out(ss, port, to, &fd);
-
- if (!NT_STATUS_IS_OK(status)) {
- return NULL;
- }
-
-#ifndef LDAP_PROTO_TCP
-#define LDAP_PROTO_TCP 1
-#endif
- uri = talloc_asprintf(talloc_tos(), "ldap://%s:%u", server, port);
- if (uri == NULL) {
- return NULL;
- }
- ldap_err = ldap_init_fd(fd, LDAP_PROTO_TCP, uri, &ldp);
- talloc_free(uri);
-
- if (ldap_err != LDAP_SUCCESS) {
- return NULL;
- }
- return ldp;
- }
-#endif
-
if (to) {
/* Setup timeout */
gotalarm = 0;