summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-06 16:54:08 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-07 17:45:21 +1100
commit0ba60760a3601a41161c93f7b9186c35e3e31621 (patch)
tree331b766c4dffe0f1261e6999ae43b3f159938515
parent80e439453d4c0f6e160745826c561dd99e2bd167 (diff)
downloadsamba-0ba60760a3601a41161c93f7b9186c35e3e31621.tar.gz
samba-0ba60760a3601a41161c93f7b9186c35e3e31621.tar.bz2
samba-0ba60760a3601a41161c93f7b9186c35e3e31621.zip
s3-param: inline octal_string into caller to allow code merge
-rw-r--r--source3/param/loadparm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 345f748384..255bc74594 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7616,9 +7616,12 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
break;
case P_OCTAL: {
- char *o = octal_string(*(int *)ptr);
- fprintf(f, "%s", o);
- TALLOC_FREE(o);
+ int val = *(int *)ptr;
+ if (val == -1) {
+ fprintf(f, "-1");
+ } else {
+ fprintf(f, "0%o", val);
+ }
break;
}