Rev 11157: Merge from Wilco's branch in
file:///home/jelmer/bzr.samba/4.0-regwrite/
Jelmer Vernooij
jelmer at samba.org
Tue Jan 16 22:28:12 GMT 2007
------------------------------------------------------------
revno: 11157
revision-id: jelmer at samba.org-20070116222757-087aafuwkwfw4267
parent: jelmer at samba.org-20070115235410-krfav3ng4in38pkx
parent: wilco at baanhofman.nl-20070116142220-zhlab62f0scnatqs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-regwrite
timestamp: Tue 2007-01-16 23:27:57 +0100
message:
Merge from Wilco's branch
removed:
source/web_server/config.m4 svn-v2:7004 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fweb_server%2fconfig.m4
modified:
source/build/m4/check_ld.m4 svn-v2:7274 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fbuild%2fm4%2fcheck_ld.m4
source/configure.ac svn-v2:15565 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fconfigure.ac
source/dsdb/samdb/ldb_modules/partition.c svn-v2:16264 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fdsdb%2fsamdb%2fldb_modules%2fpartition.c
source/heimdal_build/config.mk svn-v2:7322 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fheimdal_build%2fconfig.mk
source/lib/registry/reg_backend_regf.c svn-v2:4132 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2freg_backend_nt4.c
source/lib/registry/regf.idl svn-v2:9995 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fregf.idl
source/lib/replace/libreplace.m4 svn-v2:18074 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2flibreplace.m4
source/lib/replace/system/aio.h svn-v2:20659 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2fsystem%2faio.h
source/lib/replace/system/wait.h svn-v2:18129 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2fsystem%2fwait.h
source/lib/replace/test/testsuite.c svn-v2:18031 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2ftest%2ftestsuite.c
source/script/tests/selftest.sh svn-v2:6564 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fselftest.sh
source/scripting/ejs/ejsnet/net_user.c svn-v2:20782 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscripting%2fejs%2fejsnet%2fnet_user.c
source/web_server/http.c svn-v2:6981 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fweb_server%2fhttp.c
------------------------------------------------------------
revno: 11153.1.4
merged: wilco at baanhofman.nl-20070116142220-zhlab62f0scnatqs
parent: wilco at baanhofman.nl-20070116003959-zvipf456y0f3eme5
committer: Wilco Baan Hofman <wilco at baanhofman.nl>
branch nick: 4.0-regwrite
timestamp: Tue 2007-01-16 15:22:20 +0100
message:
Fix order of lseek arguments.
------------------------------------------------------------
revno: 11153.1.3
merged: wilco at baanhofman.nl-20070116003959-zvipf456y0f3eme5
parent: wilco at synlap-20070115234139-9f4snfvyjh8fe5ge
parent: svn-v2:20822 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Wilco Baan Hofman <wilco at baanhofman.nl>
branch nick: 4.0-regwrite
timestamp: Tue 2007-01-16 01:39:59 +0100
message:
Merge from upstream
------------------------------------------------------------
revno: 11140.1.66
merged: svn-v2:20822 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20819 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: jelmer
timestamp: Mon 2007-01-15 23:42:52 +0000
message:
Fix total failure counting.
------------------------------------------------------------
revno: 11140.1.65
merged: svn-v2:20819 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20816 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 19:27:45 +0000
message:
- include system/aio.h
- use full prototype for main
- use ifdef instead if
metze
------------------------------------------------------------
revno: 11153.1.2
merged: wilco at synlap-20070115234139-9f4snfvyjh8fe5ge
parent: wilco at synlap-20070115191347-aks9wt62ve99v497
committer: Wilco Baan Hofman <wilco at synlap>
branch nick: 4.0-regwrite
timestamp: Tue 2007-01-16 00:41:39 +0100
message:
Fix regf.idl, in particular the description.
Recompute checksum upon write.
Now regf files no longer corrupt when writing.
------------------------------------------------------------
revno: 11153.1.1
merged: wilco at synlap-20070115191347-aks9wt62ve99v497
parent: wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5
parent: svn-v2:20816 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Wilco Baan Hofman <wilco at synlap>
branch nick: 4.0-regwrite
timestamp: Mon 2007-01-15 20:13:47 +0100
message:
Merge from upstream
------------------------------------------------------------
revno: 11140.1.64
merged: svn-v2:20816 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20815 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 19:08:03 +0000
message:
merge from samba3:
include setjmp.h via system/wait.h
metze
------------------------------------------------------------
revno: 11140.1.63
merged: svn-v2:20815 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20814 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 19:05:11 +0000
message:
merge from samba3
metze
------------------------------------------------------------
revno: 11140.1.62
merged: svn-v2:20814 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20813 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 18:44:06 +0000
message:
always define SHLIBEXT, to fix the build on host with no support for shared libs,
there we just define it to an invalid value
metze
------------------------------------------------------------
revno: 11140.1.61
merged: svn-v2:20813 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20810 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 18:38:43 +0000
message:
fix the build with autodependencies
metze
------------------------------------------------------------
revno: 11140.1.60
merged: svn-v2:20810 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20809 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 17:55:26 +0000
message:
unlink the test file when the test is done
metze
------------------------------------------------------------
revno: 11140.1.59
merged: svn-v2:20809 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20808 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 17:53:53 +0000
message:
rename struct partition into struct dsdb_control_current_partition
we'll soon pass this down as DSDB_CONTROL_CURRENT_PARTITION_OID control
so that the repl_meta_data module knows where to update the replUpToDateVector
attribute
metze
------------------------------------------------------------
revno: 11140.1.58
merged: svn-v2:20808 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20807 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-15 17:41:53 +0000
message:
remove whitespace
metze
=== removed file 'source/web_server/config.m4'
--- a/source/web_server/config.m4 2005-07-15 07:00:12 +0000
+++ b/source/web_server/config.m4 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-AC_CHECK_HEADERS(setjmp.h)
-
=== modified file 'source/build/m4/check_ld.m4'
--- a/source/build/m4/check_ld.m4 2006-11-08 02:01:31 +0000
+++ b/source/build/m4/check_ld.m4 2007-01-15 18:44:06 +0000
@@ -154,33 +154,54 @@
# 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_MSG_CHECKING([SHLIBEXT])
+ AC_MSG_RESULT([$SHLIBEXT])
+ AC_MSG_CHECKING([SONAMEFLAG])
+ AC_MSG_RESULT([$SONAMEFLAG])
+
+ 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
+ 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([SHLIBEXT])
-AC_MSG_RESULT([$SHLIBEXT])
-AC_MSG_CHECKING([SONAMEFLAG])
-AC_MSG_RESULT([$SONAMEFLAG])
-
-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
-fi
-fi
AC_MSG_CHECKING([if we can link using the selected flags])
AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
=== modified file 'source/configure.ac'
--- a/source/configure.ac 2006-11-07 14:13:59 +0000
+++ b/source/configure.ac 2007-01-15 19:08:03 +0000
@@ -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 file 'source/dsdb/samdb/ldb_modules/partition.c'
--- a/source/dsdb/samdb/ldb_modules/partition.c 2007-01-13 11:37:13 +0000
+++ b/source/dsdb/samdb/ldb_modules/partition.c 2007-01-15 17:53:53 +0000
@@ -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 file 'source/heimdal_build/config.mk'
--- a/source/heimdal_build/config.mk 2007-01-14 18:48:14 +0000
+++ b/source/heimdal_build/config.mk 2007-01-15 17:41:53 +0000
@@ -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 file 'source/lib/registry/reg_backend_regf.c'
--- a/source/lib/registry/reg_backend_regf.c 2007-01-15 23:54:10 +0000
+++ b/source/lib/registry/reg_backend_regf.c 2007-01-16 22:27:57 +0000
@@ -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 file 'source/lib/registry/regf.idl'
--- a/source/lib/registry/regf.idl 2007-01-14 15:15:41 +0000
+++ b/source/lib/registry/regf.idl 2007-01-15 23:41:39 +0000
@@ -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 file 'source/lib/replace/libreplace.m4'
--- a/source/lib/replace/libreplace.m4 2007-01-15 07:15:47 +0000
+++ b/source/lib/replace/libreplace.m4 2007-01-15 19:08:03 +0000
@@ -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 file 'source/lib/replace/system/aio.h'
--- a/source/lib/replace/system/aio.h 2007-01-10 20:07:13 +0000
+++ b/source/lib/replace/system/aio.h 2007-01-15 19:27:45 +0000
@@ -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 file 'source/lib/replace/system/wait.h'
--- a/source/lib/replace/system/wait.h 2006-09-06 08:43:33 +0000
+++ b/source/lib/replace/system/wait.h 2007-01-15 19:08:03 +0000
@@ -36,4 +36,8 @@
#define SIGNAL_CAST (RETSIGTYPE (*)(int))
#endif
+#ifdef HAVE_SETJMP_H
+#include <setjmp.h>
+#endif
+
#endif
=== modified file 'source/lib/replace/test/testsuite.c'
--- a/source/lib/replace/test/testsuite.c 2006-11-29 18:44:54 +0000
+++ b/source/lib/replace/test/testsuite.c 2007-01-15 19:27:45 +0000
@@ -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 file 'source/script/tests/selftest.sh'
--- a/source/script/tests/selftest.sh 2007-01-14 03:38:56 +0000
+++ b/source/script/tests/selftest.sh 2007-01-15 23:42:52 +0000
@@ -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 file 'source/scripting/ejs/ejsnet/net_user.c'
--- a/source/scripting/ejs/ejsnet/net_user.c 2007-01-14 20:37:14 +0000
+++ b/source/scripting/ejs/ejsnet/net_user.c 2007-01-15 18:38:43 +0000
@@ -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"
=== modified file 'source/web_server/http.c'
--- a/source/web_server/http.c 2007-01-13 02:27:54 +0000
+++ b/source/web_server/http.c 2007-01-15 19:08:03 +0000
@@ -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