diff options
Diffstat (limited to 'databases/openldap/patches/patch-am')
| -rw-r--r-- | databases/openldap/patches/patch-am | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/databases/openldap/patches/patch-am b/databases/openldap/patches/patch-am index 8c0bf478cdd..5abcea56966 100644 --- a/databases/openldap/patches/patch-am +++ b/databases/openldap/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $ +$NetBSD: patch-am,v 1.4.4.1 2006/05/22 12:58:24 salo Exp $ ---- libraries/libldap/cyrus.c.orig 2005-10-05 13:42:19.000000000 -0400 +--- libraries/libldap/cyrus.c.orig 2006-05-13 11:47:50.000000000 +0200 +++ libraries/libldap/cyrus.c -@@ -835,7 +835,7 @@ ldap_int_sasl_external( +@@ -884,7 +884,7 @@ ldap_int_sasl_external( LDAP *ld, LDAPConn *conn, const char * authid, @@ -11,16 +11,16 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $ { int sc; sasl_conn_t *ctx; -@@ -977,6 +977,7 @@ int ldap_pvt_sasl_secprops( - char **props = ldap_str2charray( in, "," ); +@@ -1026,6 +1026,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; -@@ -1002,9 +1003,9 @@ int ldap_pvt_sasl_secprops( - if ( next == NULL || next[ 0 ] != '\0' ) continue; +@@ -1056,9 +1057,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; @@ -31,7 +31,7 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $ case GOT_MAXBUF: maxbufsize = v; got_maxbufsize++; break; } -@@ -1100,7 +1101,7 @@ ldap_int_sasl_get_option( LDAP *ld, int +@@ -1155,7 +1156,7 @@ ldap_int_sasl_get_option( LDAP *ld, int return -1; } @@ -40,7 +40,7 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $ } break; case LDAP_OPT_X_SASL_SSF_EXTERNAL: -@@ -1108,13 +1109,13 @@ ldap_int_sasl_get_option( LDAP *ld, int +@@ -1163,13 +1164,13 @@ ldap_int_sasl_get_option( LDAP *ld, int return -1; case LDAP_OPT_X_SASL_SSF_MIN: @@ -57,7 +57,7 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $ break; case LDAP_OPT_X_SASL_SECPROPS: -@@ -1160,7 +1161,7 @@ ldap_int_sasl_set_option( LDAP *ld, int +@@ -1215,7 +1216,7 @@ ldap_int_sasl_set_option( LDAP *ld, int #else memset(&extprops, 0L, sizeof(extprops)); @@ -66,7 +66,7 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $ sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, (void *) &extprops ); -@@ -1172,13 +1173,13 @@ ldap_int_sasl_set_option( LDAP *ld, int +@@ -1227,13 +1228,13 @@ ldap_int_sasl_set_option( LDAP *ld, int } break; case LDAP_OPT_X_SASL_SSF_MIN: @@ -83,7 +83,7 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $ break; case LDAP_OPT_X_SASL_SECPROPS: { -@@ -1277,7 +1278,7 @@ ldap_int_sasl_external( +@@ -1332,7 +1333,7 @@ ldap_int_sasl_external( LDAP *ld, LDAPConn *conn, const char * authid, |