svn commit: samba r6539 - in
branches/SAMBA_4_0/source/scripting/swig: .
tpot at samba.org
tpot at samba.org
Sun May 1 01:31:24 GMT 2005
Author: tpot
Date: 2005-05-01 01:31:23 +0000 (Sun, 01 May 2005)
New Revision: 6539
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6539
Log:
A patch from jbm:
- convert rpcclient to new credential code
- allow anonymous connections
Modified:
branches/SAMBA_4_0/source/scripting/swig/rpcclient
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/swig/rpcclient
===================================================================
--- branches/SAMBA_4_0/source/scripting/swig/rpcclient 2005-05-01 00:00:37 UTC (rev 6538)
+++ branches/SAMBA_4_0/source/scripting/swig/rpcclient 2005-05-01 01:31:23 UTC (rev 6539)
@@ -28,12 +28,10 @@
prompt = 'rpcclient$ '
- def __init__(self, server, domain, username, password):
+ def __init__(self, server, cred):
Cmd.__init__(self)
self.server = server
- self.domain = domain
- self.username = username
- self.password = password
+ self.cred = cred
def emptyline(self):
@@ -85,7 +83,7 @@
pipe = dcerpc.pipe_connect(
'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- (self.domain, self.username, self.password))
+ self.cred)
connect_handle = samr.Connect(pipe)
@@ -107,7 +105,7 @@
pipe = dcerpc.pipe_connect(
'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- (self.domain, self.username, self.password))
+ self.cred)
connect_handle = samr.Connect(pipe)
@@ -128,7 +126,7 @@
pipe = dcerpc.pipe_connect(
'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- (self.domain, self.username, self.password))
+ self.cred)
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -155,7 +153,7 @@
pipe = dcerpc.pipe_connect(
'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- (self.domain, self.username, self.password))
+ self.cred)
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -182,7 +180,7 @@
pipe = dcerpc.pipe_connect(
'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- (self.domain, self.username, self.password))
+ self.cred)
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -207,7 +205,7 @@
pipe = dcerpc.pipe_connect(
'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- (self.domain, self.username, self.password))
+ self.cred)
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -231,7 +229,7 @@
pipe = dcerpc.pipe_connect(
'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- (self.domain, self.username, self.password))
+ self.cred)
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -268,8 +266,10 @@
options, args = parser.parse_args()
- # Break --username up into domain, usernamd and password
+ # Break --username up into domain, username and password
+ cred = None
+
if not options.username:
options.username = '%'
@@ -283,9 +283,12 @@
username = options.username
+ if username != '':
+ cred = (domain, username, password)
+
# Run command loop
- c = rpcclient(server, domain, username, password)
+ c = rpcclient(server, cred)
if options.command:
c.onecmd(options.command)
More information about the samba-cvs
mailing list