← 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: 2011-02-01 02:51:01 UTC
  • mto: (2132.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2134.
  • Revision ID: brian@tangent.org-20110201025101-yaj5kkdk2towo6ou
Merge in error message rework. Many error messages are fixed in this patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/auth_ldap/auth_ldap.cc
288
288
    {
289
289
      if (! connect())
290
290
      {
291
 
        errmsg_printf(ERRMSG_LVL_ERROR, _("Reconnect failed: %s\n"),
 
291
        errmsg_printf(error::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(ERRMSG_LVL_ERROR, _("ldap_search_ext_s failed: %s\n"),
 
310
      errmsg_printf(error::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(ERRMSG_LVL_ERROR, _("Could not load auth ldap: %s\n"),
 
416
    errmsg_printf(error::ERROR, _("Could not load auth ldap: %s\n"),
417
417
                  auth_ldap->getError().c_str());
418
418
    delete auth_ldap;
419
419
    return 1;