The branch, v3-2-test has been updated
via d7346e9360ffa97e44fa781293d32c707436193b (commit)
from d954a4954ba8ed6cb2c6074176a6008cfa398dd7 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d7346e9360ffa97e44fa781293d32c707436193b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Feb 29 14:51:37 2008 +0100
Pure cosmetics, trying to get my group policy diff smaller.
Gunther
-----------------------------------------------------------------------
Summary of changes:
source/libgpo/gpo_fetch.c | 35 ++++++++++++-----------------------
source/libgpo/gpo_filesync.c | 4 ++--
source/libgpo/gpo_ini.c | 4 ++--
source/libgpo/gpo_ldap.c | 12 ++++++------
source/libgpo/gpo_sec.c | 8 ++++----
5 files changed, 26 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libgpo/gpo_fetch.c b/source/libgpo/gpo_fetch.c
index 916db2b..2ec0664 100644
--- a/source/libgpo/gpo_fetch.c
+++ b/source/libgpo/gpo_fetch.c
@@ -44,15 +44,18 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
if (!next_token_talloc(mem_ctx, &file_sys_path, server, "\\")) {
return NT_STATUS_INVALID_PARAMETER;
}
+ NT_STATUS_HAVE_NO_MEMORY(*server);
if (!next_token_talloc(mem_ctx, &file_sys_path, service, "\\")) {
return NT_STATUS_INVALID_PARAMETER;
}
+ NT_STATUS_HAVE_NO_MEMORY(*service);
if ((*nt_path = talloc_asprintf(mem_ctx, "\\%s", file_sys_path))
== NULL) {
return NT_STATUS_NO_MEMORY;
}
+ NT_STATUS_HAVE_NO_MEMORY(*nt_path);
if ((path = talloc_asprintf(mem_ctx,
"%s/%s",
@@ -65,9 +68,8 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
- if ((*unix_path = talloc_strdup(mem_ctx, path)) == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
+ *unix_path = talloc_strdup(mem_ctx, path);
+ NT_STATUS_HAVE_NO_MEMORY(*unix_path);
TALLOC_FREE(path);
return NT_STATUS_OK;
@@ -124,36 +126,23 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
result = gpo_explode_filesyspath(mem_ctx, gpo->file_sys_path,
&server, &service, &nt_path,
&unix_path);
- if (!NT_STATUS_IS_OK(result)) {
- goto out;
- }
+ NT_STATUS_NOT_OK_RETURN(result);
result = gpo_prepare_local_store(mem_ctx, unix_path);
- if (!NT_STATUS_IS_OK(result)) {
- goto out;
- }
+ NT_STATUS_NOT_OK_RETURN(result);
unix_ini_path = talloc_asprintf(mem_ctx, "%s/%s", unix_path, GPT_INI);
nt_ini_path = talloc_asprintf(mem_ctx, "%s\\%s", nt_path, GPT_INI);
- if (!unix_path || !nt_ini_path) {
- result = NT_STATUS_NO_MEMORY;
- goto out;
- }
+ NT_STATUS_HAVE_NO_MEMORY(unix_ini_path);
+ NT_STATUS_HAVE_NO_MEMORY(nt_ini_path);
result = gpo_copy_file(mem_ctx, cli, nt_ini_path, unix_ini_path);
- if (!NT_STATUS_IS_OK(result)) {
- goto out;
- }
+ NT_STATUS_NOT_OK_RETURN(result);
result = gpo_sync_directories(mem_ctx, cli, nt_path, unix_path);
- if (!NT_STATUS_IS_OK(result)) {
- goto out;
- }
+ NT_STATUS_NOT_OK_RETURN(result);
- result = NT_STATUS_OK;
-
- out:
- return result;
+ return NT_STATUS_OK;
}
/****************************************************************
diff --git a/source/libgpo/gpo_filesync.c b/source/libgpo/gpo_filesync.c
index 03d5286..6d64d7b 100644
--- a/source/libgpo/gpo_filesync.c
+++ b/source/libgpo/gpo_filesync.c
@@ -117,10 +117,10 @@ static bool gpo_sync_files(struct sync_context *ctx)
ctx) == -1) {
DEBUG(1,("listing [%s] failed with error: %s\n",
ctx->mask, cli_errstr(ctx->cli)));
- return False;
+ return false;
}
- return True;
+ return true;
}
/****************************************************************
diff --git a/source/libgpo/gpo_ini.c b/source/libgpo/gpo_ini.c
index 306d6f9..d8f14b6 100644
--- a/source/libgpo/gpo_ini.c
+++ b/source/libgpo/gpo_ini.c
@@ -174,7 +174,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx,
failed:
- DEBUG(1,("gp_inifile_init_context failed: %s\n",
+ DEBUG(1,("gp_inifile_init_context failed: %s\n",
nt_errstr(status)));
TALLOC_FREE(ctx);
@@ -237,7 +237,7 @@ NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx,
result = NT_STATUS_OK;
out:
- if (dict) {
+ if (dict) {
iniparser_freedict(dict);
}
diff --git a/source/libgpo/gpo_ldap.c b/source/libgpo/gpo_ldap.c
index a34e686..477832a 100644
--- a/source/libgpo/gpo_ldap.c
+++ b/source/libgpo/gpo_ldap.c
@@ -27,7 +27,7 @@ bool ads_parse_gp_ext(TALLOC_CTX *mem_ctx,
const char *extension_raw,
struct GP_EXT **gp_ext)
{
- bool ret = False;
+ bool ret = false;
struct GP_EXT *ext = NULL;
char **ext_list = NULL;
char **ext_strings = NULL;
@@ -134,7 +134,7 @@ bool ads_parse_gp_ext(TALLOC_CTX *mem_ctx,
*gp_ext = ext;
- ret = True;
+ ret = true;
parse_error:
TALLOC_FREE(ext_list);
@@ -659,7 +659,7 @@ ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads,
}
}
- new_token = create_local_nt_token(mem_ctx, &object_sid, False,
+ new_token = create_local_nt_token(mem_ctx, &object_sid, false,
num_token_sids, token_sids);
ADS_ERROR_HAVE_NO_MEMORY(new_token);
@@ -713,7 +713,7 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
ADS_STATUS status;
struct GP_LINK gp_link;
const char *parent_dn, *site_dn, *tmp_dn;
- bool add_only_forced_gpos = False;
+ bool add_only_forced_gpos = false;
ZERO_STRUCTP(gpo_list);
@@ -793,7 +793,7 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
/* block inheritance from now on */
if (gp_link.gp_opts &
GPOPTIONS_BLOCK_INHERITANCE) {
- add_only_forced_gpos = True;
+ add_only_forced_gpos = true;
}
status = add_gplink_to_gpo_list(ads,
@@ -839,7 +839,7 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
/* block inheritance from now on */
if (gp_link.gp_opts &
GPOPTIONS_BLOCK_INHERITANCE) {
- add_only_forced_gpos = True;
+ add_only_forced_gpos = true;
}
status = add_gplink_to_gpo_list(ads,
diff --git a/source/libgpo/gpo_sec.c b/source/libgpo/gpo_sec.c
index 7f8324b..42ab72a 100644
--- a/source/libgpo/gpo_sec.c
+++ b/source/libgpo/gpo_sec.c
@@ -28,13 +28,13 @@ static bool gpo_sd_check_agp_object_guid(const struct
security_ace_object *objec
NTSTATUS status;
if (!object) {
- return False;
+ return false;
}
status = GUID_from_string(ADS_EXTENDED_RIGHT_APPLY_GROUP_POLICY,
&ext_right_apg_guid);
if (!NT_STATUS_IS_OK(status)) {
- return False;
+ return false;
}
switch (object->flags) {
@@ -52,7 +52,7 @@ static bool gpo_sd_check_agp_object_guid(const struct
security_ace_object *objec
break;
}
- return False;
+ return false;
}
/****************************************************************
@@ -61,7 +61,7 @@ static bool gpo_sd_check_agp_object_guid(const struct
security_ace_object *objec
static bool gpo_sd_check_agp_object(const SEC_ACE *ace)
{
if (!sec_ace_object(ace->type)) {
- return False;
+ return false;
}
return gpo_sd_check_agp_object_guid(&ace->object.object);
--
Samba Shared Repository
