Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 289339 Details for
Bug 314473
net-im/jabberd2-2.2.17 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
jabberd2-2.2.14-nossl_compilation.patch
jabberd2-2.2.14-nossl_compilation.patch (text/plain), 4.22 KB, created by
Marcin Mirosław
on 2011-10-09 11:42:47 UTC
(
hide
)
Description:
jabberd2-2.2.14-nossl_compilation.patch
Filename:
MIME Type:
Creator:
Marcin Mirosław
Created:
2011-10-09 11:42:47 UTC
Size:
4.22 KB
patch
obsolete
>Index: sx/ssl.c >=================================================================== >--- sx/ssl.c (revision 954) >+++ sx/ssl.c (revision 955) >@@ -281,7 +281,7 @@ > id++; > } > /* Check if we're not out of space */ >- if (id == SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT) { >+ if (id == SX_CONN_EXTERNAL_ID_MAX_COUNT) { > sk_GENERAL_NAME_pop_free(altnames, GENERAL_NAME_free); > goto end; > } >@@ -310,7 +310,7 @@ > _sx_debug(ZONE, "external_id: Found(%d) commonName: '%s'", id, sc->external_id[id]); > OPENSSL_free(buff); > /* Check if we're not out of space */ >- if (id == SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT) >+ if (id == SX_CONN_EXTERNAL_ID_MAX_COUNT) > goto end; > } > >@@ -653,7 +653,7 @@ > SSL_set_options(sc->ssl, SSL_OP_NO_TICKET); > > /* empty external_id */ >- for (i = 0; i < SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT; i++) >+ for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) > sc->external_id[i] = NULL; > > /* alternate pemfile */ >@@ -744,7 +744,7 @@ > SSL_set_accept_state(sc->ssl); > > /* empty external_id */ >- for (i = 0; i < SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT; i++) >+ for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) > sc->external_id[i] = NULL; > > /* buffer queue */ >@@ -772,7 +772,7 @@ > return; > } > >- for (i = 0; i < SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT; i++) >+ for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) > if(sc->external_id[i] != NULL) > free(sc->external_id[i]); > else >Index: sx/plugins.h >=================================================================== >--- sx/plugins.h (revision 954) >+++ sx/plugins.h (revision 955) >@@ -45,6 +45,8 @@ > #define SX_ERR_COMPRESS_FAILURE (0x021) > > >+#define SX_CONN_EXTERNAL_ID_MAX_COUNT 8 >+ > #ifdef __cplusplus > extern "C" { > #endif >@@ -73,12 +75,11 @@ > #define SX_SSL_STATE_WANT_READ (1) > #define SX_SSL_STATE_WANT_WRITE (2) > #define SX_SSL_STATE_ERROR (3) >-#define SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT 8 > > /** a single conn */ > typedef struct _sx_ssl_conn_st { > /* id and ssf for sasl external auth */ >- char *external_id[SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT]; >+ char *external_id[SX_CONN_EXTERNAL_ID_MAX_COUNT]; > > SSL *ssl; > >Index: sx/sasl_gsasl.c >=================================================================== >--- sx/sasl_gsasl.c (revision 954) >+++ sx/sasl_gsasl.c (revision 955) >@@ -34,7 +34,7 @@ > sx_sasl_callback_t cb; > void *cbarg; > >- char *ext_id[SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT]; >+ char *ext_id[SX_CONN_EXTERNAL_ID_MAX_COUNT]; > } *_sx_sasl_t; > > /* Per-session library handle. */ >@@ -405,7 +405,10 @@ > _sx_sasl_t ctx = (_sx_sasl_t) p->private; > char *buf = NULL, *out = NULL, *realm = NULL, **ext_id; > char hostname[256]; >- int ret, i; >+ int ret; >+#ifdef HAVE_SSL >+ int i; >+#endif > size_t buflen, outlen; > > if(mech != NULL) { >@@ -454,7 +457,7 @@ > if (ext_id != NULL) { > //_sx_debug(ZONE, "sasl context ext id '%s'", ext_id); > /* if there is, store it for later */ >- for (i = 0; i < SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT; i++) >+ for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) > if (ext_id[i] != NULL) { > ctx->ext_id[i] = strdup(ext_id[i]); > } else { >@@ -843,7 +846,7 @@ > _sx_debug(ZONE, "sasl external"); > _sx_debug(ZONE, "sasl creds.authzid is '%s'", creds.authzid); > >- for (i = 0; i < SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT; i++) { >+ for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) { > if (ctx->ext_id[i] == NULL) > break; > _sx_debug(ZONE, "sasl ext_id(%d) is '%s'", i, ctx->ext_id[i]); >@@ -893,7 +896,7 @@ > > if (ctx->gsasl_ctx != NULL) gsasl_done (ctx->gsasl_ctx); > if (ctx->appname != NULL) free(ctx->appname); >- for (i = 0; i < SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT; i++) >+ for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) > if(ctx->ext_id[i] != NULL) > free(ctx->ext_id[i]); > else >@@ -926,7 +929,7 @@ > ctx->appname = strdup(appname); > ctx->cb = cb; > ctx->cbarg = cbarg; >- for (i = 0; i < SX_SSL_CONN_EXTERNAL_ID_MAX_COUNT; i++) >+ for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) > ctx->ext_id[i] = NULL; > > ret = gsasl_init(&ctx->gsasl_ctx);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 314473
:
227217
|
260835
|
267507
|
267509
|
267511
|
269483
|
279767
|
279777
|
280283
|
286421
|
288599
|
289339
|
289341
|
311831
|
311833
|
312185
|
322412
|
322507
|
330825
|
331398
|
331400
|
332788
|
332790
|
332792
|
350230
|
350366
|
350368
|
358958
|
358960