Changeset 1212

Timestamp:

03/05/10 10:09:49 (5 months ago)

Author:

Gary

Message:

unxsBind bind.c experimental code now alpha approved.

Files:

• trunk/unxsBind/bind.c (modified) (11 diffs)

trunk/unxsBind/bind.c

@@ -50 +50 @@
 unsigned uGetZoneOwner(unsigned uZone);//local
 
-#define EXPERIMENTAL
-#ifdef EXPERIMENTAL
-        unsigned uNamedCheckConf(char *cNSSet);
-        #warning "You are compiling with the EXPERIMENTAL define on. You may be including code:"
-        #warning "That is in progress, not properly tested, possibly buggy or that does not compile."
-        #warning "You have been warned!"
-#endif
+unsigned uNamedCheckConf(char *cNSSet);
 
 
@@ -1503 +1497 @@
                 unsigned uGID=25;
                 unsigned uUID=25;
-#ifdef EXPERIMENTAL
                 char cZoneFile[512]={""};
                 unsigned uZoneOwner=0;
-#endif
                 GetConfiguration("cuUID",cuUID,0);
                 if(cuUID[0]) sscanf(cuUID,"%u",&uUID);
@@ -1577 +1569 @@
                         sprintf(gcQuery,"/usr/local/idns/named.d/master/%s/%c/%s",
                                         field[12],field[0][0],field[0]);
-#ifdef EXPERIMENTAL
                         sprintf(cZoneFile,"%.511s",gcQuery);
-#endif
                         if(!uDebug)
                         {
@@ -1719 +1709 @@
                         mysql_free_result(res2);
                         if(zfp && !uDebug) fclose(zfp);
-#ifdef EXPERIMENTAL
-                        //Here's when this EXPERIMENTAL code starts to make sense.
-                        //Does it?
-                        //If defined, the software will run a named-checkzone for the zone
-                        //In case an issue is found, a tLog record will be created in order
-                        //to report to the user via interface func() procedure.
-                        //The format of the tLog entry will be:
-                        //tLog.uTablePK=tZone.uZone
-                        //tLog.cTableName="tZone"
-                        //tLog.cMessage="Zone with errors"
-                        //tLog.uOwner will match the tClient.uClient value of the company that owns the zone
-
+
+                        //Check with ISC tools and report to dashboard
                         int iRetVal;
-                        char cQuery[512];
+                        char cQuery[256];
 
                         uZoneOwner=uGetZoneOwner(uZone);
@@ -1749 +1729 @@
                                 printf("%s returned %d\n",cQuery,iRetVal);
                         }
-#endif
+
                 }
                 mysql_free_result(res);
@@ -2199 +2179 @@
                 //debug only
                 //printf("Reconfiguring slave server...");
-#ifdef EXPERIMENTAL             
                 if((uNamedCheckConf(cNameServer))) exit(1); //Exit without reloading the server
-#endif
                 if(cuControlPort[0])
                         sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reconfig",gcBinDir,cuControlPort);
@@ -2336 +2314 @@
         if(uReload)
         {
-#ifdef EXPERIMENTAL
                 if((uNamedCheckConf(cNameServer))) exit(1); //Will exit without server reload or reconfig
-#endif
                 if(cuControlPort[0])
                         sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload",gcBinDir,cuControlPort);
@@ -2349 +2325 @@
         else if(uReconfig)
         {
-#ifdef EXPERIMENTAL
                 if((uNamedCheckConf(cNameServer))) exit(1); //Will exit without server reload or reconfig
-#endif
                 if(cuControlPort[0])
                         sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reconfig",gcBinDir,cuControlPort);
@@ -3315 +3289 @@
 
         GetConfiguration("cuControlPort",cuControlPort,0);
-#ifdef EXPERIMENTAL
         if((uNamedCheckConf("ViewReloadZone() call"))) return(1);
-#endif
         //Multiple view rndc reload
         //Do we need to reload all views, when we might have only modified the internal view for example?
@@ -3692 +3664 @@
 
 
-#ifdef EXPERIMENTAL
 unsigned uNamedCheckConf(char *cNameServer)
 {
@@ -3723 +3694 @@
 
 }//unsigned uNamedCheckConf(void)
-#endif
+
 
 unsigned uGetOrganization(char *cLabel)