← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/auth_http/auth_http.cc

Merge in security refactor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/auth_http/auth_http.cc
77
77
    if (sysvar_auth_http_enable == false)
78
78
      return true;
79
79
 
80
 
    assert(session->security_ctx.user.c_str());
 
80
    assert(session->getSecurityContext().getUser().c_str());
81
81
    assert(password);
82
82
 
83
83
 
86
86
#if defined(HAVE_CURLOPT_USERNAME)
87
87
 
88
88
    rv= curl_easy_setopt(curl_handle, CURLOPT_USERNAME,
89
 
                         session->security_ctx.user.c_str());
 
89
                         session->getSecurityContext().getUser().c_str());
90
90
    rv= curl_easy_setopt(curl_handle, CURLOPT_PASSWORD, password);
91
91
 
92
92
#else
93
93
 
94
 
    string userpwd= session->security_ctx.user;
 
94
    string userpwd= session->getSecurityContext().getUser();
95
95
    userpwd.append(":");
96
96
    userpwd.append(password);
97
97
    rv= curl_easy_setopt(curl_handle, CURLOPT_USERPWD, userpwd.c_str());