[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-334-g1440140

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  144014096a41de293ce7ec15f82681a469dd3aa1 (commit)
       via  b82120f9b7f5aad83d8b4ece0261e9693eedca0c (commit)
      from  8b0bee7c7688a966777f502c97922d7ad40d841c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 144014096a41de293ce7ec15f82681a469dd3aa1
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sun Nov 18 14:45:19 2007 +0100

    Add a comment

commit b82120f9b7f5aad83d8b4ece0261e9693eedca0c
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sun Nov 18 14:24:54 2007 +0100

    Fix a valgrind error

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

Summary of changes:
 source/locking/locking.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/locking/locking.c b/source/locking/locking.c
index 8d511e9..eb7531d 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -472,11 +472,18 @@ static void print_share_mode_table(struct locking_data 
*data)
 
        for (i = 0; i < num_share_modes; i++) {
                struct share_mode_entry entry;
-               char *str = share_mode_str(NULL, i, &entry);
+               char *str;
+
+               /*
+                * We need to memcpy the entry here due to alignment
+                * restrictions that are not met when directly accessing
+                * shares[i]
+                */
 
                memcpy(&entry, &shares[i], sizeof(struct share_mode_entry));
-               DEBUG(10,("print_share_mode_table: %s\n",
-                         str ? str : ""));
+               str = share_mode_str(talloc_tos(), i, &entry);
+
+               DEBUG(10,("print_share_mode_table: %s\n", str ? str : ""));
                TALLOC_FREE(str);
        }
 }


-- 
Samba Shared Repository