diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
| commit | 7f10bf980edef3ace1522d0c9c082b35e225c950 (patch) | |
| tree | d4e9af21de194cca812e754b28f9358a3651f4ce /source3/utils/net_ads_gpo.c | |
| parent | f8f68703da58cf7f61b655b48bbbc45cda647748 (diff) | |
| parent | f930f504e1d5e78d2f6f36cab9ce36dbeb34e955 (diff) | |
| download | samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.gz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.bz2 samba-7f10bf980edef3ace1522d0c9c082b35e225c950.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/utils/net_ads_gpo.c')
| -rw-r--r-- | source3/utils/net_ads_gpo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c index 181cba221d..910c78d05a 100644 --- a/source3/utils/net_ads_gpo.c +++ b/source3/utils/net_ads_gpo.c @@ -257,7 +257,7 @@ static int net_ads_gpo_list_all(struct net_context *c, int argc, const char **ar msg; msg = ads_next_entry(ads, msg)) { - if ((dn = ads_get_dn(ads, msg)) == NULL) { + if ((dn = ads_get_dn(ads, mem_ctx, msg)) == NULL) { goto out; } @@ -266,18 +266,16 @@ static int net_ads_gpo_list_all(struct net_context *c, int argc, const char **ar if (!ADS_ERR_OK(status)) { d_printf("ads_parse_gpo failed: %s\n", ads_errstr(status)); - ads_memfree(ads, dn); goto out; } dump_gpo(ads, mem_ctx, &gpo, 0); - ads_memfree(ads, dn); } out: ads_msgfree(ads, res); - talloc_destroy(mem_ctx); + TALLOC_FREE(mem_ctx); ads_destroy(&ads); return 0; |