[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-139-gd2d564a

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  d2d564ad2e9b7cb0440a30a302176cce333649c7 (commit)
       via  a70cbd63d9c398ddcbbaa595ee29343335e89aa7 (commit)
      from  0f0c8519b87481e3473a469cefd51c76b4a7632e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit d2d564ad2e9b7cb0440a30a302176cce333649c7
Merge: a70cbd63d9c398ddcbbaa595ee29343335e89aa7 0f0c8519b87481e3473a469cefd51c76b4a7632e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Apr 14 22:34:22 2008 +0200

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

commit a70cbd63d9c398ddcbbaa595ee29343335e89aa7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Apr 14 20:39:12 2008 +0200

    Fix the build.

-----------------------------------------------------------------------

Summary of changes:
 source/utils/net/net_join.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net/net_join.c b/source/utils/net/net_join.c
index 2102257..37b3c21 100644
--- a/source/utils/net/net_join.c
+++ b/source/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;


-- 
Samba Shared Repository