← Back to branch summary

~ubuntu-branches/ubuntu/raring/maradns/raring

« back to all changes in this revision

Viewing changes to update/1.3.07.07/maradns-1.3.07.06-ra_value.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kai Hendry
  • Date: 2010-01-24 12:17:40 UTC
  • mfrom: (1.1.13 upstream) (10.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100124121740-a4e1fjobwaouz443
Tags: 1.4.02-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
update/1.3.07.07/maradns-1.3.07.06-ra_value.patch
1
 
--- maradns-1.3.07.07/server/functions_server.h.orig    2007-10-25 08:30:19.000000000 -0500
2
 
+++ maradns-1.3.07.07/server/functions_server.h 2007-10-25 08:30:44.000000000 -0500
3
 
@@ -366,4 +366,5 @@
4
 
 
5
 
 int udpsuccess(rr *where, int id, int sock, struct sockaddr_in *client,
6
 
                js_string *query, void **rotate_point, int show_cname_a,
7
 
-               int rd_val, conn *ect, int force_authoritative);
8
 
+               int rd_val, conn *ect, int force_authoritative, int
9
 
+               ra_value);
10
 
--- maradns-1.3.07.07/server/MaraDNS.c.orig     2007-10-25 08:26:23.000000000 -0500
11
 
+++ maradns-1.3.07.07/server/MaraDNS.c  2007-10-25 08:30:58.000000000 -0500
12
 
@@ -2434,11 +2434,11 @@
13
 
     if(spot_data.value != 0 && spot_data.datatype == MARA_DNSRR) {
14
 
         if(qtype_o == RR_A || qtype_q == RR_CNAME) {
15
 
             udpsuccess(spot_data.value,id,sock,0,question,
16
 
-                       spot_data.point,1,rd_val,ect,force_auth);
17
 
+                       spot_data.point,1,rd_val,ect,force_auth,0);
18
 
             }
19
 
         else {
20
 
             udpsuccess(spot_data.value,id,sock,0,question,
21
 
-                       spot_data.point,0,rd_val,ect,force_auth);
22
 
+                       spot_data.point,0,rd_val,ect,force_auth,0);
23
 
              }
24
 
         return JS_SUCCESS;
25
 
         }
26
 
@@ -2995,7 +2995,7 @@
27
 
 #endif
28
 
         /* We return a NS server delegation */
29
 
         udpsuccess(spot_data.value,header.id,sock,0,origq,spot_data.point,
30
 
-                        0,desires_recursion,ect,0);
31
 
+                        0,desires_recursion,ect,0,0);
32
 
         js_destroy(lookfor); js_destroy(origq); js_destroy(lc);
33
 
         return JS_SUCCESS;
34
 
         }
35
 
@@ -3050,7 +3050,7 @@
36
 
         if(spot_data.value != 0 && spot_data.datatype == MARA_DNSRR) {
37
 
             /* We return a NS server delegation */
38
 
             udpsuccess(spot_data.value,header.id,sock,0,origq,
39
 
-                       spot_data.point,0,desires_recursion,ect,0);
40
 
+                       spot_data.point,0,desires_recursion,ect,0,0);
41
 
             js_destroy(lookfor); js_destroy(origq); js_destroy(lc);
42
 
             return JS_SUCCESS;
43
 
             }
44
 
--- maradns-1.3.07.07/server/recursive.c.orig   2007-10-25 08:26:48.000000000 -0500
45
 
+++ maradns-1.3.07.07/server/recursive.c        2007-10-25 08:30:07.000000000 -0500
46
 
@@ -144,7 +144,7 @@
47
 
 extern int udpsuccess(rr *where, int id, int sock, struct sockaddr_in
48
 
                       *client, js_string *query, void **rotate_point,
49
 
                       int show_cname_a, int rd_val, conn *ect,
50
 
-                      int force_authoritative);
51
 
+                      int force_authoritative, int ra_value);
52
 
 extern int mhash_add_ip();
53
 
 extern int mhash_put_data();
54
 
 
55
 
@@ -2525,7 +2525,7 @@
56
 
             }
57
 
         else {
58
 
             udpsuccess(value,id,sock,&client,query,rotate_point,
59
 
-                       cname_answer,1,0,0);
60
 
+                       cname_answer,1,0,0,1);
61
 
             }
62
 
         }
63
 
     else if(ipret != NULL) { /* If we are simply changint the value of
64
 
@@ -3356,7 +3356,7 @@
65
 
                 log_unlock();
66
 
                 }
67
 
             udpsuccess(spot_data.value,id,sock,&client,query,
68
 
-                       spot_data.point,0,1,0,0);
69
 
+                       spot_data.point,0,1,0,0,1);
70
 
             big_unlock();
71
 
             return JS_SUCCESS;
72
 
             }
73
 
@@ -3439,10 +3439,10 @@
74
 
                     }
75
 
                 if(original_rtype > 0)
76
 
                     udpsuccess(spot_data.value,id,sock,&client,query,
77
 
-                               spot_data.point,original_rtype,1,0,0);
78
 
+                               spot_data.point,original_rtype,1,0,0,1);
79
 
                 else
80
 
                     udpsuccess(spot_data.value,id,sock,&client,query,
81
 
-                               spot_data.point,0,1,0,0);
82
 
+                               spot_data.point,0,1,0,0,1);
83
 
         big_unlock();
84
 
                 return JS_SUCCESS;
85
 
                 }
86
 
--- maradns-1.3.07.07/server/udpsuccess.c.orig  2007-10-25 08:26:40.000000000 -0500
87
 
+++ maradns-1.3.07.07/server/udpsuccess.c       2007-10-25 08:29:15.000000000 -0500
88
 
@@ -53,12 +53,13 @@
89
 
           authoritative bit is determined by looking at the data in where.
90
 
           If 1, the record is always marked in the DNS headers as
91
 
           "authoritative".
92
 
+         The value to give the "RA" bit.
93
 
    Output: JS_ERROR on error, JS_SUCCESS on success
94
 
 */
95
 
 
96
 
 int udpsuccess(rr *where, int id, int sock, struct sockaddr_in *client,
97
 
                js_string *query, void **rotate_point, int show_cname_a,
98
 
-               int rd_val, conn *ect, int force_authoritative) {
99
 
+               int rd_val, conn *ect, int force_authoritative,int ra_value) {
100
 
     js_string *most = 0; /* Most of the data */
101
 
     js_string *ar = 0; /* Then the additional records */
102
 
 
103
 
@@ -471,7 +472,7 @@
104
 
     header.opcode = 0;
105
 
     header.tc = 0;
106
 
     header.rd = rd_val; /* RDBUG udpsuccess */
107
 
-    header.ra = 0;
108
 
+    header.ra = ra_value;
109
 
     header.z = 0;
110
 
     header.rcode = 0; /* No error */
111
 
     header.qdcount = 1;