[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  ce55d7c Revert "s4:netcmd/drs.py - use "objectClass" for discovering the server and it's NTDS settings object"
       via  b028a60 replace:wscript - change the "bool" checks to be compatible with more platforms
      from  7e2b315 add handling for solaris

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ce55d7c9f0c0720f765f549f9b2617cb9a3d2299
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 28 12:54:02 2010 +0100

    Revert "s4:netcmd/drs.py - use "objectClass" for discovering the server and it's NTDS settings object"
    
    This reverts commit b87c3703cf890bd55340a201536073bd2be1e1d8.
    Andrew Bartlett told me that exactly the opposite is true - the "objectCategory"
    lookup is performing better.
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Sun Nov 28 14:18:41 CET 2010 on sn-devel-104

commit b028a6001ad7e440fbd71faa45cad8b5966fac1c
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 28 12:28:03 2010 +0100

    replace:wscript - change the "bool" checks to be compatible with more platforms
    
    - If the type was found then we are fine and define "HAVE_BOOL"
    - Othewise we substitute it in "replace.h" as "_Bool" or if not possible as "int"
    - This prevents lot of warnings on platforms where we don't have a "bool" type as Tru64
    - The length check for "bool" is not really useful and therefore removed

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/wscript                          |    4 ++--
 source4/scripting/python/samba/netcmd/drs.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 0bfe660..f6a9bef 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -73,8 +73,8 @@ def configure(conf):
 
     conf.CHECK_TYPES('"long long" intptr_t uintptr_t ptrdiff_t comparison_fn_t')
     conf.CHECK_TYPE('_Bool', define='HAVE__Bool')
+    conf.CHECK_TYPE('bool', define='HAVE_BOOL')
 
-    conf.CHECK_TYPE('bool', 'int')
     conf.CHECK_TYPE('int8_t', 'char')
     conf.CHECK_TYPE('uint8_t', 'unsigned char')
     conf.CHECK_TYPE('int16_t', 'short')
@@ -91,7 +91,7 @@ def configure(conf):
     conf.CHECK_TYPE('volatile int', define='HAVE_VOLATILE')
     conf.CHECK_TYPE('uint_t', 'unsigned int')
 
-    conf.CHECK_SIZEOF('bool char int "long long" long short size_t ssize_t')
+    conf.CHECK_SIZEOF('char int "long long" long short size_t ssize_t')
     conf.CHECK_SIZEOF('int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t')
     conf.CHECK_SIZEOF('void*', define='SIZEOF_VOID_P')
     conf.CHECK_SIZEOF('off_t dev_t ino_t time_t')
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py
index 6816790..387524b 100644
--- a/source4/scripting/python/samba/netcmd/drs.py
+++ b/source4/scripting/python/samba/netcmd/drs.py
@@ -260,7 +260,7 @@ class cmd_drs_replicate(Command):
 
         # we need to find the NTDS GUID of the source DC
         msg = self.samdb.search(base=self.samdb.get_config_basedn(),
-                                expression="(&(objectClass=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC,
+                                expression="(&(objectCategory=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC,
                                                                                                        SOURCE_DC),
                                 attrs=[])
         if len(msg) == 0:
@@ -268,7 +268,7 @@ class cmd_drs_replicate(Command):
         server_dn = msg[0]['dn']
 
         msg = self.samdb.search(base=server_dn, scope=ldb.SCOPE_ONELEVEL,
-                                expression="(objectClass=nTDSDSA)",
+                                expression="(|(objectCategory=nTDSDSA)(objectCategory=nTDSDSARO))",
                                 attrs=['objectGUID', 'options'])
         if len(msg) == 0:
             raise CommandError("Failed to find source NTDS DN %s" % SOURCE_DC)


-- 
Samba Shared Repository