diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 22:57:07 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 22:57:07 +0200 |
| commit | b1bdcd4a8a11f28b2750a26b46983cc6b1c1bf5e (patch) | |
| tree | b47f72d340b9d0882988099599d13097b7015ef2 | |
| parent | 18f8f5d6561d50b9179541ea24e03a5a807a2a2a (diff) | |
| parent | 9b503470769e1f808c4bdafafba0b93e2ede3bd6 (diff) | |
| download | samba-b1bdcd4a8a11f28b2750a26b46983cc6b1c1bf5e.tar.gz samba-b1bdcd4a8a11f28b2750a26b46983cc6b1c1bf5e.tar.bz2 samba-b1bdcd4a8a11f28b2750a26b46983cc6b1c1bf5e.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 7fd98e492e2bf71d111ea8fa3ca9108506f60264)
| -rw-r--r-- | source4/utils/net/net_join.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c index 2102257c6c..37b3c21fcf 100644 --- a/source4/utils/net/net_join.c +++ b/source4/utils/net/net_join.c @@ -114,11 +114,11 @@ int net_vampire(struct net_context *ctx, int argc, const char **argv) case 0: /* no args -> fail */ return net_vampire_usage(ctx, argc, argv); case 1: /* only DOMAIN */ - tmp = talloc_strdup(ctx->mem_ctx, argv[0]); + tmp = talloc_strdup(ctx, argv[0]); break; case 2: /* domain and target dir */ - tmp = talloc_strdup(ctx->mem_ctx, argv[0]); - targetdir = talloc_strdup(ctx->mem_ctx, argv[1]); + tmp = talloc_strdup(ctx, argv[0]); + targetdir = talloc_strdup(ctx, argv[1]); break; default: /* too many args -> fail */ return net_vampire_usage(ctx, argc, argv); @@ -131,7 +131,7 @@ int net_vampire(struct net_context *ctx, int argc, const char **argv) return -1; } libnetctx->cred = ctx->credentials; - r = talloc(ctx->mem_ctx, struct libnet_Vampire); + r = talloc(ctx, struct libnet_Vampire); if (!r) { return -1; } @@ -151,7 +151,7 @@ int net_vampire(struct net_context *ctx, int argc, const char **argv) talloc_free(libnetctx); return -1; } - d_printf("Vampired domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx->mem_ctx, r->out.domain_sid)); + d_printf("Vampired domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx, r->out.domain_sid)); talloc_free(libnetctx); return 0; |