s3:net: Refactor net_ads_setspn_add(), allocate a talloc context

ADS_STRUCT will be allocated in the talloc context.

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 68352c0ad1c801f05adefe3e0a029c73512cfe12..ec8ef38f18934e8e2ffe952016dd4275e75f152e 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -3416,32 +3416,35 @@ out:
 
 static int net_ads_setspn_add(struct net_context *c, int argc, const char **argv)
 {
-       int ret = 0;
-       bool ok = false;
+       TALLOC_CTX *tmp_ctx = talloc_stackframe();
        ADS_STRUCT *ads = NULL;
+       ADS_STATUS status;
+       bool ok = false;
+       int ret = -1;
+
        if (c->display_usage || argc < 1) {
                d_printf("%s\n%s",
                         _("Usage:"),
                         _("net ads setspn add <machinename> SPN\n"));
-               ret = 0;
-               goto done;
+               TALLOC_FREE(tmp_ctx);
+               return 0;
        }
-       if (!ADS_ERR_OK(ads_startup(c, true, &ads))) {
-               ret = -1;
-               goto done;
+
+       status = ads_startup(c, true, &ads);
+       if (!ADS_ERR_OK(status)) {
+               goto out;
        }
+
        if (argc > 1) {
                ok = ads_setspn_add(ads, argv[0], argv[1]);
        } else {
                ok = ads_setspn_add(ads, lp_netbios_name(), argv[0]);
        }
-       if (!ok) {
-            ret = -1;
-       }
-done:
-       if (ads) {
-               ads_destroy(&ads);
-       }
+
+       ret = ok ? 0 : -1;
+out:
+       ads_destroy(&ads);
+       TALLOC_FREE(tmp_ctx);
        return ret;
 }