svn commit: samba r26614 - in branches/SAMBA_4_0: . source/scripting/python/samba

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-27 23:31:42 +0000 (Thu, 27 Dec 2007)
New Revision: 26614

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26614

Log:
Fix options parsing for credentials in Python.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/scripting/python/samba/getopt.py


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/scripting/python/samba/getopt.py
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/samba/getopt.py	2007-12-27 07:47:11 UTC (rev 26613)
+++ branches/SAMBA_4_0/source/scripting/python/samba/getopt.py	2007-12-27 23:31:42 UTC (rev 26614)
@@ -35,12 +35,24 @@
 class CredentialsOptions(optparse.OptionGroup):
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Credentials Options")
-        self.add_option("--simple-bind-dn", type="string", metavar="DN",
+        self.add_option("--simple-bind-dn", metavar="DN", action="callback",
+                        callback=self.set_simple_bind_dn, type=str,
                         help="DN to use for a simple bind")
-        self.add_option("--password", type="string", metavar="PASSWORD",
-                        help="Password")
+        self.add_option("--password", metavar="PASSWORD", action="callback",
+                        help="Password", type=str, callback=self.set_password)
+        self.add_option("-U", "--username", metavar="USERNAME", 
+                        action="callback", type=str,
+                        help="username", callback=self.parse_username)
+        self.creds = Credentials()
 
+    def parse_username(self, option, opt_str, arg, parser):
+        self.creds.parse_string(arg)
+
+    def set_password(self, option, opt_str, arg, parser):
+        self.creds.set_password(arg)
+
+    def set_simple_bind_dn(self, option, opt_str, arg, parser):
+        self.creds.set_simple_bind_dn(arg)
+
     def get_credentials(self):
-        creds = Credentials()
-        # FIXME: Update
-        return creds
+        return self.creds