diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
| commit | 3a5cc58fde0d53d83d46e37f80670ad6bd67f892 (patch) | |
| tree | af90a90140ba6578e973247176d40c6af54a167a /source/libads | |
| parent | a1b3f2f9bac039395fa20f0be779367f7e23400a (diff) | |
| download | samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.gz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.xz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.zip | |
r16104: Set version to 3.0.23rc2
Bring release tree up to current 3.0 tree
(svn merge -r15845:16103 $SVNURL/branches/SAMBA_3_0)
Diffstat (limited to 'source/libads')
| -rw-r--r-- | source/libads/ldap_schema.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/libads/ldap_schema.c b/source/libads/ldap_schema.c index a0c735208fa..13a8ab0cb0b 100644 --- a/source/libads/ldap_schema.c +++ b/source/libads/ldap_schema.c @@ -303,13 +303,14 @@ ADS_STATUS ads_check_posix_schema_mapping(ADS_STRUCT *ads, enum wb_posix_mapping } } - talloc_destroy(ctx); - - ADS_ERROR_HAVE_NO_MEMORY(ads->schema.posix_uidnumber_attr); - ADS_ERROR_HAVE_NO_MEMORY(ads->schema.posix_gidnumber_attr); - ADS_ERROR_HAVE_NO_MEMORY(ads->schema.posix_homedir_attr); - ADS_ERROR_HAVE_NO_MEMORY(ads->schema.posix_shell_attr); - ADS_ERROR_HAVE_NO_MEMORY(ads->schema.posix_gecos_attr); + if (!ads->schema.posix_uidnumber_attr || + !ads->schema.posix_gidnumber_attr || + !ads->schema.posix_homedir_attr || + !ads->schema.posix_shell_attr || + !ads->schema.posix_gecos_attr) { + status = ADS_ERROR(LDAP_NO_MEMORY); + goto done; + } status = ADS_ERROR(LDAP_SUCCESS); |