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

« back to all changes in this revision

Viewing changes to update/1.4.01/maradns-1.3.14-nostar.patch

• browse files at revision 17
• compare with another revision
• download diff
• download tarball
• view history from revision 17

Show diffs side-by-side

added

removed

update/1.4.01/maradns-1.3.14-nostar.patch

 

1

--- maradns-1.3.14/parse/Csv2_main.c    2009-08-04 11:52:43.000000000 -0500

 

2

+++ maradns-1.4.01/parse/Csv2_main.c    2009-12-02 10:18:31.000000000 -0600

 

3

@@ -556,6 +556,23 @@

 

4

 int csv2_parse_zone_bighash(js_string *zone, js_string *filename,

 

5

                 mhash *bighash, int32 starwhitis) {

 

6

         csv2_add_state *state; /* State of adding record to database */

 

7

+

 

8

+       /* No stars in zone names; yes some people who do not RTFM try

 

9

+        * this then whine when things don't work */

 

10

+       int nostar;

 

11

+       for(nostar = 0; nostar < (zone->unit_size * zone->unit_count); 

 

12

+                       nostar++) {

 

13

+               if(*(zone->string + nostar) == '*') {   

 

14

+                       printf("Illegal zone name: ");

 

15

+                       for(nostar = 0; nostar < 

 

16

+                           (zone->unit_size * zone->unit_count); nostar++) {

 

17

+                               printf("%c",*(zone->string + nostar));

 

18

+                       }

 

19

+                       printf("\nThis is a fatal error.\n");

 

20

+                       exit(1);

 

21

+               }

 

22

+       }

 

23

+

 

24

         if((state = csv2_init_add_state(zone)) == 0) {

 

25

                 return 0;

 

26

         }

 

27

--- maradns-1.3.14/doc/en/source/mararc.ej      2009-02-13 02:18:31.000000000 -0600

 

28

+++ maradns-1.4.01/doc/en/source/mararc.ej      2009-12-11 12:35:25.000000000 -0600

 

29

@@ -96,6 +96,11 @@

 

30

 <b>csv2(5)</b> 

 

31

 for a description of this file's format.

 

32

 

 

33

+<p>

 

34

+

 

35

+The dictionary index (zone name) can not have a * in it.  If it does, 

 

36

+MaraDNS will terminate with an "Illegal zone name" error.

 

37

+

 

38

 <h2>csv1</h2>

 

39

 

 

40

 csv1: Used to indicate the filename to use for a given zone stored in 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1