The branch, master has been updated
via d83850a... build: uname on opensolaris returns 1 for success
via 7cbcf65... s4-ldb: use a parent context in the ldb utils
from df6d0db... s4: Fix python binding for drsblobs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d83850abe2c393352ec65c32b3bcec7c33be7cd0
Author: Andrew Tridgell <[email protected]>
Date: Sun May 2 16:12:14 2010 +0200
build: uname on opensolaris returns 1 for success
check for -1 as failure, not 0 for success
commit 7cbcf652c51d283ac55b898c60ea39e45a48e5dd
Author: Andrew Tridgell <[email protected]>
Date: Sun May 2 15:53:14 2010 +0200
s4-ldb: use a parent context in the ldb utils
This avoids a talloc free with references error on exit
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_conftests.py | 2 +-
source4/lib/ldb/tools/ldbadd.c | 5 +++--
source4/lib/ldb/tools/ldbdel.c | 5 +++--
source4/lib/ldb/tools/ldbedit.c | 6 ++++--
source4/lib/ldb/tools/ldbmodify.c | 5 +++--
source4/lib/ldb/tools/ldbrename.c | 5 +++--
source4/lib/ldb/tools/ldbsearch.c | 6 ++++--
7 files changed, 21 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_conftests.py
b/buildtools/wafsamba/samba_conftests.py
index ecdf8e7..e709929 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -267,7 +267,7 @@ def CHECK_UNAME(conf):
for v in "sysname machine release version".split():
if not conf.CHECK_CODE('''
struct utsname n;
- if (uname(&n) != 0) return -1;
+ if (uname(&n) == -1) return -1;
printf("%%s", n.%s);
''' % v,
define='SYSTEM_UNAME_%s' % v.upper(),
diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 0dd35cc..e057b87 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -95,8 +95,9 @@ int main(int argc, const char **argv)
struct ldb_context *ldb;
unsigned int i, count = 0;
int ret=0;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
- ldb = ldb_init(NULL, NULL);
+ ldb = ldb_init(mem_ctx, NULL);
options = ldb_cmdline_process(ldb, argc, argv, usage);
@@ -130,7 +131,7 @@ int main(int argc, const char **argv)
ldb_transaction_cancel(ldb);
}
- talloc_free(ldb);
+ talloc_free(mem_ctx);
printf("Added %d records with %d failures\n", count, failures);
diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 04884e1..6994b3d 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -87,8 +87,9 @@ int main(int argc, const char **argv)
struct ldb_cmdline *options;
struct ldb_context *ldb;
int ret = 0, i;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
- ldb = ldb_init(NULL, NULL);
+ ldb = ldb_init(mem_ctx, NULL);
options = ldb_cmdline_process(ldb, argc, argv, usage);
@@ -127,7 +128,7 @@ int main(int argc, const char **argv)
}
}
- talloc_free(ldb);
+ talloc_free(mem_ctx);
return ret;
}
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 4c5683c..1866cc3 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -284,8 +284,9 @@ int main(int argc, const char **argv)
int ret;
const char *expression = "(|(objectClass=*)(distinguishedName=*))";
const char * const * attrs = NULL;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
- ldb = ldb_init(NULL, NULL);
+ ldb = ldb_init(mem_ctx, NULL);
options = ldb_cmdline_process(ldb, argc, argv, usage);
@@ -330,6 +331,7 @@ int main(int argc, const char **argv)
}
}
- talloc_free(ldb);
+ talloc_free(mem_ctx);
+
return 0;
}
diff --git a/source4/lib/ldb/tools/ldbmodify.c
b/source4/lib/ldb/tools/ldbmodify.c
index 57988cb..ecbdadf 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -94,8 +94,9 @@ int main(int argc, const char **argv)
struct ldb_context *ldb;
int count=0;
int i, ret=LDB_SUCCESS;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
- ldb = ldb_init(NULL, NULL);
+ ldb = ldb_init(mem_ctx, NULL);
options = ldb_cmdline_process(ldb, argc, argv, usage);
@@ -115,7 +116,7 @@ int main(int argc, const char **argv)
}
}
- talloc_free(ldb);
+ talloc_free(mem_ctx);
printf("Modified %d records with %d failures\n", count, failures);
diff --git a/source4/lib/ldb/tools/ldbrename.c
b/source4/lib/ldb/tools/ldbrename.c
index bfccacc..e0f258c 100644
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -51,8 +51,9 @@ int main(int argc, const char **argv)
int ret;
struct ldb_cmdline *options;
struct ldb_dn *dn1, *dn2;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
- ldb = ldb_init(NULL, NULL);
+ ldb = ldb_init(mem_ctx, NULL);
options = ldb_cmdline_process(ldb, argc, argv, usage);
@@ -71,7 +72,7 @@ int main(int argc, const char **argv)
options->argv[0], options->argv[1], ldb_errstring(ldb));
}
- talloc_free(ldb);
+ talloc_free(mem_ctx);
return ret;
}
diff --git a/source4/lib/ldb/tools/ldbsearch.c
b/source4/lib/ldb/tools/ldbsearch.c
index 327a75e..179646c 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -271,8 +271,9 @@ int main(int argc, const char **argv)
struct ldb_cmdline *options;
int ret = -1;
const char *expression = "(|(objectClass=*)(distinguishedName=*))";
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
- ldb = ldb_init(NULL, NULL);
+ ldb = ldb_init(mem_ctx, NULL);
if (ldb == NULL) {
return -1;
}
@@ -311,6 +312,7 @@ int main(int argc, const char **argv)
ret = do_search(ldb, basedn, options, expression, attrs);
}
- talloc_free(ldb);
+ talloc_free(mem_ctx);
+
return ret;
}
--
Samba Shared Repository
