1 files changed, 8 insertions, 5 deletions
diff --git a/source3/python/gprinterdata b/source3/python/gprinterdata
index f1992db5a5..59c5f3c315 100755
--- a/source3/python/gprinterdata
+++ b/source3/python/gprinterdata
@@ -9,16 +9,19 @@ import printerdata
 
 # Initialise printerdata dictionary
 
-if len(sys.argv) != 2:
-    print "Usage: gprinterdata <printer>"
+if len(sys.argv) < 2 or len(sys.argv) > 3:
+    print "Usage: gprinterdata [--ex] <printer>"
     print "where <printer> is a UNC printer name."
     sys.exit(1)
 
 try:
-    host = string.replace(sys.argv[1], "/", "\\")
-    t = printerdata.printerdata(host)
+    host = string.replace(sys.argv[len(sys.argv) - 1], "/", "\\")
+    if sys.argv[1] == "--ex":
+        t = printerdata.printerdata_ex(host)
+    else:
+        t = printerdata.printerdata(host)
 except:
-    print "gprinterdata: error opening %s" % sys.argv[1]
+    print "gprinterdata: error opening %s" % sys.argv[len(sys.argv) - 1]
     sys.exit(1)
 
 # Create interface