Changeset 228 for branches/samba-3.2.x/source/utils

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

Location:

branches/samba-3.2.x/source/utils

Files:

• net.c (modified) (1 diff)
• net_dns.c (modified) (2 diffs)
• net_rap.c (modified) (2 diffs)
• net_rpc.c (modified) (8 diffs)
• net_rpc_join.c (modified) (2 diffs)
• net_rpc_samsync.c (modified) (9 diffs)
• ntlm_auth.c (modified) (1 diff)
• smbcacls.c (modified) (15 diffs)
• smbcquotas.c (modified) (1 diff)
• smbfilter.c (modified) (1 diff)
• smbtree.c (modified) (3 diffs)

branches/samba-3.2.x/source/utils/net.c

@@ -1066 +1066 @@
         TALLOC_CTX *frame = talloc_stackframe();
 
-        zero_addr(&opt_dest_ip);
+        zero_sockaddr(&opt_dest_ip);
 
         load_case_tables();

branches/samba-3.2.x/source/utils/net_dns.c

@@ -146 +146 @@
 
 {
-        struct iface_struct nics[MAX_INTERFACES];
         int i, n;
         struct sockaddr_storage *list = NULL;
         int count = 0;
 
-        /* find the first non-loopback address from our list of interfaces */
-
-        n = get_interfaces(nics, MAX_INTERFACES);
+        /* Honor the configured list of interfaces to register */
+
+        load_interfaces();
+        n = iface_count();
 
         if (n <= 0) {
@@ -164 +164 @@
 
         for ( i=0; i<n; i++ ) {
-                if (is_loopback_addr(&nics[i].ip)) {
+                const struct sockaddr_storage *nic_sa_storage = NULL;
+
+                if ((nic_sa_storage = iface_n_sockaddr_storage(i)) == NULL)
+                        continue;
+
+                /* Don't register loopback addresses */
+                if (is_loopback_addr(nic_sa_storage)) {
                         continue;
                 }
-#if defined(HAVE_IPV6)
-                if ((nics[i].ip.ss_family == AF_INET6)) {
-                        memcpy(&list[count++], &nics[i].ip,
-                               sizeof(struct sockaddr_storage));
-                } else
-#endif
-                if (nics[i].ip.ss_family == AF_INET) {
-                        memcpy(&list[count++], &nics[i].ip,
-                               sizeof(struct sockaddr_storage));
-                }
+
+                memcpy(&list[count++], nic_sa_storage, sizeof(struct sockaddr_storage));
         }
         *pp_ss = list;

branches/samba-3.2.x/source/utils/net_rap.c

@@ -513 +513 @@
          "net rap printq [misc. options] [targets]\n"\
          "\tor\n"\
-         "net rap printq list [<queue_name>] [misc. options] [targets]\n"\
+         "net rap printq info [<queue_name>] [misc. options] [targets]\n"\
          "\tlists the specified queue and jobs on the target server.\n"\
          "\tIf the queue name is not specified, all queues are listed.\n\n");
@@ -857 +857 @@
          "\n\t Enumerate users in a group\n"\
          "\nnet rap groupmember DELETE <group> <user> [misc. options] "\
-         "[targets]\n\t Delete sepcified user from specified group\n"\
+         "[targets]\n\t Delete specified user from specified group\n"\
          "\nnet rap groupmember ADD <group> <user> [misc. options] [targets]"\
          "\n\t Add specified user to specified group\n");

branches/samba-3.2.x/source/utils/net_rpc.c

@@ -805 +805 @@
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         POLICY_HND connect_pol, domain_pol, user_pol;
-        uchar pwbuf[516];
         const char *user;
         const char *new_password;
         char *prompt = NULL;
         union samr_UserInfo info;
+        struct samr_CryptPassword crypt_pwd;
 
         if (argc < 1) {
@@ -879 +879 @@
         /* Set password on account */
 
-        encode_pw_buffer(pwbuf, new_password, STR_UNICODE);
-
-        init_samr_user_info24(&info.info24, pwbuf, 24);
-
-        SamOEMhashBlob(info.info24.password.data, 516,
-                       &cli->user_session_key);
+        init_samr_CryptPassword(new_password,
+                                &cli->user_session_key,
+                                &crypt_pwd);
+
+        init_samr_user_info24(&info.info24, &crypt_pwd,
+                              PASS_DONT_CHANGE_AT_NEXT_LOGON);
 
         result = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
@@ -4188 +4188 @@
 }
 
-static bool is_sid_in_token(NT_USER_TOKEN *token, DOM_SID *sid)
-{
-        int i;
-
-        for (i=0; i<token->num_sids; i++) {
-                if (sid_compare(sid, &token->user_sids[i]) == 0)
-                        return True;
-        }
-        return False;
-}
-
 static void add_sid_to_token(NT_USER_TOKEN *token, DOM_SID *sid)
 {
@@ -5213 +5202 @@
         struct initshutdown_String_sub s;
 
-        if (opt_comment) {
+        if (opt_comment && strlen(opt_comment)) {
                 msg = opt_comment;
         }
@@ -5267 +5256 @@
         WERROR werr;
 
-        if (opt_comment) {
+        if (opt_comment && strlen(opt_comment)) {
                 msg = opt_comment;
         }
@@ -5430 +5419 @@
                 struct lsa_BinaryString parameters;
                 const int units_per_week = 168;
-                uchar pwbuf[516];
-
-                encode_pw_buffer(pwbuf, argv[1], STR_UNICODE);
+                struct samr_CryptPassword crypt_pwd;
 
                 ZERO_STRUCT(notime);
@@ -5446 +5433 @@
                 memset(hours.bits, 0xFF, units_per_week);
 
+                init_samr_CryptPassword(argv[1],
+                                        &cli->user_session_key,
+                                        &crypt_pwd);
+
                 init_samr_user_info23(&info.info23,
                                       notime, notime, notime,
@@ -5451 +5442 @@
                                       NULL, NULL, NULL, NULL, NULL,
                                       NULL, NULL, NULL, NULL, &parameters,
-                                      0, 0, ACB_DOMTRUST, SAMR_FIELD_ACCT_FLAGS,
+                                      0, 0, ACB_DOMTRUST,
+                                      SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_PASSWORD,
                                       hours,
                                       0, 0, 0, 0, 0, 0, 0,
-                                      pwbuf, 24);
-
-                SamOEMhashBlob(info.info23.password.data, 516,
-                               &cli->user_session_key);
+                                      &crypt_pwd);
 
                 result = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,

branches/samba-3.2.x/source/utils/net_rpc_join.c

@@ -147 +147 @@
 
         char *clear_trust_password = NULL;
-        uchar pwbuf[516];
+        struct samr_CryptPassword crypt_pwd;
         uchar md4_trust_password[16];
         union samr_UserInfo set_info;
@@ -334 +334 @@
         }
 
-        encode_pw_buffer(pwbuf, clear_trust_password, STR_UNICODE);
-
         /* Set password on machine account */
 
-        init_samr_user_info24(&set_info.info24, pwbuf, 24);
-
-        SamOEMhashBlob(set_info.info24.password.data, 516,
-                       &cli->user_session_key);
+        init_samr_CryptPassword(clear_trust_password,
+                                &cli->user_session_key,
+                                &crypt_pwd);
+
+        init_samr_user_info24(&set_info.info24, &crypt_pwd,
+                              PASS_DONT_CHANGE_AT_NEXT_LOGON);
 
         CHECK_RPC_ERR(rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,

branches/samba-3.2.x/source/utils/net_rpc_samsync.c

@@ -66 +66 @@
 {
         fstring hex_nt_passwd, hex_lm_passwd;
-        uchar lm_passwd[16], nt_passwd[16];
-        static uchar zero_buf[16];
-
+        uchar zero_buf[16];
+
+        memset(zero_buf, '\0', sizeof(zero_buf));
         /* Decode hashes from password hash (if they are not NULL) */
 
         if (memcmp(r->lmpassword.hash, zero_buf, 16) != 0) {
-                sam_pwd_hash(r->rid, r->lmpassword.hash, lm_passwd, 0);
-                pdb_sethexpwd(hex_lm_passwd, lm_passwd, r->acct_flags);
+                pdb_sethexpwd(hex_lm_passwd, r->lmpassword.hash, r->acct_flags);
         } else {
                 pdb_sethexpwd(hex_lm_passwd, NULL, 0);
@@ -79 +78 @@
 
         if (memcmp(r->ntpassword.hash, zero_buf, 16) != 0) {
-                sam_pwd_hash(r->rid, r->ntpassword.hash, nt_passwd, 0);
-                pdb_sethexpwd(hex_nt_passwd, nt_passwd, r->acct_flags);
+                pdb_sethexpwd(hex_nt_passwd, r->ntpassword.hash, r->acct_flags);
         } else {
                 pdb_sethexpwd(hex_nt_passwd, NULL, 0);
@@ -392 +390 @@
                 samsync_fix_delta_array(mem_ctx,
                                         &session_key,
-                                        false,
                                         database_id,
                                         delta_enum_array);
@@ -467 +464 @@
         const char *old_string, *new_string;
         time_t unix_time, stored_time;
-        uchar lm_passwd[16], nt_passwd[16];
-        static uchar zero_buf[16];
+        uchar zero_buf[16];
+
+        memset(zero_buf, '\0', sizeof(zero_buf));
 
         /* Username, fullname, home dir, dir drive, logon script, acct
@@ -632 +630 @@
            in that case
         */
+        if (memcmp(r->lmpassword.hash, zero_buf, 16) != 0) {
+                pdb_set_lanman_passwd(account, r->lmpassword.hash, PDB_CHANGED);
+        }
+
         if (memcmp(r->ntpassword.hash, zero_buf, 16) != 0) {
-                sam_pwd_hash(r->rid, r->ntpassword.hash, lm_passwd, 0);
-                pdb_set_lanman_passwd(account, lm_passwd, PDB_CHANGED);
-        }
-
-        if (memcmp(r->lmpassword.hash, zero_buf, 16) != 0) {
-                sam_pwd_hash(r->rid, r->lmpassword.hash, nt_passwd, 0);
-                pdb_set_nt_passwd(account, nt_passwd, PDB_CHANGED);
+                pdb_set_nt_passwd(account, r->ntpassword.hash, PDB_CHANGED);
         }
 
@@ -1258 +1254 @@
                 samsync_fix_delta_array(mem_ctx,
                                         &session_key,
-                                        true,
                                         database_id,
                                         delta_enum_array);
@@ -1756 +1751 @@
         fstring hex_nt_passwd, hex_lm_passwd;
         fstring description, profilepath, fullname, sambaSID;
-        uchar lm_passwd[16], nt_passwd[16];
         char *flags, *user_rdn;
         const char *ou;
         const char* nopasswd = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
-        static uchar zero_buf[16];
+        uchar zero_buf[16];
         uint32 rid = 0, group_rid = 0, gidNumber = 0;
         time_t unix_time;
         int i;
+
+        memset(zero_buf, '\0', sizeof(zero_buf));
 
         /* Get the username */
@@ -1809 +1805 @@
         /* Get lm and nt password data */
         if (memcmp(r->lmpassword.hash, zero_buf, 16) != 0) {
-                sam_pwd_hash(r->rid, r->lmpassword.hash, lm_passwd, 0);
-                pdb_sethexpwd(hex_lm_passwd, lm_passwd, r->acct_flags);
+                pdb_sethexpwd(hex_lm_passwd, r->lmpassword.hash, r->acct_flags);
         } else {
                 pdb_sethexpwd(hex_lm_passwd, NULL, 0);
         }
         if (memcmp(r->ntpassword.hash, zero_buf, 16) != 0) {
-                sam_pwd_hash(r->rid, r->ntpassword.hash, nt_passwd, 0);
-                pdb_sethexpwd(hex_nt_passwd, nt_passwd, r->acct_flags);
+                pdb_sethexpwd(hex_nt_passwd, r->ntpassword.hash, r->acct_flags);
         } else {
                 pdb_sethexpwd(hex_nt_passwd, NULL, 0);
@@ -2174 +2168 @@
                 samsync_fix_delta_array(mem_ctx,
                                         &session_key,
-                                        true,
                                         database_id,
                                         delta_enum_array);

branches/samba-3.2.x/source/utils/ntlm_auth.c

@@ -381 +381 @@
 
         if (nt_response && nt_response->length) {
-                memcpy(request.data.auth_crap.nt_resp, 
-                       nt_response->data, 
-                       MIN(nt_response->length, sizeof(request.data.auth_crap.nt_resp)));
+                if (nt_response->length > sizeof(request.data.auth_crap.nt_resp)) {
+                        request.flags = request.flags | WBFLAG_BIG_NTLMV2_BLOB;
+                        request.extra_len = nt_response->length;
+                        request.extra_data.data = SMB_MALLOC_ARRAY(char, request.extra_len);
+                        if (request.extra_data.data == NULL) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
+                        memcpy(request.extra_data.data, nt_response->data,
+                               nt_response->length);
+
+                } else {
+                        memcpy(request.data.auth_crap.nt_resp,
+                               nt_response->data, nt_response->length);
+                }
                 request.data.auth_crap.nt_resp_len = nt_response->length;
         }
         
         result = winbindd_request_response(WINBINDD_PAM_AUTH_CRAP, &request, &response);
+        SAFE_FREE(request.extra_data.data);
 
         /* Display response */

branches/samba-3.2.x/source/utils/smbcacls.c

@@ -24 +24 @@
 #include "includes.h"
 
-static int test_args = False;
+static int test_args;
 
 #define CREATE_ACCESS_READ READ_CONTROL_ACCESS
@@ -30 +30 @@
 /* numeric is set when the user wants numeric SIDs and ACEs rather
    than going via LSA calls to resolve them */
-static int numeric = False;
+static int numeric;
 
 enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD };
@@ -182 +182 @@
         }
 
-        slprintf(str, sizeof(fstring) - 1, "%s%s%s",
-                 domain, lp_winbind_separator(), name);
-        
+        if (*domain) {
+                slprintf(str, sizeof(fstring) - 1, "%s%s%s",
+                        domain, lp_winbind_separator(), name);
+        } else {
+                fstrcpy(str, name);
+        }
 }
 
@@ -199 +202 @@
 }
 
+static void print_ace_flags(FILE *f, uint8_t flags)
+{
+        char *str = talloc_strdup(NULL, "");
+
+        if (!str) {
+                goto out;
+        }
+
+        if (flags & SEC_ACE_FLAG_OBJECT_INHERIT) {
+                str = talloc_asprintf(str, "%s%s",
+                                str, "OI|");
+                if (!str) {
+                        goto out;
+                }
+        }
+        if (flags & SEC_ACE_FLAG_CONTAINER_INHERIT) {
+                str = talloc_asprintf(str, "%s%s",
+                                str, "CI|");
+                if (!str) {
+                        goto out;
+                }
+        }
+        if (flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT) {
+                str = talloc_asprintf(str, "%s%s",
+                                str, "NP|");
+                if (!str) {
+                        goto out;
+                }
+        }
+        if (flags & SEC_ACE_FLAG_INHERIT_ONLY) {
+                str = talloc_asprintf(str, "%s%s",
+                                str, "IO|");
+                if (!str) {
+                        goto out;
+                }
+        }
+        if (flags & SEC_ACE_FLAG_INHERITED_ACE) {
+                str = talloc_asprintf(str, "%s%s",
+                                str, "I|");
+                if (!str) {
+                        goto out;
+                }
+        }
+        /* Ignore define SEC_ACE_FLAG_SUCCESSFUL_ACCESS ( 0x40 )
+           and SEC_ACE_FLAG_FAILED_ACCESS ( 0x80 ) as they're
+           audit ace flags. */
+
+        if (str[strlen(str)-1] == '|') {
+                str[strlen(str)-1] = '\0';
+                fprintf(f, "/%s/", str);
+        } else {
+                fprintf(f, "/0x%x/", flags);
+        }
+        TALLOC_FREE(str);
+        return;
+
+  out:
+        fprintf(f, "/0x%x/", flags);
+}
 
 /* print an ACE on a FILE, using either numeric or ascii representation */
@@ -213 +275 @@
 
         if (numeric) {
-                fprintf(f, "%d/%d/0x%08x", 
+                fprintf(f, "%d/0x%x/0x%08x",
                         ace->type, ace->flags, ace->access_mask);
                 return;
@@ -228 +290 @@
         }
 
-        /* Not sure what flags can be set in a file ACL */
-
-        fprintf(f, "/%d/", ace->flags);
+        print_ace_flags(f, ace->flags);
 
         /* Standard permissions */
@@ -266 +326 @@
 }
 
+static bool parse_ace_flags(const char *str, unsigned int *pflags)
+{
+        const char *p = str;
+        *pflags = 0;
+
+        while (*p) {
+                if (strnequal(p, "OI", 2)) {
+                        *pflags |= SEC_ACE_FLAG_OBJECT_INHERIT;
+                        p += 2;
+                } else if (strnequal(p, "CI", 2)) {
+                        *pflags |= SEC_ACE_FLAG_CONTAINER_INHERIT;
+                        p += 2;
+                } else if (strnequal(p, "NP", 2)) {
+                        *pflags |= SEC_ACE_FLAG_NO_PROPAGATE_INHERIT;
+                        p += 2;
+                } else if (strnequal(p, "IO", 2)) {
+                        *pflags |= SEC_ACE_FLAG_INHERIT_ONLY;
+                        p += 2;
+                } else if (*p == 'I') {
+                        *pflags |= SEC_ACE_FLAG_INHERITED_ACE;
+                        p += 1;
+                } else if (*p) {
+                        return false;
+                }
+
+                if (*p != '|' && *p != '\0') {
+                        return false;
+                }
+        }
+        return true;
+}
 
 /* parse an ACE in the same format as print_ace() */
@@ -338 +429 @@
         /* Only numeric form accepted for flags at present */
 
-        if (!(next_token_talloc(frame, &cp, &tok, "/") &&
-              sscanf(tok, "%i", &aflags))) {
-                printf("ACE '%s': bad integer flags entry at '%s'\n",
+        if (!next_token_talloc(frame, &cp, &tok, "/")) {
+                printf("ACE '%s': bad flags entry at '%s'\n",
                         orig_str, tok);
                 SAFE_FREE(str);
                 TALLOC_FREE(frame);
                 return False;
+        }
+
+        if (tok[0] < '0' || tok[0] > '9') {
+                if (!parse_ace_flags(tok, &aflags)) {
+                        printf("ACE '%s': bad named flags entry at '%s'\n",
+                                orig_str, tok);
+                        SAFE_FREE(str);
+                        TALLOC_FREE(frame);
+                        return False;
+                }
+        } else if (strnequal(tok, "0x", 2)) {
+                if (!sscanf(tok, "%x", &aflags)) {
+                        printf("ACE '%s': bad hex flags entry at '%s'\n",
+                                orig_str, tok);
+                        SAFE_FREE(str);
+                        TALLOC_FREE(frame);
+                        return False;
+                }
+        } else {
+                if (!sscanf(tok, "%i", &aflags)) {
+                        printf("ACE '%s': bad integer flags entry at '%s'\n",
+                                orig_str, tok);
+                        SAFE_FREE(str);
+                        TALLOC_FREE(frame);
+                        return False;
+                }
         }
 
@@ -509 +625 @@
 
         fprintf(f, "REVISION:%d\n", sd->revision);
+        fprintf(f, "CONTROL:0x%x\n", sd->type);
 
         /* Print owner and group sid */
@@ -629 +746 @@
 
 
-/* The MSDN is contradictory over the ordering of ACE entries in an ACL.
-   However NT4 gives a "The information may have been modified by a
-   computer running Windows NT 5.0" if denied ACEs do not appear before
-   allowed ACEs. */
+/* The MSDN is contradictory over the ordering of ACE entries in an
+   ACL.  However NT4 gives a "The information may have been modified
+   by a computer running Windows NT 5.0" if denied ACEs do not appear
+   before allowed ACEs. At
+   http://technet.microsoft.com/en-us/library/cc781716.aspx the
+   canonical order is specified as "Explicit Deny, Explicit Allow,
+   Inherited ACEs unchanged" */
 
 static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2)
 {
-        if (sec_ace_equal(ace1, ace2)) 
+        if (sec_ace_equal(ace1, ace2))
                 return 0;
 
-        if (ace1->type != ace2->type) 
+        if ((ace1->flags & SEC_ACE_FLAG_INHERITED_ACE) &&
+                        !(ace2->flags & SEC_ACE_FLAG_INHERITED_ACE))
+                return 1;
+        if (!(ace1->flags & SEC_ACE_FLAG_INHERITED_ACE) &&
+                        (ace2->flags & SEC_ACE_FLAG_INHERITED_ACE))
+                return -1;
+        if ((ace1->flags & SEC_ACE_FLAG_INHERITED_ACE) &&
+                        (ace2->flags & SEC_ACE_FLAG_INHERITED_ACE))
+                return ace1 - ace2;
+
+        if (ace1->type != ace2->type)
                 return ace2->type - ace1->type;
 
-        if (sid_compare(&ace1->trustee, &ace2->trustee)) 
+        if (sid_compare(&ace1->trustee, &ace2->trustee))
                 return sid_compare(&ace1->trustee, &ace2->trustee);
 
-        if (ace1->flags != ace2->flags) 
+        if (ace1->flags != ace2->flags)
                 return ace1->flags - ace2->flags;
 
-        if (ace1->access_mask != ace2->access_mask) 
+        if (ace1->access_mask != ace2->access_mask)
                 return ace1->access_mask - ace2->access_mask;
 
-        if (ace1->size != ace2->size) 
+        if (ace1->size != ace2->size)
                 return ace1->size - ace2->size;
 
@@ -680 +810 @@
 set the ACLs on a file given an ascii description
 *******************************************************/
+
 static int cacl_set(struct cli_state *cli, char *filename, 
                     char *the_acl, enum acl_mode mode)
@@ -733 +864 @@
 
                         if (!found) {
-                                printf("ACL for ACE:"); 
+                                printf("ACL for ACE:");
                                 print_ace(cli, stdout, &sd->dacl->aces[i]);
                                 printf(" not found\n");
@@ -765 +896 @@
                 }
 
-                if (sd->group_sid) { 
+                if (sd->group_sid) {
                         old->group_sid = sd->group_sid;
                 }
@@ -828 +959 @@
         uint32_t flags = 0;
 
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         if (get_cmdline_auth_info_use_kerberos()) {
@@ -898 +1029 @@
                 { "chown", 'C', POPT_ARG_STRING, NULL, 'C', "Change ownership of a file", "USERNAME" },
                 { "chgrp", 'G', POPT_ARG_STRING, NULL, 'G', "Change group ownership of a file", "GROUPNAME" },
-                { "numeric", 0, POPT_ARG_NONE, &numeric, True, "Don't resolve sids or masks to names" },
-                { "test-args", 't', POPT_ARG_NONE, &test_args, True, "Test arguments"},
+                { "numeric", 0, POPT_ARG_NONE, &numeric, 1, "Don't resolve sids or masks to names" },
+                { "test-args", 't', POPT_ARG_NONE, &test_args, 1, "Test arguments"},
                 POPT_COMMON_SAMBA
                 POPT_COMMON_CONNECTION

branches/samba-3.2.x/source/utils/smbcquotas.c

@@ -374 +374 @@
         uint32_t flags = 0;
 
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         if (get_cmdline_auth_info_use_machine_account() &&

branches/samba-3.2.x/source/utils/smbfilter.c

@@ -213 +213 @@
         /* start listening on port 445 locally */
 
-        zero_addr(&my_ss);
+        zero_sockaddr(&my_ss);
         s = open_socket_in(SOCK_STREAM, 445, 0, &my_ss, True);
         

branches/samba-3.2.x/source/utils/smbtree.c

@@ -31 +31 @@
 /* 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 void free_name_list(struct name_list *list)
+static struct smb_name_list *workgroups, *servers, *shares;
+
+static void free_name_list(struct smb_name_list *list)
 {
         while(list)
@@ -48 +48 @@
                      const char *comment, void *state)
 {
-        struct name_list **name_list = (struct name_list **)state;
-        struct name_list *new_name;
-
-        new_name = SMB_MALLOC_P(struct name_list);
+        struct smb_name_list **name_list = (struct smb_name_list **)state;
+        struct smb_name_list *new_name;
+
+        new_name = SMB_MALLOC_P(struct smb_name_list);
 
         if (!new_name)
@@ -222 +222 @@
 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 */