Changeset 274 for branches/samba-3.3.x/source/param

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

File:

• branches/samba-3.3.x/source/param/loadparm.c (modified) (8 diffs)

branches/samba-3.3.x/source/param/loadparm.c

@@ -671 +671 @@
 static void set_allowed_client_auth(void);
 
+static void add_to_file_list(const char *fname, const char *subfname);
+
 static const struct enum_list enum_protocol[] = {
         {PROTOCOL_NT1, "NT1"},
@@ -6615 +6617 @@
                 }
         }
+        if (iServiceIndex >= 0) {
+                return  service_ok(iServiceIndex);
+        }
         return true;
 }
@@ -6632 +6637 @@
                 goto done;
         }
+
+        add_to_file_list(INCLUDE_REGISTRY_NAME, INCLUDE_REGISTRY_NAME);
 
         ret = do_parameter("registry shares", "yes", NULL);
@@ -6701 +6708 @@
         return ret;
 }
+
+#define MAX_INCLUDE_DEPTH 100
+
+static uint8_t include_depth;
 
 static struct file_lists {
@@ -6774 +6785 @@
         DEBUG(6, ("lp_file_list_changed()\n"));
 
-        if (lp_config_backend_is_registry()) {
-                struct smbconf_ctx *conf_ctx = lp_smbconf_ctx();
-
-                if (conf_ctx == NULL) {
-                        return false;
-                }
-                if (smbconf_changed(conf_ctx, &conf_last_csn, NULL, NULL)) {
-                        DEBUGADD(6, ("registry config changed\n"));
-                        return true;
-                }
-        }
-
         while (f) {
                 char *n2 = NULL;
                 time_t mod_time;
 
-                n2 = alloc_sub_basic(get_current_username(),
-                                    current_user_info.domain,
-                                    f->name);
-                if (!n2) {
-                        return false;
+                if (strequal(f->name, INCLUDE_REGISTRY_NAME)) {
+                        struct smbconf_ctx *conf_ctx = lp_smbconf_ctx();
+
+                        if (conf_ctx == NULL) {
+                                return false;
+                        }
+                        if (smbconf_changed(conf_ctx, &conf_last_csn, NULL,
+                                            NULL))
+                        {
+                                DEBUGADD(6, ("registry config changed\n"));
+                                return true;
+                        }
+                } else {
+                        n2 = alloc_sub_basic(get_current_username(),
+                                            current_user_info.domain,
+                                            f->name);
+                        if (!n2) {
+                                return false;
+                        }
+                        DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
+                                     f->name, n2, ctime(&f->modtime)));
+
+                        mod_time = file_modtime(n2);
+
+                        if (mod_time &&
+                            ((f->modtime != mod_time) ||
+                             (f->subfname == NULL) ||
+                             (strcmp(n2, f->subfname) != 0)))
+                        {
+                                DEBUGADD(6,
+                                         ("file %s modified: %s\n", n2,
+                                          ctime(&mod_time)));
+                                f->modtime = mod_time;
+                                SAFE_FREE(f->subfname);
+                                f->subfname = n2; /* Passing ownership of
+                                                     return from alloc_sub_basic
+                                                     above. */
+                                return true;
+                        }
+                        SAFE_FREE(n2);
                 }
-                DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
-                             f->name, n2, ctime(&f->modtime)));
-
-                mod_time = file_modtime(n2);
-
-                if (mod_time && ((f->modtime != mod_time) || (f->subfname == NULL) || (strcmp(n2, f->subfname) != 0))) {
-                        DEBUGADD(6,
-                                 ("file %s modified: %s\n", n2,
-                                  ctime(&mod_time)));
-                        f->modtime = mod_time;
-                        SAFE_FREE(f->subfname);
-                        f->subfname = n2; /* Passing ownership of
-                                             return from alloc_sub_basic
-                                             above. */
-                        return true;
-                }
-                SAFE_FREE(n2);
                 f = f->next;
         }
@@ -6889 +6906 @@
         char *fname;
 
+        if (include_depth >= MAX_INCLUDE_DEPTH) {
+                DEBUG(0, ("Error: Maximum include depth (%u) exceeded!\n",
+                          include_depth));
+                return false;
+        }
+
         if (strequal(pszParmValue, INCLUDE_REGISTRY_NAME)) {
                 if (!bAllowIncludeRegistry) {
@@ -6894 +6917 @@
                 }
                 if (bInGlobalSection) {
-                        return process_registry_globals();
+                        bool ret;
+                        include_depth++;
+                        ret = process_registry_globals();
+                        include_depth--;
+                        return ret;
                 } else {
                         DEBUG(1, ("\"include = registry\" only effective "
@@ -6911 +6938 @@
 
         if (file_exist(fname, NULL)) {
-                bool ret = pm_process(fname, do_section, do_parameter, NULL);
+                bool ret;
+                include_depth++;
+                ret = pm_process(fname, do_section, do_parameter, NULL);
+                include_depth--;
                 SAFE_FREE(fname);
                 return ret;