[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  32c82fe s4:lib/tls - include GNUTLS headers consistently using <...>
       via  fa89f27 s4:samba-tool fsmo * - fix missing "takes_optiongroups"
      from  476d503 lib/util: Remove unused sys_sendto()

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


- Log -----------------------------------------------------------------
commit 32c82fe69b588fe18674c0bda49cd7fc0f73f50a
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Fri Feb 17 22:58:07 2012 +0100

    s4:lib/tls - include GNUTLS headers consistently using <...>
    
    These are system-specific.
    
    Reviewed-by: Jelmer
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Sat Feb 18 00:43:58 CET 2012 on sn-devel-104

commit fa89f2756f2d56ff83a5a6646ccff759b03f900d
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Fri Feb 17 21:24:48 2012 +0100

    s4:samba-tool fsmo * - fix missing "takes_optiongroups"
    
    This has been reported in bug #8755.
    
    Reviewed-by: Jelmer

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

Summary of changes:
 source4/lib/tls/tls.c                         |    2 +-
 source4/lib/tls/tls_tstream.c                 |    2 +-
 source4/lib/tls/tlscert.c                     |    4 ++--
 source4/scripting/python/samba/netcmd/fsmo.py |   12 ++++++++++++
 source4/utils/tests/test_samba_tool.sh        |    2 ++
 5 files changed, 18 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 82cf260..7bf2ff8 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -28,7 +28,7 @@
 #include "param/param.h"
 
 #if ENABLE_GNUTLS
-#include "gnutls/gnutls.h"
+#include <gnutls/gnutls.h>
 
 #define DH_BITS 1024
 
diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index eb4a6d9..6bb68fb 100644
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -25,7 +25,7 @@
 #include "lib/tls/tls.h"
 
 #if ENABLE_GNUTLS
-#include "gnutls/gnutls.h"
+#include <gnutls/gnutls.h>
 
 #define DH_BITS 1024
 
diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
index bef6348..0c780ea 100644
--- a/source4/lib/tls/tlscert.c
+++ b/source4/lib/tls/tlscert.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 
 #if ENABLE_GNUTLS
-#include "gnutls/gnutls.h"
-#include "gnutls/x509.h"
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
 #if HAVE_GCRYPT_H
 #include <gcrypt.h>
 #endif
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py
index 958e5b8..f4e03b2 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/source4/scripting/python/samba/netcmd/fsmo.py
@@ -125,6 +125,12 @@ class cmd_fsmo_show(Command):
 
     synopsis = "%prog [options]"
 
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "credopts": options.CredentialsOptions,
+        "versionopts": options.VersionOptions,
+        }
+
     takes_options = [
         Option("-H", "--URL", help="LDB URL for database or target server", type=str,
                metavar="URL", dest="H"),
@@ -182,6 +188,12 @@ class cmd_fsmo_transfer(Command):
 
     synopsis = "%prog [options]"
 
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "credopts": options.CredentialsOptions,
+        "versionopts": options.VersionOptions,
+        }
+
     takes_options = [
         Option("-H", "--URL", help="LDB URL for database or target server", type=str,
                metavar="URL", dest="H"),
diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh
index 0e03ee4..7057312 100755
--- a/source4/utils/tests/test_samba_tool.sh
+++ b/source4/utils/tests/test_samba_tool.sh
@@ -40,4 +40,6 @@ testit "domain level.show" $VALGRIND $samba_tool domain level show
 
 testit "domain info" $VALGRIND $samba_tool domain info $SERVER_IP
 
+testit "fsmo show" $VALGRIND $samba_tool fsmo show
+
 exit $failed


-- 
Samba Shared Repository