The branch, v4-1-test has been updated
via fd036b8 WHATSNEW: Start release notes for Samba 4.1.0rc1.
via e5465d7 VERSION: Set version to 4.1.0rc1-GITSNAPSHOT.
via a0130c6 Merge remote-tracking branch 'origin/v4-1-test' into master
via af6d9ce tevent: Fix a typo
via a68cea6 docs: Fix typos in "use ntdb" section.
via 2763cad dsdb-ridalloc: Fix RID pools - RID numbers increase too
quickly
via 2536ee8 Make the output of the crackname script more readable
via caf3af3 s3-winbind: Allow sec_initial_uid() to store creds.
via a4af4fa selftest: Use higher ip numbers.
via d5511b1 selftest: Add a newline to root entries in the nss files.
via 7392985 selftest: Fix domain name of plugindc.
via bf5bc72 torture: Don't segfault in smb2.session on error.
via d295e18 torture: Don't segfault in raw.session on error.
via 474eee0 torture: Fix comparsion of uninitalized bytes.
via 0b58eed tsocket: Pass the full port number to getaddrinfo().
from e56343f VERSION: Set version to 4.1.0rc1-GITSNAPSHOT.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit fd036b8df5b57fb6da6bc99e383d19070c22889c
Author: Karolin Seeger <ksee...@samba.org>
Date: Fri Jul 5 10:04:37 2013 +0200
WHATSNEW: Start release notes for Samba 4.1.0rc1.
Signed-off-by: Karolin Seeger <ksee...@samba.org>
(cherry picked from commit 0025e9782d6a2d9df56556871566a3354996a999)
commit e5465d78711ea04da8ba801b8313109cfa6465c5
Author: Karolin Seeger <ksee...@samba.org>
Date: Fri Jul 5 10:05:19 2013 +0200
VERSION: Set version to 4.1.0rc1-GITSNAPSHOT.
Signed-off-by: Karolin Seeger <ksee...@samba.org>
Autobuild-User(v4-1-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-1-test): Fri Jul 5 11:56:40 CEST 2013 on sn-devel-104
(cherry picked from commit e56343f1bba603852afcb816f7b5ebdf680c182e)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/tuning/usentdb.xml | 4 ++--
lib/tevent/doc/tevent_request.dox | 2 +-
source4/dsdb/samdb/ldb_modules/ridalloc.c | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/tuning/usentdb.xml
b/docs-xml/smbdotconf/tuning/usentdb.xml
index 9a0d2cd..6d5ca48 100644
--- a/docs-xml/smbdotconf/tuning/usentdb.xml
+++ b/docs-xml/smbdotconf/tuning/usentdb.xml
@@ -6,9 +6,9 @@
<para>Beginning in Samba 4.1, a growing number of databases can
use the NTDB format rather than TDB.
</para>
- <para>If you enable this option these databases will defaul to a
+ <para>If you enable this option these databases will default to a
<filename>.ntdb</filename> extension rather than
- <filename>.tdb</filename>: If the <filename>.tdb</filename> file
+ <filename>.tdb</filename>. If the <filename>.tdb</filename> file
exists, it will automatically be converted to NTDB and renamed to
<filename>.tdb.bak</filename>.
</para>
diff --git a/lib/tevent/doc/tevent_request.dox
b/lib/tevent/doc/tevent_request.dox
index 1461384..3358cfb 100644
--- a/lib/tevent/doc/tevent_request.dox
+++ b/lib/tevent/doc/tevent_request.dox
@@ -1,6 +1,6 @@
/**
@page tevent_request Chapter 4: Tevent request
-@section request Tevent requst
+@section request Tevent request
A specific feature of the library is the tevent request API that provides for
asynchronous computation and allows much more interconnected working and
diff --git a/source4/dsdb/samdb/ldb_modules/ridalloc.c
b/source4/dsdb/samdb/ldb_modules/ridalloc.c
index 73ecb03..c0859d3 100644
--- a/source4/dsdb/samdb/ldb_modules/ridalloc.c
+++ b/source4/dsdb/samdb/ldb_modules/ridalloc.c
@@ -606,7 +606,8 @@ int ridalloc_allocate_rid(struct ldb_module *module,
uint32_t *rid, struct ldb_r
/*
* if we are half-exhausted then try to get a new pool.
*/
- if (nridset.next_rid > (prev_pool_hi + prev_pool_lo)/2) {
+ if (nridset.next_rid > (prev_pool_hi + prev_pool_lo)/2 &&
+ nridset.alloc_pool == nridset.prev_pool) {
/*
* if we are the RID Manager,
* we can get a new pool localy.
--
Samba Shared Repository
