Catching up with old patches. Add define for VERITAS quota support.

Check return in ldap.
Jeremy.
(This used to be commit e789edbb287319f52f49f2999917a610565144d9)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index a958fd416c0c3f4e53ce7ed9660737511a616b44..90477105576fede7bad43c5db8a4f079a4af4616 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1181,5 +1181,13 @@ time_t timegm(struct tm *tm);
 #define strlen(x) valgrind_strlen(x)
 #endif
 
+/*
+ * Veritas File System.  Often in addition to native.
+ * Quotas different.
+ */
+#if defined(HAVE_SYS_FS_VX_QUOTA_H)
+#define VXFS_QUOTA
+#endif
+
 #endif /* _INCLUDES_H */
 

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 97ccf76983a0936345aa7f835f6419132a8a3abb..1ed1da0b5d0a308d011cfea4fcd65e99ce3b8dd1 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -326,6 +326,8 @@ static struct berval *dup_berval(TALLOC_CTX *ctx, const struct berval *in_val)
        if (!in_val) return NULL;
 
        value = talloc_zero(ctx, sizeof(struct berval));
+       if (value == NULL)
+               return NULL;
        if (in_val->bv_len == 0) return value;
 
        value->bv_len = in_val->bv_len;