[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Wed Aug 18 05:34:28 MDT 2010


The branch, master has been updated
       via  b9353c6... s3: Fix serverid_register_msg_flags
      from  937da4d... s3-lib: Fixed a possible crash bug.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b9353c65c0662895c8e87f3d1c66574444ccfa12
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Aug 18 13:20:50 2010 +0200

    s3: Fix serverid_register_msg_flags
    
    Thanks, Andreas, for pointing this out! (How drunk have I been?...)

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/serverid.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 6adad7e..0fac375 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -124,7 +124,7 @@ bool serverid_register_msg_flags(const struct server_id id, bool do_reg,
 	struct serverid_key key;
 	struct serverid_data *data;
 	struct db_record *rec;
-	TDB_DATA tdbkey, tdbdata;
+	TDB_DATA tdbkey;
 	NTSTATUS status;
 	bool ret = false;
 
@@ -157,9 +157,7 @@ bool serverid_register_msg_flags(const struct server_id id, bool do_reg,
 		data->msg_flags &= ~msg_flags;
 	}
 
-	ZERO_STRUCT(tdbdata);
-
-	status = rec->store(rec, tdbdata, 0);
+	status = rec->store(rec, rec->value, 0);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("Storing serverid.tdb record failed: %s\n",
 			  nt_errstr(status)));


-- 
Samba Shared Repository


More information about the samba-cvs mailing list