From 0dcecc314899b6f36e9215e0b3881220062ba4f9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 20 May 2006 03:08:44 +0000 Subject: r15731: module init functions should return NTSTATUS, not void (This used to be commit c6d20c22454b87b4dea3527f0efcecd373679848) --- source4/scripting/ejs/smbcalls_auth.c | 3 ++- source4/scripting/ejs/smbcalls_config.c | 3 ++- source4/scripting/ejs/smbcalls_data.c | 3 ++- source4/scripting/ejs/smbcalls_ldb.c | 3 ++- source4/scripting/ejs/smbcalls_nbt.c | 3 ++- source4/scripting/ejs/smbcalls_nss.c | 3 ++- source4/scripting/ejs/smbcalls_rand.c | 3 ++- source4/scripting/ejs/smbcalls_samba3.c | 3 ++- source4/scripting/ejs/smbcalls_string.c | 3 ++- source4/scripting/ejs/smbcalls_sys.c | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c index ea9aaf9739..568b24713c 100644 --- a/source4/scripting/ejs/smbcalls_auth.c +++ b/source4/scripting/ejs/smbcalls_auth.c @@ -187,8 +187,9 @@ static int ejs_system_session(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_auth(void) +NTSTATUS smb_setup_ejs_auth(void) { ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE); ejsDefineCFunction(-1, "system_session", ejs_system_session, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c index fae497e2a5..2827920bd0 100644 --- a/source4/scripting/ejs/smbcalls_config.c +++ b/source4/scripting/ejs/smbcalls_config.c @@ -215,7 +215,8 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_config(void) +NTSTATUS smb_setup_ejs_config(void) { ejsDefineCFunction(-1, "loadparm_init", ejs_loadparm_init, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c index a1686a71e1..4ee4230aee 100644 --- a/source4/scripting/ejs/smbcalls_data.c +++ b/source4/scripting/ejs/smbcalls_data.c @@ -278,7 +278,8 @@ static int ejs_datablob_init(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_datablob(void) +NTSTATUS smb_setup_ejs_datablob(void) { ejsDefineCFunction(-1, "datablob_init", ejs_datablob_init, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c index f6b4ffc6b0..ea6f70a41e 100644 --- a/source4/scripting/ejs/smbcalls_ldb.c +++ b/source4/scripting/ejs/smbcalls_ldb.c @@ -556,7 +556,8 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_ldb(void) +NTSTATUS smb_setup_ejs_ldb(void) { ejsDefineCFunction(-1, "ldb_init", ejs_ldb_init, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c index 4bcb450ee3..15b560bd93 100644 --- a/source4/scripting/ejs/smbcalls_nbt.c +++ b/source4/scripting/ejs/smbcalls_nbt.c @@ -87,7 +87,8 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_nbt(void) +NTSTATUS smb_setup_ejs_nbt(void) { ejsDefineCFunction(-1, "resolveName", ejs_resolve_name, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c index 6111ed57c2..6b18227845 100644 --- a/source4/scripting/ejs/smbcalls_nss.c +++ b/source4/scripting/ejs/smbcalls_nss.c @@ -154,7 +154,8 @@ static int ejs_nss_init(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_nss(void) +NTSTATUS smb_setup_ejs_nss(void) { ejsDefineCFunction(-1, "nss_init", ejs_nss_init, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c index 9920c06958..9027efc3e6 100644 --- a/source4/scripting/ejs/smbcalls_rand.c +++ b/source4/scripting/ejs/smbcalls_rand.c @@ -98,7 +98,8 @@ static int ejs_random_init(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_random(void) +NTSTATUS smb_setup_ejs_random(void) { ejsDefineCFunction(-1, "random_init", ejs_random_init, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c index 0bcc670552..64517bad28 100644 --- a/source4/scripting/ejs/smbcalls_samba3.c +++ b/source4/scripting/ejs/smbcalls_samba3.c @@ -494,7 +494,8 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_samba3(void) +NTSTATUS smb_setup_ejs_samba3(void) { ejsDefineCFunction(-1, "samba3_read", ejs_samba3_read, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c index d742d43173..2eb9a1b3f7 100644 --- a/source4/scripting/ejs/smbcalls_string.c +++ b/source4/scripting/ejs/smbcalls_string.c @@ -505,7 +505,8 @@ static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_string(void) +NTSTATUS smb_setup_ejs_string(void) { ejsDefineCFunction(-1, "string_init", ejs_string_init, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c index b8382db296..860002e1d7 100644 --- a/source4/scripting/ejs/smbcalls_sys.c +++ b/source4/scripting/ejs/smbcalls_sys.c @@ -351,7 +351,8 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv) /* setup C functions that be called from ejs */ -void smb_setup_ejs_system(void) +NTSTATUS smb_setup_ejs_system(void) { ejsDefineCFunction(-1, "sys_init", ejs_sys_init, NULL, MPR_VAR_SCRIPT_HANDLE); + return NT_STATUS_OK; } -- cgit