Sync with HEAD

diff --git a/include/ac/string.h b/include/ac/string.h
index e19811ce41bf89c348d6f97d4a2e2ce6cf7cda99..791bb009c9ea090051c2d4371bc419a3d23de72a 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -89,4 +89,6 @@ int (strncasecmp)();
                else AC_MEMCPY( (d), (s), (n) ); \
        } while(0)
 
+#define STRLENOF(s)    (sizeof(s)-1)
+
 #endif /* _AC_STRING_H */

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index 695d9dfb5dd527c257289c88a020fcd210f9e0f7..ffc09626bce15cfea4c42c07a01d7ffafd444f88 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -165,8 +165,20 @@ ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));
 #define ber_bvchr(bv,c) \
        memchr( (bv)->bv_val, (c), (bv)->bv_len )
 
-#define BER_BVC(x)     { sizeof( (x) ) - 1, (x) }
-#define BER_BVNULL     { 0L, NULL }
+#define BER_BVC(s)             { sizeof(s) - 1, (s) }
+#define BER_BVNULL             { 0L, NULL }
+#define BER_BVZERO(bv) \
+       do { \
+               (bv)->bv_len = 0; \
+               (bv)->bv_val = NULL; \
+       } while (0)
+#define BER_BVSTR(bv,s)        \
+       do { \
+               (bv)->bv_len = sizeof(s)-1; \
+               (bv)->bv_val = (s); \
+       } while (0)
+#define BER_BVISNULL(bv)       ((bv)->bv_val == NULL)
+#define BER_BVISEMPTY(bv)      ((bv)->bv_len == 0)
 
 LDAP_END_DECL
 

diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c
index f5c2d5375236588453d37dd2adfbcf9efa6704fc..3dcd510653b1b2194baf872e453fa6c1bf8d960d 100644 (file)
--- a/libraries/liblber/sockbuf.c
+++ b/libraries/liblber/sockbuf.c
@@ -851,7 +851,6 @@ sb_debug_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len )
                                "%swrite: want=%ld error=%s\n",
                                (char *)sbiod->sbiod_pvt, (long)len,
                                STRERROR( errno ) );
-                       errno = err;
                } else {
                        ber_log_printf( LDAP_DEBUG_PACKETS, sbiod->sbiod_sb->sb_debug,
                                "%swrite: want=%ld, written=%ld\n",