As promised to Simo, here is the fix to convert prs_XXX to talloc, not malloc. This was a fun one to get right, took me a while. Luckily it's mostly deleting code. I think this is a reasonably minimal commit (as it's mostly "-" lines), please push if you're happy with it. Jeremy