diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-03-18 16:46:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-03-20 13:54:07 +0100 |
| commit | 95ca5fbadd390fe056ee2e8f9716ee478904458e (patch) | |
| tree | 42e63363688ffa6945a06121f1cd8215222403a8 /source4/librpc | |
| parent | 6058977f900c513eafe20201d0b1b0d13727ba13 (diff) | |
| download | samba-95ca5fbadd390fe056ee2e8f9716ee478904458e.tar.gz samba-95ca5fbadd390fe056ee2e8f9716ee478904458e.tar.bz2 samba-95ca5fbadd390fe056ee2e8f9716ee478904458e.zip | |
libndr: Rename ndr64_transfer_syntax and null_ndr_syntax_id so they have a ndr_ prefix.
This makes the NDR namespace a bit clearer, in preparation of ABI checking.
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_auth.c | 4 | ||||
| -rw-r--r-- | source4/librpc/rpc/pyrpc.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c index f119b426d9..cedcdd1bec 100644 --- a/source4/librpc/rpc/dcerpc_auth.c +++ b/source4/librpc/rpc/dcerpc_auth.c @@ -41,9 +41,9 @@ static NTSTATUS dcerpc_init_syntaxes(const struct ndr_interface_table *table, syntax->if_version = table->syntax_id.if_version; if (pipe_flags & DCERPC_NDR64) { - *transfer_syntax = ndr64_transfer_syntax; + *transfer_syntax = ndr_transfer_syntax_ndr64; } else { - *transfer_syntax = ndr_transfer_syntax; + *transfer_syntax = ndr_transfer_syntax_ndr; } return NT_STATUS_OK; diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c index 23961e7a07..67462f18f3 100644 --- a/source4/librpc/rpc/pyrpc.c +++ b/source4/librpc/rpc/pyrpc.c @@ -262,10 +262,9 @@ static PyObject *py_iface_alter_context(PyObject *self, PyObject *args, PyObject return NULL; if (py_transfer_syntax == Py_None) { - transfer_syntax = ndr_transfer_syntax; + transfer_syntax = ndr_transfer_syntax_ndr; } else { - if (!ndr_syntax_from_py_object(py_transfer_syntax, - &transfer_syntax)) + if (!ndr_syntax_from_py_object(py_transfer_syntax, &transfer_syntax)) return NULL; } |