projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less horrible strncpy's
[apps/madmutt.git]
/
mutt_ssl_gnutls.c
diff --git
a/mutt_ssl_gnutls.c
b/mutt_ssl_gnutls.c
index
f6d8b2d
..
2b44e26
100644
(file)
--- a/
mutt_ssl_gnutls.c
+++ b/
mutt_ssl_gnutls.c
@@
-21,7
+21,9
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt.h"
#include "mutt_socket.h"
@@
-29,7
+31,6
@@
#include "mutt_menu.h"
#include "mutt_ssl.h"
#include "mutt_menu.h"
#include "mutt_ssl.h"
-#include "lib/str.h"
#include "lib/rx.h"
typedef struct _tlssockdata {
#include "lib/rx.h"
typedef struct _tlssockdata {
@@
-415,8
+416,8
@@
static int tls_check_stored_hostname (const gnutls_datum * cert,
if (regexec (&preg, linestr, 3, pmatch, 0) == 0) {
linestr[pmatch[1].rm_eo] = '\0';
linestr[pmatch[2].rm_eo] = '\0';
if (regexec (&preg, linestr, 3, pmatch, 0) == 0) {
linestr[pmatch[1].rm_eo] = '\0';
linestr[pmatch[2].rm_eo] = '\0';
- if (
str_cmp
(linestr + pmatch[1].rm_so, hostname) == 0 &&
-
str_cmp
(linestr + pmatch[2].rm_so, buf) == 0) {
+ if (
m_strcmp
(linestr + pmatch[1].rm_so, hostname) == 0 &&
+
m_strcmp
(linestr + pmatch[2].rm_so, buf) == 0) {
regfree (&preg);
p_delete(&linestr);
fclose (fp);
regfree (&preg);
p_delete(&linestr);
fclose (fp);