The branch, master has been updated
via 8823a54... s4/drs: propagate DRS_ extension flags in code base
via f9d820e... s4/idl: Regenerate IDL for DRSUAPI interface
via 5c7f55b... s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN ext.
flag for DRSUAPI
via 386f2c3... s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10
flag for DRSUAPI
via d8a7718... s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5
flag for DRSUAPI
via 6687c6e... s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY flag
for DRSUAPI
from d899032... Fix bug 7075 - bug in vfs_scannedonly rmdir
implementation.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8823a549ca6102e9bf6710361eedc832d4317926
Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com>
Date: Tue Feb 2 14:28:57 2010 +0200
s4/drs: propagate DRS_ extension flags in code base
commit f9d820ed52274806202da0f44ddc7d2555131b38
Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com>
Date: Tue Feb 2 14:27:46 2010 +0200
s4/idl: Regenerate IDL for DRSUAPI interface
commit 5c7f55ba26504d48bdf08031bb5f80a1e6639362
Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com>
Date: Tue Feb 2 13:48:01 2010 +0200
s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN ext. flag for DRSUAPI
This flag corresponds to DRS_EXT_RECYCLE_BIN extended
flag in [MS-DRSR] documentation.
Reference:
[MS-DRSR] - 5.37
Description:
If present, signifies that the DC has enabled
the Recycle Binoptional feature.
commit 386f2c3d128878434813d5fdcc4923c56866c793
Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com>
Date: Tue Feb 2 13:46:20 2010 +0200
s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10 flag for DRSUAPI
This flag corresponds to DRS_EXT_GETCHGREQ_V10 flag
in [MS-DRSR] documentation.
Reference:
[MS-DRSR] - 5.37
Description:
If present, signifies that the DC supports DRS_MSG_GETCHGREQ_V10.
commit d8a7718b9e73df1f0ddf1d78a6d07de395460101
Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com>
Date: Tue Feb 2 13:44:49 2010 +0200
s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5 flag for DRSUAPI
This flag corresponds to DRS_EXT_GETCHGREQ_V5 flag
in [MS-DRSR] documentation.
Reference:
[MS-DRSR] - 5.37
Description:
If present, signifies that the DC supports DRS_MSG_GETCHGREQ_V5.
commit 6687c6e1826588e64ca2bbbc10251a17c6e6b179
Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com>
Date: Tue Feb 2 13:34:55 2010 +0200
s4/idl: add DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY flag for DRSUAPI
This flag corresponds to DRS_EXT_ADDENTRY flag
in [MS-DRSR] documentation.
Reference:
[MS-DRSR] - 5.37
Description:
If present, signifies that the DC supports IDL_DRSAddEntry.
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/drsuapi.h | 7 ++++---
librpc/gen_ndr/ndr_drsuapi.c | 7 ++++---
librpc/idl/drsuapi.idl | 9 +++++----
source4/dsdb/repl/drepl_service.c | 2 +-
source4/libnet/libnet_become_dc.c | 2 +-
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 2 +-
6 files changed, 16 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h
index 5bcbf00..4717753 100644
--- a/librpc/gen_ndr/drsuapi.h
+++ b/librpc/gen_ndr/drsuapi.h
@@ -63,7 +63,7 @@
#define DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS ( 0x00000010 )
#define DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1 ( 0x00000020 )
#define DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION ( 0x00000040 )
-#define DRSUAPI_SUPPORTED_EXTENSION_00000080 ( 0x00000080 )
+#define DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY ( 0x00000080 )
#define DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE ( 0x00000100 )
#define DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2 ( 0x00000200 )
#define DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION ( 0x00000400 )
@@ -76,7 +76,7 @@
#define DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP ( 0x00020000 )
#define DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY ( 0x00040000 )
#define DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3 ( 0x00080000 )
-#define DRSUAPI_SUPPORTED_EXTENSION_00100000 ( 0x00100000 )
+#define DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5 ( 0x00100000 )
#define DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2 ( 0x00200000 )
#define DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6 ( 0x00400000 )
#define DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS ( 0x00800000 )
@@ -87,13 +87,14 @@
#define DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7 ( 0x08000000 )
#define DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT ( 0x08000000 )
#define DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS ( 0x10000000 )
-#define DRSUAPI_SUPPORTED_EXTENSION_20000000 ( 0x20000000 )
+#define DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10 ( 0x20000000 )
#define DRSUAPI_SUPPORTED_EXTENSION_40000000 ( 0x40000000 )
#define DRSUAPI_SUPPORTED_EXTENSION_80000000 ( 0x80000000 )
/* bitmap drsuapi_SupportedExtensionsExt */
#define DRSUAPI_SUPPORTED_EXTENSION_ADAM ( 0x00000001 )
#define DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2 ( 0x00000002 )
+#define DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN ( 0x00000004 )
struct drsuapi_DsBindInfo24 {
uint32_t supported_extensions;
diff --git a/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index 2bcf511..9cf2f80 100644
--- a/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
@@ -91,7 +91,7 @@ _PUBLIC_ void ndr_print_drsuapi_SupportedExtensions(struct
ndr_print *ndr, const
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS",
DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1", DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1,
r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION",
DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_00000080", DRSUAPI_SUPPORTED_EXTENSION_00000080,
r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY", DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY,
r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE",
DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2",
DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION",
DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION, r);
@@ -104,7 +104,7 @@ _PUBLIC_ void ndr_print_drsuapi_SupportedExtensions(struct
ndr_print *ndr, const
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP",
DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY",
DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3",
DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_00100000", DRSUAPI_SUPPORTED_EXTENSION_00100000,
r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5",
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2",
DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6",
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS",
DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS, r);
@@ -115,7 +115,7 @@ _PUBLIC_ void ndr_print_drsuapi_SupportedExtensions(struct
ndr_print *ndr, const
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7",
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT",
DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS",
DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_20000000", DRSUAPI_SUPPORTED_EXTENSION_20000000,
r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10",
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_40000000", DRSUAPI_SUPPORTED_EXTENSION_40000000,
r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_80000000", DRSUAPI_SUPPORTED_EXTENSION_80000000,
r);
ndr->depth--;
@@ -141,6 +141,7 @@ _PUBLIC_ void
ndr_print_drsuapi_SupportedExtensionsExt(struct ndr_print *ndr, co
ndr->depth++;
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_ADAM", DRSUAPI_SUPPORTED_EXTENSION_ADAM, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2", DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2,
r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN",
DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN, r);
ndr->depth--;
}
diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index 64f82cb..0a3c6a4 100644
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -67,7 +67,7 @@ interface drsuapi
DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS =
0x00000010,
DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1 =
0x00000020,
DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION =
0x00000040,
- DRSUAPI_SUPPORTED_EXTENSION_00000080 =
0x00000080,
+ DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY =
0x00000080,
DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE =
0x00000100,
DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2 =
0x00000200,
DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION =
0x00000400,
@@ -80,7 +80,7 @@ interface drsuapi
DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP =
0x00020000,
DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY =
0x00040000,
DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3 =
0x00080000,
- DRSUAPI_SUPPORTED_EXTENSION_00100000 =
0x00100000,
+ DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5 =
0x00100000,
DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2 =
0x00200000,
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6 =
0x00400000,
DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS =
0x00800000,
@@ -95,14 +95,15 @@ interface drsuapi
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7 =
0x08000000,
DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT =
0x08000000,
DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS =
0x10000000,
- DRSUAPI_SUPPORTED_EXTENSION_20000000 =
0x20000000,
+ DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10 =
0x20000000,
DRSUAPI_SUPPORTED_EXTENSION_40000000 =
0x40000000,
DRSUAPI_SUPPORTED_EXTENSION_80000000 =
0x80000000
} drsuapi_SupportedExtensions;
typedef [bitmap32bit] bitmap {
DRSUAPI_SUPPORTED_EXTENSION_ADAM =
0x00000001,
- DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2 =
0x00000002
+ DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2 =
0x00000002,
+ DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN =
0x00000004
} drsuapi_SupportedExtensionsExt;
/* this is used by w2k */
diff --git a/source4/dsdb/repl/drepl_service.c
b/source4/dsdb/repl/drepl_service.c
index 44164ff..28d4334 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -80,7 +80,7 @@ static WERROR dreplsrv_connect_samdb(struct dreplsrv_service
*service, struct lo
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3;
- bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_00100000;
+ bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS;
diff --git a/source4/libnet/libnet_become_dc.c
b/source4/libnet/libnet_become_dc.c
index baaa46b..b7205dc 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1626,7 +1626,7 @@ static void becomeDC_drsuapi_bind_send(struct
libnet_BecomeDC_state *s,
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3;
- bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_00100000;
+ bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6;
bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS;
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index b5088bb..f94efa0 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -176,7 +176,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct
dcesrv_call_state *dce_call, TALLOC_C
b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP;
b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY;
b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3;
- b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_00100000;
+ b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5;
b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2;
b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6;
b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS;
--
Samba Shared Repository
