Index: src/cf.extern.h
===================================================================
--- src/cf.extern.h	(revision 628)
+++ src/cf.extern.h	(revision 629)
@@ -198,6 +198,7 @@
 extern char *CLASSBUFF;
 extern char ALLCLASSBUFFER[4*CF_BUFSIZE];
 extern char CHROOT[CF_BUFSIZE];
+extern char DEFINECLASSBUFFER[CF_BUFSIZE];
 extern char ELSECLASSBUFFER[CF_BUFSIZE];
 extern char FAILOVERBUFFER[CF_BUFSIZE];
 extern char *LINKFROM;
Index: src/install.c
===================================================================
--- src/install.c	(revision 628)
+++ src/install.c	(revision 629)
@@ -1977,7 +1977,7 @@
    DeleteSlash(buffer);
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer2,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer2,""); 
  
 if ((ptr = (struct Link *)malloc(sizeof(struct Link))) == NULL)
    {
@@ -2099,7 +2099,7 @@
    }
 
 ExpandVarstring(from,ebuff,"");
-ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
 
 Build2DListFromVarstring(&tp,to,LISTSEPARATOR,false);
 Set2DList(tp);
@@ -2241,7 +2241,7 @@
       FatalError("Memory Allocation failed for InstallRequired() #2");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+   ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
    
    if ((ptr->define = strdup(buffer)) == NULL)
       {
@@ -3601,7 +3601,7 @@
    ptr->done = 'n';
    ptr->scope = strdup(CONTEXTID);
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
    
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -3776,7 +3776,7 @@
    ptr->done = 'n';
    ptr->scope = strdup(CONTEXTID);
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
    
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -3837,7 +3837,7 @@
       FatalError("Memory Allocation failed for AppendDisable() #2");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
 
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -4313,7 +4313,7 @@
       FatalError("Memory Allocation failed for InstallMakepath() #3");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+   ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
    
    if ((ptr->defines = strdup(buffer)) == NULL)
       {
@@ -4801,7 +4801,7 @@
       FatalError("Memory Allocation failed for InstallFileListItem() #3");
       }
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,""); 
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,""); 
 
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -4930,7 +4930,7 @@
    FatalError("Memory Allocation failed for InstallProcItem() #3");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,ebuff,""); 
+ExpandVarstring(DEFINECLASSBUFFER,ebuff,""); 
  
 if ((ptr->defines = strdup(ebuff)) == NULL)
    {
@@ -5114,7 +5114,7 @@
    FatalError("Memory Allocation failed for InstallPackageItem() #4");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
 
 if ((ptr->defines = strdup(buffer)) == NULL)
    {
@@ -5321,7 +5321,7 @@
          FatalError("Memory Allocation failed for InstallImageItem() #6");
          }
       
-      ExpandVarstring(ALLCLASSBUFFER,buf4,"");
+      ExpandVarstring(DEFINECLASSBUFFER,buf4,"");
       
       if ((ptr->defines = strdup(buf4)) == NULL)
          {
@@ -6050,7 +6050,7 @@
    yyerror(OUTPUT);
    }
 */
-strcpy(ALLCLASSBUFFER,value);
+strcpy(DEFINECLASSBUFFER,value);
 
 for (sp = value; *sp != '\0'; sp++)
    {
@@ -6772,7 +6772,7 @@
    FatalError("Memory Allocation failed for PrependTidy() #2");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
 
 if ((tp->defines = strdup(buffer)) == NULL)
    {
Index: src/parse.c
===================================================================
--- src/parse.c	(revision 628)
+++ src/parse.c	(revision 629)
@@ -1279,6 +1279,7 @@
  STRATEGYNAME[0] = '\0';
  FILTERNAME[0] = '\0';
  memset(ALLCLASSBUFFER,0,CF_BUFSIZE);
+ memset(DEFINECLASSBUFFER,0,CF_BUFSIZE);
  memset(ELSECLASSBUFFER,0,CF_BUFSIZE);
  
  strcpy(CFSERVER,"localhost");
Index: src/globals.c
===================================================================
--- src/globals.c	(revision 628)
+++ src/globals.c	(revision 629)
@@ -127,6 +127,7 @@
   PUBLIC char VCURRENTFILE[CF_BUFSIZE];
   PUBLIC char VLOGFILE[CF_BUFSIZE];
   PUBLIC char ALLCLASSBUFFER[CF_ALLCLASSSIZE];
+  PUBLIC char DEFINECLASSBUFFER[CF_BUFSIZE];
   PUBLIC char ELSECLASSBUFFER[CF_BUFSIZE];
   PUBLIC char FAILOVERBUFFER[CF_BUFSIZE];
   PUBLIC char CHROOT[CF_BUFSIZE];