1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
$NetBSD: patch-am,v 1.7 2012/03/13 19:57:11 adam Exp $
--- libraries/libldap/cyrus.c.orig 2012-02-29 17:37:09.000000000 +0000
+++ libraries/libldap/cyrus.c
@@ -680,7 +680,7 @@ ldap_int_sasl_external(
LDAP *ld,
LDAPConn *conn,
const char * authid,
- ber_len_t ssf )
+ ber_uint_t ssf )
{
int sc;
sasl_conn_t *ctx;
@@ -824,6 +824,7 @@ int ldap_pvt_sasl_secprops(
char **props;
unsigned sflags = 0;
int got_sflags = 0;
+ int tmp_ssf;
sasl_ssf_t max_ssf = 0;
int got_max_ssf = 0;
sasl_ssf_t min_ssf = 0;
@@ -854,9 +855,9 @@ int ldap_pvt_sasl_secprops(
if ( next == &props[i][sprops[j].key.bv_len] || next[0] != '\0' ) continue;
switch( sprops[j].ival ) {
case GOT_MINSSF:
- min_ssf = v; got_min_ssf++; break;
+ min_ssf = (v >= 0 ? (sasl_ssf_t)v : 0); got_min_ssf++; break;
case GOT_MAXSSF:
- max_ssf = v; got_max_ssf++; break;
+ max_ssf = (v >= 0 ? (sasl_ssf_t)v : 0); got_max_ssf++; break;
case GOT_MAXBUF:
maxbufsize = v; got_maxbufsize++; break;
}
@@ -960,7 +961,7 @@ ldap_int_sasl_get_option( LDAP *ld, int
return -1;
}
- *(ber_len_t *)arg = *ssf;
+ *(sasl_ssf_t *)arg = *ssf;
} break;
case LDAP_OPT_X_SASL_SSF_EXTERNAL:
@@ -968,13 +969,13 @@ ldap_int_sasl_get_option( LDAP *ld, int
return -1;
case LDAP_OPT_X_SASL_SSF_MIN:
- *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.min_ssf;
+ *(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.min_ssf;
break;
case LDAP_OPT_X_SASL_SSF_MAX:
- *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.max_ssf;
+ *(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.max_ssf;
break;
case LDAP_OPT_X_SASL_MAXBUFSIZE:
- *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
+ *(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
break;
case LDAP_OPT_X_SASL_NOCANON:
*(int *)arg = (int) LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_SASL_NOCANON );
@@ -1074,7 +1075,7 @@ ldap_int_sasl_set_option( LDAP *ld, int
#else
memset(&extprops, 0L, sizeof(extprops));
- extprops.ssf = * (ber_len_t *) arg;
+ extprops.ssf = * (sasl_ssf_t *) arg;
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
(void *) &extprops );
@@ -1086,13 +1087,13 @@ ldap_int_sasl_set_option( LDAP *ld, int
} break;
case LDAP_OPT_X_SASL_SSF_MIN:
- ld->ld_options.ldo_sasl_secprops.min_ssf = *(ber_len_t *)arg;
+ ld->ld_options.ldo_sasl_secprops.min_ssf = *(sasl_ssf_t *)arg;
break;
case LDAP_OPT_X_SASL_SSF_MAX:
- ld->ld_options.ldo_sasl_secprops.max_ssf = *(ber_len_t *)arg;
+ ld->ld_options.ldo_sasl_secprops.max_ssf = *(sasl_ssf_t *)arg;
break;
case LDAP_OPT_X_SASL_MAXBUFSIZE:
- ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_len_t *)arg;
+ ld->ld_options.ldo_sasl_secprops.maxbufsize = *(sasl_ssf_t *)arg;
break;
case LDAP_OPT_X_SASL_NOCANON:
if ( arg == LDAP_OPT_OFF ) {
@@ -1220,7 +1221,7 @@ ldap_int_sasl_external(
LDAP *ld,
LDAPConn *conn,
const char * authid,
- ber_len_t ssf )
+ ber_uint_t ssf )
{ return LDAP_SUCCESS; }
#endif /* HAVE_CYRUS_SASL */
|
