Changeset 1251

Timestamp:

03/15/10 16:34:17 (5 months ago)

Author:

Hugo

Message:

iDNS: unstable save commit don't use

Location:

trunk/unxsBind

Files:

• interfaces/org/resource.c (modified) (1 diff)
• mysqlrad.h (modified) (1 diff)
• tzonefunc.h (modified) (8 diffs)

trunk/unxsBind/interfaces/org/resource.c

@@ -1570 +1570 @@
         else if(1)
         {
-                gcMessage="<blink>Must select valid Resource Type (A,MX,PTR,TXT,NS,CNAME,HINFO)</blink>";
+                gcMessage="<blink>Must select valid Resource Type (A,MX,PTR,TXT,NS,CNAME,HINFO,NAPTR,AAAA)</blink>";
                 cRRTypeStyle="type_fields_req";
                 return(16);

trunk/unxsBind/mysqlrad.h

@@ -168 +168 @@
 void ExttZoneGetHook(entry gentries[], int x);
 void ExttZoneNavBar(void);
+unsigned OnLineZoneCheck(unsigned uZone,unsigned uCalledMode,unsigned uCalledFrom);
 
 //tResource

trunk/unxsBind/tzonefunc.h

@@ -104 +104 @@
 void PrepareTestData(unsigned uResource,char *cName,char *cParam1,char *cParam2,char *cParam3,
                         char *cParam4,char *cRRType,char *cComment,unsigned uRRTTL,unsigned uCalledFrom);
-unsigned OnLineZoneCheck(unsigned uCalledFrom);
 void PrepDelToolsTestData(unsigned uNumIPs);
 
@@ -842 +841 @@
                         //named-checkzone online check
                         PrepDelToolsTestData(uNumIPs);
-                        OnLineZoneCheck(1);
+                        OnLineZoneCheck(uZone,4001,1);
                         fprintf(stderr,"cNSList=%s\n",cNSList);
                         while(1)
@@ -3639 +3638 @@
 
 
-unsigned OnLineZoneCheck(unsigned uCalledFrom)
+unsigned OnLineZoneCheck(unsigned uZone,unsigned uCalledMode,unsigned uCalledFrom)
 {
         //This function will create a zonefile online and run named-checkzone
@@ -3648 +3647 @@
         FILE *zfp;
         FILE *dnfp;
-        unsigned uZone=0;
         unsigned uRRType=0;
         char cTTL[50]={""};
         char cZoneFile[100]={""};
-
-        //PrepareTestData(uResource,cName,cParam1,cParam2,cParam3,cParam4,cRRType,cComment,uRRTTL,uCalledFrom);
-        
+        char cZone[256]={""};
+        static char cMessage[512]={""};
+
         //Test if named-checkzone can be run, otherwise return 0
         if(access("/usr/sbin/named-checkzone",X_OK)==-1) return(0); //Ticket #100
 
+        sprintf(cZone,"%.255s",ForeignKey("tZone","cZone",uZone));
         sprintf(cZoneFile,"/tmp/%s",cZone);
 
@@ -3670 +3669 @@
                         "tZone.uMailServers,tZone.cMainAddress,tView.cLabel FROM tZone,tNSSet,tNS,tView"
                         " WHERE tZone.uNSSet=tNSSet.uNSSet AND tNSSet.uNSSet=tNS.uNSSet AND"
-                        " tZone.uView=tView.uView AND tZone.cZone='%s' AND tZone.uView='%u'",cZone,uView);
+                        " tZone.uView=tView.uView AND tZone.uZone=%u'",uZone);
 
         mysql_query(&gMysql,gcQuery);
@@ -3702 +3701 @@
                 //13 tView.cMaster
                 //14 tView.uOrder
-                sscanf(field[1],"%u",&uZone);
-        
                 if((cp=strchr(field[3],' '))) *cp=0;
 
@@ -3748 +3745 @@
                 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);
                 fclose(zfp);
@@ -3797 +3811 @@
                                         cp=strstr(cLine,cZoneFile);
                                         cp=cp+strlen(cZoneFile)+2; //2 more chars ': '
-                                        sprintf(gcQuery,"<blink>Error: </blink> The RR has an error: %s",cp);
+                                        sprintf(cMessage,"<blink>Error: </blink> The RR has an error: %s",cp);
                                         if(uCalledFrom)
                                         {
-                                                guMode=4001;
-                                                tZone(gcQuery);
+                                                guMode=uCalledMode;
+                                                tZone(cMessage);
                                         }
                                         else
-                                                tResource(gcQuery);
+                                        {
+                                                guMode=uCalledMode;
+                                                tResource(cMessage);
+                                        }
                                 }
                         }