diff options
| author | Matthias Schiffer <matthias@gamezock.de> | 2010-02-17 03:27:39 +0100 |
|---|---|---|
| committer | Matthias Schiffer <matthias@gamezock.de> | 2010-02-17 03:27:39 +0100 |
| commit | 9197a1e626345437f00fbf401325146259980634 (patch) | |
| tree | 140550b8a716757c3be1ffa798699ca2c8e0f0a5 /src/modules | |
| parent | 3e17bfe4f2e5e64f9528c26b38d4241ca46f1082 (diff) | |
| download | mad-9197a1e626345437f00fbf401325146259980634.tar mad-9197a1e626345437f00fbf401325146259980634.zip | |
Updated for new boost release & new kadm5 API
Included boost patch (needed for boost < 1.42)
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.cpp | 8 | ||||
| -rw-r--r-- | src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.cpp b/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.cpp index 72c8160..5f4e3cf 100644 --- a/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.cpp +++ b/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.cpp @@ -64,8 +64,8 @@ void UserConfigBackendKrb5::_connect() { princ += "@" + realm; if(!password.isEmpty() && keytab.isEmpty()) { - krb5_error_code err = kadm5_init_with_password(const_cast<char*>(princ.toLocale().c_str()), const_cast<char*>(password.toLocale().c_str()), - const_cast<char*>(KADM5_ADMIN_SERVICE), ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, 0, &handle); + krb5_error_code err = kadm5_init_with_password(context, const_cast<char*>(princ.toLocale().c_str()), const_cast<char*>(password.toLocale().c_str()), + const_cast<char*>(KADM5_ADMIN_SERVICE), ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_3, 0, &handle); if(err) { application->log(Core::Logger::LOG_USER, Core::Logger::LOG_ERROR, Core::Format("kadm5_init_with_password: %1%") % krb5_get_error_message(context, err)); @@ -80,8 +80,8 @@ void UserConfigBackendKrb5::_connect() { keytabName = const_cast<char*>(keytabStr.c_str()); } - krb5_error_code err = kadm5_init_with_skey(const_cast<char*>(princ.toLocale().c_str()), keytabName, - const_cast<char*>(KADM5_ADMIN_SERVICE), ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, 0, &handle); + krb5_error_code err = kadm5_init_with_skey(context, const_cast<char*>(princ.toLocale().c_str()), keytabName, + const_cast<char*>(KADM5_ADMIN_SERVICE), ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_3, 0, &handle); if(err) { application->log(Core::Logger::LOG_USER, Core::Logger::LOG_ERROR, Core::Format("kadm5_init_with_skey: %1%") % krb5_get_error_message(context, err)); diff --git a/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.h b/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.h index c02f868..34ab14c 100644 --- a/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.h +++ b/src/modules/UserConfigBackendKrb5/UserConfigBackendKrb5.h @@ -27,8 +27,6 @@ #include <Core/ConfigManager.h> #include <boost/thread/mutex.hpp> - -#define USE_KADM5_API_VERSION 2 #include <kadm5/admin.h> namespace Mad { |