The branch, master has been updated
via 7e9e529... s4:dynconfig: fix the autoconf build and pass
-DPYTHONDIR=\"$(pythondir)\"
via 135208d... s4:rpc_server/netlogon: add no memory checks
from b4b43fc... s4-netlogon: fixed dc_unc and dc_address_type
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7e9e5291de3e3a44491a482754515d2e76a99a83
Author: Stefan Metzmacher <[email protected]>
Date: Tue Apr 20 15:58:02 2010 +0200
s4:dynconfig: fix the autoconf build and pass -DPYTHONDIR=\"$(pythondir)\"
metze
commit 135208d99067a7c84920ef7ce85955021f7be997
Author: Stefan Metzmacher <[email protected]>
Date: Tue Apr 20 16:00:52 2010 +0200
s4:rpc_server/netlogon: add no memory checks
metze
-----------------------------------------------------------------------
Summary of changes:
source4/dynconfig/config.mk | 4 ++--
source4/rpc_server/netlogon/dcerpc_netlogon.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index 7db288d..976ca71 100644
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -21,5 +21,5 @@ $(dynconfigsrcdir)/dynconfig.o:
CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR
-DSETUPDIR=\"$(setupdir)\" \
-DWINBINDD_PRIVILEGED_SOCKET_DIR=\"$(winbindd_privileged_socket_dir)\"
\
-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" \
- -DNTP_SIGND_SOCKET_DIR=\"$(ntp_signd_socket_dir)\"
-
+ -DNTP_SIGND_SOCKET_DIR=\"$(ntp_signd_socket_dir)\" \
+ -DPYTHONDIR=\"$(pythondir)\"
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c
b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index d7aa425..66af44e 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1523,10 +1523,11 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct
dcesrv_call_state *dce_call,
W_ERROR_HAVE_NO_MEMORY(info);
info->dc_unc = talloc_asprintf(mem_ctx, "\\\\%s",
response.data.nt5_ex.pdc_dns_name);
+ W_ERROR_HAVE_NO_MEMORY(info->dc_unc);
info->dc_address = talloc_asprintf(mem_ctx, "\\\\%s",
response.data.nt5_ex.sockaddr.pdc_ip);
- info->dc_address_type = DS_ADDRESS_TYPE_INET;
W_ERROR_HAVE_NO_MEMORY(info->dc_address);
+ info->dc_address_type = DS_ADDRESS_TYPE_INET; /* TODO: make this
dynamic? for ipv6 */
info->domain_guid = response.data.nt5_ex.domain_uuid;
info->domain_name = response.data.nt5_ex.dns_domain;
info->forest_name = response.data.nt5_ex.forest;
--
Samba Shared Repository
