The branch, master has been updated
via b7becc0 s4-rpc_server: Fix search for existing trust to actually
look for the dns name
via e203b28 s3-build: Remove FIXME, bigballofmud is no more
from 12609c1 Update man page to fix typo vfs_aio_fork ->
vfs_aio_pthread, add aio read size, aio write size examples.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b7becc0b19f38ddb1fd52f354e8ce13df949471c
Author: Andrew Bartlett <[email protected]>
Date: Thu Jan 26 09:13:30 2012 +1100
s4-rpc_server: Fix search for existing trust to actually look for the dns
name
Found by a eagle-eyed user.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <[email protected]>
Autobuild-Date: Thu Jan 26 08:39:47 CET 2012 on sn-devel-104
commit e203b28777f2d245bf827ccb5725984e31ed7208
Author: Andrew Bartlett <[email protected]>
Date: Wed Jan 25 15:56:05 2012 +1100
s3-build: Remove FIXME, bigballofmud is no more
-----------------------------------------------------------------------
Summary of changes:
source3/wscript_build | 2 --
source4/rpc_server/lsa/dcesrv_lsa.c | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index cc25674..5adc2a1 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -499,8 +499,6 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
-# FIXME: bigballofmud
-
CLIENT_SRC1 = '''client/client.c client/clitar.c
client/dnsbrowse.c'''
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c
b/source4/rpc_server/lsa/dcesrv_lsa.c
index 609fb65..de95b4a 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -983,7 +983,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct
dcesrv_call_state *dc
}
if (dns_name) {
- char *dns_encoded = ldb_binary_encode_string(mem_ctx,
netbios_name);
+ char *dns_encoded = ldb_binary_encode_string(mem_ctx, dns_name);
char *netbios_encoded = ldb_binary_encode_string(mem_ctx,
netbios_name);
/* search for the trusted_domain record */
ret = gendb_search(sam_ldb,
--
Samba Shared Repository
