sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-05-28 21:05:48 +03:00
Code

Remove special socket_wrapper code.

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider 2014-04-07 16:09:00 +02:00 committed by Stefan Metzmacher
parent a9c1d5bd63
commit d407446ddc
6 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/replace/getifaddrs.c
View File

@ -23,8 +23,6 @@
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"

9
lib/replace/system/network.h
View File

@ -367,13 +367,4 @@ struct addrinfo {
#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

3
lib/replace/wscript
View File

@ -561,7 +561,6 @@ removeea setea
#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"
@ -617,7 +616,7 @@ def build(bld):
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
)

8
nsswitch/winbind_nss_config.h
View File

@ -27,14 +27,6 @@
#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

2
nsswitch/wscript_build
View File

@ -6,7 +6,7 @@ host_os = sys.platform
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
)

32
source3/libads/ldap.c
View File

@ -71,38 +71,6 @@ static void gotalarm_sig(int signum)
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;