summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-07 23:56:53 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:48 +0100
commit47554fd72e00911f05c1c16f1af4d06481d32882 (patch)
treebba372b491472cb5cfeede2fc8171bd7fb24a869
parentda2ae4995370affe57cfecfe371a4edf553065d0 (diff)
downloadsamba-47554fd72e00911f05c1c16f1af4d06481d32882.tar.gz
samba-47554fd72e00911f05c1c16f1af4d06481d32882.tar.bz2
samba-47554fd72e00911f05c1c16f1af4d06481d32882.zip
r26338: Fix parameter, typo.
(This used to be commit 2a005096dd41f66fd99577d6ca7eb3e0f1cb30f2)
-rw-r--r--source4/lib/ldb-samba/ldif_handlers.c5
-rw-r--r--source4/scripting/ejs/smbcalls_config.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c
index faf3cad2d0..f8e3505655 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/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/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 122d78ac20..347cb758fe 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/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) {