The branch, master has been updated
via 1ddd63b ldb:tools/cmdline.c - reorganise imports
via b5d8727 s4:param/secrets.c - reorganise imports
via 7e710c4 s4:rpc_server/common/common.h - introduce two forward
declarations to suppress parameter declaration warnings
via 5f98d31 ldb:tools/cmdline.c - make a counter unsigned where
appropriate
via c0a863b s4:ldb_register_samba_handlers - fix up and convert result
codes to LDB/LDAP results
via ea3f21d lib/replace/wscript:Tru64 build - Better use version 600
for _XOPEN_SOURCE
from 83cd3f7 s4:dcesrv_samr_GetGroupsForUser - also universal group
memberships are returned here
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1ddd63bddb902c82d52c1516b2649c610ae87db4
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Sep 11 17:44:43 2010 +0200
ldb:tools/cmdline.c - reorganise imports
commit b5d872704cc1074203b570f3965d67b8a9d177f5
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Sep 11 18:01:57 2010 +0200
s4:param/secrets.c - reorganise imports
commit 7e710c4de92c310897817acc06d229cce763d2d7
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Sep 11 17:53:32 2010 +0200
s4:rpc_server/common/common.h - introduce two forward declarations to
suppress parameter declaration warnings
Always Tru64 in file "param/loadparm.c" and possibly others.
commit 5f98d31fc086e57507acb6e46095a1329f0e5f3b
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Sep 11 17:43:44 2010 +0200
ldb:tools/cmdline.c - make a counter unsigned where appropriate
commit c0a863b6f35315a748fa3bb4ae4e4e7c48ad2102
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Sep 11 17:41:38 2010 +0200
s4:ldb_register_samba_handlers - fix up and convert result codes to
LDB/LDAP results
commit ea3f21dff6c28dc26a3cf9223da84ff4c545b22c
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Sep 11 16:50:47 2010 +0200
lib/replace/wscript:Tru64 build - Better use version 600 for _XOPEN_SOURCE
This means we request the "Single UNIX Specification, Version 3" with C99
compatibility as the Python 2.5 release on the system. This prevents
redefinitions with different values.
> [ 451/1918] Compiling scripting/python/pyglue.c
> cc: Warning: /usr/local/include/python2.5/pyconfig.h, line 951: The
redefinition of the macro "_XOPEN_SOURCE" conflicts with a current definition
because the replacement lists differ. The redefinition is now in effect.
(macroredef)
> #define _XOPEN_SOURCE 600
> ----------------------^
> cc: Warning: default/source4/include/config.h, line 54: The redefinition
of the macro "_XOPEN_SOURCE" conflicts with a current definition because the
replacement lists differ. The redefinition is now in effect. (macroredef)
> #define _XOPEN_SOURCE 500
> ----------------------^
-----------------------------------------------------------------------
Summary of changes:
lib/replace/wscript | 4 ++--
source4/dsdb/common/tests/dsdb_dn.c | 6 +++---
source4/lib/ldb-samba/ldb_wrap.c | 2 +-
source4/lib/ldb-samba/ldif_handlers.c | 2 +-
source4/lib/ldb/tools/cmdline.c | 12 ++++--------
source4/param/secrets.c | 4 ----
source4/rpc_server/common/common.h | 3 +++
source4/torture/drs/rpc/dssync.c | 2 +-
source4/torture/ldb/ldb.c | 10 +++++-----
9 files changed, 20 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index e626eeb..fef3663 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -30,10 +30,10 @@ def configure(conf):
conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
# on Tru64 certain features are only available with _OSF_SOURCE set to 1
- # and _XOPEN_SOURCE set to 500
+ # and _XOPEN_SOURCE set to 600
if conf.env['SYSTEM_UNAME_SYSNAME'] == 'OSF1':
conf.DEFINE('_OSF_SOURCE', 1, add_to_cflags=True)
- conf.DEFINE('_XOPEN_SOURCE', 500, add_to_cflags=True)
+ conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
conf.CHECK_HEADERS('crypt.h locale.h acl/libacl.h compat.h')
conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
diff --git a/source4/dsdb/common/tests/dsdb_dn.c
b/source4/dsdb/common/tests/dsdb_dn.c
index 183bce2..d01e858 100644
--- a/source4/dsdb/common/tests/dsdb_dn.c
+++ b/source4/dsdb/common/tests/dsdb_dn.c
@@ -44,7 +44,7 @@ static bool torture_dsdb_dn_attrs(struct torture_context
*torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@@ -127,7 +127,7 @@ static bool torture_dsdb_dn_valid(struct torture_context
*torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@@ -249,7 +249,7 @@ static bool torture_dsdb_dn_invalid(struct torture_context
*torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c
index 13ab3ed..ebc1818 100644
--- a/source4/lib/ldb-samba/ldb_wrap.c
+++ b/source4/lib/ldb-samba/ldb_wrap.c
@@ -192,7 +192,7 @@ static int ldb_wrap_destructor(struct ldb_wrap *w)
* precedence over the 'binary attribute' declaration in the
* schema */
ret = ldb_register_samba_handlers(ldb);
- if (ret == -1) {
+ if (ret != LDB_SUCCESS) {
talloc_free(ldb);
return NULL;
}
diff --git a/source4/lib/ldb-samba/ldif_handlers.c
b/source4/lib/ldb-samba/ldif_handlers.c
index 0ff6d32..1c36610 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -1278,7 +1278,7 @@ int ldb_register_samba_handlers(struct ldb_context *ldb)
}
if (!s) {
- return -1;
+ return LDB_ERR_OPERATIONS_ERROR;
}
ret = ldb_schema_attribute_add_with_syntax(ldb,
samba_attributes[i].name, LDB_ATTR_FLAG_FIXED, s);
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index c2b595f..356ce14 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -23,16 +23,12 @@
#if (_SAMBA_BUILD_ >= 4)
#include "includes.h"
-#include <ldb.h>
#include "lib/cmdline/popt_common.h"
-#include "lib/ldb-samba/ldif_handlers.h"
#include "auth/gensec/gensec.h"
#include "auth/auth.h"
-#include "ldb_wrap.h"
#include "param/param.h"
-#include "librpc/gen_ndr/drsblobs.h"
-#include "dsdb/schema/schema.h"
-#include "dsdb/common/proto.h"
+#include "dsdb/samdb/samdb.h"
+#include "ldb_wrap.h"
#else
#include "ldb_includes.h"
#include "ldb.h"
@@ -90,7 +86,7 @@ void ldb_cmdline_help(const char *cmdname, FILE *f)
*/
static bool add_control(TALLOC_CTX *mem_ctx, const char *control)
{
- int i;
+ unsigned int i;
/* count how many controls we already have */
for (i=0; options.controls && options.controls[i]; i++) ;
@@ -122,7 +118,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context
*ldb,
#if (_SAMBA_BUILD_ >= 4)
r = ldb_register_samba_handlers(ldb);
- if (r != 0) {
+ if (r != LDB_SUCCESS) {
goto failed;
}
diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index d17c5f7..befe7f3 100644
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -28,13 +28,9 @@
#include "tdb_wrap.h"
#include "lib/ldb-samba/ldb_wrap.h"
#include "lib/ldb/include/ldb.h"
-#include "../tdb/include/tdb.h"
#include "../lib/util/util_tdb.h"
-#include "../lib/util/util_ldb.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "dsdb/samdb/samdb.h"
-#include "dsdb/common/util.h"
-#include "dsdb/common/proto.h"
/**
* Use a TDB to store an incrementing random seed.
diff --git a/source4/rpc_server/common/common.h
b/source4/rpc_server/common/common.h
index ba023e1..3f3275b 100644
--- a/source4/rpc_server/common/common.h
+++ b/source4/rpc_server/common/common.h
@@ -36,6 +36,9 @@ struct dcerpc_server_info {
uint32_t version_build;
};
+enum srvsvc_PlatformId;
+enum srvsvc_ShareType;
+
#include "rpc_server/common/proto.h"
#endif /* _DCERPC_SERVER_COMMON_H_ */
diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c
index c7b6708..aaae85b 100644
--- a/source4/torture/drs/rpc/dssync.c
+++ b/source4/torture/drs/rpc/dssync.c
@@ -265,7 +265,7 @@ static bool test_LDAPBind(struct torture_context *tctx,
struct DsSyncTest *ctx,
/* Despite us loading the schema from the AD server, we need
* the samba handlers to get the extended DN syntax stuff */
ret = ldb_register_samba_handlers(ldb);
- if (ret == -1) {
+ if (ret != LDB_SUCCESS) {
talloc_free(ldb);
return NULL;
}
diff --git a/source4/torture/ldb/ldb.c b/source4/torture/ldb/ldb.c
index 8bc6357..8a5a3f3 100644
--- a/source4/torture/ldb/ldb.c
+++ b/source4/torture/ldb/ldb.c
@@ -57,7 +57,7 @@ static bool torture_ldb_attrs(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@@ -216,7 +216,7 @@ static bool torture_ldb_dn_attrs(struct torture_context
*torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@@ -334,7 +334,7 @@ static bool torture_ldb_dn_extended(struct torture_context
*torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@@ -595,7 +595,7 @@ static bool torture_ldb_dn(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@@ -707,7 +707,7 @@ static bool torture_ldb_dn_invalid_extended(struct
torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
- ldb_register_samba_handlers(ldb), 0,
+ ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
--
Samba Shared Repository
