1
0
mirror of https://github.com/samba-team/samba.git synced 2025-10-24 15:33:20 +03:00

r9477: Convert popt options to an ejs object. Doesn't seem to break anything

except of popt help (-h) option (unexpected ?).

rafal
This commit is contained in:
Rafal Szczesniak
2005-08-22 14:32:58 +00:00
committed by Gerald (Jerry) Carter
parent d1b7a4a24c
commit 1990793b23
6 changed files with 53 additions and 33 deletions

View File

@@ -23,6 +23,7 @@
#include "includes.h"
#include "scripting/ejs/smbcalls.h"
#include "lib/appweb/ejs/ejs.h"
#include "lib/cmdline/popt_common.h"
/*
helper function to get the local objects credentials ptr
@@ -184,19 +185,9 @@ static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar *
/*
initialise credentials ejs object
*/
static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
static int ejs_credentials_obj(MprVarHandle eid, int argc, struct MprVar **argv, struct cli_credentials *creds)
{
struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
struct cli_credentials *creds;
creds = cli_credentials_init(mprMemCtx());
if (creds == NULL) {
return -1;
}
cli_credentials_guess(creds);
cli_credentials_set_username(creds, "", CRED_GUESSED);
cli_credentials_set_password(creds, "", CRED_GUESSED);
mprSetPtrChild(obj, "creds", creds);
@@ -216,6 +207,30 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
}
/*
initialise credentials ejs object
*/
static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
{
struct cli_credentials *creds;
creds = cli_credentials_init(mprMemCtx());
if (creds == NULL) {
return -1;
}
return ejs_credentials_obj(eid, argc, argv, creds);
}
/*
initialise cmdline credentials ejs object
*/
int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
{
return ejs_credentials_obj(eid, argc, argv, cmdline_credentials);
}
/*
setup C functions that be called from ejs
*/