pyldb: avoid segfault when adding an element with no name

[kai/samba-autobuild/.git] / source4 / scripting / bin / smbstatus

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index bbd0e848269a9475a23976a74382ff0645dbfdca..fd67b2ca6916da5ccd6dcf76c935934b1f144ea7 100755 (executable)
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -1,16 +1,22 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 #  provide information on connected users and open files
-#  Copyright ǒ Jelmer Vernooij 2008
+#  Copyright (c) Jelmer Vernooij 2008
 #
 #  Based on the original in EJS:
 #  Copyright Andrew Tridgell 2005
 #  Released under the GNU GPL version 3 or later
 #
-
+from __future__ import print_function
 import os, sys
 
+# make sure the script dies immediately when hitting control-C,
+# rather than raising KeyboardInterrupt. As we do all database
+# operations using transactions, this is safe.
+import signal
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
 sys.path.insert(0, "bin/python")
 
 import optparse
@@ -18,66 +24,69 @@ import samba.getopt as options
 from samba import irpc, messaging
 
 def show_sessions(conn):
-       """show open sessions"""
+    """show open sessions"""
 
-       sessions = conn.smbsrv_information(irpc.SMBSRV_INFO_SESSIONS).next()
-       print "User                                  Client      Connected at"
-       print "-------------------------------------------------------------------------------"
-       for session in sessions:
-               fulluser = "%s/%s" % (session.account_name, session.domain_name)
-               print "%-30s %16s   %s" % (fulluser, session.client_ip, sys.httptime(session.connect_time))
-       print ""
+    sessions = next(conn.smbsrv_information(irpc.SMBSRV_INFO_SESSIONS))
+    print("User                                  Client      Connected at")
+    print("-" * 79)
+    for session in sessions:
+        fulluser = "%s/%s" % (session.account_name, session.domain_name)
+        print("%-30s %16s   %s" % (fulluser,
+                                   session.client_ip,
+                                   sys.httptime(session.connect_time)))
+    print()
 
 def show_tcons(open_connection):
-       """show open tree connects"""
-       conn = open_connection("smb_server")
-       tcons = conn.smbsrv_information(irpc.SMBSRV_INFO_TCONS).next()
-       print "Share                                 Client      Connected at"
-       print "-------------------------------------------------------------------------------"
-       for tcon in tcons:
-               print "%-30s %16s   %s" % (tcon.share_name, tcon.client_ip, sys.httptime(tcon.connect_time))
+    """show open tree connects"""
+    conn = open_connection("smb_server")
+    tcons = next(conn.smbsrv_information(irpc.SMBSRV_INFO_TCONS))
+    print("Share                                 Client      Connected at")
+    print("-" * 79)
+    for tcon in tcons:
+        print("%-30s %16s   %s" %
+              (tcon.share_name, tcon.client_ip, sys.httptime(tcon.connect_time)))
 
 
 def show_nbt(open_connection):
-       """show nbtd information"""
-       conn = open_connection("nbt_server")
-       stats = conn.nbtd_information(irpc.NBTD_INFO_STATISTICS).next()
-       print "NBT server statistics:"
-       fields = [("total_received", "Total received"),
-                         ("total_sent", "Total sent"),
-                         ("query_count", "Query count"),
-                         ("register_count", "Register count"),
-                         ("release_count", "Release count")]
-       for (field, description) in fields:
-               print "\t%s:\t%s" % (description, getattr(stats, field))
-       print
+    """show nbtd information"""
+    conn = open_connection("nbt_server")
+    stats = next(conn.nbtd_information(irpc.NBTD_INFO_STATISTICS))
+    print("NBT server statistics:")
+    fields = [("total_received", "Total received"),
+              ("total_sent", "Total sent"),
+              ("query_count", "Query count"),
+              ("register_count", "Register count"),
+              ("release_count", "Release count")]
+    for (field, description) in fields:
+        print("\t%s:\t%s" % (description, getattr(stats, field)))
+    print()
 
 parser = optparse.OptionParser("%s [options]" % sys.argv[0])
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option("--messaging-path", type="string", metavar="PATH",
-                         help="messaging path")
+                  help="messaging path")
 parser.add_option("--nbt", help="show NetBIOS status", action="store_true")
 
 opts, args = parser.parse_args()
 
 lp = sambaopts.get_loadparm()
 
-print "%s" % lp.get("server string")
+print("%s" % lp.get("server string"))
 
 messaging_path = (opts.messaging_path or os.path.join(lp.get("private dir"), "smbd.tmp", "messaging"))
 
 def open_connection(name):
-       return messaging.ClientConnection(name, messaging_path=messaging_path)
+    return messaging.ClientConnection(name, messaging_path=messaging_path)
 
 if opts.nbt:
-       show_nbt(open_connection)
+    show_nbt(open_connection)
 else:
-       try:
-               conn = open_connection("smb_server")
-       except RuntimeError, (num, msg):
-               if msg ==  'NT_STATUS_OBJECT_NAME_NOT_FOUND':
-                       print "No active connections"
-       else:
-               show_sessions(conn)
-               show_tcons(conn)
+    try:
+        conn = open_connection("smb_server")
+    except RuntimeError, (num, msg):
+        if msg == 'NT_STATUS_OBJECT_NAME_NOT_FOUND':
+            print("No active connections")
+    else:
+        show_sessions(conn)
+        show_tcons(conn)