Changeset 1225

Timestamp:

03/11/10 06:26:17 (2 years ago)

Author:

Gary

Message:

unxsBind idnsAdmin resource.c fix for #117 must be reviewed and tested carefully.

Files:

• trunk/unxsBind/interfaces/admin/resource.c (modified) (2 diffs)

trunk/unxsBind/interfaces/admin/resource.c

@@ -2748 +2748 @@
 //messages are displayed, if incorrecty set, probably you will miss part of the error 
 //text, or worst make idnsAdmin to crash!
-#define BIND_9_6
+//#define BIND_9_6
 
         //This function will create a zonefile online and run named-checkzone
@@ -2856 +2856 @@
                 while((field2=mysql_fetch_row(res2)))
                 {
+                        char cRRType[9]="";
+
                         sscanf(field2[2],"%u",&uRRType);
+                        sprintf(cRRType,"%.8s",GetRRType(uRRType));
+
                         if(field2[1][0]!='0') strcpy(cTTL,field2[1]);
+
                         //Do not write TTL if cName is a $GENERATE line
                         if(strstr(field2[0],"$GENERATE")==NULL)
                         {
-                                if(strcmp(GetRRType(uRRType),"SRV"))
-                                        fprintf(zfp,"%s\t%s\t%s\t%s\t%s\n",
-                                                        field2[0],
-                                                        cTTL,
-                                                        GetRRType(uRRType),
-                                                        field2[3],
-                                                        field2[4]);
-                                else
+                                if(!strcmp(cRRType,"SRV"))
                                         fprintf(zfp,"%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
                                                         field2[0],
                                                         cTTL,
-                                                        GetRRType(uRRType),
+                                                        cRRType,
                                                         field2[3],
                                                         field2[4],
                                                         field2[5],
                                                         field2[6]);
+                                else if(!strcmp(cRRType,"NAPTR"))
+                                        fprintf(zfp,"%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
+                                                        field2[0],
+                                                        cTTL,
+                                                        cRRType,
+                                                        field2[3],
+                                                        field2[4],
+                                                        field2[5],
+                                                        field2[6]);
+                                else if(1)
+                                        fprintf(zfp,"%s\t%s\t%s\t%s\t%s\n",
+                                                        field2[0],
+                                                        cTTL,
+                                                        cRRType,
+                                                        field2[3],
+                                                        field2[4]);
                         }
                         else
+                        {
                                 fprintf(zfp,"%s\t%s\t%s\t%s\n",
                                                 field2[0],
-                                                GetRRType(uRRType),
+                                                cRRType,
                                                 field2[3],
                                                 field2[4]);
+                        }
                 }
                 mysql_free_result(res2);