summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-18 15:37:57 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-18 15:37:57 +0200
commit6c83039eaba70fe983325f15359f1bafc40c4ec6 (patch)
tree84f0766be1c9fc1f6f284cb38ad693fb59a20eae /source3/utils
parent18faf30d1684ed9d46ffa42b6d6f9768c2b0c54f (diff)
parent339925f98d5b42f7ea09842f3920fb9281e6caa2 (diff)
downloadsamba-6c83039eaba70fe983325f15359f1bafc40c4ec6.tar.gz
samba-6c83039eaba70fe983325f15359f1bafc40c4ec6.tar.bz2
samba-6c83039eaba70fe983325f15359f1bafc40c4ec6.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into xmaster
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/testparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 05682efe5d..da129cf7c0 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -436,8 +436,8 @@ rameter is ignored when using CUPS libraries.\n",
}
done:
- TALLOC_FREE(frame);
gfree_loadparm();
+ TALLOC_FREE(frame);
return ret;
}