[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1bbcc65 s3-waf: check for KRB5_PDU_NONE as in the autoconf build.
via 07664f9 s3-autoconf: fix the build of the pdb_ldap shared module in
autoconf build as well.
via 91c04ea s3-waf: fix compile of pdb_ldap as shared module by moving
ldap schema helpers to libpdb.so
via 31d9b24 s3-waf: also check for
gsskrb5_extract_authz_data_from_sec_context() during configure.
from 342be28 s3:build: add auth/gensec/spnego.o
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1bbcc65399fffc962066c087fcad7d5b3a4811dd
Author: Günther Deschner g...@samba.org
Date: Thu Jan 12 16:29:39 2012 +0100
s3-waf: check for KRB5_PDU_NONE as in the autoconf build.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Jan 13 11:15:35 CET 2012 on sn-devel-104
commit 07664f9a99e646948e3aafe2f667b838eceedda2
Author: Günther Deschner g...@samba.org
Date: Thu Jan 12 15:08:34 2012 +0100
s3-autoconf: fix the build of the pdb_ldap shared module in autoconf build
as well.
Guenther
commit 91c04ea04fd11eb82866336a9cedbcd45e8e87b6
Author: Günther Deschner g...@samba.org
Date: Thu Jan 12 15:06:25 2012 +0100
s3-waf: fix compile of pdb_ldap as shared module by moving ldap schema
helpers to libpdb.so
These helpers are used in other parts of Samba as well (like in idmap and
in the
net provision code).
Guenther
commit 31d9b24eef6a7f7d1e5d97351df9bbab65fa0ef1
Author: Günther Deschner g...@samba.org
Date: Thu Jan 12 14:27:10 2012 +0100
s3-waf: also check for gsskrb5_extract_authz_data_from_sec_context() during
configure.
Guenther
---
Summary of changes:
source3/Makefile.in |7 +++
source3/configure.in |2 +-
source3/passdb/wscript_build |2 +-
source3/wscript |4 +++-
source3/wscript_build|3 ++-
5 files changed, 10 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 96c58c8..810fdaf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -808,7 +808,7 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o
passdb/pdb_interface.o \
passdb/login_cache.o @PDB_STATIC@ \
passdb/account_pol.o $(PRIVILEGES_OBJ) \
lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ) \
- passdb/pdb_util.o
+ passdb/pdb_util.o passdb/pdb_ldap_schema.o
DEVEL_HELP_WEIRD_OBJ = ../lib/util/charset/weird.o
CHARSET_MACOSXFS_OBJ = ../lib/util/charset/charset_macosxfs.o
@@ -2854,11 +2854,10 @@ bin/sam.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_SAM_OBJ)
@$(SHLD_MODULE) $(AUTH_SAM_OBJ)
bin/ldapsam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ldap.o passdb/pdb_nds.o \
- passdb/pdb_ipa.o passdb/pdb_ldap_util.o \
- passdb/pdb_ldap_schema.o
+ passdb/pdb_ipa.o passdb/pdb_ldap_util.o
@echo Building plugin $@
@$(SHLD_MODULE) passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o \
- passdb/pdb_ldap_util.o passdb/pdb_ldap_schema.o
$(LDAP_LIBS)
+ passdb/pdb_ldap_util.o $(LDAP_LIBS)
bin/ads.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ads.o
@echo Building plugin $@
diff --git a/source3/configure.in b/source3/configure.in
index e59d1e5..61ae567 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6957,7 +6957,7 @@ if test x$MODULE_DEFAULT_vfs_notify_fam = xSTATIC -o \
AC_SUBST(SMBD_FAM_LIBS)
fi
-SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o
passdb/pdb_ldap_util.o passdb/pdb_ldap_schema.o,
+SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o
passdb/pdb_ldap_util.o,
bin/ldapsam.$SHLIBEXT, PDB,
[ PASSDB_LIBS=$PASSDB_LIBS $LDAP_LIBS ] )
SMB_MODULE(pdb_ads, passdb/pdb_ads.o \$(TLDAP_OBJ), bin/ads.$SHLIBEXT, PDB)
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index dbf9707..662cfd2 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
PDB_TDBSAM_SRC ='pdb_tdb.c'
-PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c
pdb_ldap_schema.c'
+PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c'
PDB_ADS_SRC = 'pdb_ads.c'
PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
diff --git a/source3/wscript b/source3/wscript
index 3eafc2d..1a5a5c4 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -570,7 +570,8 @@ msg.msg_acctrightslen = sizeof(fd);
if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi') or \
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via afb8a7c s3: Fix the talloc hierarchy in fetch_share_mode_unlocked
from 1bbcc65 s3-waf: check for KRB5_PDU_NONE as in the autoconf build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit afb8a7c87083cbfe0fb1fd32e37ab9736136908b
Author: Volker Lendecke v...@samba.org
Date: Wed Jan 11 19:51:53 2012 +0100
s3: Fix the talloc hierarchy in fetch_share_mode_unlocked
Thanks, metze for noticing!
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Fri Jan 13 13:16:44 CET 2012 on sn-devel-104
---
Summary of changes:
source3/locking/share_mode_lock.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locking/share_mode_lock.c
b/source3/locking/share_mode_lock.c
index 3b353d6..002a399 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -454,7 +454,7 @@ struct share_mode_lock
*fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
TALLOC_FREE(data.dptr);
return NULL;
}
- lck-data = parse_share_modes(mem_ctx, data);
+ lck-data = parse_share_modes(lck, data);
TALLOC_FREE(data.dptr);
if (lck-data == NULL) {
TALLOC_FREE(lck);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b8a8870 idl: add to_null property
via 94f925c idl: add to_null attribute to the spoolss devicename array
via 0df5d06 idl: add to_null attribute to the spoolss formname array
via ee292bf ndr: add ndr_pull_charset_to_null()
via 6501b8b idl: add parser for the to_null property
via 2fd4be0 s4-smbtorture: tweak spoolss_OpenPrinterEx devmode
from afb8a7c s3: Fix the talloc hierarchy in fetch_share_mode_unlocked
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b8a8870d276950fa7992047f98181bc137d63066
Author: David Disseldorp dd...@suse.de
Date: Fri Jan 13 13:51:22 2012 -0800
idl: add to_null property
to_null specifies that character conversion should only occur until the
null pointer in an array based string.
Signed-off-by: Jeremy Allison j...@samba.org
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Jan 14 00:51:54 CET 2012 on sn-devel-104
commit 94f925c815586221da10dcc5fcbadf9fb04a98f4
Author: David Disseldorp dd...@samba.org
Date: Wed Nov 23 02:03:48 2011 +0100
idl: add to_null attribute to the spoolss devicename array
OpenPrinterEx requests have also been observed in the wild carrying
non-utf16 garbage after the device mode devicename field null
terminator.
Signed-off-by: Jeremy Allison j...@samba.org
commit 0df5d0608e8aaa7dce2866d0c2cc4c27c677d98d
Author: David Disseldorp dd...@suse.de
Date: Sun Nov 13 20:40:56 2011 +0100
idl: add to_null attribute to the spoolss formname array
OpenPrinterEx requests have been observed in the wild carrying a device
mode formname A4 followed by non-utf16 garbage after the null
terminator. Such requests currently fail during unmarshalling in the
ndr_pull_charset() codepath, causing intermittent print job failures.
This change ensures that garbage after the device mode formname null
terminator is not processed in unmarshalling.
https://bugzilla.samba.org/show_bug.cgi?id=8606
Signed-off-by: Jeremy Allison j...@samba.org
commit ee292bf5f342652b382a1926779f215f7f8bd806
Author: David Disseldorp dd...@suse.de
Date: Sun Nov 13 20:01:43 2011 +0100
ndr: add ndr_pull_charset_to_null()
The same as ndr_pull_charset(), however only perform character
conversion on bytes prior to and including the null terminator.
Signed-off-by: Jeremy Allison j...@samba.org
commit 6501b8bc6f6f7cd83f67c9766abc8231caf7fe54
Author: David Disseldorp dd...@suse.de
Date: Sun Nov 13 20:39:58 2011 +0100
idl: add parser for the to_null property
Compile into a ndr_pull_charset_to_null call.
Signed-off-by: Jeremy Allison j...@samba.org
commit 2fd4be0085332753ddbd59b2bc841da9a4d0cdce
Author: David Disseldorp dd...@samba.org
Date: Tue Nov 15 18:08:43 2011 +0100
s4-smbtorture: tweak spoolss_OpenPrinterEx devmode
Flip some bits after the null terminator in the spoolss device mode
character arrays to trigger bug 8606.
Signed-off-by: Jeremy Allison j...@samba.org
---
Summary of changes:
librpc/idl/spoolss.idl |4 +-
librpc/ndr/libndr.h |1 +
librpc/ndr/ndr_string.c | 31 ++
pidl/lib/Parse/Pidl/NDR.pm |9 +++-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |6 -
source4/torture/ndr/spoolss.c|4 +-
6 files changed, 49 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 4599e3a..d888a79 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -678,7 +678,7 @@ cpp_quote(#define spoolss_security_descriptor
security_descriptor)
const int MAXDEVICENAME = 32;
typedef [public,gensize] struct {
- [charset(UTF16)] uint16 devicename[MAXDEVICENAME];
+ [charset(UTF16),to_null] uint16 devicename[MAXDEVICENAME];
spoolss_DeviceModeSpecVersion specversion;
uint16 driverversion;
uint16 size;
@@ -697,7 +697,7 @@ cpp_quote(#define spoolss_security_descriptor
security_descriptor)
uint16 yresolution;
spoolss_DeviceModeTTOption ttoption;
spoolss_DeviceModeCollate collate;
- [charset(UTF16)] uint16 formname[MAXDEVICENAME];
+ [charset(UTF16),to_null] uint16 formname[MAXDEVICENAME];
uint16 logpixels; /* reserved */
uint32 bitsperpel; /* reserved */
uint32 pelswidth; /* reserved */
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 9c26bef..162c109 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -598,6
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ab1f896 KCC importldif/exportldif and intersite topology via aff8dad Intersite KCC flags for python via 11e2c84 Intersite KCC flags from b8a8870 idl: add to_null property http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ab1f896c5152dfd10609ac146eaaecd1bd2d5b70 Author: Dave Craft wimber...@gmail.com Date: Wed Jan 11 08:11:35 2012 -0600 KCC importldif/exportldif and intersite topology Add options for extracting an LDIF file from a database and reimporting the LDIF into a schema-less database for subsequent topology test/debug. Add intersite topology generation with computation of ISTG and bridgehead servers Signed-off-by: Andrew Tridgell tri...@samba.org Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Sat Jan 14 07:45:11 CET 2012 on sn-devel-104 commit aff8dad076f803e6deb2c5b59fa3bc5cb7ca7bd7 Author: Dave Craft wimber...@gmail.com Date: Wed Jan 11 08:10:27 2012 -0600 Intersite KCC flags for python Add NTDSSITELINK options to dsdb class for use in python samba_kcc Signed-off-by: Andrew Tridgell tri...@samba.org commit 11e2c8493f08214c290fec87dac18ad23de234bf Author: Dave Craft wimber...@gmail.com Date: Wed Jan 11 08:08:52 2012 -0600 Intersite KCC flags NTDSSITELINK option flags added Signed-off-by: Andrew Tridgell tri...@samba.org --- Summary of changes: libds/common/flags.h|5 + source4/dsdb/pydsdb.c |5 + source4/scripting/bin/samba_kcc | 1629 --- source4/scripting/python/samba/kcc_utils.py | 1176 4 files changed, 2439 insertions(+), 376 deletions(-) Changeset truncated at 500 lines: diff --git a/libds/common/flags.h b/libds/common/flags.h index c25a9e9..96709af 100644 --- a/libds/common/flags.h +++ b/libds/common/flags.h @@ -268,3 +268,8 @@ #define NTDSCONN_OPT_DISABLE_INTERSITE_COMPRESSION 0x0010 #define NTDSCONN_OPT_USER_OWNED_SCHEDULE 0x0020 #define NTDSCONN_OPT_RODC_TOPOLOGY 0x0040 + +/* 7.1.1.2.2.3.3 Site Link Object options flags */ +#define NTDSSITELINK_OPT_USE_NOTIFY 0x0001 +#define NTDSSITELINK_OPT_TWOWAY_SYNC0x0002 +#define NTDSSITELINK_OPT_DISABLE_COMPRESSION0x0004 diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c index f9896c0..616e169 100644 --- a/source4/dsdb/pydsdb.c +++ b/source4/dsdb/pydsdb.c @@ -1186,6 +1186,11 @@ void initdsdb(void) ADD_DSDB_FLAG(NTDSCONN_OPT_USER_OWNED_SCHEDULE); ADD_DSDB_FLAG(NTDSCONN_OPT_RODC_TOPOLOGY); +/* Site Link Object options */ +ADD_DSDB_FLAG(NTDSSITELINK_OPT_USE_NOTIFY); +ADD_DSDB_FLAG(NTDSSITELINK_OPT_TWOWAY_SYNC); +ADD_DSDB_FLAG(NTDSSITELINK_OPT_DISABLE_COMPRESSION); + /* GPO policy flags */ ADD_DSDB_FLAG(GPLINK_OPT_DISABLE); ADD_DSDB_FLAG(GPLINK_OPT_ENFORCE); diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index c17439e..583d88f 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -18,6 +18,7 @@ # along with this program. If not, see http://www.gnu.org/licenses/. import os +import tempfile import sys import random import copy @@ -35,11 +36,15 @@ os.environ[TZ] = GMT # Find right directory when running from source tree sys.path.insert(0, bin/python) -import samba, ldb import optparse import logging -from samba import getopt as options +from samba import (getopt as options, \ + Ldb, \ + ldb, \ + dsdb,\ + param, \ + read_and_sub_file) from samba.auth import system_session from samba.samdb import SamDB from samba.dcerpcimport drsuapi @@ -47,19 +52,25 @@ from samba.kcc_utils import * class KCC: The Knowledge Consistency Checker class. A container for - objects and methods allowing a run of the KCC. Produces - a set of connections in the samdb for which the Distributed - Replication Service can then utilize to replicate naming - contexts +objects and methods allowing a run of the KCC. Produces +a set of connections in the samdb for which the Distributed +Replication Service can then utilize to replicate naming +contexts -def __init__(self, samdb): +def __init__(self): Initializes the partitions class which can hold - our local DCs partitions or all the partitions in - the forest +
