The branch, master has been updated via 13784b7 s3:smbd: fix typo in comment for set_conn_force_user_group() via 9006198 s4:samba_kcc: Use 'dburl' passed from command line rather than lp.samdb_url() via 1b71f08 s4:kcc_util: fix loading connection transport object - used to refer to not defined object via 1325e0a s4:samba_kcc: fix reference to DSA object while building partial replica list via b241aac s4:samba_kcc: Fix error handling opening export ldif file via 42fb23b s4:kcc_utils: Propagate 'samdb' into load_connection_transport() method via 8b68f9b s4:KCC: Use dsdb.DS_DOMAIN_FUNCTION_2008 constant for DS-Behavior comparisons via c9b1f6b samba-tool/upgrade: Fix exception thrown during upgrade from samba3 from 6549716 s3: srvsvc pipe - We should return WERR_BADFILE in _srvsvc_NetShareAdd if the path does not exist.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 13784b74d84e1351e27702fd3bbfb04eeb9a40f8 Author: Michael Adam <ob...@samba.org> Date: Tue Apr 22 22:32:14 2014 +0200 s3:smbd: fix typo in comment for set_conn_force_user_group() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Kamen Mazdrashki <kame...@samba.org> Autobuild-User(master): Kamen Mazdrashki <kame...@samba.org> Autobuild-Date(master): Wed Apr 23 01:49:09 CEST 2014 on sn-devel-104 commit 9006198839b740be9eb7a4c21ee227c66651b9e3 Author: Kamen Mazdrashki <kame...@samba.org> Date: Mon Apr 21 17:51:09 2014 +0200 s4:samba_kcc: Use 'dburl' passed from command line rather than lp.samdb_url() This patch makes '-H, --URL' param to actually work as expected Change-Id: Ie7f4e9e3fc1f79a938473312e200f36de6886596 Signed-off-by: Kamen Mazdrashki <kame...@samba.org> Reviewed-By: Jelmer Vernooij <jel...@samba.org> commit 1b71f080eae8fa7b7fb7a1e879bd460797edc010 Author: Kamen Mazdrashki <kame...@samba.org> Date: Mon Apr 21 17:39:21 2014 +0200 s4:kcc_util: fix loading connection transport object - used to refer to not defined object Change-Id: If8dc8e8db85f1a882ec73dc83d28fa1b5156de84 Signed-off-by: Kamen Mazdrashki <kame...@samba.org> Reviewed-By: Jelmer Vernooij <jel...@samba.org> commit 1325e0af6a1d411e7f3d6bb15ad69ffc59dd9296 Author: Kamen Mazdrashki <kame...@samba.org> Date: Mon Apr 21 17:36:58 2014 +0200 s4:samba_kcc: fix reference to DSA object while building partial replica list Change-Id: I33209dfd42d8c3af8d80b862ba0022d15385311b Signed-off-by: Kamen Mazdrashki <kame...@samba.org> Reviewed-By: Jelmer Vernooij <jel...@samba.org> commit b241aacc4658a93102bc69d8f4a9c4a542b18cdd Author: Kamen Mazdrashki <kame...@samba.org> Date: Mon Apr 21 17:32:36 2014 +0200 s4:samba_kcc: Fix error handling opening export ldif file Change-Id: If52440272513ef244e33481476da0e884969153c Signed-off-by: Kamen Mazdrashki <kame...@samba.org> Reviewed-By: Jelmer Vernooij <jel...@samba.org> commit 42fb23b8b28601baaaca8c4f695a220ca1ead64b Author: Kamen Mazdrashki <kame...@samba.org> Date: Mon Apr 21 14:43:51 2014 +0200 s4:kcc_utils: Propagate 'samdb' into load_connection_transport() method so it is actually able to make samdb.search-es Change-Id: I8491fd215710a53fbb41d607381f89afb5267464 Signed-off-by: Kamen Mazdrashki <kame...@samba.org> Reviewed-By: Jelmer Vernooij <jel...@samba.org> commit 8b68f9b931877cbaed86471dd34076ae929983a2 Author: Kamen Mazdrashki <kame...@samba.org> Date: Mon Apr 21 14:32:48 2014 +0200 s4:KCC: Use dsdb.DS_DOMAIN_FUNCTION_2008 constant for DS-Behavior comparisons DS_BEHAVIOR_WIN2008 was used so far which is a leftover from previous KCC implementation in "C" Change-Id: Id9b6551073c0b17cc27e086faa315b01305f39a5 Signed-off-by: Kamen Mazdrashki <kame...@samba.org> Reviewed-By: Jelmer Vernooij <jel...@samba.org> commit c9b1f6b366e4f51c8fbf1051bcb44c7d91364b89 Author: Kamen Mazdrashki <kame...@samba.org> Date: Mon Apr 21 03:47:40 2014 +0200 samba-tool/upgrade: Fix exception thrown during upgrade from samba3 Change-Id: Ib486c0c7a68c53c61acdf270f966a43b1c61bace Signed-off-by: Kamen Mazdrashki <kame...@samba.org> Reviewed-By: Jelmer Vernooij <jel...@samba.org> ----------------------------------------------------------------------- Summary of changes: python/samba/kcc_utils.py | 7 ++++--- python/samba/upgrade.py | 2 +- source3/smbd/service.c | 2 +- source4/scripting/bin/samba_kcc | 20 ++++++++++---------- 4 files changed, 16 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/kcc_utils.py b/python/samba/kcc_utils.py index 57c3187..ad0f4e5 100644 --- a/python/samba/kcc_utils.py +++ b/python/samba/kcc_utils.py @@ -502,7 +502,7 @@ class DirectoryServiceAgent(object): """Is dsa at minimum windows level greater than or equal to (version) :param version: Windows version to test against - (e.g. DS_BEHAVIOR_WIN2008) + (e.g. DS_DOMAIN_FUNCTION_2008) """ if self.dsa_behavior >= version: return True @@ -903,7 +903,7 @@ class NTDSConnection(object): if "transportType" in msg: dsdn = dsdb_Dn(samdb, msg["tranportType"][0]) - self.load_connection_transport(str(dsdn.dn)) + self.load_connection_transport(samdb, str(dsdn.dn)) if "schedule" in msg: self.schedule = ndr_unpack(drsblobs.replSchedule, msg["schedule"][0]) @@ -916,7 +916,7 @@ class NTDSConnection(object): self.from_dnstr = str(dsdn.dn) assert self.from_dnstr is not None - def load_connection_transport(self, tdnstr): + def load_connection_transport(self, samdb, tdnstr): """Given a NTDSConnection object which enumerates a transport DN, load the transport information for the connection object @@ -932,6 +932,7 @@ class NTDSConnection(object): (tdnstr, estr)) if "objectGUID" in res[0]: + msg = res[0] self.transport_dnstr = tdnstr self.transport_guid = \ misc.GUID(samdb.schema_format_value("objectGUID", diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index 7eca5b6..11a66a6 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -666,7 +666,7 @@ Please fix this account before attempting to upgrade again try: ldb_object = Ldb(url, credentials=creds) except ldb.LdbError, e: - raise ProvisiongError("Could not open ldb connection to %s, the error message is: %s" % (url, e)) + raise ProvisioningError("Could not open ldb connection to %s, the error message is: %s" % (url, e)) else: break logger.info("Exporting posix attributes") diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 401cd8f..a9ad847 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -430,7 +430,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc } /**************************************************************************** - set relavent user and group settings corresponding to force user/group + Set relevant user and group settings corresponding to force user/group configuration for the given snum. ****************************************************************************/ diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index e3d38c9..617cad2 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -1009,10 +1009,10 @@ class KCC(object): # IF AmIRODC() and cr!nCName corresponds to default NC then # Let dsaobj be the nTDSDSA object of the dc - # IF dsaobj.msDS-Behavior-Version < DS_BEHAVIOR_WIN2008 + # IF dsaobj.msDS-Behavior-Version < DS_DOMAIN_FUNCTION_2008 # Skip dc if self.my_dsa.is_ro() and part.is_default(): - if not dsa.is_minimum_behavior(DS_BEHAVIOR_WIN2008): + if not dsa.is_minimum_behavior(dsdb.DS_DOMAIN_FUNCTION_2008): continue # IF t!name != "IP" and the parent object of dc has no value for @@ -1651,7 +1651,7 @@ class KCC(object): # an RODC, at least one writable domain controller in # the domain must be running Windows Server 2008 if ro and not partial and nc_x.nc_type == NCType.domain: - if not dc_s.is_minimum_behavior(DS_BEHAVIOR_WIN2008): + if not dc_s.is_minimum_behavior(dsdb.DS_DOMAIN_FUNCTION_2008): continue # If we haven't been told to turn off stale connection @@ -1683,7 +1683,7 @@ class KCC(object): # Pull out the NCReplica with the dn that # matches NC (x) we are examining. - p_of_x = dsa.current_rep_table[nc_x.nc_dnstr] + p_of_x = dc_s.current_rep_table[nc_x.nc_dnstr] # Replica (p) of NC (x) must be partial if not p_of_x.is_partial(): @@ -1724,7 +1724,7 @@ class KCC(object): # is no minimum windows behavior for those since GCs # have always been present. if ro and not partial and nc_x.nc_type == NCType.domain: - if not dc_s.is_minimum_behavior(DS_BEHAVIOR_WIN2008): + if not dc_s.is_minimum_behavior(dsdb.DS_DOMAIN_FUNCTION_2008): continue # If we haven't been told to turn off stale connection @@ -1910,13 +1910,13 @@ class KCC(object): # currently importing an ldif for a test run if self.samdb is None: try: - self.samdb = SamDB(url=lp.samdb_url(), + self.samdb = SamDB(url=dburl, session_info=system_session(), credentials=creds, lp=lp) except ldb.LdbError, (num, msg): logger.error("Unable to open sam database %s : %s" % - (lp.samdb_url(), msg)) + (dburl, msg)) return 1 try: @@ -2027,7 +2027,7 @@ class KCC(object): credentials=creds, lp=lp) except ldb.LdbError, (enum, estr): logger.error("Unable to open sam database (%s) : %s" % - (lp.samdb_url(), estr)) + (dburl, estr)) return 1 if os.path.exists(ldif_file): @@ -2037,8 +2037,8 @@ class KCC(object): try: f = open(ldif_file, "w") - except (enum, estr): - logger.error("Unable to open (%s) : %s" % (ldif_file, estr)) + except IOError as ioerr: + logger.error("Unable to open (%s) : %s" % (ldif_file, str(ioerr))) return 1 try: -- Samba Shared Repository