summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-11-25 15:53:56 -0800
committerJeremy Allison <jra@samba.org>2008-11-25 15:53:56 -0800
commitd3fa3c080f4509d8d043b26f3bee157f026d6e8a (patch)
tree0a65687650e245a46910094cf21a0cae296cb8f3 /source3/utils
parentfc0985dbc546eff9d9d8660a30a0bf923782f2d7 (diff)
downloadsamba-d3fa3c080f4509d8d043b26f3bee157f026d6e8a.tar.gz
samba-d3fa3c080f4509d8d043b26f3bee157f026d6e8a.tar.bz2
samba-d3fa3c080f4509d8d043b26f3bee157f026d6e8a.zip
Fix bug #5914 - Build failure: redefinition of struct name_list
Jeremy.
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/smbtree.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index ce2de4d7fe..9fc02bac13 100644
--- a/source3/utils/smbtree.c
+++ b/source3/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 */