[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre2-311-g069df88

[Karolin Seeger]

The branch, v3-3-stable has been updated
       via  069df886d9fef69d6b3693cb26daf595cef068ad (commit)
       via  5207cd4f0b8c0013027c6e967b210db2a69dbf16 (commit)
      from  d272c6e8937ae448a19fd21b689d3ae3cb99ae26 (commit)

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


- Log -----------------------------------------------------------------
commit 069df886d9fef69d6b3693cb26daf595cef068ad
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 26 15:58:42 2008 +0100

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit 1888b07267845634e21ee9e7e220c7e1ff9e66bc)

commit 5207cd4f0b8c0013027c6e967b210db2a69dbf16
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 25 15:54:53 2008 -0800

    Fix bug #5914 - Build failure: redefinition of struct name_list
    Jeremy.
    (cherry picked from commit 528e01f402e54f8d6c1b74a5b7647c037f456412)

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

Summary of changes:
 WHATSNEW.txt           |    1 +
 source/utils/smbtree.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 2a7d1a6..cf1814b 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -197,6 +197,7 @@ o   Jeremy Allison <jra at samba.org>
     * BUG 5903: Fix breaking of file contents in vfs_streams_xattr.
     * BUG 5904: Fix SIGABRT while servicing getaddrinfo() request caused by
       libnss_wins.
+    * BUG 5914: Fix redefinition of struct name_list.
     * Correctly fix smbclient to terminate on eof from server.
     * Fix client timeout when searching for a large number of cups printers.
     * Unify access checks for lsa server functions.
diff --git a/source/utils/smbtree.c b/source/utils/smbtree.c
index ce2de4d..9fc02ba 100644
--- a/source/utils/smbtree.c
+++ b/source/utils/smbtree.c
@@ -30,15 +30,15 @@ static enum tree_level level = LEV_SHARE;
 
 /* Holds a list of workgroups or servers */
 
-struct name_list {
-        struct name_list *prev, *next;
+struct smb_name_list {
+        struct smb_name_list *prev, *next;
         char *name, *comment;
         uint32 server_type;
 };
 
-static struct name_list *workgroups, *servers, *shares;
+static struct smb_name_list *workgroups, *servers, *shares;
 
-static void free_name_list(struct name_list *list)
+static void free_name_list(struct smb_name_list *list)
 {
         while(list)
                 DLIST_REMOVE(list, list);
@@ -47,10 +47,10 @@ static void free_name_list(struct name_list *list)
 static void add_name(const char *machine_name, uint32 server_type,
                      const char *comment, void *state)
 {
-        struct name_list **name_list = (struct name_list **)state;
-        struct name_list *new_name;
+        struct smb_name_list **name_list = (struct smb_name_list **)state;
+        struct smb_name_list *new_name;
 
-        new_name = SMB_MALLOC_P(struct name_list);
+        new_name = SMB_MALLOC_P(struct smb_name_list);
 
         if (!new_name)
                 return;
@@ -222,7 +222,7 @@ static bool get_shares(char *server_name, struct user_auth_info *user_info)
 
 static bool print_tree(struct user_auth_info *user_info)
 {
-        struct name_list *wg, *sv, *sh;
+        struct smb_name_list *wg, *sv, *sh;
 
         /* List workgroups */
 


-- 
Samba Shared Repository