← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/user.cc

Merge in security refactor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/user.cc
57
57
bool Item_func_user::fix_fields(Session *session, Item **ref)
58
58
{
59
59
  return (Item_str_func::fix_fields(session, ref) ||
60
 
          init(session->security_ctx.user.c_str(),
61
 
               session->security_ctx.ip.c_str()));
 
60
          init(session->getSecurityContext().getUser().c_str(),
 
61
               session->getSecurityContext().getIp().c_str()));
62
62
}
63
63
 
64
64
 
67
67
  if (Item_str_func::fix_fields(session, ref))
68
68
    return true;
69
69
 
70
 
  Security_context *ctx= &session->security_ctx;
71
 
  return init(ctx->user.c_str(), ctx->ip.c_str());
 
70
  const SecurityContext *ctx= &session->getSecurityContext();
 
71
  return init(ctx->getUser().c_str(), ctx->getIp().c_str());
72
72
}
73
73
 
74
74
} /* namespace drizzled */