From e17bf6af22a672ae42f458e8904531d0c36c088f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 28 Aug 2012 07:46:49 +1000 Subject: s3-param: Avoid assert on use of talloc_tos() without stackframe This is hit during samba-tool domain classicupgrade Andrew Bartlett --- source3/param/loadparm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/param') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d9ce4b4b58..c92b6319b7 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2784,13 +2784,14 @@ static bool handle_dos_charset(struct loadparm_context *unused, int snum, const static bool handle_realm(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) { bool ret = true; - char *realm = strupper_talloc(talloc_tos(), pszParmValue); + TALLOC_CTX *frame = talloc_stackframe(); + char *realm = strupper_talloc(frame, pszParmValue); char *dnsdomain = strlower_talloc(realm, pszParmValue); ret &= string_set(&Globals.szRealm, pszParmValue); ret &= string_set(&Globals.szRealm_upper, realm); ret &= string_set(&Globals.szRealm_lower, dnsdomain); - TALLOC_FREE(realm); + TALLOC_FREE(frame); return ret; } -- cgit