← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Dennis Schoen
  • Date: 2010-01-28 16:47:02 UTC
  • mto: This revision was merged to the branch mainline in revision 1292.
  • Revision ID: dennis@blogma.de-20100128164702-0gyrsy2ymctj9ia4
add getSecurityContext()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
391
391
    if (global_system_variables.log_warnings)
392
392
        errmsg_printf(ERRMSG_LVL_WARN, ER(ER_FORCING_CLOSE),my_progname,
393
393
                      thread_id,
394
 
                      (security_ctx.getUser().c_str() ?
395
 
                       security_ctx.getUser().c_str() : ""));
 
394
                      (getSecurityContext().getUser().c_str() ?
 
395
                       getSecurityContext().getUser().c_str() : ""));
396
396
    disconnect(0, false);
397
397
  }
398
398
 
682
682
 
683
683
  if (passwd_len != 0 && passwd_len != SCRAMBLE_LENGTH)
684
684
  {
685
 
    my_error(ER_HANDSHAKE_ERROR, MYF(0), security_ctx.getIp().c_str());
 
685
    my_error(ER_HANDSHAKE_ERROR, MYF(0), getSecurityContext().getIp().c_str());
686
686
    return false;
687
687
  }
688
688
 
691
691
  if (is_authenticated != true)
692
692
  {
693
693
    my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
694
 
             security_ctx.getUser().c_str(),
695
 
             security_ctx.getIp().c_str(),
 
694
             getSecurityContext().getUser().c_str(),
 
695
             getSecurityContext().getIp().c_str(),
696
696
             passwd_len ? ER(ER_YES) : ER(ER_NO));
697
697
 
698
698
    return false;