From: Volker Lendecke <vl@samba.org>
Date: Mon, 27 Sep 2010 05:15:40 +0000 (-0700)
Subject: Lift talloc_autofree_context() from OpenConfFile()
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=8e02130c623fca4bf06baff6789b45d8782bf5b0;p=abartlet%2Fsamba.git%2F.git

Lift talloc_autofree_context() from OpenConfFile()
---

diff --git a/lib/util/params.c b/lib/util/params.c
index 80adc71fca2..d589771f4dc 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -488,7 +488,7 @@ static bool Parse( myFILE *InFile,
   return( true );
   } /* Parse */
 
-static myFILE *OpenConfFile( const char *FileName )
+static myFILE *OpenConfFile(TALLOC_CTX *mem_ctx, const char *FileName )
   /* ------------------------------------------------------------------------ **
    * Open a configuration file.
    *
@@ -502,7 +502,7 @@ static myFILE *OpenConfFile( const char *FileName )
   const char *func = "params.c:OpenConfFile() -";
   myFILE *ret;
 
-  ret = talloc(talloc_autofree_context(), myFILE);
+  ret = talloc(mem_ctx, myFILE);
   if (!ret) return NULL;
 
   ret->buf = file_load(FileName, &ret->size, 0, ret);
@@ -543,7 +543,7 @@ bool pm_process( const char *FileName,
   myFILE *InFile;
   const char *func = "params.c:pm_process() -";
 
-  InFile = OpenConfFile( FileName );          /* Open the config file. */
+  InFile = OpenConfFile(talloc_autofree_context(), FileName); /* Open the config file. */
   if( NULL == InFile )
     return( false );