← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/auth_pam/auth_pam.cc

  • Committer: Monty Taylor
  • Date: 2010-03-02 18:33:15 UTC
  • mto: (1317.4.1) (1320.1.13 build)
  • mto: This revision was merged to the branch mainline in revision 1322.
  • Revision ID: mordred@inaugust.com-20100302183315-84c30ejnvpj2q8w1
Fixed Authentication plugin interface to use SecurityContext rather than the
whole darned Session object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/auth_pam/auth_pam.cc
23
23
*/
24
24
 
25
25
#include "config.h"
26
 
#include <drizzled/session.h>
27
 
#include <drizzled/plugin/authentication.h>
 
26
 
28
27
#include <security/pam_appl.h>
29
28
#if !defined(__sun) && !defined(__FreeBSD__)
30
29
#include <security/pam_misc.h>
31
30
#endif
32
31
 
 
32
#include "drizzled/security_context.h"
 
33
#include "drizzled/plugin/authentication.h"
 
34
 
33
35
using namespace drizzled;
34
36
 
35
37
typedef struct {
104
106
public:
105
107
  Auth_pam(std::string name_arg)
106
108
    : drizzled::plugin::Authentication(name_arg) {}
107
 
  virtual bool authenticate(Session *session, const char *password)
 
109
  virtual bool authenticate(const SecurityContext &sctx,
 
110
                            const std::string &password)
108
111
  {
109
112
    int retval;
110
113
    auth_pam_userinfo userinfo= { NULL, NULL };
111
114
    struct pam_conv conv_info= { &auth_pam_talker, (void*)&userinfo };
112
115
    pam_handle_t *pamh= NULL;
113
116
 
114
 
    userinfo.name= session->getSecurityContext().getUser().c_str();
115
 
    userinfo.password= password;
 
117
    userinfo.name= sctx.getUser().c_str();
 
118
    userinfo.password= password.c_str();
116
119
 
117
120
    retval= pam_start("check_user", userinfo.name, &conv_info, &pamh);
118
121