svn commit: samba r25640 - in branches/4.0-python: . source/torture
source/web_server source/winbind
jelmer at samba.org
jelmer at samba.org
Sun Oct 14 22:42:18 GMT 2007
Author: jelmer
Date: 2007-10-14 22:42:17 +0000 (Sun, 14 Oct 2007)
New Revision: 25640
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25640
Log:
Disable web server for now.
Modified:
branches/4.0-python/
branches/4.0-python/source/torture/ui.c
branches/4.0-python/source/web_server/config.mk
branches/4.0-python/source/web_server/http.c
branches/4.0-python/source/winbind/config.mk
Changeset:
Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/torture/ui.c
===================================================================
--- branches/4.0-python/source/torture/ui.c 2007-10-14 22:28:45 UTC (rev 25639)
+++ branches/4.0-python/source/torture/ui.c 2007-10-14 22:42:17 UTC (rev 25640)
@@ -34,7 +34,8 @@
{
SMB_ASSERT(tctx->outputdir != NULL);
- *tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir, prefix);
+ *tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir,
+ prefix);
NT_STATUS_HAVE_NO_MEMORY(*tempdir);
if (mkdtemp(*tempdir) == NULL) {
@@ -126,11 +127,9 @@
}
struct torture_test *torture_tcase_add_test(struct torture_tcase *tcase,
- const char *name,
- bool (*run) (struct torture_context *,
- const void *tcase_data,
- const void *test_data),
- const void *data)
+ const char *name,
+ bool (*run) (struct torture_context *, const void *tcase_data, const void *test_data),
+ const void *data)
{
struct torture_test *test = talloc(tcase, struct torture_test);
@@ -147,9 +146,9 @@
}
-bool torture_suite_init_tcase(struct torture_suite *suite,
- struct torture_tcase *tcase,
- const char *name)
+bool torture_suite_init_tcase(struct torture_suite *suite,
+ struct torture_tcase *tcase,
+ const char *name)
{
tcase->name = talloc_strdup(tcase, name);
tcase->description = NULL;
@@ -176,7 +175,7 @@
}
bool torture_run_suite(struct torture_context *context,
- struct torture_suite *suite)
+ struct torture_suite *suite)
{
bool ret = true;
struct torture_tcase *tcase;
@@ -213,9 +212,9 @@
return ret;
}
-void torture_ui_test_start(struct torture_context *context,
- struct torture_tcase *tcase,
- struct torture_test *test)
+void torture_ui_test_start(struct torture_context *context,
+ struct torture_tcase *tcase,
+ struct torture_test *test)
{
if (context->ui_ops->test_start)
context->ui_ops->test_start(context, tcase, test);
@@ -234,9 +233,9 @@
return ret;
}
-void torture_ui_test_result(struct torture_context *context,
- enum torture_result result,
- const char *comment)
+void torture_ui_test_result(struct torture_context *context,
+ enum torture_result result,
+ const char *comment)
{
if (context->ui_ops->test_result)
context->ui_ops->test_result(context, result, comment);
@@ -311,7 +310,7 @@
}
bool torture_run_tcase(struct torture_context *context,
- struct torture_tcase *tcase)
+ struct torture_tcase *tcase)
{
bool ret = true;
char *old_testname;
@@ -335,7 +334,8 @@
}
old_testname = context->active_testname;
- context->active_testname = talloc_asprintf(context, "%s-%s", old_testname, tcase->name);
+ context->active_testname = talloc_asprintf(context, "%s-%s",
+ old_testname, tcase->name);
for (test = tcase->tests; test; test = test->next) {
ret &= internal_torture_run_test(context, tcase, test,
tcase->fixture_persistent);
@@ -383,8 +383,9 @@
return lp_parm_bool(global_loadparm, NULL, "torture", name, default_value);
}
-const char *torture_setting_string(struct torture_context *test, const char *name,
- const char *default_value)
+const char *torture_setting_string(struct torture_context *test,
+ const char *name,
+ const char *default_value)
{
const char *ret = lp_parm_string(global_loadparm, NULL, "torture", name);
@@ -395,8 +396,8 @@
}
static bool wrap_test_with_simple_tcase(struct torture_context *torture_ctx,
- struct torture_tcase *tcase,
- struct torture_test *test)
+ struct torture_tcase *tcase,
+ struct torture_test *test)
{
bool (*fn) (struct torture_context *, const void *tcase_data);
@@ -406,10 +407,9 @@
}
struct torture_tcase *torture_suite_add_simple_tcase(
- struct torture_suite *suite,
- const char *name,
- bool (*run) (struct torture_context *test, const void *),
- const void *data)
+ struct torture_suite *suite, const char *name,
+ bool (*run) (struct torture_context *test, const void *),
+ const void *data)
{
struct torture_tcase *tcase;
struct torture_test *test;
@@ -431,8 +431,8 @@
}
static bool wrap_simple_test(struct torture_context *torture_ctx,
- struct torture_tcase *tcase,
- struct torture_test *test)
+ struct torture_tcase *tcase,
+ struct torture_test *test)
{
bool (*fn) (struct torture_context *);
@@ -465,7 +465,7 @@
}
bool torture_suite_add_suite(struct torture_suite *suite,
- struct torture_suite *child)
+ struct torture_suite *child)
{
if (child == NULL)
return false;
@@ -480,7 +480,7 @@
struct torture_suite *torture_find_suite(struct torture_suite *parent,
- const char *name)
+ const char *name)
{
struct torture_suite *child;
@@ -492,8 +492,8 @@
}
static bool wrap_test_with_simple_test(struct torture_context *torture_ctx,
- struct torture_tcase *tcase,
- struct torture_test *test)
+ struct torture_tcase *tcase,
+ struct torture_test *test)
{
bool (*fn) (struct torture_context *, const void *tcase_data);
Modified: branches/4.0-python/source/web_server/config.mk
===================================================================
--- branches/4.0-python/source/web_server/config.mk 2007-10-14 22:28:45 UTC (rev 25639)
+++ branches/4.0-python/source/web_server/config.mk 2007-10-14 22:42:17 UTC (rev 25640)
@@ -3,12 +3,13 @@
#######################
# Start SUBSYSTEM WEB
[MODULE::WEB]
+ENABLE = NO
INIT_FUNCTION = server_service_web_init
SUBSYSTEM = service
PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = \
web_server.o \
http.o
-PRIVATE_DEPENDENCIES = LIBTLS process_model
+PRIVATE_DEPENDENCIES = LIBTLS process_model LIBPYTHON
# End SUBSYSTEM WEB
#######################
Modified: branches/4.0-python/source/web_server/http.c
===================================================================
--- branches/4.0-python/source/web_server/http.c 2007-10-14 22:28:45 UTC (rev 25639)
+++ branches/4.0-python/source/web_server/http.c 2007-10-14 22:42:17 UTC (rev 25640)
@@ -32,6 +32,7 @@
#include "lib/tls/tls.h"
#include "param/param.h"
#include "system/filesys.h"
+#include "Python.h"
#define SAMBA_SESSION_KEY "SambaSessionId"
#define HTTP_PREAUTH_URI "/scripting/preauth.esp"
@@ -40,7 +41,7 @@
struct esp_state {
struct websrv_context *web;
struct EspRequest *req;
- struct MprVar variables[ESP_OBJ_MAX];
+ PyObject *variables;
struct session_data *session;
};
Modified: branches/4.0-python/source/winbind/config.mk
===================================================================
--- branches/4.0-python/source/winbind/config.mk 2007-10-14 22:28:45 UTC (rev 25639)
+++ branches/4.0-python/source/winbind/config.mk 2007-10-14 22:42:17 UTC (rev 25640)
@@ -42,7 +42,8 @@
RPC_NDR_LSA \
dcerpc_samr \
PAM_ERRORS \
- LIBCLI_LDAP
+ LIBCLI_LDAP \
+ LIBSAMBA-NET
# End SUBSYSTEM WINBIND
#######################
More information about the samba-cvs
mailing list