[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-118-g982924a

Michael Adam obnox at samba.org
Wed Feb 11 12:17:53 GMT 2009


The branch, v3-2-ctdb has been updated
       via  982924ac829a493a9b0e325ac2a6ca7212d7f1a3 (commit)
       via  fe30a4abe24f8aceb9966b250c55ad2e3b4ffc82 (commit)
       via  4ac94e5f08c7454228e10711575e79fba34c5df9 (commit)
      from  c98cb1395d11c22db979b793e82ee9c6022bb66f (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit 982924ac829a493a9b0e325ac2a6ca7212d7f1a3
Merge: c98cb1395d11c22db979b793e82ee9c6022bb66f fe30a4abe24f8aceb9966b250c55ad2e3b4ffc82
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 13:15:42 2009 +0100

    Merge commit 'origin/v3-2-test' into v3-2-ctdb

commit fe30a4abe24f8aceb9966b250c55ad2e3b4ffc82
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 11:03:30 2009 +0100

    s3:build: some implementations of "ln" are picky about the order or arguments
    
    Michael

commit 4ac94e5f08c7454228e10711575e79fba34c5df9
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 10 19:08:46 2009 -0800

    Fix resume handle for _samr_EnumDomainGroups

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

Summary of changes:
 source/Makefile.in              |   26 +++++++++++++-------------
 source/rpc_server/srv_samr_nt.c |    2 --
 2 files changed, 13 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index d76538c..1827a66 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1560,7 +1560,7 @@ $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLO
 
 $(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
 	@rm -f $@
-	@ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
+	@ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
 
 $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
 	@echo Linking non-shared library $@
@@ -1580,7 +1580,7 @@ installlibtalloc:: installdirs libtalloc
 	-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
 	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
 	-if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
-		ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
+		ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
 			$(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
 	fi
 	-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1626,7 +1626,7 @@ $(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
 
 $(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
 	@rm -f $@
-	@ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
+	@ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
 	@echo Linking non-shared library $@
@@ -1647,7 +1647,7 @@ installlibtdb:: installdirs libtdb
 	-$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
 	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
 	-if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
-		ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
+		ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
 			$(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
 	fi
 	-$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1700,7 +1700,7 @@ $(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBW
 
 $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
 	@rm -f $@
-	@ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
+	@ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
 
 $(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
 	@echo Linking non-shared library $@
@@ -1720,7 +1720,7 @@ installlibwbclient:: installdirs libwbclient
 	-$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
 	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
 	-if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
-		ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
+		ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
 			$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
 	fi
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
@@ -1761,7 +1761,7 @@ $(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_S
 
 $(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME)
 	@rm -f $@
-	@ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
+	@ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
 
 $(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
 	@echo Linking non-shared library $@
@@ -1780,7 +1780,7 @@ installlibaddns:: installdirs libaddns
 	-$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
 	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
 	-if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
-		ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
+		ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
 			$(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
 	fi
 	-$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1840,7 +1840,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAP
 
 $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
 	@rm -f $@
-	@ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
+	@ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
 $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
 	@echo Linking non-shared library $@
@@ -1860,7 +1860,7 @@ installlibnetapi:: installdirs libnetapi
 	-$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
 	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
 	-if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
-		ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
+		ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
 			$(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
 	fi
 	-$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1921,7 +1921,7 @@ installlibsmbclient:: installdirs libsmbclient
 	-$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
 	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
 	-if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
-		ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
+		ln -f -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
 			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
 	fi
 	-$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1973,7 +1973,7 @@ $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_O
 
 $(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)
 	@rm -f $@
-	@ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
+	@ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
 
 $(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
 	@echo Linking non-shared library $@
@@ -1992,7 +1992,7 @@ installlibsmbsharemodes:: installdirs libsmbsharemodes
 	-$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
 	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
 	-if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
-		ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
+		ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
 			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
 	fi
 	-$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 6b1d465..6e37ea5 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1177,9 +1177,7 @@ NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
 
 	*r->out.sam = samr_array;
 	*r->out.num_entries = num_groups;
-	/* this was missing, IMHO:
 	*r->out.resume_handle = num_groups + *r->in.resume_handle;
-	*/
 
 	DEBUG(5,("_samr_EnumDomainGroups: %d\n", __LINE__));
 


-- 
SAMBA-CTDB repository


More information about the samba-cvs mailing list