← Back to branch summary

~ubuntu-branches/ubuntu/natty/bind9/natty-updates

« back to all changes in this revision

Viewing changes to bin/named/xfrout.c

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones, Internet Software Consortium, Inc, LaMont Jones
  • Date: 2010-06-21 09:53:30 UTC
  • mfrom: (1.6.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20100621095330-k6874kbj59lfo3xm
Tags: 1:9.7.1.dfsg-1
http://bugs.debian.org/578447
https://launchpad.net/bugs/596363
[Internet Software Consortium, Inc]

* 9.7.1

[LaMont Jones]

* Add freebsd support.  Closes: #578447
* soname changes
* freshen root cache.  LP: #596363

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/named/xfrout.c
1
1
/*
2
 
 * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
 
2
 * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
3
3
 * Copyright (C) 1999-2003  Internet Software Consortium.
4
4
 *
5
5
 * Permission to use, copy, modify, and/or distribute this software for any
15
15
 * PERFORMANCE OF THIS SOFTWARE.
16
16
 */
17
17
 
18
 
/* $Id: xfrout.c,v 1.136 2009/06/30 02:52:32 each Exp $ */
 
18
/* $Id: xfrout.c,v 1.136.132.2 2010/05/27 23:49:54 tbox Exp $ */
19
19
 
20
20
#include <config.h>
21
21
 
810
810
#ifdef DLZ
811
811
        {
812
812
                /*
813
 
                 * Normal zone table does not have a match.  Try the DLZ database
 
813
                 * Normal zone table does not have a match.
 
814
                 * Try the DLZ database
814
815
                 */
815
816
                if (client->view->dlzdatabase != NULL) {
816
817
                        result = dns_dlzallowzonexfr(client->view,
817
 
                                                     question_name, &client->peeraddr,
 
818
                                                     question_name,
 
819
                                                     &client->peeraddr,
818
820
                                                     &db);
819
821
 
820
822
                        if (result == ISC_R_NOPERM) {
1053
1055
 
1054
1056
#ifdef DLZ
1055
1057
        if (is_dlz)
1056
 
                CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
1057
 
                                        reqtype, question_class, zone, db, ver,
1058
 
                                        quota, stream,
 
1058
                CHECK(xfrout_ctx_create(mctx, client, request->id,
 
1059
                                        question_name, reqtype, question_class,
 
1060
                                        zone, db, ver, quota, stream,
1059
1061
                                        dns_message_gettsigkey(request),
1060
1062
                                        tsigbuf,
1061
1063
                                        3600,
1065
1067
                                        &xfr));
1066
1068
        else
1067
1069
#endif
1068
 
                CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
1069
 
                                        reqtype, question_class, zone, db, ver,
1070
 
                                        quota, stream,
 
1070
                CHECK(xfrout_ctx_create(mctx, client, request->id,
 
1071
                                        question_name, reqtype, question_class,
 
1072
                                        zone, db, ver, quota, stream,
1071
1073
                                        dns_message_gettsigkey(request),
1072
1074
                                        tsigbuf,
1073
1075
                                        dns_zone_getmaxxfrout(zone),