[SCM] Samba Shared Repository - branch master updated
Matthieu Patou
mat at samba.org
Sat Oct 26 19:26:02 MDT 2013
The branch, master has been updated
via 9c1c3bb auth-kerberos: add the credentials.h so that enum credentials_obtained is defined
via 1e2e421 librpc-idl: replace int32 by uint32 as the values are always > 0
via 568bf16 librpc-idl: replace int32 by the enumeration as it's the type that we use in union's switch drsuapi_DsGetDCInfoCtrLevels
from 68427f1 torture: add FSCTL_SRV_COPYCHUNK_WRITE access test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9c1c3bb4ecb47c10548c7d80784ac293cd91aa89
Author: Matthieu Patou <mat at matws.net>
Date: Tue Oct 15 15:06:57 2013 -0700
auth-kerberos: add the credentials.h so that enum credentials_obtained is defined
We had a warning about the enum being defined in the parameter list:
warning: ‘enum credentials_obtained’ declared inside parameter list
Signed-off-by: Matthieu Patou <mat at matws.net>
Reviewed-by: Andrew Bartlet <abartlet at samba.org>
Autobuild-User(master): Matthieu Patou <mat at samba.org>
Autobuild-Date(master): Sun Oct 27 02:25:47 CET 2013 on sn-devel-104
commit 1e2e421632c275f8cf7529935f72ef3639ddea14
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 21 08:40:28 2013 +0200
librpc-idl: replace int32 by uint32 as the values are always > 0
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 568bf16dfadb4bd3003ed18b19098a3d1473f2fe
Author: Matthieu Patou <mat at matws.net>
Date: Sun Oct 20 20:16:27 2013 -0700
librpc-idl: replace int32 by the enumeration as it's the type that we use in union's switch drsuapi_DsGetDCInfoCtrLevels
Signed-off-by: Matthieu Patou <mat at matws.net>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/drsuapi.idl | 24 ++++++++++++------------
source4/auth/kerberos/kerberos_pac.c | 1 +
2 files changed, 13 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index 063d135..7e3d343 100644
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -1107,12 +1107,19 @@ interface drsuapi
/*****************/
/* Function 0x10 */
+ typedef [v1_enum] enum {
+ DRSUAPI_DC_INFO_CTR_1 = 1,
+ DRSUAPI_DC_INFO_CTR_2 = 2,
+ DRSUAPI_DC_INFO_CTR_3 = 3,
+ DRSUAPI_DC_CONNECTION_CTR_01 = 0xFFFFFFFF
+ } drsuapi_DsGetDCInfoCtrLevels;
+
typedef struct {
[charset(UTF16),string] uint16 *domain_name; /* netbios or dns */
- int32 level; /* specifies the switch level for the request */
+ drsuapi_DsGetDCInfoCtrLevels level; /* specifies the switch level for the request */
} drsuapi_DsGetDCInfoRequest1;
- typedef [switch_type(int32)] union {
+ typedef [switch_type(uint32)] union {
[case(1)] drsuapi_DsGetDCInfoRequest1 req1;
} drsuapi_DsGetDCInfoRequest;
@@ -1204,14 +1211,7 @@ interface drsuapi
[size_is(count)] drsuapi_DsGetDCConnection01 *array;
} drsuapi_DsGetDCConnectionCtr01;
- typedef [v1_enum] enum {
- DRSUAPI_DC_INFO_CTR_1 = 1,
- DRSUAPI_DC_INFO_CTR_2 = 2,
- DRSUAPI_DC_INFO_CTR_3 = 3,
- DRSUAPI_DC_CONNECTION_CTR_01 = -1
- } drsuapi_DsGetDCInfoCtrLevels;
-
- typedef [switch_type(int32)] union {
+ typedef [switch_type(drsuapi_DsGetDCInfoCtrLevels)] union {
[case(DRSUAPI_DC_INFO_CTR_1)] drsuapi_DsGetDCInfoCtr1 ctr1;
[case(DRSUAPI_DC_INFO_CTR_2)] drsuapi_DsGetDCInfoCtr2 ctr2;
[case(DRSUAPI_DC_INFO_CTR_3)] drsuapi_DsGetDCInfoCtr3 ctr3;
@@ -1220,9 +1220,9 @@ interface drsuapi
WERROR drsuapi_DsGetDomainControllerInfo(
[in] policy_handle *bind_handle,
- [in] int32 level,
+ [in] uint32 level,
[in,ref,switch_is(level)] drsuapi_DsGetDCInfoRequest *req,
- [out,ref] int32 *level_out,
+ [out,ref] drsuapi_DsGetDCInfoCtrLevels *level_out,
[out,ref,switch_is(*level_out)] drsuapi_DsGetDCInfoCtr *ctr
);
diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 76c1d99..5d65461 100644
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -30,6 +30,7 @@
#include "librpc/gen_ndr/ndr_krb5pac.h"
#include <ldb.h>
#include "auth/auth_sam_reply.h"
+#include "auth/credentials/credentials.h"
#include "auth/kerberos/kerberos_util.h"
#include "auth/kerberos/pac_utils.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list