diff options
| author | Tim Potter <tpot@samba.org> | 2002-05-03 06:21:59 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-05-03 06:21:59 +0000 |
| commit | fe816061c1543ae8435f6e80801d5c3d5366461e (patch) | |
| tree | 729d6d9ef7db6d0638bf5e06f3cef8f6515d1eba | |
| parent | aa69c1ee80fbf7f45d61861089daeb5828e91229 (diff) | |
| download | samba-fe816061c1543ae8435f6e80801d5c3d5366461e.tar.gz samba-fe816061c1543ae8435f6e80801d5c3d5366461e.tar.bz2 samba-fe816061c1543ae8435f6e80801d5c3d5366461e.zip | |
Re-order args for enumprinterdrivers function.
(This used to be commit 5f9f32021300d47dcc068192428ee48b8aa246ea)
| -rw-r--r-- | source3/python/py_spoolss.c | 10 | ||||
| -rw-r--r-- | source3/python/py_spoolss_drivers.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/python/py_spoolss.c b/source3/python/py_spoolss.c index c87b6626fe..e1d6d47345 100644 --- a/source3/python/py_spoolss.c +++ b/source3/python/py_spoolss.c @@ -53,10 +53,10 @@ static PyMethodDef spoolss_methods[] = { { "openprinter", spoolss_openprinter, METH_VARARGS | METH_KEYWORDS, "openprinter(printername, [creds, access]) -> <spoolss hnd object> -Open a printer given by printername in UNC format. Optionally a -dictionary of (username, password) may be given in which case they are -used when opening the RPC pipe. An access mask may also be given which -defaults to MAXIMUM_ALLOWED_ACCESS. +Open a printer given by printername in UNC format. Optionally a dictionary +of (domain, username, password) may be given in which case they are used +when opening the RPC pipe. An access mask may also be given which defaults +to MAXIMUM_ALLOWED_ACCESS. Example: @@ -104,7 +104,7 @@ Example: { "enumprinterdrivers", spoolss_enumprinterdrivers, METH_VARARGS | METH_KEYWORDS, -"enumprinterdrivers(server, [level, arch, creds]) -> list +"enumprinterdrivers(server, [creds, level, arch]) -> list Return a list of printer drivers. "}, diff --git a/source3/python/py_spoolss_drivers.c b/source3/python/py_spoolss_drivers.c index 5c0d6174cf..de2fd5626b 100644 --- a/source3/python/py_spoolss_drivers.c +++ b/source3/python/py_spoolss_drivers.c @@ -31,15 +31,15 @@ PyObject *spoolss_enumprinterdrivers(PyObject *self, PyObject *args, int level = 1, i; uint32 needed, num_drivers; char *arch = "Windows NT x86", *server_name; - static char *kwlist[] = {"server", "level", "arch", "creds", NULL}; + static char *kwlist[] = {"server", "creds", "level", "arch", NULL}; struct cli_state *cli = NULL; TALLOC_CTX *mem_ctx = NULL; /* Parse parameters */ - if (!PyArg_ParseTupleAndKeywords(args, kw, "s|isO!", kwlist, - &server_name, &level, &arch, - &PyDict_Type, &creds)) + if (!PyArg_ParseTupleAndKeywords(args, kw, "s|O!is", kwlist, + &server_name, &PyDict_Type, &creds, + &level, &arch)) return NULL; /* Call rpc function */ |