diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-12 02:34:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:07 -0500 |
| commit | b1e93b296ea8f62ce0f15ccef5f6ae5339f4929f (patch) | |
| tree | 2ba5c18f14d374a29a79061ee17b7dff28186355 /source4/scripting/ejs/smbcalls_string.c | |
| parent | 36bb0ffd4c59b17c7f942d874e18865707d3c696 (diff) | |
| download | samba-b1e93b296ea8f62ce0f15ccef5f6ae5339f4929f.tar.gz samba-b1e93b296ea8f62ce0f15ccef5f6ae5339f4929f.tar.bz2 samba-b1e93b296ea8f62ce0f15ccef5f6ae5339f4929f.zip | |
r8337: - use 64 bit access functions in ejs calls
- added access to smbd random functions
- fixed ordering in join()
- added sys_interfaces(), sys_hostname(), sys_nttime() and sys_ldaptime()
(This used to be commit 28c1a1f3c0cd2f8228fd8c3c695ab6f45226fa3f)
Diffstat (limited to 'source4/scripting/ejs/smbcalls_string.c')
| -rw-r--r-- | source4/scripting/ejs/smbcalls_string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c index b52a6d2182..b729f5dd3a 100644 --- a/source4/scripting/ejs/smbcalls_string.c +++ b/source4/scripting/ejs/smbcalls_string.c @@ -115,7 +115,7 @@ static int ejs_join(MprVarHandle eid, int argc, struct MprVar **argv) } separator = mprToString(argv[0]); - list = mprToList(tmp_ctx, argv[1]); + list = mprToArray(tmp_ctx, argv[1]); if (list == NULL || list[0] == NULL) { talloc_free(tmp_ctx); |