summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-25 14:52:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:52 -0500
commitea4ff9bf23b491c396983605fbb0e4988ae91743 (patch)
tree0f1f8becc18abe179a0083a11b65c20eab1cf21d
parentb9142f20dfb59055e05fa52c5414fb7c1877c556 (diff)
downloadsamba-ea4ff9bf23b491c396983605fbb0e4988ae91743.tar.gz
samba-ea4ff9bf23b491c396983605fbb0e4988ae91743.tar.bz2
samba-ea4ff9bf23b491c396983605fbb0e4988ae91743.zip
r17832: Fix bug 4050
(This used to be commit 0504cf6d13c81d90a2457a01a78630d105af0ebc)
-rw-r--r--source3/param/loadparm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index acb54f25df..b99fd8a514 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3864,7 +3864,6 @@ static void dump_a_service(service * pService, FILE * f)
BOOL dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
{
- service * pService = ServicePtrs[snum];
int i;
BOOL result = False;
parm_class p_class;
@@ -3907,11 +3906,13 @@ BOOL dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
{
void *ptr;
- if (isGlobal)
+ if (isGlobal) {
ptr = parm_table[i].ptr;
- else
+ } else {
+ service * pService = ServicePtrs[snum];
ptr = ((char *)pService) +
PTR_DIFF(parm_table[i].ptr, &sDefault);
+ }
print_parameter(&parm_table[i],
ptr, f);