The branch, master has been updated
via 32a76ca s4:lib/policy/gp_ldap.c - make more use of LDB result
constants
via dcdfc27 s4:lib/registry/registry.h - align a copyright line in
header comment
via 6723e90 talloc - improve doxygen comment of "talloc_move"
via 05a9b7c s4:smb_server/smb/trans2.c - "talloc_move" isn't strictly
necessary here
from 72833e4 s3-ctdb_wrap: remove unused variable from
db_ctdb_fetch_persistent().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 32a76ca146104e94a974e23668e93464c2b35a9a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Mar 27 22:14:56 2011 +0200
s4:lib/policy/gp_ldap.c - make more use of LDB result constants
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Wed Mar 30 09:33:38 CEST 2011 on sn-devel-104
commit dcdfc27dbf3e2f47a3fea0c2ee7e18918430be60
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Mar 25 20:03:42 2011 +0100
s4:lib/registry/registry.h - align a copyright line in header comment
commit 6723e90d524c8e73f19c06b3ff28867a1a89b14b
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Mar 24 09:41:19 2011 +0100
talloc - improve doxygen comment of "talloc_move"
Express better that this should be a pointer of a pointer.
Reviewed-by: Tridge
commit 05a9b7c32dd5831d2099a1c634d9380fe12a530e
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Mar 24 10:28:10 2011 +0100
s4:smb_server/smb/trans2.c - "talloc_move" isn't strictly necessary here
Since the "set" will be free'd afterwards "talloc_steal" is enough.
Reviewed-by: Tridge
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/talloc.h | 6 +++---
source4/lib/policy/gp_ldap.c | 26 +++++++++++++-------------
source4/lib/registry/registry.h | 2 +-
source4/smb_server/smb/trans2.c | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index 5710861..64879b7 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -402,14 +402,14 @@ const char *talloc_set_name(const void *ptr, const char
*fmt, ...) PRINTF_ATTRIB
*
* @param[in] new_ctx The new parent context.
*
- * @param[in] ptr Pointer to the talloc chunk to move.
+ * @param[in] pptr Pointer to the talloc chunk to move.
*
* @return The pointer of the talloc chunk it has been moved to,
* NULL on error.
*/
-void *talloc_move(const void *new_ctx, const void *ptr);
+void *talloc_move(const void *new_ctx, void **pptr);
#else
-#define talloc_move(ctx, ptr) (_TALLOC_TYPEOF(*(ptr)))_talloc_move((ctx),(void
*)(ptr))
+#define talloc_move(ctx, pptr)
(_TALLOC_TYPEOF(*(pptr)))_talloc_move((ctx),(void *)(pptr))
void *_talloc_move(const void *new_ctx, const void *pptr);
#endif
diff --git a/source4/lib/policy/gp_ldap.c b/source4/lib/policy/gp_ldap.c
index 091af2e..de56e4c 100644
--- a/source4/lib/policy/gp_ldap.c
+++ b/source4/lib/policy/gp_ldap.c
@@ -641,7 +641,7 @@ NTSTATUS gp_set_gplink(struct gp_context *gp_ctx, const
char *dn_str, struct gp_
msg->dn = dn;
rv = ldb_msg_add_string(msg, "gPLink", gplink_str);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add string failed: %s\n",
ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -649,7 +649,7 @@ NTSTATUS gp_set_gplink(struct gp_context *gp_ctx, const
char *dn_str, struct gp_
msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
rv = ldb_modify(gp_ctx->ldb_ctx, msg);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -717,14 +717,14 @@ NTSTATUS gp_del_gplink(struct gp_context *gp_ctx, const
char *dn_str, const char
if (strcmp(gplink_str, "") == 0) {
rv = ldb_msg_add_empty(msg, "gPLink", LDB_FLAG_MOD_DELETE,
NULL);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add empty element failed: %s\n",
ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
}
} else {
rv = ldb_msg_add_string(msg, "gPLink", gplink_str);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add string failed: %s\n",
ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -732,7 +732,7 @@ NTSTATUS gp_del_gplink(struct gp_context *gp_ctx, const
char *dn_str, const char
msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
}
rv = ldb_modify(gp_ctx->ldb_ctx, msg);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -789,7 +789,7 @@ NTSTATUS gp_set_inheritance(struct gp_context *gp_ctx,
const char *dn_str, enum
NT_STATUS_HAVE_NO_MEMORY_AND_FREE(inheritance_string, msg);
rv = ldb_msg_add_string(msg, "gPOptions", inheritance_string);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add string failed: %s\n",
ldb_strerror(rv)));
talloc_free(msg);
return NT_STATUS_UNSUCCESSFUL;
@@ -797,7 +797,7 @@ NTSTATUS gp_set_inheritance(struct gp_context *gp_ctx,
const char *dn_str, enum
msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
rv = ldb_modify(gp_ctx->ldb_ctx, msg);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
talloc_free(msg);
return NT_STATUS_UNSUCCESSFUL;
@@ -963,7 +963,7 @@ NTSTATUS gp_set_ads_acl (struct gp_context *gp_ctx, const
char *dn_str, const st
msg->dn = ldb_dn_new(mem_ctx, gp_ctx->ldb_ctx, dn_str);
rv = ldb_msg_add_value(msg, "nTSecurityDescriptor", &data, NULL);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add element failed for adding
nTSecurityDescriptor: %s\n", ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -971,7 +971,7 @@ NTSTATUS gp_set_ads_acl (struct gp_context *gp_ctx, const
char *dn_str, const st
msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
rv = ldb_modify(gp_ctx->ldb_ctx, msg);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -1003,7 +1003,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx,
struct gp_object *gpo)
NT_STATUS_HAVE_NO_MEMORY_AND_FREE(msg, mem_ctx);
rv = ldb_msg_add_string(msg, "flags", flags_str);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add string failed for flags: %s\n",
ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -1011,7 +1011,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx,
struct gp_object *gpo)
msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
rv = ldb_msg_add_string(msg, "version", version_str);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add string failed for version: %s\n",
ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -1019,7 +1019,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx,
struct gp_object *gpo)
msg->elements[1].flags = LDB_FLAG_MOD_REPLACE;
rv = ldb_msg_add_string(msg, "displayName", gpo->display_name);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB message add string failed for displayName:
%s\n", ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
@@ -1027,7 +1027,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx,
struct gp_object *gpo)
msg->elements[2].flags = LDB_FLAG_MOD_REPLACE;
rv = ldb_modify(gp_ctx->ldb_ctx, msg);
- if (rv != 0) {
+ if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
index 8fc0257..8a8271e 100644
--- a/source4/lib/registry/registry.h
+++ b/source4/lib/registry/registry.h
@@ -2,7 +2,7 @@
Unix SMB/CIFS implementation.
Registry interface
Copyright (C) Gerald Carter 2002.
- Copyright (C) Jelmer Vernooij
2003-2007.
+ Copyright (C) Jelmer Vernooij 2003-2007.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index 416d6f0..0a6c014 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -1487,7 +1487,7 @@ static NTSTATUS dodc_or_sysvol_referral(TALLOC_CTX *ctx,
NT_STATUS_HAVE_NO_MEMORY_AND_FREE(dc_list, context);
for(j=0; j<set[i]->count; j++) {
- dc_list[num_dcs + j] = talloc_move(context,
&set[i]->names[j]);
+ dc_list[num_dcs + j] = talloc_steal(context,
set[i]->names[j]);
}
num_dcs = num_dcs + set[i]->count;
TALLOC_FREE(set[i]);
--
Samba Shared Repository
