r26338: Fix parameter, typo.

diff --git a/source/lib/ldb-samba/ldif_handlers.c b/source/lib/ldb-samba/ldif_handlers.c
index faf3cad2d0e35df053b6381cf5f36baabdcaca17..f8e35056556bacb6907e46754f9ab8c073ac3fb1 100644 (file)
--- a/source/lib/ldb-samba/ldif_handlers.c
+++ b/source/lib/ldb-samba/ldif_handlers.c
@@ -23,10 +23,9 @@
 
 #include "includes.h"
 #include "lib/ldb/include/ldb_includes.h"
-
+#include "dsdb/samdb/samdb.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
-#include "dsdb/samdb/samdb.h"
 #include "libcli/security/security.h"
 
 /*
@@ -291,7 +290,7 @@ static int ldif_write_ntSecurityDescriptor(struct ldb_context *ldb, void *mem_ct
 }
 
 /* 
-   canonicolise an objectCategory.  We use the short form as the cannoical form:
+   canonicalise an objectCategory.  We use the short form as the cannoical form:
    cn=Person,cn=Schema,cn=Configuration,<basedn> becomes 'person'
 */
 

diff --git a/source/scripting/ejs/smbcalls_config.c b/source/scripting/ejs/smbcalls_config.c
index 122d78ac2029d9afa6f91e546915e715720f2602..347cb758fe760e1ac04bbc8123d35bc7a0c297e3 100644 (file)
--- a/source/scripting/ejs/smbcalls_config.c
+++ b/source/scripting/ejs/smbcalls_config.c
@@ -98,7 +98,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
                        mpr_Return(eid, mprCreateUndefinedVar());
                        return 0;
                }
-               parm_ptr = lp_parm_ptr(service, parm);
+               parm_ptr = lp_parm_ptr(global_loadparm, service, parm);
        } else if (strchr(argv[0], ':')) {
                /* its a global parametric option */
                const char *type = talloc_strndup(mprMemCtx(), 
@@ -123,7 +123,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
                        mpr_Return(eid, mprCreateUndefinedVar());
                        return 0;
                }
-               parm_ptr = lp_parm_ptr(NULL, parm);
+               parm_ptr = lp_parm_ptr(global_loadparm, NULL, parm);
        }
 
        if (parm == NULL || parm_ptr == NULL) {