svn commit: samba r20175 - in
branches/SAMBA_4_0/source/scripting/ejs: .
mimir at samba.org
mimir at samba.org
Thu Dec 14 22:12:56 GMT 2006
Author: mimir
Date: 2006-12-14 22:12:53 +0000 (Thu, 14 Dec 2006)
New Revision: 20175
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20175
Log:
use libnet context instead mem_ctx as the latter gets
freed just before the function returns.
rafal
Modified:
branches/SAMBA_4_0/source/scripting/ejs/ejsnet.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet.c 2006-12-14 22:11:17 UTC (rev 20174)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet.c 2006-12-14 22:12:53 UTC (rev 20175)
@@ -375,7 +375,7 @@
/* create UserInfo object */
mprUserInfo = mprObject("UserInfo");
-
+
mprAccountName = mprString(req.out.account_name);
mprFullName = mprString(req.out.full_name);
mprDescription = mprString(req.out.description);
@@ -384,8 +384,8 @@
mprComment = mprString(req.out.comment);
mprLogonScript = mprString(req.out.logon_script);
mprAcctExpiry = mprString(timestring(mem_ctx, req.out.acct_expiry->tv_sec));
- mprAllowPassChange = mprString(timestring(mem_ctx, req.out.allow_password_change->tv_sec));
- mprForcePassChange = mprString(timestring(mem_ctx, req.out.force_password_change->tv_sec));
+ mprAllowPassChange = mprString(timestring(ctx, req.out.allow_password_change->tv_sec));
+ mprForcePassChange = mprString(timestring(ctx, req.out.force_password_change->tv_sec));
status = mprSetVar(&mprUserInfo, "AccountName", mprAccountName);
if (!NT_STATUS_IS_OK(status)) goto done;
@@ -407,7 +407,6 @@
if (!NT_STATUS_IS_OK(status)) goto done;
status = mprSetVar(&mprUserInfo, "ForcePasswordChange", mprForcePassChange);
if (!NT_STATUS_IS_OK(status)) goto done;
-
done:
talloc_free(mem_ctx);
mpr_Return(eid, mprUserInfo);
More information about the samba-cvs
mailing list