[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha5-157-g97d0273
Andrew Bartlett
abartlet at samba.org
Fri Jul 25 04:16:14 GMT 2008
The branch, v4-0-test has been updated
via 97d02730e8fde56de27aeb51612a4777c2953c9f (commit)
via b62490e3e21b606b66e0737a403b0d170b64cddd (commit)
via b12dd8ee5443ebfc204d1684f541d68ffb351197 (commit)
via 7cf9b9dd0bb35835a7c6e9897ea99951a33c63c7 (commit)
via e9c3c9ad8289ee48efa998ab6b486250dcd40b52 (commit)
via 8dfba3160cc4bc518f3ad8570d104e5baae784ca (commit)
from 1223cd17c79d130b46b0e0ccb0f6011c92441173 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 97d02730e8fde56de27aeb51612a4777c2953c9f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 25 14:15:22 2008 +1000
Per feedback, remove epoch and ldconfig requires.
See https://bugzilla.redhat.com/show_bug.cgi?id=453083
commit b62490e3e21b606b66e0737a403b0d170b64cddd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 25 14:11:18 2008 +1000
Make a new define to ensure the accoc_group_id we use is always in common.
commit b12dd8ee5443ebfc204d1684f541d68ffb351197
Merge: 7cf9b9dd0bb35835a7c6e9897ea99951a33c63c7 1223cd17c79d130b46b0e0ccb0f6011c92441173
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 25 11:58:51 2008 +1000
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commit 7cf9b9dd0bb35835a7c6e9897ea99951a33c63c7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 25 11:58:24 2008 +1000
Try to avoid a memory leak if we re-set the global schema
However, try also not to pull a schema out from under a running ldb
session.
Andrew Bartlett
commit e9c3c9ad8289ee48efa998ab6b486250dcd40b52
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 25 08:45:16 2008 +1000
Complain if we are told to use an ldap backend, without the type
commit 8dfba3160cc4bc518f3ad8570d104e5baae784ca
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 25 08:44:00 2008 +1000
Clarify how we are doing the 'this is a rootdse query' check.
-----------------------------------------------------------------------
Summary of changes:
packaging/Fedora/samba4.spec | 23 +++++++++--------------
source/dsdb/samdb/ldb_modules/rootdse.c | 3 ++-
source/dsdb/schema/schema_init.c | 9 +++++++++
source/rpc_server/dcerpc_server.c | 6 ++++--
source/scripting/python/samba/provision.py | 2 ++
5 files changed, 26 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/Fedora/samba4.spec b/packaging/Fedora/samba4.spec
index 4e86050..45d1429 100644
--- a/packaging/Fedora/samba4.spec
+++ b/packaging/Fedora/samba4.spec
@@ -11,7 +11,6 @@
Summary: The Samba4 CIFS and AD client and server suite
Name: samba4
-Epoch: 0
Version: 4.0.0
Release: 0.%{main_release}.alpha%{alpha_version}%{?dist}
License: GPLv3+, LGPLv3+, BSD
@@ -25,7 +24,7 @@ Source1: %{name}.log
Source4: %{name}.sysconfig
Source5: %{name}.init
-Requires(pre): %{name}-common = %{epoch}:%{version}-%{release}
+Requires(pre): %{name}-common = %{version}-%{release}
Requires: pam >= 0:0.64
Requires: logrotate >= 0:3.4
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -33,7 +32,7 @@ Requires(pre): /usr/sbin/groupadd
Requires(post): /sbin/chkconfig, /sbin/service
Requires(preun): /sbin/chkconfig, /sbin/service
BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, e2fsprogs-devel
-BuildRequires: popt-devel, libattr-devel, libaio-devel, sed, ldconfig
+BuildRequires: popt-devel, libattr-devel, libaio-devel, sed
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: libtalloc-devel >= %{talloc_version}
BuildRequires: libtdb-devel >= %{tdb_version}
@@ -48,8 +47,8 @@ by Windows 2000 and above.
%package client
Summary: Samba client programs
Group: Applications/System
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description client
The %{name}-client package provides some SMB/CIFS clients to complement
@@ -59,10 +58,6 @@ of SMB/CIFS shares and printing to SMB/CIFS printers.
%package libs
Summary: Samba libraries
Group: Applications/System
-Requires: libtdb >= 0:%{tdb_version}
-Requires: libtalloc >= 0:%{talloc_version}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
%description libs
The %{name}-libs package contains the libraries needed by programs
@@ -71,7 +66,7 @@ that link against the SMB, RPC and other protocols provided by the Samba suite.
%package python
Summary: Samba python libraries
Group: Applications/System
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description python
The %{name}-python package contains the python libraries needed by programs
@@ -80,7 +75,7 @@ that use SMB, RPC and other Samba provided protocols in python programs/
%package devel
Summary: Developer tools for Samba libraries
Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
The %{name}-devel package contains the header files for the libraries
@@ -99,8 +94,8 @@ and Wireshark to parse IDL and similar protocols
%package common
Summary: Files used by both Samba servers and clients
Group: Applications/System
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): /sbin/chkconfig, /sbin/service, coreutils
+Requires: %{name}-libs = %{version}-%{release}
+Requires(post): /sbin/chkconfig, /sbin/service
Requires(preun): /sbin/chkconfig, /sbin/service
%description common
@@ -110,7 +105,7 @@ packages of Samba.
%package winbind
Summary: Samba winbind
Group: Applications/System
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description winbind
The samba-winbind package provides the winbind NSS library, and some
diff --git a/source/dsdb/samdb/ldb_modules/rootdse.c b/source/dsdb/samdb/ldb_modules/rootdse.c
index 97491a2..ebc90d4 100644
--- a/source/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source/dsdb/samdb/ldb_modules/rootdse.c
@@ -263,9 +263,10 @@ static int rootdse_search(struct ldb_module *module, struct ldb_request *req)
struct ldb_request *down_req;
int ret;
- /* see if its for the rootDSE */
+ /* see if its for the rootDSE - only a base search on the "" DN qualifies */
if (req->op.search.scope != LDB_SCOPE_BASE ||
( ! ldb_dn_is_null(req->op.search.base))) {
+ /* Otherwise, pass down to the rest of the stack */
return ldb_next_request(module, req);
}
diff --git a/source/dsdb/schema/schema_init.c b/source/dsdb/schema/schema_init.c
index 2ec5ad3..706c8e2 100644
--- a/source/dsdb/schema/schema_init.c
+++ b/source/dsdb/schema/schema_init.c
@@ -1755,6 +1755,11 @@ int dsdb_set_global_schema(struct ldb_context *ldb)
return ret;
}
+ /* Keep a reference to this schema, just incase the global copy is replaced */
+ if (talloc_reference(ldb, global_schema) == NULL) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
return LDB_SUCCESS;
}
@@ -1792,6 +1797,10 @@ void dsdb_make_schema_global(struct ldb_context *ldb)
return;
}
+ if (global_schema) {
+ talloc_unlink(talloc_autofree_context(), schema);
+ }
+
talloc_steal(talloc_autofree_context(), schema);
global_schema = schema;
diff --git a/source/rpc_server/dcerpc_server.c b/source/rpc_server/dcerpc_server.c
index ac36825..cb07f6e 100644
--- a/source/rpc_server/dcerpc_server.c
+++ b/source/rpc_server/dcerpc_server.c
@@ -36,6 +36,8 @@
#include "libcli/security/security.h"
#include "param/param.h"
+#define SAMBA_ACCOC_GROUP 0x12345678
+
extern const struct dcesrv_interface dcesrv_mgmt_interface;
/*
@@ -554,7 +556,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
* assoc_group_id back to the clients
*/
if (call->pkt.u.bind.assoc_group_id != 0 &&
- call->pkt.u.bind.assoc_group_id != 0x12345678) {
+ call->pkt.u.bind.assoc_group_id != SAMBA_ACCOC_GROUP) {
return dcesrv_bind_nak(call, 0);
}
@@ -629,7 +631,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
pkt.u.bind_ack.max_xmit_frag = 0x2000;
pkt.u.bind_ack.max_recv_frag = 0x2000;
/* we need to send a non zero assoc_group_id here to make longhorn happy, it also matches samba3 */
- pkt.u.bind_ack.assoc_group_id = 0x12345678;
+ pkt.u.bind_ack.assoc_group_id = SAMBA_ACCOC_GROUP;
if (iface) {
/* FIXME: Use pipe name as specified by endpoint instead of interface name */
pkt.u.bind_ack.secondary_address = talloc_asprintf(call, "\\PIPE\\%s", iface->name);
diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 4b31038..0119f40 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -504,6 +504,8 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
backend_modules = ["normalise", "entryuuid", "paged_searches"]
# OpenLDAP handles subtree renames, so we don't want to do any of these things
tdb_modules_list = None
+ elif ldap_backend is not None:
+ raise "LDAP Backend specified, but LDAP Backend Type not specified"
elif serverrole == "domain controller":
backend_modules = ["repl_meta_data"]
else:
--
Samba Shared Repository
More information about the samba-cvs
mailing list