sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-04-14 22:57:07 +02:00
commit 7fd98e492e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/utils/net/net_join.c
View File

@ -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;