--- Makefile.in.orig	2007-04-23 13:22:06.000000000 -0400
+++ Makefile.in	2007-04-23 15:34:15.000000000 -0400
@@ -317,7 +317,8 @@
 	       $(RPC_CLIENT_OBJ1) rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \
 	       rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o  \
 	       rpc_client/cli_ds.o rpc_client/cli_svcctl.o \
-	       rpc_client/cli_shutdown.o rpc_client/cli_dfs.o rpc_client/cli_echo.o
+	       rpc_client/cli_shutdown.o rpc_client/cli_dfs.o \
+	       rpc_client/cli_echo.o $(TALLOC_OBJ)
 
 LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_wkssvc.o \
 		   $(LIBNDR_GEN_OBJ) $(LIBNDR_OBJ)
@@ -1346,12 +1347,12 @@
 
 bin/rid.@SHLIBEXT@: proto_exists nsswitch/idmap_rid.o
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_rid.o \
+	@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_rid.o $(TALLOC_OBJ) \
 		@SONAMEFLAG@`basename $@`
 
 bin/ad.@SHLIBEXT@: nsswitch/idmap_ad.o
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ad.o \
+	@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ad.o $(TALLOC_OBJ) \
 		@SONAMEFLAG@`basename $@`
 
 bin/weird.@SHLIBEXT@: proto_exists $(DEVEL_HELP_WEIRD_OBJ)