sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

s3-libgpo: move group policy protos to where they belong.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2010-05-10 00:07:10 +02:00
parent ed8a98f6f4
commit 3d5972c43f
16 changed files with 102 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libgpo/gpext/gpext.c
View File

@ -18,9 +18,13 @@
*/
#include "includes.h"
#include "../libgpo/gpo.h"
#include "../libgpo/gpext/gpext.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "lib/util/dlinklist.h"
#if _SAMBA_BUILD_ == 3
#include "libgpo/gpo_proto.h"
#endif
static struct gp_extension *extensions = NULL;

2
libgpo/gpo_fetch.c
View File

@ -32,6 +32,8 @@
#include "libgpo/ads_convenience.h"
#include "libgpo/gpo_s4.h"
#include "lib/util/util.h"
#else
#include "libgpo/gpo_proto.h"
#endif
/****************************************************************

2
libgpo/gpo_ldap.c
View File

@ -18,8 +18,8 @@
*/
#include "includes.h"
#if _SAMBA_BUILD_ == 4
#include "libgpo/gpo.h"
#if _SAMBA_BUILD_ == 4
#include "libgpo/gpo_s4.h"
#include "source4/libgpo/ads_convenience.h"
#endif

2
libgpo/gpo_sec.c
View File

@ -19,12 +19,12 @@
#include "includes.h"
#include "libcli/security/dom_sid.h"
#include "../libgpo/gpo.h"
#if _SAMBA_BUILD_ == 4
#include "libgpo/ads_convenience.h"
#include "librpc/gen_ndr/security.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "../libcli/security/secace.h"
#include "../libgpo/gpo.h"
#endif
/****************************************************************

2
libgpo/gpo_util.c
View File

@ -19,10 +19,10 @@
#define TALLOC_DEPRECATED 1
#include "includes.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "../libgpo/gpo.h"
#if _SAMBA_BUILD_ == 4
#include "system/filesys.h"
#include "auth/auth.h"
#include "../libgpo/gpo.h"
#include "../lib/talloc/talloc.h"
#include "source4/libgpo/ads_convenience.h"
#endif

1
source3/include/ads_protos.h
View File

@ -96,6 +96,7 @@ void ads_process_results(ADS_STRUCT *ads, LDAPMessage *res,
void *data_area);
void ads_dump(ADS_STRUCT *ads, LDAPMessage *res);
struct GROUP_POLICY_OBJECT;
ADS_STATUS ads_parse_gpo(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
LDAPMessage *res,

1
source3/include/includes.h
View File

@ -651,7 +651,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "mapping.h"
#include "passdb.h"
#include "rpc_secdes.h"
#include "../libgpo/gpo.h"
#include "msdfs.h"
#include "../lib/crypto/md5.h"
#include "../lib/crypto/md4.h"

78
source3/include/proto.h
View File

@ -2017,84 +2017,6 @@ ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_princip
ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
char **returned_principal);
/* The following definitions come from libgpo/gpo_filesync.c */
NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const char *nt_path,
const char *unix_path);
NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const char *nt_path,
const char *local_path);
/* The following definitions come from libgpo/gpo_ini.c */
NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx,
const char *filename,
uint32_t *version,
char **display_name);
/* The following definitions come from libgpo/gpo_reg.c */
struct nt_user_token *registry_create_system_token(TALLOC_CTX *mem_ctx);
WERROR gp_init_reg_ctx(TALLOC_CTX *mem_ctx,
const char *initial_path,
uint32_t desired_access,
const struct nt_user_token *token,
struct gp_registry_context **reg_ctx);
void gp_free_reg_ctx(struct gp_registry_context *reg_ctx);
WERROR gp_store_reg_subkey(TALLOC_CTX *mem_ctx,
const char *subkeyname,
struct registry_key *curr_key,
struct registry_key **new_key);
WERROR gp_read_reg_subkey(TALLOC_CTX *mem_ctx,
struct gp_registry_context *reg_ctx,
const char *subkeyname,
struct registry_key **key);
WERROR gp_store_reg_val_sz(TALLOC_CTX *mem_ctx,
struct registry_key *key,
const char *val_name,
const char *val);
WERROR gp_read_reg_val_sz(TALLOC_CTX *mem_ctx,
struct registry_key *key,
const char *val_name,
const char **val);
WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
uint32_t flags,
const char *dn,
const struct nt_user_token *token,
struct GROUP_POLICY_OBJECT *gpo_list);
WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx,
uint32_t flags,
const DOM_SID *sid,
struct GROUP_POLICY_OBJECT **gpo_list);
WERROR gp_secure_key(TALLOC_CTX *mem_ctx,
uint32_t flags,
struct registry_key *key,
const DOM_SID *sid);
void dump_reg_val(int lvl, const char *direction,
const char *key, const char *subkey,
struct registry_value *val);
void dump_reg_entry(uint32_t flags,
const char *dir,
struct gp_registry_entry *entry);
void dump_reg_entries(uint32_t flags,
const char *dir,
struct gp_registry_entry *entries,
size_t num_entries);
bool add_gp_registry_entry_to_array(TALLOC_CTX *mem_ctx,
struct gp_registry_entry *entry,
struct gp_registry_entry **entries,
size_t *num);
WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
struct registry_key *root_key,
struct gp_registry_context *reg_ctx,
struct gp_registry_entry *entry,
const struct nt_user_token *token,
uint32_t flags);
#include "librpc/gen_ndr/ndr_krb5pac.h"
#include "librpc/gen_ndr/ndr_spoolss.h"

2
source3/libgpo/gpext/registry.c
View File

@ -19,6 +19,8 @@
#include "includes.h"
#include "../libgpo/gpo_ini.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#define GP_EXT_NAME "registry"

4
source3/libgpo/gpext/scripts.c
View File

@ -18,7 +18,9 @@
*/
#include "includes.h"
#include "libgpo/gpo_ini.h"
#include "../libgpo/gpo_ini.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#define GP_EXT_NAME "scripts"

4
source3/libgpo/gpext/security.c
View File

@ -18,7 +18,9 @@
*/
#include "includes.h"
#include "libgpo/gpo_ini.h"
#include "../libgpo/gpo_ini.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#define GP_EXT_NAME "security"

2
source3/libgpo/gpo_filesync.c
View File

@ -18,6 +18,8 @@
*/
#include "includes.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
struct sync_context {
TALLOC_CTX *mem_ctx;

77
source3/libgpo/gpo_proto.h Normal file
View File

@ -0,0 +1,77 @@
/* The following definitions come from libgpo/gpo_filesync.c */
NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const char *nt_path,
const char *unix_path);
NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const char *nt_path,
const char *local_path);
/* The following definitions come from libgpo/gpo_ini.c */
NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx,
const char *filename,
uint32_t *version,
char **display_name);
/* The following definitions come from libgpo/gpo_reg.c */
struct nt_user_token *registry_create_system_token(TALLOC_CTX *mem_ctx);
WERROR gp_init_reg_ctx(TALLOC_CTX *mem_ctx,
const char *initial_path,
uint32_t desired_access,
const struct nt_user_token *token,
struct gp_registry_context **reg_ctx);
void gp_free_reg_ctx(struct gp_registry_context *reg_ctx);
WERROR gp_store_reg_subkey(TALLOC_CTX *mem_ctx,
const char *subkeyname,
struct registry_key *curr_key,
struct registry_key **new_key);
WERROR gp_read_reg_subkey(TALLOC_CTX *mem_ctx,
struct gp_registry_context *reg_ctx,
const char *subkeyname,
struct registry_key **key);
WERROR gp_store_reg_val_sz(TALLOC_CTX *mem_ctx,
struct registry_key *key,
const char *val_name,
const char *val);
WERROR gp_read_reg_val_sz(TALLOC_CTX *mem_ctx,
struct registry_key *key,
const char *val_name,
const char **val);
WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
uint32_t flags,
const char *dn,
const struct nt_user_token *token,
struct GROUP_POLICY_OBJECT *gpo_list);
WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx,
uint32_t flags,
const DOM_SID *sid,
struct GROUP_POLICY_OBJECT **gpo_list);
WERROR gp_secure_key(TALLOC_CTX *mem_ctx,
uint32_t flags,
struct registry_key *key,
const DOM_SID *sid);
void dump_reg_val(int lvl, const char *direction,
const char *key, const char *subkey,
struct registry_value *val);
void dump_reg_entry(uint32_t flags,
const char *dir,
struct gp_registry_entry *entry);
void dump_reg_entries(uint32_t flags,
const char *dir,
struct gp_registry_entry *entries,
size_t num_entries);
bool add_gp_registry_entry_to_array(TALLOC_CTX *mem_ctx,
struct gp_registry_entry *entry,
struct gp_registry_entry **entries,
size_t *num);
WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
struct registry_key *root_key,
struct gp_registry_context *reg_ctx,
struct gp_registry_entry *entry,
const struct nt_user_token *token,
uint32_t flags);

2
source3/libgpo/gpo_reg.c
View File

@ -18,6 +18,8 @@
*/
#include "includes.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
/****************************************************************

2
source3/registry/reg_backend_db.c
View File

@ -65,7 +65,7 @@ static const char *builtin_registry_paths[] = {
KEY_HKCU,
KEY_GP_USER_POLICY,
KEY_GP_USER_WIN_POLICY,
KEY_WINLOGON_GPEXT_PATH,
"HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\GPExtensions",
"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print\\Monitors",
KEY_PROD_OPTIONS,
"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Terminal Server\\DefaultUserConfiguration",

2
source3/utils/net_ads_gpo.c
View File

@ -19,6 +19,8 @@
#include "includes.h"
#include "utils/net.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#ifdef HAVE_ADS