samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r22323 - in branches/SAMBA_4_0/source/scripting/ejs/ej

Subject: svn commit: samba r22323 - in branches/SAMBA_4_0/source/scripting/ejs/ejsnet: .
From:
Date: Tue, 17 Apr 2007 23:06:43 +0000 GMT
Author: mimir
Date: 2007-04-17 23:06:43 +0000 (Tue, 17 Apr 2007)
New Revision: 22323

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22323

Log:
- add credentials property to NetContext object
- change a comment (matches the idea better)


rafal


Modified:
   branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
   branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c    2007-04-17 
22:35:01 UTC (rev 22322)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c    2007-04-17 
23:06:43 UTC (rev 22323)
@@ -43,7 +43,7 @@
        TALLOC_CTX *event_mem_ctx = talloc_new(mprMemCtx());
        struct cli_credentials *creds;
        struct libnet_context *ctx;
-       struct MprVar obj;
+       struct MprVar obj, mprCreds;
        struct event_context *ev;
 
        if (!event_mem_ctx) {
@@ -59,6 +59,9 @@
        talloc_steal(ctx, event_mem_ctx);
 
        if (argc == 0 || (argc == 1 && argv[0]->type == MPR_TYPE_NULL)) {
+               /* 
+                  create the default credentials
+               */
                creds = cli_credentials_init(ctx);
                if (creds == NULL) {
                        ejsSetErrorMsg(eid, "cli_credential_init() failed");
@@ -68,11 +71,16 @@
                cli_credentials_set_conf(creds);
                cli_credentials_set_anonymous(creds);
 
+               mprCreds = mprCredentials(creds);
+
        } else if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-               /* get credential values from credentials object */
-               creds = mprGetPtr(argv[0], "creds");
+               /*
+                 get credential values from credentials object
+               */
+               mprCreds = *(argv[0]);
+               creds = mprGetPtr(&mprCreds, "creds");
                if (creds == NULL) {
-                       ejsSetErrorMsg(eid, "userAuth requires a 'creds' first 
parameter");
+                       ejsSetErrorMsg(eid, "invalid credentials parameter");
                        talloc_free(ctx);
                        return -1;
                }
@@ -82,15 +90,25 @@
                talloc_free(ctx);
                return -1;
        }
-
+       
+       /* setup libnet_context credentials */
        ctx->cred = creds;
 
-       obj = mprObject("NetCtx");
+       /* create the NetContext object */
+       obj = mprObject("NetContext");
+
+       /* add internal libnet_context pointer to the NetContext object */
        mprSetPtrChild(&obj, "ctx", ctx);
+
+       /* add properties publicly available from js code */
+       mprCreateProperty(&obj, "credentials", &mprCreds);
        
+       /* add methods to the object */
        mprSetCFunction(&obj, "UserMgr", ejs_net_userman);
        mprSetCFunction(&obj, "JoinDomain", ejs_net_join_domain);
        mprSetCFunction(&obj, "SamSyncLdb", ejs_net_samsync_ldb);
+
+       /* return the object */
        mpr_Return(eid, obj);
 
        return 0;

Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c   2007-04-17 
22:35:01 UTC (rev 22322)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c   2007-04-17 
23:06:43 UTC (rev 22323)
@@ -59,7 +59,7 @@
 
        } else if (argc == 1 && mprVarIsString(argv[0]->type)) {
                /* domain name can also be specified explicitly 
-                  (e.g. to connect remote domain) */
+                  (e.g. to connect BUILTIN domain) */
                userman_domain = mprToString(argv[0]);
 
        } else {

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r22323 - in branches/SAMBA_4_0/source/scripting/ejs/ejsnet: ., mimir <=