Author: gd Date: 2007-02-15 00:03:38 +0000 (Thu, 15 Feb 2007) New Revision: 21352
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21352 Log: Let ads_upn_suffixes() return a pointer to an array of suffixes. Guenther Modified: branches/SAMBA_3_0/source/libads/ldap.c branches/SAMBA_3_0_25/source/libads/ldap.c Changeset: Modified: branches/SAMBA_3_0/source/libads/ldap.c =================================================================== --- branches/SAMBA_3_0/source/libads/ldap.c 2007-02-14 21:55:29 UTC (rev 21351) +++ branches/SAMBA_3_0/source/libads/ldap.c 2007-02-15 00:03:38 UTC (rev 21352) @@ -2620,10 +2620,10 @@ * @param ads connection to ads server * @param mem_ctx Pointer to talloc context * @param suffixes Pointer to an array of suffixes - * @param site_name Pointer to the number of suffixes + * @param num_suffixes Pointer to the number of suffixes * @return status of search **/ -ADS_STATUS ads_upn_suffixes(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, char **suffixes, size_t *num_suffixes) +ADS_STATUS ads_upn_suffixes(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, char ***suffixes, size_t *num_suffixes) { ADS_STATUS status; LDAPMessage *res; @@ -2658,8 +2658,8 @@ return ADS_ERROR(LDAP_NO_SUCH_OBJECT); } - suffixes = ads_pull_strings(ads, mem_ctx, res, "uPNSuffixes", num_suffixes); - if (suffixes == NULL) { + (*suffixes) = ads_pull_strings(ads, mem_ctx, res, "uPNSuffixes", num_suffixes); + if ((*suffixes) == NULL) { ads_msgfree(ads, res); return ADS_ERROR(LDAP_NO_MEMORY); } Modified: branches/SAMBA_3_0_25/source/libads/ldap.c =================================================================== --- branches/SAMBA_3_0_25/source/libads/ldap.c 2007-02-14 21:55:29 UTC (rev 21351) +++ branches/SAMBA_3_0_25/source/libads/ldap.c 2007-02-15 00:03:38 UTC (rev 21352) @@ -2620,10 +2620,10 @@ * @param ads connection to ads server * @param mem_ctx Pointer to talloc context * @param suffixes Pointer to an array of suffixes - * @param site_name Pointer to the number of suffixes + * @param num_suffixes Pointer to the number of suffixes * @return status of search **/ -ADS_STATUS ads_upn_suffixes(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, char **suffixes, size_t *num_suffixes) +ADS_STATUS ads_upn_suffixes(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, char ***suffixes, size_t *num_suffixes) { ADS_STATUS status; LDAPMessage *res; @@ -2658,8 +2658,8 @@ return ADS_ERROR(LDAP_NO_SUCH_OBJECT); } - suffixes = ads_pull_strings(ads, mem_ctx, res, "uPNSuffixes", num_suffixes); - if (suffixes == NULL) { + (*suffixes) = ads_pull_strings(ads, mem_ctx, res, "uPNSuffixes", num_suffixes); + if ((*suffixes) == NULL) { ads_msgfree(ads, res); return ADS_ERROR(LDAP_NO_MEMORY); }
