Changeset 2059

Timestamp:

01/18/2008 12:53:45 PM (4 months ago)

Author:

glen

Message:

- support letterhomes in mod_userdir (#1473)

Files:

• trunk/NEWS (modified) (1 diff)
• trunk/src/mod_userdir.c (modified) (7 diffs)

trunk/NEWS

@@ -14 +14 @@
-  * ssl.cipher-list and ssl.use-sslv2 ported from 1.4.x (#1422)
-  * add IdleServers and Scoreboard directives in ?auto mode for mod_status (#1507)
+  * support letterhomes in mod_userdir (#1473)
-
-- 1.5.0-r19.. -

trunk/src/mod_userdir.c

@@ -23 +23 @@
-        buffer *path;
-        buffer *basepath;
+        unsigned short letterhomes;
-} plugin_config;
-
@@ -91 +92 @@
-                { "userdir.include-user",       NULL, T_CONFIG_ARRAY,  T_CONFIG_SCOPE_CONNECTION },       /* 2 */
-                { "userdir.basepath",           NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },       /* 3 */
+                { "userdir.letterhomes",        NULL, T_CONFIG_BOOLEAN,T_CONFIG_SCOPE_CONNECTION },       /* 4 */
-                { NULL,                         NULL, T_CONFIG_UNSET,  T_CONFIG_SCOPE_UNSET }
-        };
@@ -106 +108 @@
-                s->path = buffer_init();
-                s->basepath = buffer_init();
+                s->letterhomes = 0;
-
-                cv[0].destination = s->path;
@@ -111 +114 @@
-                cv[2].destination = s->include_user;
-                cv[3].destination = s->basepath;
+                cv[4].destination = &(s->letterhomes);
-
-                p->config_storage[i] = s;
@@ -130 +134 @@
-        PATCH_OPTION(include_user);
-        PATCH_OPTION(basepath);
+        PATCH_OPTION(letterhomes);
-
-        /* skip the first, the global context */
@@ -151 +156 @@
-                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("userdir.basepath"))) {
-                                PATCH_OPTION(basepath);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("userdir.letterhomes"))) {
+                                PATCH_OPTION(letterhomes);
-                        }
-                }
@@ -254 +261 @@
-                buffer_copy_string_buffer(p->temp_path, p->conf.basepath);
-                PATHNAME_APPEND_SLASH(p->temp_path);
+                if (p->conf.letterhomes) {
+                        buffer_append_string_len(p->temp_path, p->username->ptr, 1);
+                        PATHNAME_APPEND_SLASH(p->temp_path);
+                }
-                buffer_append_string_buffer(p->temp_path, p->username);
-        }