[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-11-44-ge9587eb
Karolin Seeger
kseeger at samba.org
Wed Jun 10 07:53:17 GMT 2009
The branch, v3-2-stable has been updated
via e9587ebf807a90ed9976114dfc22631fbdb496c6 (commit)
via a67b1beffdeaabab7d341c104b93b3ad135e056a (commit)
via ddf3582070f0d83372d17d3942b7a452c41d2cd3 (commit)
via 9d0e43c16f595215db81b7b4e77736ed520d86d6 (commit)
via 7a2597508aef988fb2aa45444d754c6695fdabb2 (commit)
from 3f60dc96f4d81f9fa841398110aa5d3130a91bf6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit e9587ebf807a90ed9976114dfc22631fbdb496c6
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jun 10 08:39:35 2009 +0200
s3/docs: Fix typos.
Fix typos reported by OPC oota <t-oota [at] dh.jp.nec.com>.
Thanks!
Karolin
(cherry picked from commit ad0d8032068fc9b920e205d3f5f923174101d777)
(cherry picked from commit b7d54f443ade79d3f2b71aa138fd5254754bb750)
(cherry picked from commit cec179962a833771b9fdba3ba747b571ef27ace6)
(cherry picked from commit 484c38b5529ca903dede7ed4770ba996be447dbf)
commit a67b1beffdeaabab7d341c104b93b3ad135e056a
Author: Karolin Seeger <kseeger at samba.org>
Date: Sat Jun 6 15:56:47 2009 +0200
s3/docs: Fix example.
The 'ldap suffix' is not added automatically to the 'ldap admin dn'.
This fixes bug #5584.
Thanks to Stefan Bauer <stefan.bauer [at] plzk.de> for reporting!
Karolin
(cherry picked from commit 0fee798552038b730b0107540d6cfeb475803555)
(cherry picked from commit 629e7aa91a33a5428676d8f6eeac19ea9fec14d6)
(cherry picked from commit 01acd8d9277362ae3c0e92963f66e7af3202b84d)
(cherry picked from commit 7d3936b788de16433fbaaf7fd015873df4edd605)
commit ddf3582070f0d83372d17d3942b7a452c41d2cd3
Author: Karolin Seeger <kseeger at samba.org>
Date: Sat Jun 6 15:10:08 2009 +0200
s3/passdb: Fix debug message: 'net setmaxrid' does not exist.
This is aiming bug #6351.
Karolin
(cherry picked from commit c94d1cd7b1dc3ff99ae5a1eb9058ed6015fb9749)
(cherry picked from commit 11ed212591d612632fcb47f1eac10507b89ffdec)
(cherry picked from commit 28d4cd50d1a76bc374a8420c490411a52c32fdbb)
commit 9d0e43c16f595215db81b7b4e77736ed520d86d6
Author: Günther Deschner <gd at samba.org>
Date: Mon May 25 14:05:18 2009 +0200
s3-samr: Fix Bug #6372, usermanager only displaying 1024 groups and aliases.
This is now also verified with the RPC-SAMR-LARGE-DC test.
Guenther
(cherry picked from commit fca7dce1a908570e463ddcbd663955fcafd1d843)
(cherry picked from commit 6ad726f50ee10ac2a2f157906b3b3adb88bfea37)
commit 7a2597508aef988fb2aa45444d754c6695fdabb2
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jun 5 15:35:05 2009 +0200
s3/docs: Fix typo.
Karolin
(cherry picked from commit 613c8acbdd93210b40ec6fa48cbbf297a061b3cc)
(cherry picked from commit c84f1c7ac9da7e26f28cb233efe45614f0cedea3)
(cherry picked from commit 8878670414bd2607ad238b4fb61a109d5f430538)
(cherry picked from commit 6da23f8f0d4d045095d965ff62b7892c645fa139)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml | 4 ++--
docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml | 6 +++---
docs-xml/smbdotconf/protocol/unixextensions.xml | 4 ++--
source/passdb/pdb_interface.c | 4 ++--
source/rpc_server/srv_samr_nt.c | 12 ++++++++++++
5 files changed, 21 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml b/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
index ff25525..517bb0f 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
@@ -1214,7 +1214,7 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb
<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
<smbconfoption name="ldap group suffix">ou=People</smbconfoption>
<smbconfoption name="ldap idmap suffix">ou=People</smbconfoption>
-<smbconfoption name="ldap admin dn">cn=Manager</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=Manager,dc=quenya,dc=org</smbconfoption>
<smbconfoption name="ldap ssl">no</smbconfoption>
<smbconfoption name="ldap passwd sync">Yes</smbconfoption>
<smbconfoption name="idmap uid">15000-20000</smbconfoption>
@@ -1281,7 +1281,7 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb
<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
<smbconfoption name="ldap group suffix">ou=People</smbconfoption>
<smbconfoption name="ldap idmap suffix">ou=People</smbconfoption>
-<smbconfoption name="ldap admin dn">cn=Manager</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=Manager,dc=quenya,dc=org</smbconfoption>
<smbconfoption name="ldap ssl">no</smbconfoption>
<smbconfoption name="ldap passwd sync">Yes</smbconfoption>
<smbconfoption name="idmap uid">15000-20000</smbconfoption>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
index d37edbe..451af57 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
@@ -306,7 +306,7 @@ many SSO solutions are an administrative nightmare.
<indexterm><primary>SSO</primary></indexterm>
SSO implementations utilize centralization of all user account information. Depending on environmental
complexity and the age of the systems over which a SSO solution is implemented, it may not be possible to
-change the solution architecture so as to accomodate a new identity management and user authentication system.
+change the solution architecture so as to accommodate a new identity management and user authentication system.
Many SSO solutions involving legacy systems consist of a new super-structure that handles authentication on
behalf of the user. The software that gets layered over the old system may simply implement a proxy
authentication system. This means that the addition of SSO increases over-all information systems complexity.
@@ -375,8 +375,8 @@ that share live services. The Liberty Alliance, an industry group formed to prom
standards, has adopted SAML 1.1 as part of its application framework. Microsoft and IBM have proposed an
alternative specification called WS-Security. Some believe that the competing technologies and methods may
converge when the SAML 2.0 standard is introduced. A few Web access-management products support SAML today,
-but implemention of the technology mostly requires customization to integrate applications and develop user
-interfaces. In a nust-shell, that is why FIM is a big and growing industry.
+but implementation of the technology mostly requires customization to integrate applications and develop user
+interfaces. In a nutshell, that is why FIM is a big and growing industry.
</para>
<para>
diff --git a/docs-xml/smbdotconf/protocol/unixextensions.xml b/docs-xml/smbdotconf/protocol/unixextensions.xml
index 5b4a36a..da9ad10 100644
--- a/docs-xml/smbdotconf/protocol/unixextensions.xml
+++ b/docs-xml/smbdotconf/protocol/unixextensions.xml
@@ -4,8 +4,8 @@
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This boolean parameter controls whether Samba
- implments the CIFS UNIX extensions, as defined by HP.
+ <para>This boolean parameter controls whether Samba
+ implements the CIFS UNIX extensions, as defined by HP.
These extensions enable Samba to better serve UNIX CIFS clients
by supporting features such as symbolic links, hard links, etc...
These extensions require a similarly enabled client, and are of
diff --git a/source/passdb/pdb_interface.c b/source/passdb/pdb_interface.c
index b83d618..0ac37dc 100644
--- a/source/passdb/pdb_interface.c
+++ b/source/passdb/pdb_interface.c
@@ -1062,8 +1062,8 @@ bool pdb_new_rid(uint32 *rid)
DEBUG(0, ("'algorithmic rid base' is set but a passdb backend "
"without algorithmic RIDs is chosen.\n"));
DEBUGADD(0, ("Please map all used groups using 'net groupmap "
- "add', set the maximum used RID using\n"));
- DEBUGADD(0, ("'net setmaxrid' and remove the parameter\n"));
+ "add', set the maximum used RID\n"));
+ DEBUGADD(0, ("and remove the parameter\n"));
return False;
}
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index f14c53b..a394eb3 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1165,6 +1165,12 @@ NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
make_group_sam_entry_list(p->mem_ctx, &samr_entries,
num_groups, groups);
+ if (MAX_SAM_ENTRIES <= num_groups) {
+ status = STATUS_MORE_ENTRIES;
+ } else {
+ status = NT_STATUS_OK;
+ }
+
samr_array->count = num_groups;
samr_array->entries = samr_entries;
@@ -1233,6 +1239,12 @@ NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
DEBUG(5,("_samr_EnumDomainAliases: %d\n", __LINE__));
+ if (MAX_SAM_ENTRIES <= num_aliases) {
+ status = STATUS_MORE_ENTRIES;
+ } else {
+ status = NT_STATUS_OK;
+ }
+
samr_array->count = num_aliases;
samr_array->entries = samr_entries;
--
Samba Shared Repository
More information about the samba-cvs
mailing list