merge from 2.2

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 543e9bab9f5e82e8d6d01eb8769a57dcd47259b0..df08c9693ed8185a83d7ede134338b3f5b030152 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -3085,6 +3085,9 @@ void lp_add_one_printer(char *name, char *comment)
                        ServicePtrs[i]->autoloaded = True;
                }
        }
+
+       /* free up temporary memory */
+       lp_talloc_free();
 }
 
 /***************************************************************************