The branch, v4-5-test has been updated via 3cbc061 ctdb-scripts: Fix calculation of CTDB_BASE via 0cc06c4 s3-winbind: Do not return NO_MEMORY if we have an empty user list from 9f2a816 provision: Add support for BIND 9.11.x
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-5-test - Log ----------------------------------------------------------------- commit 3cbc061b9270a951d4950319cb0962529a145264 Author: Amitay Isaacs <ami...@gmail.com> Date: Thu Nov 3 16:03:24 2016 +1100 ctdb-scripts: Fix calculation of CTDB_BASE This is a regression introduced in f227c26178c2eaf3fae49f32a90ec905f85005f4. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12407 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Martin Schwenke <mar...@meltin.net> Autobuild-User(master): Martin Schwenke <mart...@samba.org> Autobuild-Date(master): Thu Nov 3 10:10:31 CET 2016 on sn-devel-144 (cherry picked from commit 9c6f0dc69bd9eb2ca2bc1ca18c81762791958f88) Autobuild-User(v4-5-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-5-test): Fri Nov 4 15:46:09 CET 2016 on sn-devel-144 commit 0cc06c4cce019840402e52487d9096d29d44dba0 Author: Andreas Schneider <a...@samba.org> Date: Wed Nov 2 17:19:09 2016 +0100 s3-winbind: Do not return NO_MEMORY if we have an empty user list The domain child for the MACHINE ACCOUNT might fail with NT_STATUS_NO_MEMORY because an emtpy user list is returned. *pnum_info is already set to 0 at the beginngin so we should just declare victory here! BUG: https://bugzilla.samba.org/show_bug.cgi?id=12405 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> (cherry picked from commit e714dc03e0ccf9ec17da6bacc1bcfcaea7518e22) ----------------------------------------------------------------------- Summary of changes: ctdb/config/ctdb-crash-cleanup.sh | 2 +- ctdb/config/debug-hung-script.sh | 2 +- ctdb/config/debug_locks.sh | 2 +- ctdb/config/statd-callout | 2 +- source3/winbindd/winbindd_rpc.c | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/config/ctdb-crash-cleanup.sh b/ctdb/config/ctdb-crash-cleanup.sh index bcecbfe..22b0ce8 100755 --- a/ctdb/config/ctdb-crash-cleanup.sh +++ b/ctdb/config/ctdb-crash-cleanup.sh @@ -5,7 +5,7 @@ # [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" diff --git a/ctdb/config/debug-hung-script.sh b/ctdb/config/debug-hung-script.sh index cdf1657..da988c2 100755 --- a/ctdb/config/debug-hung-script.sh +++ b/ctdb/config/debug-hung-script.sh @@ -4,7 +4,7 @@ # for other operating systems. [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh index 8c9b466..f678724 100755 --- a/ctdb/config/debug_locks.sh +++ b/ctdb/config/debug_locks.sh @@ -8,7 +8,7 @@ # rather than mutex locks. [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout index 4ac354e..3f2dd39 100755 --- a/ctdb/config/statd-callout +++ b/ctdb/config/statd-callout @@ -9,7 +9,7 @@ # STATD_HOSTNAME="myhostname -H /etc/ctdb/statd-callout" [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 386396a..7b355ba 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -88,6 +88,10 @@ NTSTATUS rpc_query_user_list(TALLOC_CTX *mem_ctx, num_dom_users = disp_info.info1.count; num_info += num_dom_users; + /* If there are no user to enumerate we're done */ + if (num_info == 0) { + return NT_STATUS_OK; + } info = talloc_realloc(mem_ctx, info, -- Samba Shared Repository