Changeset 745 for trunk/server/lib/util/params.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/params.c (modified) (3 diffs)

trunk/server/lib/util/params.c

@@ -489 +489 @@
   } /* Parse */
 
-static myFILE *OpenConfFile( const char *FileName )
+static myFILE *OpenConfFile(TALLOC_CTX *mem_ctx, const char *FileName )
   /* ------------------------------------------------------------------------ **
    * Open a configuration file.
@@ -503 +503 @@
   myFILE *ret;
 
-  ret = talloc(talloc_autofree_context(), myFILE);
+  ret = talloc(mem_ctx, myFILE);
   if (!ret) return NULL;
 
@@ -544 +544 @@
   const char *func = "params.c:pm_process() -";
 
-  InFile = OpenConfFile( FileName );          /* Open the config file. */
+  InFile = OpenConfFile(NULL, FileName); /* Open the config file. */
   if( NULL == InFile )
     return( false );