[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Tue Oct 13 09:39:53 MDT 2009
The branch, master has been updated
via 11a8a54... s4:hdb-samba4 - Don't double-free "db"
via c183acc... s4:dcesrv_samr - add another constant
from 6b91a2a... s4:dcesrv_samr - prevent "ldb_modify" on a possibly empty message
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 11a8a54c825a52d7dd6ab78bc7aeff2d719327d2
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Tue Oct 13 17:36:58 2009 +0200
s4:hdb-samba4 - Don't double-free "db"
"db" is freed anyway after the destructor terminates so this does really make
no sense here (rather it makes code crash).
Should fix bug #6801.
commit c183acc782ffa881dac770b093f3a50cc24b6262
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Tue Oct 13 17:29:52 2009 +0200
s4:dcesrv_samr - add another constant
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/hdb-samba4.c | 1 -
source4/rpc_server/samr/dcesrv_samr.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 4062e13..bed6ee9 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -1442,7 +1442,6 @@ static krb5_error_code hdb_samba4_nextkey(krb5_context context, HDB *db, unsigne
static krb5_error_code hdb_samba4_destroy(krb5_context context, HDB *db)
{
- talloc_free(db);
return 0;
}
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 00820a3..6c5f5b8 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -2646,7 +2646,7 @@ static NTSTATUS dcesrv_samr_SetAliasInfo(struct dcesrv_call_state *dce_call, TAL
/* modify the samdb record */
ret = ldb_modify(a_state->sam_ctx, msg);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
/* we really need samdb.c to return NTSTATUS */
return NT_STATUS_UNSUCCESSFUL;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list