The branch, v3-6-test has been updated
via 7ad77c2 idl: add file_id idl.
via 4538a21 s3-libndr: remove cmdline_lp_ctx.
via 64620cb waf: share libndr.so between samba3 and samba4.
via b50f096 libndr: move ndr_print_bool to ndr_basic.c
via 20e09d2 s3-waf: add PKGCONFIGDIR.
via 802e2a9 idl: remove protected storage
via 3ee3cbd idl: Add IDL for remote key backup protocol (rkbp)
from d6ab521 s3-build: remove source4 include path for autoconf build as
well.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 7ad77c2eab787801946689ba462c20c2b26dbda6
Author: Günther Deschner <g...@samba.org>
Date: Tue Jan 25 02:42:59 2011 +0100
idl: add file_id idl.
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Tue Jan 25 12:27:00 CET 2011 on sn-devel-104
(cherry picked from commit c9f4fad75cf9749709cbebfe55c59f3c2d01858e)
commit 4538a217368eabf5a0649d1168ecfb19a7919d94
Author: Günther Deschner <g...@samba.org>
Date: Tue Jan 25 02:52:18 2011 +0100
s3-libndr: remove cmdline_lp_ctx.
Guenther
(cherry picked from commit f0b3c72bcc119f497a4379c549bc55fb1031ce90)
commit 64620cbba4fe18731760e39990db41f13e29b042
Author: Günther Deschner <g...@samba.org>
Date: Tue Jan 25 02:01:56 2011 +0100
waf: share libndr.so between samba3 and samba4.
Guenther
(cherry picked from commit dd35fe181c2397a970fa956afa5f4da534841b99)
commit b50f096f37dfe3d50e097797c9b84f4b8064faeb
Author: Günther Deschner <g...@samba.org>
Date: Tue Jan 25 00:52:10 2011 +0100
libndr: move ndr_print_bool to ndr_basic.c
Guenther
(cherry picked from commit 7eac3100ea77eca64152444336180418938d5843)
commit 20e09d269b0f0d3ec5433566809dbe369774a713
Author: Günther Deschner <g...@samba.org>
Date: Tue Jan 25 00:47:05 2011 +0100
s3-waf: add PKGCONFIGDIR.
Guenther
(cherry picked from commit 62e1c80cf532681c02ecd2ddcb7c920381a0465e)
commit 802e2a918e3db282f2cfd282c1341437fa126e12
Author: Matthieu Patou <m...@matws.net>
Date: Sat Nov 20 18:06:12 2010 +0300
idl: remove protected storage
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit 9d9c2128585a1d5fdb9090215750427df6a883ff)
commit 3ee3cbd49fa06bd3d17fe6a52920d5d1dd557444
Author: Matthieu Patou <m...@matws.net>
Date: Sat Nov 20 18:19:06 2010 +0300
idl: Add IDL for remote key backup protocol (rkbp)
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit 25ae380fabfd2d7e5141dadb48b8e30b5b723c1f)
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/backupkey.idl | 120 +++++++++++++++++++++
librpc/idl/file_id.idl | 14 +++
librpc/idl/protected_storage.idl | 14 ---
librpc/idl/wscript_build | 6 +-
librpc/ndr/libndr.h | 2 +
librpc/ndr/ndr_backupkey.c | 215 ++++++++++++++++++++++++++++++++++++++
librpc/ndr/ndr_backupkey.h | 2 +
librpc/ndr/ndr_basic.c | 5 +
librpc/wscript_build | 35 +++++--
source3/Makefile.in | 2 +-
source3/build/dynconfig.py | 1 +
source3/include/locking.h | 9 +--
source3/include/proto.h | 4 -
source3/librpc/idl/notify.idl | 2 +
source3/librpc/ndr/util.c | 46 --------
source3/librpc/wscript_build | 2 +-
source3/wscript_build | 14 +--
source4/librpc/wscript_build | 15 +---
18 files changed, 398 insertions(+), 110 deletions(-)
create mode 100644 librpc/idl/backupkey.idl
create mode 100644 librpc/idl/file_id.idl
delete mode 100644 librpc/idl/protected_storage.idl
create mode 100644 librpc/ndr/ndr_backupkey.c
create mode 100644 librpc/ndr/ndr_backupkey.h
Changeset truncated at 500 lines:
diff --git a/librpc/idl/backupkey.idl b/librpc/idl/backupkey.idl
new file mode 100644
index 0000000..e21030b
--- /dev/null
+++ b/librpc/idl/backupkey.idl
@@ -0,0 +1,120 @@
+#include "idl_types.h"
+
+import "misc.idl", "security.idl";
+[
+ uuid("3dde7c30-165d-11d1-ab8f-00805f14db40"),
+ version(1.0),
+ endpoint("ncacn_np:[\\pipe\\protected_storage]","ncacn_np:[\\pipe\\ntsvcs]"
,"ncacn_ip_tcp:"),
+ helpstring("Remote Backup Key Storage"),
+ helper("../librpc/ndr/ndr_backupkey.h"),
+ pointer_default(unique)
+]
+interface backupkey
+{
+ const string BACKUPKEY_RESTORE_GUID =
"47270C64-2FC7-499B-AC5B-0E37CDCE899A";
+ const string BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID =
"018FF48A-EABA-40C6-8F6D-72370240E967";
+
+ const string BACKUPKEY_RESTORE_GUID_WIN2K =
"7FE94D50-178E-11D1-AB8F-00805F14DB40";
+ const string BACKUPKEY_BACKUP_GUID =
"7F752B10-178E-11D1-AB8F-00805F14DB40";
+
+ /*
+ * The magic values are really what they are there is no name it's just
remarkable values
+ * that are here to check that what is transmited or decoded is really
what the client or
+ * the server expect.
+ */
+ [public] typedef struct {
+ [value(0x00000002)] uint32 header1;
+ [value(0x00000494)] uint32 header2;
+ uint32 certificate_len;
+ [value(0x00000207)] uint32 magic1;
+ [value(0x0000A400)] uint32 magic2;
+ [value(0x32415352)] uint32 magic3;
+ [value(0x00000800)] uint32 magic4;
+ [subcontext(0),subcontext_size(4),flag(NDR_REMAINING)]
DATA_BLOB public_exponent;
+
+ [subcontext(0),subcontext_size(256),flag(NDR_REMAINING)]
DATA_BLOB modulus;
+ [subcontext(0),subcontext_size(128),flag(NDR_REMAINING)]
DATA_BLOB prime1;
+ [subcontext(0),subcontext_size(128),flag(NDR_REMAINING)]
DATA_BLOB prime2;
+ [subcontext(0),subcontext_size(128),flag(NDR_REMAINING)]
DATA_BLOB exponent1;
+ [subcontext(0),subcontext_size(128),flag(NDR_REMAINING)]
DATA_BLOB exponent2;
+ [subcontext(0),subcontext_size(128),flag(NDR_REMAINING)]
DATA_BLOB coefficient;
+ [subcontext(0),subcontext_size(256),flag(NDR_REMAINING)]
DATA_BLOB private_exponent;
+
[subcontext(0),subcontext_size(certificate_len),flag(NDR_REMAINING)] DATA_BLOB
cert;
+ } bkrp_exported_RSA_key_pair;
+
+ [public] typedef struct {
+ [value(0x00000001)] uint32 magic;
+ uint8 key[256];
+ } bkrp_dc_serverwrap_key;
+
+ [public,gensize] typedef struct {
+ uint32 version;
+ uint32 encrypted_secret_len;
+ uint32 access_check_len;
+ GUID guid;
+ uint8 encrypted_secret[encrypted_secret_len];
+ uint8 access_check[access_check_len];
+ } bkrp_client_side_wrapped;
+
+ [public] typedef struct {
+ [value(0x00000000)] uint32 magic;
+ [subcontext(0),flag(NDR_REMAINING)] DATA_BLOB secret;
+ } bkrp_client_side_unwrapped;
+
+ [public] typedef struct {
+ uint32 secret_len;
+ [value(0x00000020)] uint32 magic;
+ uint8 secret[secret_len];
+ uint8 payload_key[32];
+ } bkrp_encrypted_secret_v2;
+
+ [public] typedef struct {
+ uint32 secret_len;
+ [value(0x00000030)] uint32 magic1;
+ [value(0x00006610)] uint32 magic2;
+ [value(0x0000800e)] uint32 magic3;
+ uint8 secret[secret_len];
+ uint8 payload_key[48];
+ } bkrp_encrypted_secret_v3;
+
+ /* Due to alignement constraint we can generate the structure only via
pidl*/
+ [public, nopush, nopull] typedef struct {
+ [value(0x00000001)] uint32 magic;
+ uint32 nonce_len;
+ uint8 nonce[nonce_len];
+ dom_sid sid;
+ uint8 hash[20];
+ } bkrp_access_check_v2;
+
+ /* Due to alignement constraint we can generate the structure only via
pidl*/
+ [public,nopush,nopull] typedef struct {
+ [value(0x00000001)] uint32 magic;
+ uint32 nonce_len;
+ uint8 nonce[nonce_len];
+ dom_sid sid;
+ uint8 hash[64];
+ } bkrp_access_check_v3;
+
+ typedef enum {
+ BACKUPKEY_INVALID_GUID_INTEGER = 0xFFFF,
+ BACKUPKEY_RESTORE_GUID_INTEGER = 0x0000,
+ BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER = 0x0001
+ } bkrp_guid_to_integer;
+
+ [public] typedef [nodiscriminant] union {
+ [case(BACKUPKEY_RESTORE_GUID_INTEGER)] bkrp_client_side_wrapped
restore_req;
+ [case(BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER)]
bkrp_client_side_wrapped cert_req;
+ } bkrp_data_in_blob;
+
+ /******************/
+ /* Function: 0x00 */
+
+ [public, noprint] WERROR bkrp_BackupKey (
+ [in,ref] GUID *guidActionAgent,
+ [in,ref] [size_is(data_in_len)] uint8 *data_in,
+ [in] uint32 data_in_len,
+ [out,ref] [size_is(,*data_out_len)] uint8 **data_out,
+ [out,ref] uint32 *data_out_len,
+ [in] uint32 param
+ );
+}
diff --git a/librpc/idl/file_id.idl b/librpc/idl/file_id.idl
new file mode 100644
index 0000000..cd1febe
--- /dev/null
+++ b/librpc/idl/file_id.idl
@@ -0,0 +1,14 @@
+[
+ pointer_default(unique)
+]
+interface file_id
+{
+ typedef [public] struct {
+ /* we don't use SMB_DEV_T and SMB_INO_T as we want a fixed size
here,
+ and we may be using file system specific code to fill in
something
+ other than a dev_t for the device */
+ udlong devid;
+ udlong inode;
+ udlong extid; /* Support systems that use an extended id (e.g.
snapshots). */
+ } file_id;
+}
diff --git a/librpc/idl/protected_storage.idl b/librpc/idl/protected_storage.idl
deleted file mode 100644
index 7841f91..0000000
--- a/librpc/idl/protected_storage.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- protected_storage interface definitions
- Also seen with UUID:
-*/
-
-[ uuid("c9378ff1-16f7-11d0-a0b2-00aa0061426a"),
- version(1.0),
- pointer_default(unique)
-] interface protected_storage
-{
- /*****************************/
- /* Function 0x00 */
- WERROR ps_XXX ();
-}
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index eed6080..7342228 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -2,15 +2,15 @@
bld.SAMBA_PIDL_LIST('PIDL',
'''atsvc.idl drsuapi.idl epmapper.idl initshutdown.idl
- misc.idl ntlmssp.idl protected_storage.idl schannel.idl
trkwks.idl
- audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl
keysvc.idl
+ misc.idl ntlmssp.idl schannel.idl trkwks.idl
+ audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl
file_id.idl keysvc.idl
msgsvc.idl ntsvcs.idl remact.idl security.idl
unixinfo.idl wzcsvc.idl
browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
named_pipe_auth.idl orpc.idl rot.idl spoolss.idl
w32time.idl xattr.idl
dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl
nbt.idl dns.idl
oxidresolver.idl samr.idl srvsvc.idl winreg.idl
dcerpc.idl
drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
- policyagent.idl scerpc.idl svcctl.idl wkssvc.idl
eventlog6.idl''',
+ policyagent.idl scerpc.idl svcctl.idl wkssvc.idl
eventlog6.idl backupkey.idl''',
options='--header --ndr-parser --samba3-ndr-server
--samba3-ndr-client --server --client --python',
output_dir='../gen_ndr')
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 06cc93a..ff20755 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -571,4 +571,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_enum_uint16(struct
ndr_push *ndr, int ndr_fl
_PUBLIC_ enum ndr_err_code ndr_push_enum_uint32(struct ndr_push *ndr, int
ndr_flags, uint32_t v);
_PUBLIC_ enum ndr_err_code ndr_push_enum_uint1632(struct ndr_push *ndr, int
ndr_flags, uint16_t v);
+_PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const
bool b);
+
#endif /* __LIBNDR_H__ */
diff --git a/librpc/ndr/ndr_backupkey.c b/librpc/ndr/ndr_backupkey.c
new file mode 100644
index 0000000..ddbaeea
--- /dev/null
+++ b/librpc/ndr/ndr_backupkey.c
@@ -0,0 +1,215 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ routines for top backup key protocol marshalling/unmarshalling
+
+ Copyright (C) Matthieu Patou 2010
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_backupkey.h"
+#include "librpc/gen_ndr/ndr_security.h"
+
+static uint32_t backupkeyguid_to_uint(const struct GUID *guid)
+{
+ struct GUID tmp;
+ NTSTATUS status;
+ bool match;
+
+ status = GUID_from_string(BACKUPKEY_RESTORE_GUID, &tmp);
+ if (NT_STATUS_IS_OK(status)) {
+ match = GUID_equal(guid, &tmp);
+ if (match) {
+ return BACKUPKEY_RESTORE_GUID_INTEGER;
+ }
+ }
+
+ status = GUID_from_string(BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID, &tmp);
+ if (NT_STATUS_IS_OK(status)) {
+ match = GUID_equal(guid, &tmp);
+ if (match) {
+ return BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER;
+ }
+ }
+
+ return BACKUPKEY_INVALID_GUID_INTEGER;
+}
+
+_PUBLIC_ void ndr_print_bkrp_BackupKey(struct ndr_print *ndr, const char
*name, int flags, const struct bkrp_BackupKey *r)
+{
+ ndr_print_struct(ndr, name, "bkrp_BackupKey");
+ if (r == NULL) { ndr_print_null(ndr); return; }
+ ndr->depth++;
+ if (flags & NDR_SET_VALUES) {
+ ndr->flags |= LIBNDR_PRINT_SET_VALUES;
+ }
+ if (flags & NDR_IN) {
+ union bkrp_data_in_blob inblob;
+ DATA_BLOB blob;
+ uint32_t level;
+ enum ndr_err_code ndr_err;
+
+ ndr_print_struct(ndr, "in", "bkrp_BackupKey");
+ ndr->depth++;
+ ndr_print_ptr(ndr, "guidActionAgent", r->in.guidActionAgent);
+ ndr->depth++;
+ ndr_print_GUID(ndr, "guidActionAgent", r->in.guidActionAgent);
+ ndr->depth--;
+
+ level = backupkeyguid_to_uint(r->in.guidActionAgent);
+ blob.data = r->in.data_in;
+ blob.length = r->in.data_in_len;
+ ndr_err = ndr_pull_union_blob(&blob, ndr, &inblob, level,
+
(ndr_pull_flags_fn_t)ndr_pull_bkrp_data_in_blob);
+
+ ndr_print_ptr(ndr, "data_in", r->in.data_in);
+ ndr->depth++;
+ if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ ndr_print_bkrp_data_in_blob(ndr, "data_in", &inblob);
+ } else {
+ ndr_print_array_uint8(ndr, "data_in", r->in.data_in,
r->in.data_in_len);
+ }
+ ndr->depth--;
+
+ ndr_print_uint32(ndr, "data_in_len", r->in.data_in_len);
+ ndr_print_uint32(ndr, "param", r->in.param);
+ ndr->depth--;
+ }
+ if (flags & NDR_OUT) {
+ ndr_print_struct(ndr, "out", "bkrp_BackupKey");
+ ndr->depth++;
+ ndr_print_ptr(ndr, "data_out", r->out.data_out);
+ ndr->depth++;
+ ndr_print_ptr(ndr, "data_out", *r->out.data_out);
+ ndr->depth++;
+
+ if (*r->out.data_out) {
+ ndr_print_array_uint8(ndr, "data_out",
*r->out.data_out, *r->out.data_out_len);
+ }
+ ndr->depth--;
+ ndr->depth--;
+ ndr_print_ptr(ndr, "data_out_len", r->out.data_out_len);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "data_out_len", *r->out.data_out_len);
+ ndr->depth--;
+ ndr_print_WERROR(ndr, "result", r->out.result);
+ ndr->depth--;
+ }
+ ndr->depth--;
+}
+
+/* We have manual push/pull because we didn't manage to do the alignment
+ * purely in PIDL as the padding is sized so that the whole access_check_v3
+ * struct size is a multiple of 8 (as specified in 2.2.2.3 of ms-bkrp.pdf)
+ */
+_PUBLIC_ enum ndr_err_code ndr_push_bkrp_access_check_v2(struct ndr_push *ndr,
int ndr_flags, const struct bkrp_access_check_v2 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ size_t ofs;
+ size_t pad;
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0x00000001));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->nonce_len));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->nonce,
r->nonce_len));
+ NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, &r->sid));
+ /* We articially increment the offset of 20 bytes (size of hash
+ * comming after the pad) so that ndr_align can determine easily
+ * the correct pad size to make the whole struct 8 bytes aligned
+ */
+ ofs = ndr->offset + 20;
+ pad = ndr_align_size(ofs, 8);
+ NDR_CHECK(ndr_push_zero(ndr, pad));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->hash, 20));
+ NDR_CHECK(ndr_push_trailer_align(ndr, 4));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_bkrp_access_check_v2(struct ndr_pull *ndr,
int ndr_flags, struct bkrp_access_check_v2 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ size_t ofs;
+ size_t pad;
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->magic));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->nonce_len));
+ NDR_PULL_ALLOC_N(ndr, r->nonce, r->nonce_len);
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->nonce,
r->nonce_len));
+ NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->sid));
+ ofs = ndr->offset + 20;
+ pad = ndr_align_size(ofs, 8);
+ NDR_CHECK(ndr_pull_advance(ndr, pad));
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->hash, 20));
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+/* We have manual push/pull because we didn't manage to do the alignment
+ * purely in PIDL as the padding is sized so that the whole access_check_v3
+ * struct size is a multiple of 16 (as specified in 2.2.2.4 of ms-bkrp.pdf)
+ */
+_PUBLIC_ enum ndr_err_code ndr_push_bkrp_access_check_v3(struct ndr_push *ndr,
int ndr_flags, const struct bkrp_access_check_v3 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ size_t ofs;
+ size_t pad;
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0x00000001));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->nonce_len));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->nonce,
r->nonce_len));
+ NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, &r->sid));
+ /* We articially increment the offset of 64 bytes (size of hash
+ * comming after the pad) so that ndr_align can determine easily
+ * the correct pad size to make the whole struct 16 bytes
aligned
+ */
+ ofs = ndr->offset + 64;
+ pad = ndr_align_size(ofs, 16);
+ NDR_CHECK(ndr_push_zero(ndr, pad));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->hash, 64));
+ NDR_CHECK(ndr_push_trailer_align(ndr, 4));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_bkrp_access_check_v3(struct ndr_pull *ndr,
int ndr_flags, struct bkrp_access_check_v3 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ size_t ofs;
+ size_t pad;
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->magic));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->nonce_len));
+ NDR_PULL_ALLOC_N(ndr, r->nonce, r->nonce_len);
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->nonce,
r->nonce_len));
+ NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->sid));
+ ofs = ndr->offset + 64;
+ pad = ndr_align_size(ofs, 16);
+ NDR_CHECK(ndr_pull_advance(ndr, pad));
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->hash, 64));
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
diff --git a/librpc/ndr/ndr_backupkey.h b/librpc/ndr/ndr_backupkey.h
new file mode 100644
index 0000000..c5c7c39
--- /dev/null
+++ b/librpc/ndr/ndr_backupkey.h
@@ -0,0 +1,2 @@
+_PUBLIC_ enum ndr_err_code ndr_push_bkrp_access_check_v2(struct ndr_push *ndr,
int ndr_flags, const struct bkrp_access_check_v2 *r);
+_PUBLIC_ enum ndr_err_code ndr_pull_bkrp_access_check_v2(struct ndr_pull *ndr,
int ndr_flags, struct bkrp_access_check_v2 *r);
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index ff207f4..d628faa 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -1208,3 +1208,8 @@ _PUBLIC_ uint32_t ndr_size_DATA_BLOB(int ret, const
DATA_BLOB *data, int flags)
if (!data) return ret;
return ret + data->length;
}
+
+_PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const
bool b)
+{
+ ndr->print(ndr, "%-25s: %s", name, b?"true":"false");
+}
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 1ba1fc6..89d0980 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -112,11 +112,6 @@ bld.SAMBA_SUBSYSTEM('NDR_MGMT',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('NDR_PROTECTED_STORAGE',
- source='../librpc/gen_ndr/ndr_protected_storage.c',
- public_deps='ndr'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_ORPC',
source='../librpc/ndr/ndr_orpc.c ../librpc/gen_ndr/ndr_orpc.c',
public_deps='ndr'
@@ -286,6 +281,16 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT',
header_path='gen_ndr'
)
+bld.SAMBA_SUBSYSTEM('NDR_BACKUPKEY',
+ source='../librpc/ndr/ndr_backupkey.c
../librpc/gen_ndr/ndr_backupkey.c',
+ public_deps='ndr'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
+ source='../librpc/gen_ndr/ndr_file_id.c',
+ public_deps='ndr'
+ )
+
bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
source='../librpc/gen_ndr/ndr_xattr_c.c',
public_deps='NDR_XATTR dcerpc'
@@ -428,11 +433,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
deps='tevent NDR_MGMT'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_PROTECTED_STORAGE',
- source='../librpc/gen_ndr/ndr_protected_storage_c.c',
- public_deps='dcerpc NDR_PROTECTED_STORAGE'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_OXIDRESOLVER',
source='../librpc/gen_ndr/ndr_oxidresolver_c.c',
public_deps='dcerpc NDR_OXIDRESOLVER'
@@ -478,6 +478,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
public_deps='dcerpc NDR_KEYSVC'
)
+bld.SAMBA_SUBSYSTEM('RPC_NDR_BACKUPKEY',
+ source='../librpc/gen_ndr/ndr_backupkey_c.c',
+ public_deps='dcerpc NDR_BACKUPKEY'
+ )
+
# a grouping library for NDR subsystems that may be used by more than one
target
bld.SAMBA_LIBRARY('ndr-samba',
source=[],
@@ -493,3 +498,13 @@ bld.SAMBA_LIBRARY('dcerpc-samba',
--
Samba Shared Repository
