From 64501e44ee672936b206ed2d80e13e4c39bbd95c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 30 Dec 2002 23:55:53 +0000
Subject: Catching up with old patches. Add define for VERITAS quota support.
 Check return in ldap. Jeremy. (This used to be commit
 66eff26fc930e37035bba8672f5fd3aeae71078d)

---
 source3/include/includes.h | 8 ++++++++
 source3/libads/ldap.c      | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index b7aa700479..58f1565d80 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1177,5 +1177,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 97ccf76983..1ed1da0b5d 100644
--- 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;
-- 
cgit