diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/libcli/util | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/libcli/util')
| -rw-r--r-- | source4/libcli/util/clilsa.c | 2 | ||||
| -rw-r--r-- | source4/libcli/util/ntstatus.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c index 1eb2de83d2..abca8f49b2 100644 --- a/source4/libcli/util/clilsa.c +++ b/source4/libcli/util/clilsa.c @@ -349,7 +349,7 @@ NTSTATUS smblsa_sid_del_privileges(struct smbcli_state *cli, struct dom_sid *sid r.in.handle = &cli->lsa->handle; r.in.sid = sid; - r.in.unknown = 0; + r.in.remove_all = 0; r.in.rights = rights; return dcerpc_lsa_RemoveAccountRights(cli->lsa->pipe, mem_ctx, &r); diff --git a/source4/libcli/util/ntstatus.h b/source4/libcli/util/ntstatus.h index 9c7bee0dfe..7d223ae789 100644 --- a/source4/libcli/util/ntstatus.h +++ b/source4/libcli/util/ntstatus.h @@ -597,6 +597,7 @@ typedef uint32_t NTSTATUS; #define NT_STATUS_DOWNGRADE_DETECTED NT_STATUS(0xC0000000 | 0x0388) #define NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED NT_STATUS(0xC0000000 | 0x20004) #define NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX NT_STATUS(0xC0000000 | 0x20026) +#define NT_STATUS_RPC_NT_CALL_FAILED NT_STATUS(0xC0000000 | 0x2001B) /* I use NT_STATUS_FOOBAR when I have no idea what error code to use - |