diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-05-08 11:57:28 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-07-07 23:32:35 +0200 |
| commit | f47df32fd144c9f306eda15c491a4ca5124dbe6e (patch) | |
| tree | 0f763ff273ad13261b2583568c49fe641c061d61 /source3/param | |
| parent | 867ed27ee976ba7c1d78523babe9246756a4ebb3 (diff) | |
| download | samba-f47df32fd144c9f306eda15c491a4ca5124dbe6e.tar.gz samba-f47df32fd144c9f306eda15c491a4ca5124dbe6e.tar.xz samba-f47df32fd144c9f306eda15c491a4ca5124dbe6e.zip | |
param: attempt to align the set_variable_helper with lp_do_parameter
This should allow some of it to be factored out into lib/param.
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
Change-Id: I7d0b3b4114c73aeaf9bf63e8c5fcd0a9d00cfc00
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index e1f52fdfe5..e350b87805 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2641,6 +2641,8 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue return ok; } + TALLOC_FREE(frame); + /* now switch on the type of variable it is */ switch (parm_table[parmnum].type) { @@ -2664,7 +2666,6 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue i = sscanf(pszParmValue, "%o", (int *)parm_ptr); if ( i != 1 ) { DEBUG ( 0, ("Invalid octal number %s\n", pszParmName )); - TALLOC_FREE(frame); return false; } break; @@ -2740,7 +2741,6 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue } case P_ENUM: if (!lp_set_enum_parm(&parm_table[parmnum], pszParmValue, (int*)parm_ptr)) { - TALLOC_FREE(frame); return false; } break; @@ -2748,7 +2748,6 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue break; } - TALLOC_FREE(frame); return true; } |