← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/auth_ldap/auth_ldap.cc

  • Committer: Brian Aker
  • Date: 2010-12-27 19:16:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2036.
  • Revision ID: brian@tangent.org-20101227191617-b1jesi0g2okc06nj
Improvement for decimal in encapsulation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/auth_ldap/auth_ldap.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
22
/* This is needed for simple auth, we're not ready for SASL yet. */
23
23
#define LDAP_DEPRECATED 1
28
28
#include <map>
29
29
#include <string>
30
30
 
31
 
#include <drizzled/plugin/authentication.h>
32
 
#include <drizzled/identifier.h>
33
 
#include <drizzled/util/convert.h>
34
 
#include <drizzled/algorithm/sha1.h>
 
31
#include "drizzled/plugin/authentication.h"
 
32
#include "drizzled/identifier.h"
 
33
#include "drizzled/util/convert.h"
 
34
#include "drizzled/algorithm/sha1.h"
35
35
 
36
36
#include <drizzled/module/option_map.h>
37
37
#include <boost/program_options.hpp>
288
288
    {
289
289
      if (! connect())
290
290
      {
291
 
        errmsg_printf(error::ERROR, _("Reconnect failed: %s\n"),
 
291
        errmsg_printf(ERRMSG_LVL_ERROR, _("Reconnect failed: %s\n"),
292
292
                      getError().c_str());
293
293
        return;
294
294
      }
307
307
                                       &result);
308
308
    if (return_code != LDAP_SUCCESS)
309
309
    {
310
 
      errmsg_printf(error::ERROR, _("ldap_search_ext_s failed: %s\n"),
 
310
      errmsg_printf(ERRMSG_LVL_ERROR, _("ldap_search_ext_s failed: %s\n"),
311
311
                    ldap_err2string(return_code));
312
312
 
313
313
      /* Only try one reconnect per request. */
413
413
  AuthLDAP *auth_ldap= new AuthLDAP("auth_ldap");
414
414
  if (! auth_ldap->initialize())
415
415
  {
416
 
    errmsg_printf(error::ERROR, _("Could not load auth ldap: %s\n"),
 
416
    errmsg_printf(ERRMSG_LVL_ERROR, _("Could not load auth ldap: %s\n"),
417
417
                  auth_ldap->getError().c_str());
418
418
    delete auth_ldap;
419
419
    return 1;