The Samba-Bugzilla – Attachment 5658 Details for
Bug 7299
DNS: generated grants policy file should allow some static entries
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for fixing this bug
0001-s4-dns-Allow-to-specify-static-grant-entries-to-be-a.patch (text/plain), 2.28 KB, created by
Matthieu Patou
on 2010-04-26 05:57:02 UTC
(
hide
)
Description:
Patch for fixing this bug
Filename:
MIME Type:
Creator:
Matthieu Patou
Created:
2010-04-26 05:57:02 UTC
Size:
2.28 KB
patch
obsolete
>From 2a8d442440708512e2fa4e2ffe10eacbbb6e704a Mon Sep 17 00:00:00 2001 >From: Matthieu Patou <mat@matws.net> >Date: Fri, 23 Apr 2010 17:27:05 +0400 >Subject: [PATCH] s4 dns: Allow to specify static grant entries to be added to the dynamicaly generated named.conf.update > >--- > source4/dsdb/dns/dns_update.c | 20 +++++++++++++++++--- > 1 files changed, 17 insertions(+), 3 deletions(-) > >diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c >index 0e8f141..1420bb7 100644 >--- a/source4/dsdb/dns/dns_update.c >+++ b/source4/dsdb/dns/dns_update.c >@@ -93,8 +93,10 @@ static void dnsupdate_rndc_done(struct tevent_req *subreq) > static void dnsupdate_rebuild(struct dnsupdate_service *service) > { > int ret; >+ size_t size; > struct ldb_result *res; >- const char *tmp_path, *path; >+ const char *tmp_path, *path, *path_static; >+ char *static_policies; > int fd; > unsigned int i; > const char *attrs[] = { "sAMAccountName", NULL }; >@@ -119,13 +121,20 @@ static void dnsupdate_rebuild(struct dnsupdate_service *service) > path = private_path(tmp_ctx, service->task->lp_ctx, "named.conf.update"); > } > >+ path_static = lp_parm_string(service->task->lp_ctx, NULL, "dnsupdate", "extra_static_grant_rules"); >+ if (path_static == NULL) { >+ path_static = private_path(tmp_ctx, service->task->lp_ctx, "named.conf.update.static"); >+ } >+ > tmp_path = talloc_asprintf(tmp_ctx, "%s.tmp", path); >- if (path == NULL || tmp_path == NULL) { >- DEBUG(0,(__location__ ": Unable to get paths")); >+ if (path == NULL || tmp_path == NULL || path_static == NULL ) { >+ DEBUG(0,(__location__ ": Unable to get paths\n")); > talloc_free(tmp_ctx); > return; > } > >+ static_policies = file_load(path_static, &size, 0, tmp_ctx); >+ > unlink(tmp_path); > fd = open(tmp_path, O_CREAT|O_TRUNC|O_WRONLY, 0444); > if (fd == -1) { >@@ -136,6 +145,11 @@ static void dnsupdate_rebuild(struct dnsupdate_service *service) > > dprintf(fd, "/* this file is auto-generated - do not edit */\n"); > dprintf(fd, "update-policy {\n"); >+ if( static_policies != NULL ) { >+ dprintf(fd, "/* Start of static entries */\n"); >+ dprintf(fd, "%s\n",static_policies); >+ dprintf(fd, "/* End of static entries */\n"); >+ } > dprintf(fd, "\tgrant %s ms-self * A AAAA;\n", realm); > dprintf(fd, "\tgrant administrator@%s wildcard * A AAAA SRV CNAME TXT;\n", realm); > >-- >1.6.3.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 7299
:
5555
| 5658