From 38264bb3b86a3c9da941070f29ec08227c471d2b Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 15 Apr 2009 01:30:12 +0200 Subject: s3-secdesc: move all winreg access bits to IDL. Guenther --- source3/include/rpc_secdes.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'source3/include') diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index c74d621f35..1ce3f84600 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -194,39 +194,4 @@ struct standard_mapping { SA_RIGHT_FILE_WRITE_DATA | \ SA_RIGHT_FILE_READ_DATA) -/* - * Access Bits for registry ACLS - */ - -/* used by registry ACLs */ - -#define SEC_RIGHTS_QUERY_VALUE 0x00000001 -#define SEC_RIGHTS_SET_VALUE 0x00000002 -#define SEC_RIGHTS_CREATE_SUBKEY 0x00000004 -#define SEC_RIGHTS_ENUM_SUBKEYS 0x00000008 -#define SEC_RIGHTS_NOTIFY 0x00000010 -#define SEC_RIGHTS_CREATE_LINK 0x00000020 -#define SEC_RIGHTS_MAXIMUM_ALLOWED 0x02000000 - - -#define REG_KEY_READ \ - ( STANDARD_RIGHTS_READ_ACCESS |\ - SEC_RIGHTS_QUERY_VALUE |\ - SEC_RIGHTS_ENUM_SUBKEYS |\ - SEC_RIGHTS_NOTIFY ) - -#define REG_KEY_EXECUTE REG_KEY_READ - -#define REG_KEY_WRITE \ - ( STANDARD_RIGHTS_WRITE_ACCESS |\ - SEC_RIGHTS_SET_VALUE |\ - SEC_RIGHTS_CREATE_SUBKEY ) - -#define REG_KEY_ALL \ - ( STANDARD_RIGHTS_REQUIRED_ACCESS |\ - REG_KEY_READ |\ - REG_KEY_WRITE |\ - SEC_RIGHTS_CREATE_LINK ) - - #endif /* _RPC_SECDES_H */ -- cgit From d94bbb3167f3a18d6b8a311557f228e2977249ea Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 21 Apr 2009 13:01:29 +0200 Subject: s3-secdesc: remove SEC_RIGHT_MAXIMUM_ALLOWED and SEC_RIGHT_SYSTEM_SECURITY. We had up to three incarnations of these flags in Samba3. Guenther --- source3/include/rpc_secdes.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include') diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 1ce3f84600..6db3f2d7c7 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -121,9 +121,6 @@ struct standard_mapping { #define STANDARD_RIGHTS_MASK 0x00FF0000 #define GENERIC_RIGHTS_MASK 0xF0000000 -#define SEC_RIGHT_SYSTEM_SECURITY 0x01000000 -#define SEC_RIGHT_MAXIMUM_ALLOWED 0x02000000 - /* Generic access rights */ #define GENERIC_RIGHT_ALL_ACCESS 0x10000000 -- cgit From dfc79de607e94179114a8e1d0b0e56117f34595b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 21 Apr 2009 05:52:34 -0700 Subject: Make cli_mkdir async. Change it to return NTSTATUS. Jeremy. --- source3/include/proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index fa6dafa1b0..3ddbf6f3b9 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2338,7 +2338,7 @@ bool cli_ntrename(struct cli_state *cli, const char *fname_src, const char *fnam bool cli_nt_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); bool cli_unlink_full(struct cli_state *cli, const char *fname, uint16 attrs); bool cli_unlink(struct cli_state *cli, const char *fname); -bool cli_mkdir(struct cli_state *cli, const char *dname); +NTSTATUS cli_mkdir(struct cli_state *cli, const char *dname); bool cli_rmdir(struct cli_state *cli, const char *dname); int cli_nt_delete_on_close(struct cli_state *cli, int fnum, bool flag); int cli_nt_create_full(struct cli_state *cli, const char *fname, -- cgit From 2eff2de2f81374483df99757046f1d5ee4050155 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 21 Apr 2009 14:27:25 +0200 Subject: Move the security_descriptor utility code to the top-level. --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include') diff --git a/source3/include/includes.h b/source3/include/includes.h index 943de8db7b..596c772d9e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -702,6 +702,7 @@ enum flush_reason_enum { #endif #include "libcli/security/secace.h" #include "libcli/security/secacl.h" +#include "libcli/security/security_descriptor.h" #if defined(HAVE_POSIX_ACLS) #include "modules/vfs_posixacl.h" -- cgit