Author: obnox Date: 2007-05-31 22:02:49 +0000 (Thu, 31 May 2007) New Revision: 23279
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23279 Log: Replace occurrence of sid_binstring inside lookup_groupmem by sid_string_static. Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 21:15:53 UTC (rev 23278) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 22:02:49 UTC (rev 23279) @@ -901,7 +901,6 @@ ADS_STRUCT *ads = NULL; char *ldap_exp; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; - char *sidstr; char **members = NULL; int i; size_t num_members = 0; @@ -914,7 +913,6 @@ char **domains_nocache = NULL; /* only needed for rpccli_lsa_lookup_sids */ uint32 num_nocache = 0; - DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name, sid_string_static(group_sid))); @@ -933,19 +931,14 @@ goto done; } - if ((sidstr = sid_binstring(group_sid)) == NULL) { - status = NT_STATUS_NO_MEMORY; - goto done; - } - /* search for all members of the group */ - if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",sidstr))) { - SAFE_FREE(sidstr); - DEBUG(1, ("ads: lookup_groupmem: tallloc_asprintf for ldap_exp failed!\n")); + if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)", + sid_string_static(group_sid)))) + { + DEBUG(1, ("ads: lookup_groupmem: talloc_asprintf for ldap_exp failed!\n")); status = NT_STATUS_NO_MEMORY; goto done; } - SAFE_FREE(sidstr); args.control = ADS_EXTENDED_DN_OID; args.val = ADS_EXTENDED_DN_HEX_STRING; Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c =================================================================== --- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c 2007-05-31 21:15:53 UTC (rev 23278) +++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c 2007-05-31 22:02:49 UTC (rev 23279) @@ -901,7 +901,6 @@ ADS_STRUCT *ads = NULL; char *ldap_exp; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; - char *sidstr; char **members = NULL; int i; size_t num_members = 0; @@ -914,7 +913,6 @@ char **domains_nocache = NULL; /* only needed for rpccli_lsa_lookup_sids */ uint32 num_nocache = 0; - DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name, sid_string_static(group_sid))); @@ -933,19 +931,14 @@ goto done; } - if ((sidstr = sid_binstring(group_sid)) == NULL) { - status = NT_STATUS_NO_MEMORY; - goto done; - } - /* search for all members of the group */ - if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",sidstr))) { - SAFE_FREE(sidstr); - DEBUG(1, ("ads: lookup_groupmem: tallloc_asprintf for ldap_exp failed!\n")); + if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)", + sid_string_static(group_sid)))) + { + DEBUG(1, ("ads: lookup_groupmem: talloc_asprintf for ldap_exp failed!\n")); status = NT_STATUS_NO_MEMORY; goto done; } - SAFE_FREE(sidstr); args.control = ADS_EXTENDED_DN_OID; args.val = ADS_EXTENDED_DN_HEX_STRING;
