--- a/pvl/dns/zone.py	Mon Dec 16 20:21:30 2013 +0200
+++ b/pvl/dns/zone.py	Mon Dec 16 20:25:32 2013 +0200
@@ -162,7 +162,7 @@
     data = None # list of data fields
     
     @classmethod
-    def load (cls, file, ttl=None, origin=None, **opts) :
+    def load (cls, file, ttl=None, origin=None, expand_generate=True, **opts) :
         """
             Parse ZoneRecord items from the given zonefile, ignoring non-record lines.
         """
@@ -190,11 +190,14 @@
                     log.info("%s: ttl: %s", line, ttl)
                 
                 elif directive == 'GENERATE' :
-                    # process...
-                    log.info("%s: generate: %s", line, args)
+                    if expand_generate :
+                        # process...
+                        log.info("%s: generate: %s", line, args)
 
-                    for record in process_generate(line, origin, args) :
-                        yield record
+                        for record in process_generate(line, origin, args) :
+                            yield record
+                    else :
+                        log.warn("%s: skip generate: %s", line, args)
 
                 elif directive == 'INCLUDE' :
                     include, = args