[PATCH] 1.3.X Re: Include conf.d/*.conf

[Sander van Zoest]

On Wed, Sep 11, 2002 at 06:56:12AM +0100, Joe Orton wrote:
> On Tue, Sep 10, 2002 at 09:21:17PM -0700, Justin Erenkrantz wrote:
> > On Tue, Sep 10, 2002 at 04:04:31PM -0700, Ian Holsman wrote:
> > > does anyone recall if there was a good reason not to include this patch
> > > in the main distribution ?
> > 
> > What patch is this?  -- justin
> I hadn't had time to submit the revised patch yet: here it is.

Please find a patch for 1.3 attached.

This patch does *not* remove the "noise".

Cheers,

-- 
Sander van Zoest                                          +1 (619) 881-3000
Yahoo!, Inc.                                           [EMAIL PROTECTED]
<http://www.yahoo.com/>                       <http://sander.vanzoest.com/>

Index: http_config.c
===================================================================
RCS file: /work/cvs/root/asf/httpd/apache-1.3/src/main/http_config.c,v
retrieving revision 1.163
diff -u -p -r1.163 http_config.c
--- http_config.c       13 Mar 2002 21:05:30 -0000      1.163
+++ http_config.c       12 Sep 2002 19:36:21 -0000
@@ -81,6 +81,7 @@
 #include "http_conf_globals.h" /* Sigh... */
 #include "http_vhost.h"
 #include "explain.h"
+#include "fnmatch.h"
 
 DEF_Explain
 
@@ -1211,7 +1212,7 @@ CORE_EXPORT(void) ap_process_resource_co
     const char *errmsg;
     cmd_parms parms;
     struct stat finfo;
-
+    int ispatt;
     fname = ap_server_root_relative(p, fname);
 
     if (!(strcmp(fname, ap_server_root_relative(p, RESOURCE_CONFIG_FILE))) ||
@@ -1233,12 +1234,38 @@ CORE_EXPORT(void) ap_process_resource_co
      * horrible loops).  If so, let's recurse and toss it back into
      * the function.
      */
-    if (ap_is_rdirectory(fname)) {
+    ispatt = ap_is_fnmatch(fname);
+    if (ispatt || ap_is_rdirectory(fname)) {
        DIR *dirp;
        struct DIR_TYPE *dir_entry;
        int current;
        array_header *candidates = NULL;
        fnames *fnew;
+       char *path = ap_pstrdup(p,fname);
+       char *pattern = NULL;
+
+        if(ispatt) {
+           pattern = strrchr(path, '/');
+            *pattern++ = '\0';
+            if (ap_is_fnmatch(path)) {
+                fprintf(stderr, "%s: wildcard patterns not allowed in Include "
+                        "%s\n", ap_server_argv0, fname);
+                exit(1);
+            }
+
+            if (!ap_is_rdirectory(path)){ 
+                fprintf(stderr, "%s: Include directory '%s' not found",
+                        ap_server_argv0, path);
+                exit(1);
+            }
+            if (!ap_is_fnmatch(pattern)) {
+                fprintf(stderr, "%s: must include a wildcard pattern "
+                        "for Include %s\n", ap_server_argv0, fname);
+                exit(1);
+            }
+
+        }
+
 
        /*
         * first course of business is to grok all the directory
@@ -1246,11 +1273,11 @@ CORE_EXPORT(void) ap_process_resource_co
         * for this.
         */
        fprintf(stderr, "Processing config directory: %s\n", fname);
-       dirp = ap_popendir(p, fname);
+       dirp = ap_popendir(p, path);
        if (dirp == NULL) {
            perror("fopen");
            fprintf(stderr, "%s: could not open config directory %s\n",
-               ap_server_argv0, fname);
+               ap_server_argv0, path);
 #ifdef NETWARE
            clean_parent_exit(1);
 #else
@@ -1261,9 +1288,11 @@ CORE_EXPORT(void) ap_process_resource_co
        while ((dir_entry = readdir(dirp)) != NULL) {
            /* strip out '.' and '..' */
            if (strcmp(dir_entry->d_name, ".") &&
-               strcmp(dir_entry->d_name, "..")) {
+               strcmp(dir_entry->d_name, "..") &&
+                (!ispatt ||
+                 !ap_fnmatch(pattern,dir_entry->d_name, FNM_PERIOD)) ) {
                fnew = (fnames *) ap_push_array(candidates);
-               fnew->fname = ap_make_full_path(p, fname, dir_entry->d_name);
+               fnew->fname = ap_make_full_path(p, path, dir_entry->d_name);
            }
        }
        ap_pclosedir(p, dirp);