summaryrefslogtreecommitdiff
path: root/source4/scripting/ejs/mprutil.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-07 06:13:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:27 -0500
commit2ed26253c1cc84fce6d9a00c642f3e7baffb5c80 (patch)
tree2b4f7e560daceca0d94fcdde35d3dd392fff4ea3 /source4/scripting/ejs/mprutil.c
parent232704793eb9bc5e89f8626fa96f5c33f00269cb (diff)
downloadsamba-2ed26253c1cc84fce6d9a00c642f3e7baffb5c80.tar.gz
samba-2ed26253c1cc84fce6d9a00c642f3e7baffb5c80.tar.bz2
samba-2ed26253c1cc84fce6d9a00c642f3e7baffb5c80.zip
r9171: - support putting a credentials object in a rpc pipe object to allow authentication
with other than the command line credentials in a rpc pipe (This used to be commit aae05ebc9c3dc7ad367aed09c54b85184ba7a82e)
Diffstat (limited to 'source4/scripting/ejs/mprutil.c')
-rw-r--r--source4/scripting/ejs/mprutil.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 657078e7c7..748f28c681 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -357,15 +357,14 @@ void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
*/
void *mprGetPtr(struct MprVar *v, const char *propname)
{
- struct MprVar *val;
- val = mprGetProperty(v, propname, NULL);
- if (val == NULL) {
+ NTSTATUS status = mprGetVar(&v, propname);
+ if (!NT_STATUS_IS_OK(status)) {
return NULL;
}
- if (val->type != MPR_TYPE_PTR) {
+ if (v->type != MPR_TYPE_PTR) {
return NULL;
}
- return val->ptr;
+ return v->ptr;
}
/*