From 2bc26db97fea4562415956269d05ea65e5710045 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 20:39:12 +0200
Subject: Fix the build. (This used to be commit
 a70cbd63d9c398ddcbbaa595ee29343335e89aa7)

---
 source4/utils/net/net_join.c | 10 +++++-----
 1 file 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;
-- 
cgit 


From 9b503470769e1f808c4bdafafba0b93e2ede3bd6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 19:41:13 +0200
Subject: Explicitly specify the paths when installing pidl. (This used to be
 commit 5e988a34ded288660c6e543e59b566ec12d2fba7)

---
 source4/pidl/config.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source4/pidl/config.mk b/source4/pidl/config.mk
index cdc3843d28..38542f5b7f 100644
--- a/source4/pidl/config.mk
+++ b/source4/pidl/config.mk
@@ -5,7 +5,12 @@ pidl-testcov: pidl/Makefile
 	cd pidl && cover -test
 
 installpidl:: pidl/Makefile
-	$(MAKE) -C pidl install_vendor VENDORPREFIX=$(prefix)
+	$(MAKE) -C pidl install_vendor VENDORPREFIX=$(prefix) \
+		                           INSTALLVENDORLIB=$(libdir) \
+								   INSTALLVENDORBIN=$(bindir) \
+								   INSTALLVENDORSCRIPT=$(bindir) \
+								   INSTALLVENDORMAN1DIR=$(mandir)/man1 \
+								   INSTALLVENDORMAN3DIR=$(mandir)/man3
 
 ifeq ($(HAVE_PERL_EXTUTILS_MAKEMAKER),1)
 install:: installpidl
-- 
cgit