diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 19:32:42 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 19:32:42 +0200 |
commit | 68a2c547d00d7a8d0c15744172489d9d010c31a3 (patch) | |
tree | 54313b0dc50014015d680121fa750a5d4777c7a4 /source4/utils/net/net_join.c | |
parent | 2cdfaedee203a726bddfb46fb10d9604de32a05f (diff) | |
parent | 4f51b0246db3242ee02ee16905cba13a5dc5633a (diff) | |
download | samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.tar.gz samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.tar.bz2 samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 0f0c8519b87481e3473a469cefd51c76b4a7632e)
Diffstat (limited to 'source4/utils/net/net_join.c')
-rw-r--r-- | source4/utils/net/net_join.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c index abdcbf6027..2102257c6c 100644 --- a/source4/utils/net/net_join.c +++ b/source4/utils/net/net_join.c @@ -24,6 +24,7 @@ #include "libnet/libnet.h" #include "libcli/security/security.h" #include "param/param.h" +#include "lib/events/events.h" int net_join(struct net_context *ctx, int argc, const char **argv) { @@ -38,10 +39,10 @@ int net_join(struct net_context *ctx, int argc, const char **argv) case 0: /* no args -> fail */ return net_join_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 role */ - tmp = talloc_strdup(ctx->mem_ctx, argv[0]); + tmp = talloc_strdup(ctx, argv[0]); if (strcasecmp(argv[1], "BDC") == 0) { secure_channel_type = SEC_CHAN_BDC; } else if (strcasecmp(argv[1], "MEMBER") == 0) { @@ -57,12 +58,12 @@ int net_join(struct net_context *ctx, int argc, const char **argv) domain_name = tmp; - libnetctx = libnet_context_init(NULL, ctx->lp_ctx); + libnetctx = libnet_context_init(event_context_find(ctx), ctx->lp_ctx); if (!libnetctx) { return -1; } libnetctx->cred = ctx->credentials; - r = talloc(ctx->mem_ctx, struct libnet_Join); + r = talloc(ctx, struct libnet_Join); if (!r) { return -1; } @@ -83,7 +84,7 @@ int net_join(struct net_context *ctx, int argc, const char **argv) talloc_free(libnetctx); return -1; } - d_printf("Joined domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx->mem_ctx, r->out.domain_sid)); + d_printf("Joined domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx, r->out.domain_sid)); talloc_free(libnetctx); return 0; |