s3-param use lp_parm_ptr() rather than parm.ptr directly

[nivanova/samba-autobuild/.git] / source3 / web / swat.c

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 277b25c4268acfb66446a42e9bd5f6f81083e368..190006b3ccecc3488712c036dd9947e51f93f106 100644 (file)
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -234,13 +234,15 @@ static void print_footer(void)
 static void show_parameter(int snum, struct parm_struct *parm)
 {
        int i;
-       void *ptr = parm->ptr;
+       void *ptr;
        char *utf8_s1, *utf8_s2;
        size_t converted_size;
        TALLOC_CTX *ctx = talloc_stackframe();
 
        if (parm->p_class == P_LOCAL && snum >= 0) {
-               ptr = lp_local_ptr_by_snum(snum, ptr);
+               ptr = lp_local_ptr_by_snum(snum, parm);
+       } else {
+               ptr = lp_parm_ptr(NULL, parm);
        }
 
        printf("<tr><td>%s</td><td>", get_parm_translated(ctx,
@@ -380,10 +382,11 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 
                if (!( parm_filter & FLAG_ADVANCED )) {
                        if (!(parm->flags & FLAG_BASIC)) {
-                                       void *ptr = parm->ptr;
-
+                               void *ptr;
                                if (parm->p_class == P_LOCAL && snum >= 0) {
-                                       ptr = lp_local_ptr_by_snum(snum, ptr);
+                                       ptr = lp_local_ptr_by_snum(snum, parm);
+                               } else {
+                                       ptr = lp_parm_ptr(NULL, parm);
                                }
 
                                switch (parm->type) {