From 0ba60760a3601a41161c93f7b9186c35e3e31621 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 6 Oct 2011 16:54:08 +1100
Subject: [PATCH] s3-param: inline octal_string into caller to allow code merge

---
 source3/param/loadparm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 345f7483842..255bc745947 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;
 		}
 
-- 
2.11.4.GIT