diff options
| author | Volker Lendecke <vl@samba.org> | 2010-10-07 21:29:19 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-10-08 21:11:45 +0200 |
| commit | 1e98d5859daceb7d2cbe550803aaec382d2bae86 (patch) | |
| tree | ec91efa4e1546f76e0589ce9ee476b93a50dcfc1 | |
| parent | 220aa311d100814be6d396dff96f3825fc01985f (diff) | |
| download | samba-1e98d5859daceb7d2cbe550803aaec382d2bae86.tar.gz samba-1e98d5859daceb7d2cbe550803aaec382d2bae86.tar.bz2 samba-1e98d5859daceb7d2cbe550803aaec382d2bae86.zip | |
s3: Remove talloc_autofree_context() from loadparm.c
None of these uses requires a special destructor
| -rw-r--r-- | source3/param/loadparm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4567f3602d..f9a908dce9 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5326,7 +5326,7 @@ static void init_globals(bool reinit_globals) Globals.bWinbindTrustedDomainsOnly = False; Globals.bWinbindNestedGroups = True; Globals.winbind_expand_groups = 1; - Globals.szWinbindNssInfo = str_list_make_v3(talloc_autofree_context(), "template", NULL); + Globals.szWinbindNssInfo = str_list_make_v3(NULL, "template", NULL); Globals.bWinbindRefreshTickets = False; Globals.bWinbindOfflineLogon = False; @@ -6109,7 +6109,7 @@ const char **lp_parm_string_list(int snum, const char *type, const char *option, return (const char **)def; if (data->list==NULL) { - data->list = str_list_make_v3(talloc_autofree_context(), data->value, NULL); + data->list = str_list_make_v3(NULL, data->value, NULL); } return (const char **)data->list; @@ -7420,7 +7420,7 @@ static bool handle_netbios_scope(int snum, const char *pszParmValue, char **ptr) static bool handle_netbios_aliases(int snum, const char *pszParmValue, char **ptr) { TALLOC_FREE(Globals.szNetbiosAliases); - Globals.szNetbiosAliases = str_list_make_v3(talloc_autofree_context(), pszParmValue, NULL); + Globals.szNetbiosAliases = str_list_make_v3(NULL, pszParmValue, NULL); return set_netbios_aliases((const char **)Globals.szNetbiosAliases); } @@ -7718,8 +7718,7 @@ static void init_copymap(struct service *pservice) TALLOC_FREE(pservice->copymap); - pservice->copymap = bitmap_talloc(talloc_autofree_context(), - NUMPARAMETERS); + pservice->copymap = bitmap_talloc(NULL, NUMPARAMETERS); if (!pservice->copymap) DEBUG(0, ("Couldn't allocate copymap!! (size %d)\n", @@ -7853,7 +7852,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue case P_LIST: TALLOC_FREE(*((char ***)parm_ptr)); *(char ***)parm_ptr = str_list_make_v3( - talloc_autofree_context(), pszParmValue, NULL); + NULL, pszParmValue, NULL); break; case P_STRING: |