author | Myhailo Danylenko <isbear@ukrpost.net> |
Wed, 15 May 2013 13:32:42 +0300 | |
changeset 86 | ac5fed257211 |
parent 52 | 887f44e99aa1 |
child 87 | 78238d26911a |
permissions | -rw-r--r-- |
29
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
1 |
Guard XMPP password with option guard |
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
2 |
|
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
3 |
* instead of filtering access to stored in public place |
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
4 |
restricted data, better store restricted data somewhere else |
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
5 |
* add xmpp_init() and xmpp_have_password (non-api) |
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
6 |
|
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
7 |
diff -r ce54b748207b mcabber/mcabber/commands.c |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
8 |
--- a/mcabber/mcabber/commands.c Thu Oct 18 13:43:12 2012 +0300 |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
9 |
+++ b/mcabber/mcabber/commands.c Thu Oct 18 13:43:18 2012 +0300 |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
10 |
@@ -2274,10 +2274,8 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
11 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
12 |
static void list_option_cb(char *k, char *v, void *f) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
13 |
{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
14 |
- if (strcmp(k, "password")) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
15 |
- GSList **list = f; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
16 |
- *list = g_slist_insert_sorted(*list, k, (GCompareFunc)strcmp); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
17 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
18 |
+ GSList **list = f; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
19 |
+ *list = g_slist_insert_sorted(*list, k, (GCompareFunc)strcmp); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
20 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
21 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
22 |
static void do_set(char *arg) |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
23 |
diff -r ce54b748207b mcabber/mcabber/main.c |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
24 |
--- a/mcabber/mcabber/main.c Thu Oct 18 13:43:12 2012 +0300 |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
25 |
+++ b/mcabber/mcabber/main.c Thu Oct 18 13:43:18 2012 +0300 |
24
7bb7fb2c1822
Put patches with fixes at the start of queue
Myhailo Danylenko <isbear@ukrpost.net>
parents:
18
diff
changeset
|
26 |
@@ -381,6 +381,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
27 |
scr_init_locale_charset(); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
28 |
ut_init_debug(); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
29 |
help_init(); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
30 |
+ xmpp_init(); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
31 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
32 |
/* Parsing config file... */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
33 |
ret = cfg_read_file(configFile, TRUE); |
24
7bb7fb2c1822
Put patches with fixes at the start of queue
Myhailo Danylenko <isbear@ukrpost.net>
parents:
18
diff
changeset
|
34 |
@@ -417,8 +418,9 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
35 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
36 |
/* If no password is stored, we ask for it before entering |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
37 |
ncurses mode -- unless the username is unknown. */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
38 |
- if (settings_opt_get("jid") && !settings_opt_get("password")) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
39 |
+ if (settings_opt_get("jid") && !xmpp_have_password) { |
13
ce6711e64d02
Update patches for latest fixes
Myhailo Danylenko <isbear@ukrpost.net>
parents:
0
diff
changeset
|
40 |
char *pwd = ask_password("your Jabber password"); |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
41 |
+ /* Will be intercepted by guard */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
42 |
settings_set(SETTINGS_TYPE_OPTION, "password", pwd); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
43 |
g_free(pwd); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
44 |
} |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
45 |
diff -r ce54b748207b mcabber/mcabber/xmpp.c |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
46 |
--- a/mcabber/mcabber/xmpp.c Thu Oct 18 13:43:12 2012 +0300 |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
47 |
+++ b/mcabber/mcabber/xmpp.c Thu Oct 18 13:43:18 2012 +0300 |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
48 |
@@ -23,6 +23,8 @@ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
49 |
*/ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
50 |
#include <stdlib.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
51 |
#include <string.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
52 |
+#include <sys/mman.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
53 |
+#include <errno.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
54 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
55 |
#include "xmpp.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
56 |
#include "xmpp_helper.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
57 |
@@ -53,6 +55,9 @@ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
58 |
static enum imstatus mywantedstatus = available; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
59 |
gchar *mystatusmsg; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
60 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
61 |
+static char *xmpp_password = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
62 |
+gboolean xmpp_have_password = FALSE; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
63 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
64 |
char imstatus2char[imstatus_size+1] = { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
65 |
'_', 'o', 'f', 'd', 'n', 'a', 'i', '\0' |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
66 |
}; |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
67 |
@@ -891,16 +896,15 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
68 |
GError *error = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
69 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
70 |
if (success) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
71 |
- const char *password, *resource; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
72 |
+ const char *resource; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
73 |
char *username; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
74 |
username = jid_get_username(settings_opt_get("jid")); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
75 |
- password = settings_opt_get("password"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
76 |
resource = strchr(lm_connection_get_jid(connection), |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
77 |
JID_RESOURCE_SEPARATOR); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
78 |
if (resource) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
79 |
resource++; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
80 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
81 |
- if (!lm_connection_authenticate(lconnection, username, password, resource, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
82 |
+ if (!lm_connection_authenticate(lconnection, username, xmpp_password, resource, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
83 |
connection_auth_cb, NULL, FALSE, &error)) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
84 |
scr_LogPrint(LPRINT_LOGNORM, "Failed to authenticate: %s", |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
85 |
error->message); |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
86 |
@@ -1783,13 +1787,37 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
87 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
88 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
89 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
90 |
+static gchar *xmpp_password_guard(const gchar *key, const gchar *new_value) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
91 |
+{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
92 |
+ if (xmpp_password) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
93 |
+ size_t len = strlen(xmpp_password); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
94 |
+ memset(xmpp_password, '\0', len); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
95 |
+ if (munlock(xmpp_password, len)) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
96 |
+ scr_LogPrint(LPRINT_DEBUG, "password guard: Cannot unlock memory: %s.", |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
97 |
+ strerror(errno)); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
98 |
+ g_free(xmpp_password); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
99 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
100 |
+ xmpp_password = g_strdup(new_value); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
101 |
+ if (xmpp_password) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
102 |
+ if (mlock(xmpp_password, strlen(xmpp_password))) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
103 |
+ scr_LogPrint(LPRINT_DEBUG, "password guard: Cannot lock memory: %s.", |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
104 |
+ strerror(errno)); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
105 |
+ xmpp_have_password = TRUE; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
106 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
107 |
+ return NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
108 |
+} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
109 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
110 |
+void xmpp_init(void) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
111 |
+{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
112 |
+ settings_set_guard("password", xmpp_password_guard); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
113 |
+} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
114 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
115 |
// xmpp_connect() |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
116 |
// Return a non-zero value if there's an obvious problem |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
117 |
// (no JID, no password, etc.) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
118 |
gint xmpp_connect(void) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
119 |
{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
120 |
- const char *userjid, *password, *resource, *servername, *ssl_fpr; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
121 |
+ const char *userjid, *resource, *servername, *ssl_fpr; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
122 |
char *dynresource = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
123 |
char fpr[16]; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
124 |
const char *proxy_host; |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
125 |
@@ -1806,7 +1834,6 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
126 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
127 |
servername = settings_opt_get("server"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
128 |
userjid = settings_opt_get("jid"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
129 |
- password = settings_opt_get("password"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
130 |
resource = settings_opt_get("resource"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
131 |
proxy_host = settings_opt_get("proxy_host"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
132 |
ssl_fpr = settings_opt_get("ssl_fingerprint"); |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
133 |
@@ -1815,7 +1842,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
134 |
scr_LogPrint(LPRINT_LOGNORM, "Your JID has not been specified!"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
135 |
return -1; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
136 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
137 |
- if (!password) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
138 |
+ if (!xmpp_password) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
139 |
scr_LogPrint(LPRINT_LOGNORM, "Your password has not been specified!"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
140 |
return -1; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
141 |
} |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
142 |
diff -r ce54b748207b mcabber/mcabber/xmpp.h |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
143 |
--- a/mcabber/mcabber/xmpp.h Thu Oct 18 13:43:12 2012 +0300 |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
144 |
+++ b/mcabber/mcabber/xmpp.h Thu Oct 18 13:43:18 2012 +0300 |
18
2714b95de09d
Sync with development version
Mikael Berthe <mikael@lilotux.net>
parents:
16
diff
changeset
|
145 |
@@ -33,7 +33,9 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
146 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
147 |
extern LmConnection* lconnection; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
148 |
extern LmSSL* lssl; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
149 |
+extern gboolean xmpp_have_password; /* private */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
150 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
151 |
+void xmpp_init(void); /* private */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
152 |
int xmpp_connect(void); |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
153 |
void xmpp_disconnect(void); |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
154 |
gboolean xmpp_is_online(void); |