git.samba.org
/
mat
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80e4394
)
s3-param: inline octal_string into caller to allow code merge
author
Andrew Bartlett
<abartlet@samba.org>
Thu, 6 Oct 2011 05:54:08 +0000
(16:54 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Fri, 7 Oct 2011 06:45:21 +0000
(17:45 +1100)
source3/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source3/param/loadparm.c
b/source3/param/loadparm.c
index 345f7483842738038dc5f2e9feebb0466d21d4b0..255bc7459479e8ec3f19177d07a89e00f2d81834 100644
(file)
--- 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;
}