Update the GPL boilerplate with the new address of the FSF.

[freeradius.git] / src / main / conffile.c

diff --git a/src/main/conffile.c b/src/main/conffile.c
index 950bd79..4d9332a 100644 (file)
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -19,14 +19,14 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * Copyright 2000  The FreeRADIUS server project
  * Copyright 2000  Miquel van Smoorenburg <miquels@cistron.nl>
  * Copyright 2000  Alan DeKok <aland@ox.org>
  */
 
-#include "autoconf.h"
+#include <freeradius-devel/autoconf.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -45,11 +45,11 @@
 
 #include <ctype.h>
 
-#include "radiusd.h"
-#include "rad_assert.h"
-#include "conffile.h"
-#include "token.h"
-#include "modules.h"
+#include <freeradius-devel/radiusd.h>
+#include <freeradius-devel/rad_assert.h>
+#include <freeradius-devel/conffile.h>
+#include <freeradius-devel/token.h>
+#include <freeradius-devel/modules.h>
 
 static const char rcsid[] =
 "$Id$";
@@ -869,7 +869,7 @@ int cf_section_parse(const CONF_SECTION *cs, void *base,
                         */
                        if (!subcs) continue;
 
-                       if (!variables[i].data) {
+                       if (!variables[i].dflt) {
                                DEBUG2("Internal sanity check 1 failed in cf_section_parse");
                                return -1;
                        }
@@ -1132,7 +1132,7 @@ static CONF_SECTION *cf_section_read(const char *cf, int *lineno, FILE *fp,
                                                 value, dp->d_name);
                                        if ((stat(buf2, &stat_buf) != 0) ||
                                            S_ISDIR(stat_buf.st_mode)) continue;
-                                       if ((is = conf_read(cf, *lineno, buf2, parent)) == NULL) {
+                                       if ((is = conf_read(cf, *lineno, buf2, cs)) == NULL) {
                                                closedir(dir);
                                                cf_section_free(&cs);
                                                return NULL;
@@ -1145,7 +1145,7 @@ static CONF_SECTION *cf_section_read(const char *cf, int *lineno, FILE *fp,
 #endif
                        { /* it was a normal file */
                                DEBUG2( "Config:   including file: %s", value );
-                               if ((is = conf_read(cf, *lineno, value, parent)) == NULL) {
+                               if ((is = conf_read(cf, *lineno, value, cs)) == NULL) {
                                        cf_section_free(&cs);
                                        return NULL;
                                }