svn commit: samba r24184 - in branches/4.0-regwrite: . source source/build/m4 source/dsdb/samdb/ldb_modules source/heimdal_build source/lib/registry source/lib/replace source/lib/replace/system source/lib/replace/test source/script/tests source/scripting/ejs/ejsnet source/web_server

jelmer at samba.org jelmer at samba.org
Sat Aug 4 13:14:33 GMT 2007


Author: jelmer
Date: 2007-08-04 13:14:29 +0000 (Sat, 04 Aug 2007)
New Revision: 24184

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24184

Log:
Merge from Wilco's branch
Removed:
   branches/4.0-regwrite/source/web_server/config.m4
Modified:
   branches/4.0-regwrite/
   branches/4.0-regwrite/source/build/m4/check_ld.m4
   branches/4.0-regwrite/source/configure.ac
   branches/4.0-regwrite/source/dsdb/samdb/ldb_modules/partition.c
   branches/4.0-regwrite/source/heimdal_build/config.mk
   branches/4.0-regwrite/source/lib/registry/reg_backend_regf.c
   branches/4.0-regwrite/source/lib/registry/regf.idl
   branches/4.0-regwrite/source/lib/replace/libreplace.m4
   branches/4.0-regwrite/source/lib/replace/system/aio.h
   branches/4.0-regwrite/source/lib/replace/system/wait.h
   branches/4.0-regwrite/source/lib/replace/test/testsuite.c
   branches/4.0-regwrite/source/script/tests/selftest.sh
   branches/4.0-regwrite/source/scripting/ejs/ejsnet/net_user.c
   branches/4.0-regwrite/source/web_server/http.c


Changeset:

Property changes on: branches/4.0-regwrite
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: Tue 2007-01-16 00:54:10.654000044 +0100
committer: Jelmer Vernooij <jelmer at samba.org>
properties: 
	branch-nick: 4.0-regwrite
	rebase-of: jelmer at samba.org-20070115235410-krfav3ng4in38pkx

   + timestamp: Tue 2007-01-16 23:27:57.482000113 +0100
committer: Jelmer Vernooij <jelmer at samba.org>
properties: 
	branch-nick: 4.0-regwrite
	rebase-of: jelmer at samba.org-20070116222757-087aafuwkwfw4267

Name: bzr:ancestry:v3-trunk0
   - wilco at baanhofman.nl-20070114042308-36zf3bavc39xsjh7-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20758
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20807

   + wilco at baanhofman.nl-20070114042308-36zf3bavc39xsjh7-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20758
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20807
wilco at baanhofman.nl-20070116142220-zhlab62f0scnatqs-svn3-upgrade

Name: bzr:revision-id:v3-trunk0
   - 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade

   + 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade
11157 jelmer at samba.org-20070116222757-087aafuwkwfw4267-svn3-upgrade


Modified: branches/4.0-regwrite/source/build/m4/check_ld.m4
===================================================================
--- branches/4.0-regwrite/source/build/m4/check_ld.m4	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/build/m4/check_ld.m4	2007-08-04 13:14:29 UTC (rev 24184)
@@ -154,34 +154,55 @@
 # test whether building a shared library actually works
 if test $BLDSHARED = true; then
 
-AC_MSG_CHECKING([SHLD])
-AC_MSG_RESULT([$SHLD])
-AC_MSG_CHECKING([SHLD_FLAGS])
-AC_MSG_RESULT([$SHLD_FLAGS])
+	AC_MSG_CHECKING([SHLD])
+	AC_MSG_RESULT([$SHLD])
+	AC_MSG_CHECKING([SHLD_FLAGS])
+	AC_MSG_RESULT([$SHLD_FLAGS])
 
-AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
-AC_MSG_CHECKING([SHLIBEXT])
-AC_MSG_RESULT([$SHLIBEXT])
-AC_MSG_CHECKING([SONAMEFLAG])
-AC_MSG_RESULT([$SONAMEFLAG])
+	AC_MSG_CHECKING([SHLIBEXT])
+	AC_MSG_RESULT([$SHLIBEXT])
+	AC_MSG_CHECKING([SONAMEFLAG])
+	AC_MSG_RESULT([$SONAMEFLAG])
 
-AC_MSG_CHECKING([PICFLAG])
-AC_MSG_RESULT([$PICFLAG])
+	AC_MSG_CHECKING([PICFLAG])
+	AC_MSG_RESULT([$PICFLAG])
 
-AC_CACHE_CHECK([whether building shared libraries actually works], 
-               [ac_cv_shlib_works],[
-   ac_cv_shlib_works=no
-   # try building a trivial shared library
-   ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o &&
-       ${SHLD} `eval echo ${SHLD_FLAGS} ` -o shlib.${SHLIBEXT} shlib.o &&
-       ac_cv_shlib_works=yes
-   rm -f shlib.${SHLIBEXT} shlib.o
-])
-if test $ac_cv_shlib_works = no; then
-   BLDSHARED=false
+	AC_CACHE_CHECK([whether building shared libraries actually works], 
+	               [ac_cv_shlib_works],[
+			ac_cv_shlib_works=no
+			# try building a trivial shared library
+			${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o &&
+				${SHLD} `eval echo ${SHLD_FLAGS} ` -o shlib.${SHLIBEXT} shlib.o && 
+				ac_cv_shlib_works=yes
+			rm -f shlib.${SHLIBEXT} shlib.o
+	])
+	if test $ac_cv_shlib_works = no; then
+		BLDSHARED=false
+	fi
 fi
+
+if test $BLDSHARED != true; then
+	SHLD="shared-libraries-disabled"
+	SHLD_FLAGS="shared-libraries-disabled"
+	SHLIBEXT="shared_libraries_disabled"
+	SONAMEFLAG="shared-libraries-disabled"
+	PICFLAG=""
+	AC_MSG_CHECKING([SHLD])
+	AC_MSG_RESULT([$SHLD])
+	AC_MSG_CHECKING([SHLD_FLAGS])
+	AC_MSG_RESULT([$SHLD_FLAGS])
+
+	AC_MSG_CHECKING([SHLIBEXT])
+	AC_MSG_RESULT([$SHLIBEXT])
+	AC_MSG_CHECKING([SONAMEFLAG])
+	AC_MSG_RESULT([$SONAMEFLAG])
+
+	AC_MSG_CHECKING([PICFLAG])
+	AC_MSG_RESULT([$PICFLAG])
 fi
 
+AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
+
 AC_MSG_CHECKING([if we can link using the selected flags])
 AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
 	    AC_MSG_RESULT(yes),

Modified: branches/4.0-regwrite/source/configure.ac
===================================================================
--- branches/4.0-regwrite/source/configure.ac	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/configure.ac	2007-08-04 13:14:29 UTC (rev 24184)
@@ -42,7 +42,6 @@
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
 m4_include(lib/socket_wrapper/config.m4)
-m4_include(web_server/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)

Modified: branches/4.0-regwrite/source/dsdb/samdb/ldb_modules/partition.c
===================================================================
--- branches/4.0-regwrite/source/dsdb/samdb/ldb_modules/partition.c	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/dsdb/samdb/ldb_modules/partition.c	2007-08-04 13:14:29 UTC (rev 24184)
@@ -38,13 +38,13 @@
 #include "ldb/include/includes.h"
 #include "dsdb/samdb/samdb.h"
 
-struct partition {
+struct dsdb_control_current_partition {
 	struct ldb_module *module;
 	const char *backend;
 	struct ldb_dn *dn;
 };
 struct partition_private_data {
-	struct partition **partitions;
+	struct dsdb_control_current_partition **partitions;
 	struct ldb_dn **replicate;
 };
 
@@ -609,10 +609,12 @@
 static int sort_compare(void *void1,
 			void *void2, void *opaque)
 {
-	struct partition **pp1 = void1;
-	struct partition **pp2 = void2;
-	struct partition *partition1 = talloc_get_type(*pp1, struct partition);
-	struct partition *partition2 = talloc_get_type(*pp2, struct partition);
+	struct dsdb_control_current_partition **pp1 = void1;
+	struct dsdb_control_current_partition **pp2 = void2;
+	struct dsdb_control_current_partition *partition1 = talloc_get_type(*pp1,
+							    struct dsdb_control_current_partition);
+	struct dsdb_control_current_partition *partition2 = talloc_get_type(*pp2,
+							    struct dsdb_control_current_partition);
 
 	return ldb_dn_compare(partition1->dn, partition2->dn);
 }
@@ -666,7 +668,7 @@
 		talloc_free(mem_ctx);
 		return LDB_ERR_CONSTRAINT_VIOLATION;
 	}
-	data->partitions = talloc_array(data, struct partition *, partition_attributes->num_values + 1);
+	data->partitions = talloc_array(data, struct dsdb_control_current_partition *, partition_attributes->num_values + 1);
 	if (!data->partitions) {
 		talloc_free(mem_ctx);
 		return LDB_ERR_OPERATIONS_ERROR;
@@ -690,7 +692,7 @@
 			talloc_free(mem_ctx);
 			return LDB_ERR_CONSTRAINT_VIOLATION;
 		}
-		data->partitions[i] = talloc(data->partitions, struct partition);
+		data->partitions[i] = talloc(data->partitions, struct dsdb_control_current_partition);
 		if (!data->partitions[i]) {
 			talloc_free(mem_ctx);
 			return LDB_ERR_OPERATIONS_ERROR;
@@ -771,7 +773,7 @@
 		for (i=0; i < modules_attributes->num_values; i++) {
 			struct ldb_dn *base_dn;
 			int partition_idx;
-			struct partition *partition = NULL;
+			struct dsdb_control_current_partition *partition = NULL;
 			const char **modules = NULL;
 
 			char *base = talloc_strdup(data->partitions, (char *)modules_attributes->values[i].data);

Modified: branches/4.0-regwrite/source/heimdal_build/config.mk
===================================================================
--- branches/4.0-regwrite/source/heimdal_build/config.mk	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/heimdal_build/config.mk	2007-08-04 13:14:29 UTC (rev 24184)
@@ -54,7 +54,7 @@
 #######################
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
-CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi/krb5 -I heimdal/lib/gssapi/mech
+CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech
 OBJ_FILES = \
 	../heimdal/lib/gssapi/mech/gss_krb5.o \
 	../heimdal/lib/gssapi/mech/gss_mech_switch.o \

Modified: branches/4.0-regwrite/source/lib/registry/reg_backend_regf.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/reg_backend_regf.c	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/lib/registry/reg_backend_regf.c	2007-08-04 13:14:29 UTC (rev 24184)
@@ -1009,6 +1009,7 @@
 static WERROR regf_save_hbin(struct registry_hive *hive)
 {
 	struct regf_data *regf = hive->backend_data;
+	struct tdr_push *push = talloc_zero(hive, struct tdr_push);
 	int i;
 
 	if (lseek(regf->fd, 0, SEEK_SET) == -1) {
@@ -1016,6 +1017,14 @@
 		return WERR_GENERAL_FAILURE;
 	}
 
+	/* Recompute checksum */
+	if (NT_STATUS_IS_ERR(tdr_push_regf_hdr(push, regf->header))) {
+		DEBUG(0, ("Failed to push regf header\n"));
+		return WERR_GENERAL_FAILURE;
+	}
+	regf->header->chksum = regf_hdr_checksum(push->data.data);
+	talloc_free(push);
+
 	if (NT_STATUS_IS_ERR(tdr_push_to_fd(regf->fd, (tdr_push_fn_t)tdr_push_regf_hdr, regf->header))) {
 		DEBUG(0, ("Error writing registry file header\n"));
 		return WERR_GENERAL_FAILURE;

Modified: branches/4.0-regwrite/source/lib/registry/regf.idl
===================================================================
--- branches/4.0-regwrite/source/lib/registry/regf.idl	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/lib/registry/regf.idl	2007-08-04 13:14:29 UTC (rev 24184)
@@ -45,8 +45,8 @@
 		uint32 data_offset;       
 		uint32 last_block;
 		[value(1)] uint32 uk7;        		/* 1 */
-		[charset(UTF16)] uint16 description[0x40];
-		uint32 padding[83]; 					/* Padding */
+		[charset(UTF16)] uint16 description[0x20];
+		uint32 padding[99]; 					/* Padding */
 		/* Checksum of first 0x200 bytes XOR-ed */
 		uint32 chksum;  
 	} regf_hdr;

Modified: branches/4.0-regwrite/source/lib/replace/libreplace.m4
===================================================================
--- branches/4.0-regwrite/source/lib/replace/libreplace.m4	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/lib/replace/libreplace.m4	2007-08-04 13:14:29 UTC (rev 24184)
@@ -62,6 +62,7 @@
 AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp)
 
 AC_CHECK_HEADERS(stdbool.h sys/select.h)
+AC_CHECK_HEADERS(setjmp.h)
 
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,

Modified: branches/4.0-regwrite/source/lib/replace/system/aio.h
===================================================================
--- branches/4.0-regwrite/source/lib/replace/system/aio.h	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/lib/replace/system/aio.h	2007-08-04 13:14:29 UTC (rev 24184)
@@ -22,7 +22,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#if HAVE_LIBAIO_H
+#ifdef HAVE_LIBAIO_H
 #include <libaio.h>
 #endif
 

Modified: branches/4.0-regwrite/source/lib/replace/system/wait.h
===================================================================
--- branches/4.0-regwrite/source/lib/replace/system/wait.h	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/lib/replace/system/wait.h	2007-08-04 13:14:29 UTC (rev 24184)
@@ -36,4 +36,8 @@
 #define SIGNAL_CAST (RETSIGTYPE (*)(int))
 #endif
 
+#ifdef HAVE_SETJMP_H
+#include <setjmp.h>
 #endif
+
+#endif

Modified: branches/4.0-regwrite/source/lib/replace/test/testsuite.c
===================================================================
--- branches/4.0-regwrite/source/lib/replace/test/testsuite.c	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/lib/replace/test/testsuite.c	2007-08-04 13:14:29 UTC (rev 24184)
@@ -46,6 +46,7 @@
 #include "system/terminal.h"
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/aio.h"
 
 #define TESTFILE "testfile.dat"
 
@@ -78,6 +79,7 @@
 		       (int)st.st_size, size);
 		return false;
 	}
+	unlink(TESTFILE);
 	printf("success: ftruncate\n");
 	return true;
 }
@@ -468,8 +470,8 @@
 	return ret;
 }
 
-#ifndef _SAMBA_BUILD_
-int main()
+#if _SAMBA_BUILD_<4
+int main(void)
 {
 	bool ret = torture_local_replace(NULL);
 	if (ret) 

Modified: branches/4.0-regwrite/source/script/tests/selftest.sh
===================================================================
--- branches/4.0-regwrite/source/script/tests/selftest.sh	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/script/tests/selftest.sh	2007-08-04 13:14:29 UTC (rev 24184)
@@ -219,8 +219,6 @@
  bin/nmblookup $CONFIGURATION -U $SERVER $NETBIOSNAME
 
 # start off with 0 failures
-failed=0
-export failed
 totalfailed=0
 export totalfailed
 
@@ -238,12 +236,12 @@
 		else
 			echo "$LINE"
 		fi
- done
-	 )
-
- exit $totalfailed
+ 	done
+	exit $totalfailed
+)
+exit $?
 ) 9>$SMBD_TEST_FIFO
-failed=$?
+totalfailed=$?
 
 kill `cat $PIDDIR/smbd.pid`
 
@@ -261,10 +259,10 @@
     for f in $PREFIX/valgrind.log*; do
 	if [ -s $f ] && grep -v DWARF2.CFI.reader $f > /dev/null; then
 	    echo "VALGRIND FAILURE";
-	    failed=`expr $failed + 1`
+	    totalfailed=`expr $totalfailed + 1`
 	    cat $f
 	fi
     done
 fi
 
-teststatus $ARG0 $failed
+teststatus $ARG0 $totalfailed

Modified: branches/4.0-regwrite/source/scripting/ejs/ejsnet/net_user.c
===================================================================
--- branches/4.0-regwrite/source/scripting/ejs/ejsnet/net_user.c	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/scripting/ejs/ejsnet/net_user.c	2007-08-04 13:14:29 UTC (rev 24184)
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "libnet/libnet.h"
-#include "proto.h"
+#include "scripting/ejs/ejsnet/proto.h"
 #include "scripting/ejs/smbcalls.h"
 #include "events/events.h"
 #include "auth/credentials/credentials.h"

Deleted: branches/4.0-regwrite/source/web_server/config.m4
===================================================================
--- branches/4.0-regwrite/source/web_server/config.m4	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/web_server/config.m4	2007-08-04 13:14:29 UTC (rev 24184)
@@ -1,2 +0,0 @@
-AC_CHECK_HEADERS(setjmp.h)
-

Modified: branches/4.0-regwrite/source/web_server/http.c
===================================================================
--- branches/4.0-regwrite/source/web_server/http.c	2007-08-04 13:14:23 UTC (rev 24183)
+++ branches/4.0-regwrite/source/web_server/http.c	2007-08-04 13:14:29 UTC (rev 24184)
@@ -27,6 +27,7 @@
 #include "smbd/service.h"
 #include "lib/events/events.h"
 #include "system/time.h"
+#include "system/wait.h"
 #include "lib/appweb/esp/esp.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "lib/util/dlinklist.h"
@@ -484,7 +485,6 @@
    it hits a major error. We need to catch these and
    report a internal server error via http
 */
-#include <setjmp.h>
 static jmp_buf ejs_exception_buf;
 static const char *exception_reason;
 



More information about the samba-cvs mailing list