sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Code cleanups: GUID generation, lp_dnsdomain instead of lp_realm, missing spaces.

Browse Source 
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
This commit is contained in:
Wilco Baan Hofman 2010-05-24 20:05:42 +02:00 committed by Jelmer Vernooij
parent 5c2c8dfc5a
commit c09922cfae
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/lib/policy/gp_ldap.c
View File

@ -215,7 +215,7 @@ NTSTATUS gp_list_all_gpos(struct gp_context *gp_ctx, struct gp_object ***ret)
rv = ldb_search(gp_ctx->ldb_ctx, mem_ctx, &result, dn, LDB_SCOPE_ONELEVEL, attrs, "(objectClass=groupPolicyContainer)");
if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB search failed: %s\n%s\n", ldb_strerror(rv),ldb_errstring(gp_ctx->ldb_ctx)));
DEBUG(0, ("LDB search failed: %s\n%s\n", ldb_strerror(rv), ldb_errstring(gp_ctx->ldb_ctx)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
}
@ -271,7 +271,7 @@ NTSTATUS gp_get_gpo_info(struct gp_context *gp_ctx, const char *dn_str, struct g
attrs,
"objectClass=groupPolicyContainer");
if (rv != LDB_SUCCESS) {
DEBUG(0, ("LDB search failed: %s\n%s\n", ldb_strerror(rv),ldb_errstring(gp_ctx->ldb_ctx)));
DEBUG(0, ("LDB search failed: %s\n%s\n", ldb_strerror(rv), ldb_errstring(gp_ctx->ldb_ctx)));
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
}

11
source4/lib/policy/gp_manage.c
View File

@ -20,6 +20,7 @@
#include "../libcli/security/dom_sid.h"
#include "../libcli/security/security_descriptor.h"
#include "../librpc/ndr/libndr.h"
#include "../lib/util/charset/charset.h"
#include "param/param.h"
#include "lib/policy/policy.h"
@ -117,7 +118,6 @@ NTSTATUS gp_create_gpo (struct gp_context *gp_ctx, const char *display_name, str
struct security_descriptor *sd;
TALLOC_CTX *mem_ctx;
struct gp_object *gpo;
unsigned int i;
NTSTATUS status;
/* Create a forked memory context, as a base for everything here */
@ -128,11 +128,8 @@ NTSTATUS gp_create_gpo (struct gp_context *gp_ctx, const char *display_name, str
/* Generate a GUID */
guid_struct = GUID_random();
guid_str = GUID_string(mem_ctx, &guid_struct);
name = talloc_asprintf(gpo, "{%s}", guid_str);
for (i = 0; name[i] != '\0'; i++) {
name[i] = toupper(name[i]);
}
guid_str = GUID_string2(mem_ctx, &guid_struct);
name = strupper_talloc(mem_ctx, guid_str);
/* Prepare the GPO struct */
gpo->dn = NULL;
@ -140,7 +137,7 @@ NTSTATUS gp_create_gpo (struct gp_context *gp_ctx, const char *display_name, str
gpo->flags = 0;
gpo->version = 0;
gpo->display_name = talloc_strdup(gpo, display_name);
gpo->file_sys_path = talloc_asprintf(gpo, "\\\\%s\\sysvol\\%s\\Policies\\%s", lp_realm(gp_ctx->lp_ctx), lp_realm(gp_ctx->lp_ctx), name);
gpo->file_sys_path = talloc_asprintf(gpo, "\\\\%s\\sysvol\\%s\\Policies\\%s", lp_dnsdomain(gp_ctx->lp_ctx), lp_dnsdomain(gp_ctx->lp_ctx), name);
/* Create the GPT */
status = gp_create_gpt(gp_ctx, name, gpo->file_sys_path);