[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Fri Mar 16 13:47:04 UTC 2018


The branch, master has been updated
       via  0361748 wbinfo: Improve the wording for --online-status
       via  a27db0b ms_schema: fix python2.6 incompatibility
      from  26e75cf s3: gse: use "gensec_gssapi:requested_life_time"

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


- Log -----------------------------------------------------------------
commit 03617480d121232c06ce5887947326f3c92625eb
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Mar 8 15:40:56 2018 +0100

    wbinfo: Improve the wording for --online-status
    
    Currently it displays if a domain is online or offline which is wrong.
    It tells us if we maintain an active connection to the domain or not.
    
    Users are confused if they read offline because the think winbind is not
    functional with that domain.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Fri Mar 16 14:46:43 CET 2018 on sn-devel-144

commit a27db0b61e40b6b503b53e3579867e227f1971b8
Author: Björn Baumbach <bb at sernet.de>
Date:   Thu Mar 15 18:32:31 2018 +0100

    ms_schema: fix python2.6 incompatibility
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13337
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>

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

Summary of changes:
 docs-xml/manpages/wbinfo.1.xml | 7 ++++---
 nsswitch/wbinfo.c              | 4 ++--
 python/samba/ms_schema.py      | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml
index e2042ca..21e3ac9 100644
--- a/docs-xml/manpages/wbinfo.1.xml
+++ b/docs-xml/manpages/wbinfo.1.xml
@@ -346,9 +346,10 @@
 
 		<varlistentry>
 		<term>--online-status <replaceable>domain</replaceable></term>
-		<listitem><para>Show whether domains are marked as online or
-				offline. An optional domain argument limits the
-				output to the online status of a given domain.
+		<listitem><para>Display whether winbind currently maintains an
+				active connection or not. An optional domain
+				argument limits the output to the online status
+				of a given domain.
 		</para></listitem>
 		</varlistentry>
 
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 82863c2..1b58c73 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -640,7 +640,7 @@ static bool wbinfo_show_onlinestatus(const char *domain)
 
 		d_printf("%s : %s\n",
 			 domain_list[i].short_name,
-			 is_offline ? "offline" : "online" );
+			 is_offline ? "no active connection" : "active connection" );
 	}
 
 	wbcFreeMemory(domain_list);
@@ -2336,7 +2336,7 @@ int main(int argc, const char **argv, char **envp)
 		{ "all-domains", 0, POPT_ARG_NONE, 0, OPT_LIST_ALL_DOMAINS, "List all domains (trusted and own domain)" },
 		{ "own-domain", 0, POPT_ARG_NONE, 0, OPT_LIST_OWN_DOMAIN, "List own domain" },
 		{ "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Deprecated command, see --online-status" },
-		{ "online-status", 0, POPT_ARG_NONE, 0, OPT_ONLINESTATUS, "Show whether domains are marked as online or offline"},
+		{ "online-status", 0, POPT_ARG_NONE, 0, OPT_ONLINESTATUS, "Show whether domains maintain an active connection"},
 		{ "domain-info", 'D', POPT_ARG_STRING, &string_arg, 'D', "Show most of the info we have about the domain" },
 		{ "user-info", 'i', POPT_ARG_STRING, &string_arg, 'i', "Get user info", "USER" },
 		{ "uid-info", 0, POPT_ARG_INT, &int_arg, OPT_UID_INFO, "Get user info from uid", "UID" },
diff --git a/python/samba/ms_schema.py b/python/samba/ms_schema.py
index a8c9363..53ec02d 100644
--- a/python/samba/ms_schema.py
+++ b/python/samba/ms_schema.py
@@ -277,7 +277,7 @@ def __transform_entry(entry, objectClass):
 
     header.append(["objectGUID", str(uuid.uuid4()), False])
 
-    entry = header + [x for x in entry if x[0].lower() not in {'dn', 'changetype', 'objectcategory'}]
+    entry = header + [x for x in entry if x[0].lower() not in set(['dn', 'changetype', 'objectcategory'])]
 
     return entry
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list