diff options
| author | Jeremy Allison <jra@samba.org> | 2002-12-30 23:55:58 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-12-30 23:55:58 +0000 |
| commit | 944fb243eb9d28761870f0c86325aaf9665041eb (patch) | |
| tree | 15ef4eadb4fe3f0275c55c61af915c865ade5da0 /source3 | |
| parent | a2244a4ecad11f70478e682d5843a710a99f60f2 (diff) | |
| download | samba-944fb243eb9d28761870f0c86325aaf9665041eb.tar.gz samba-944fb243eb9d28761870f0c86325aaf9665041eb.tar.bz2 samba-944fb243eb9d28761870f0c86325aaf9665041eb.zip | |
Catching up with old patches. Add define for VERITAS quota support.
Check return in ldap.
Jeremy.
(This used to be commit e789edbb287319f52f49f2999917a610565144d9)
Diffstat (limited to 'source3')
| -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 a958fd416c..9047710557 100644 --- 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 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; |