From 2374ee37c87adc75bb665a77713848f3d3b55230 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Fri, 12 Oct 2012 21:39:17 +0300 Subject: [PATCH] Revert "purple: make password entry optional if using kerberos" This reverts commit a800874391fc04f0a4d8c65378a4843a1349cbee. The above commit breaks the "ask for password" functionality for non-Kerberos users when Kerberos is compiled in. See also commit a69fcf02ee01a41e07d36765c72fc83bde560f45 for details, where a similar change was reverted 3 years ago. --- src/purple/purple-plugin.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/purple/purple-plugin.c b/src/purple/purple-plugin.c index 9655329b..c3d5fa1a 100644 --- a/src/purple/purple-plugin.c +++ b/src/purple/purple-plugin.c @@ -516,12 +516,16 @@ static PurplePluginProtocolInfo sipe_prpl_info = #if PURPLE_VERSION_CHECK(3,0,0) sizeof(PurplePluginProtocolInfo), /* struct_size */ #endif -#ifdef HAVE_LIBKRB5 - OPT_PROTO_CHAT_TOPIC - | OPT_PROTO_PASSWORD_OPTIONAL, -#else - OPT_PROTO_CHAT_TOPIC, -#endif + /* + * NOTE: Do *NOT* add OPT_PROTO_PASSWORD_OPTIONAL here, because it + * breaks the "ask for password" functionality for non-Kerberos + * users when Kerberos is compiled in! + * + * Kerberos users: I know this sucks. If you don't like it, then + * please improve libpurple to make this a run-time feature instead + * of a compile-time feature. + */ + OPT_PROTO_CHAT_TOPIC, NULL, /* user_splits */ NULL, /* protocol_options */ NO_BUDDY_ICONS, /* icon_spec */ -- 2.11.4.GIT