Author: jelmer Date: 2007-12-07 23:56:53 +0000 (Fri, 07 Dec 2007) New Revision: 26338
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26338 Log: Fix parameter, typo. Modified: branches/SAMBA_4_0/source/lib/ldb-samba/ldif_handlers.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb-samba/ldif_handlers.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb-samba/ldif_handlers.c 2007-12-07 16:04:25 UTC (rev 26337) +++ branches/SAMBA_4_0/source/lib/ldb-samba/ldif_handlers.c 2007-12-07 23:56:53 UTC (rev 26338) @@ -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 @@ } /* - 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' */ Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c 2007-12-07 16:04:25 UTC (rev 26337) +++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c 2007-12-07 23:56:53 UTC (rev 26338) @@ -98,7 +98,7 @@ 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 @@ 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) {
