The branch, master has been updated via 6d6c551... Revert "s4:gensec_gssapi.c - make sure that "GSS_C_DELEG_POLICY_FLAG" is available" via 1b6e5a1... s4:python/samba/__init__.py - import "sys" for "ensure_external_module" method from 488fe76... libwbclient: Fix a memleak in wbcListTrusts
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6d6c551d2695645cc7ccfc131ae5f22f12054482 Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de> Date: Mon Apr 5 12:06:02 2010 +0200 Revert "s4:gensec_gssapi.c - make sure that "GSS_C_DELEG_POLICY_FLAG" is available" This reverts commit 3e091a82167f51b7d9abf00755bede9354932c6b. This should be fixed through the new build system when it lands in "master". commit 1b6e5a1b8d8fca65c62cc1e350ddef962e8f9c3f Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de> Date: Tue Mar 30 22:06:45 2010 +0200 s4:python/samba/__init__.py - import "sys" for "ensure_external_module" method ----------------------------------------------------------------------- Summary of changes: source4/auth/gensec/gensec_gssapi.c | 5 ----- source4/scripting/python/samba/__init__.py | 2 +- 2 files changed, 1 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index 8282145..6d59bbe 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -42,11 +42,6 @@ #include "auth/gensec/gensec_gssapi.h" #include "lib/util/util_net.h" -/* There are "gssapi.h" header files which don't define all needed constants */ -#ifndef GSS_C_DELEG_POLICY_FLAG -#define GSS_C_DELEG_POLICY_FLAG 32768 -#endif - static size_t gensec_gssapi_max_input_size(struct gensec_security *gensec_security); static size_t gensec_gssapi_max_wrapped_size(struct gensec_security *gensec_security); diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index f5220b0..cb2405a 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -25,6 +25,7 @@ __docformat__ = "restructuredText" import os +import sys def _in_source_tree(): """Check whether the script is being run from the source dir. """ @@ -33,7 +34,6 @@ def _in_source_tree(): # When running, in-tree, make sure bin/python is in the PYTHONPATH if _in_source_tree(): - import sys srcdir = "%s/../../.." % os.path.dirname(__file__) sys.path.append("%s/bin/python" % srcdir) default_ldb_modules_dir = "%s/bin/modules/ldb" % srcdir -- Samba Shared Repository