diff options
| author | Jeremy Allison <jra@samba.org> | 2002-12-30 23:55:53 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-12-30 23:55:53 +0000 |
| commit | 64501e44ee672936b206ed2d80e13e4c39bbd95c (patch) | |
| tree | c9d6233ff57c6d3f3755da9d0c47400e7d57fed7 | |
| parent | 266c1ece1242e9e7b32eede8d5e1d1c81a6eb619 (diff) | |
| download | samba-64501e44ee672936b206ed2d80e13e4c39bbd95c.tar.gz samba-64501e44ee672936b206ed2d80e13e4c39bbd95c.tar.bz2 samba-64501e44ee672936b206ed2d80e13e4c39bbd95c.zip | |
Catching up with old patches. Add define for VERITAS quota support.
Check return in ldap.
Jeremy.
(This used to be commit 66eff26fc930e37035bba8672f5fd3aeae71078d)
| -rw-r--r-- | source3/include/includes.h | 8 | ||||
| -rw-r--r-- | source3/libads/ldap.c | 2 |
2 files changed, 10 insertions, 0 deletions
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; |