From: Stefan Metzmacher Date: Wed, 18 Jul 2007 07:30:41 +0000 (+0000) Subject: r23943: - always provide ads_setup_sasl_wrapping() function X-Git-Tag: samba-misc-tags/initial-v3-2-unstable~674 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=885d557ae746c318df0aabc0a03dce1587918cce;p=thirdparty%2Fsamba.git r23943: - always provide ads_setup_sasl_wrapping() function - read/write returning 0 means EOF and we need to return direct metze --- diff --git a/source/libads/sasl_wrapping.c b/source/libads/sasl_wrapping.c index 77a71d8e96b..931273f40c0 100644 --- a/source/libads/sasl_wrapping.c +++ b/source/libads/sasl_wrapping.c @@ -93,7 +93,7 @@ static ber_slen_t ads_saslwrap_read(Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t ret = LBER_SBIOD_READ_NEXT(sbiod, ads->ldap.in.buf + ads->ldap.in.ofs, 4 - ads->ldap.in.ofs); - if (ret < 0) return ret; + if (ret <= 0) return ret; ads->ldap.in.ofs += ret; if (ads->ldap.in.ofs < 4) goto eagain; @@ -120,7 +120,7 @@ static ber_slen_t ads_saslwrap_read(Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t ret = LBER_SBIOD_READ_NEXT(sbiod, ads->ldap.in.buf + ads->ldap.in.ofs, ads->ldap.in.needed); - if (ret < 0) return ret; + if (ret <= 0) return ret; ads->ldap.in.ofs += ret; ads->ldap.in.needed -= ret; @@ -227,7 +227,7 @@ static ber_slen_t ads_saslwrap_write(Sockbuf_IO_Desc *sbiod, void *buf, ber_len_ ret = LBER_SBIOD_WRITE_NEXT(sbiod, ads->ldap.out.buf + ads->ldap.out.ofs, ads->ldap.out.left); - if (ret < 0) return ret; + if (ret <= 0) return ret; ads->ldap.out.ofs += ret; ads->ldap.out.left -= ret; @@ -302,5 +302,11 @@ ADS_STATUS ads_setup_sasl_wrapping(ADS_STRUCT *ads, return ADS_SUCCESS; } - +#else +ADS_STATUS ads_setup_sasl_wrapping(ADS_STRUCT *ads, + const struct ads_saslwrap_ops *ops, + void *private_data) +{ + return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED); +} #endif /* HAVE_LDAP_SASL_WRAPPING */