svn commit: samba r6324 - in
branches/SAMBA_4_0/source/scripting/swig: .
tpot at samba.org
tpot at samba.org
Wed Apr 13 05:57:51 GMT 2005
Author: tpot
Date: 2005-04-13 05:57:51 +0000 (Wed, 13 Apr 2005)
New Revision: 6324
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6324
Log:
Pass server name instead of binding string on command line (always use
ncacn_np for the moment).
Fix rpcclient to work with struct cli_credentials.
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-04-13 05:50:02 UTC (rev 6323)
+++ branches/SAMBA_4_0/source/scripting/swig/rpcclient 2005-04-13 05:57:51 UTC (rev 6324)
@@ -28,9 +28,9 @@
prompt = 'rpcclient$ '
- def __init__(self, binding, domain, username, password):
+ def __init__(self, server, domain, username, password):
Cmd.__init__(self)
- self.binding = binding
+ self.server = server
self.domain = domain
self.username = username
self.password = password
@@ -83,9 +83,9 @@
return
pipe = dcerpc.pipe_connect(
- self.binding,
+ 'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- self.domain, self.username, self.password)
+ (self.domain, self.username, self.password))
connect_handle = samr.Connect(pipe)
@@ -105,9 +105,9 @@
return
pipe = dcerpc.pipe_connect(
- self.binding,
+ 'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- self.domain, self.username, self.password)
+ (self.domain, self.username, self.password))
connect_handle = samr.Connect(pipe)
@@ -126,9 +126,9 @@
return
pipe = dcerpc.pipe_connect(
- self.binding,
+ 'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- self.domain, self.username, self.password)
+ (self.domain, self.username, self.password))
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -153,9 +153,9 @@
return
pipe = dcerpc.pipe_connect(
- self.binding,
+ 'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- self.domain, self.username, self.password)
+ (self.domain, self.username, self.password))
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -180,9 +180,9 @@
return
pipe = dcerpc.pipe_connect(
- self.binding,
+ 'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- self.domain, self.username, self.password)
+ (self.domain, self.username, self.password))
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -205,9 +205,9 @@
return
pipe = dcerpc.pipe_connect(
- self.binding,
+ 'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- self.domain, self.username, self.password)
+ (self.domain, self.username, self.password))
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -229,9 +229,9 @@
return
pipe = dcerpc.pipe_connect(
- self.binding,
+ 'ncacn_np:%s' % self.server,
dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
- self.domain, self.username, self.password)
+ (self.domain, self.username, self.password))
connect_handle = samr.Connect(pipe)
domain_handle = connect_handle.OpenDomain(args[0])
@@ -247,18 +247,15 @@
# Parse command line
- usage = 'rpcclient BINDING [options]'
+ usage = 'rpcclient SERVER [options]'
if len(sys.argv) == 1:
print usage
sys.exit(1)
- binding = sys.argv[1]
+ server = sys.argv[1]
del(sys.argv[1])
- if string.find(binding, ':') == -1:
- binding = 'ncacn_np:' + binding
-
parser = OptionParser(usage)
parser.add_option('-U', '--username', action='store', type='string',
@@ -288,7 +285,7 @@
# Run command loop
- c = rpcclient(binding, domain, username, password)
+ c = rpcclient(server, domain, username, password)
if options.command:
c.onecmd(options.command)
More information about the samba-cvs
mailing list