← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/auth_pam/auth_pam.cc

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/auth_pam/auth_pam.cc
22
22
  @TODO: License?
23
23
*/
24
24
 
25
 
#include "config.h"
 
25
#include <config.h>
26
26
 
27
27
#include <security/pam_appl.h>
28
28
#if !defined(__sun) && !defined(__FreeBSD__)
29
29
#include <security/pam_misc.h>
30
30
#endif
31
31
 
32
 
#include "drizzled/identifier.h"
33
 
#include "drizzled/plugin/authentication.h"
 
32
#include <drizzled/identifier.h>
 
33
#include <drizzled/plugin/authentication.h>
34
34
 
35
35
using namespace drizzled;
36
36