Changeset 274 for branches/samba-3.3.x/source/winbindd/idmap_tdb2.c

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/winbindd/idmap_tdb2.c (modified) (2 diffs)

branches/samba-3.3.x/source/winbindd/idmap_tdb2.c

@@ -343 +343 @@
         NTSTATUS ret;
         struct idmap_tdb2_context *ctx;
-        char *config_option = NULL;
-        const char *range;
         NTSTATUS status;
 
@@ -356 +354 @@
         }
 
-        config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
-        if ( ! config_option) {
-                DEBUG(0, ("Out of memory!\n"));
-                ret = NT_STATUS_NO_MEMORY;
-                goto failed;
-        }
-
-        range = lp_parm_const_string(-1, config_option, "range", NULL);
-        if (( ! range) ||
-            (sscanf(range, "%u - %u", &ctx->filter_low_id, &ctx->filter_high_id) != 2) ||
-            (ctx->filter_low_id > ctx->filter_high_id)) {
+        if (strequal(dom->name, "*")) {
+                uid_t low_uid = 0;
+                uid_t high_uid = 0;
+                gid_t low_gid = 0;
+                gid_t high_gid = 0;
+
                 ctx->filter_low_id = 0;
                 ctx->filter_high_id = 0;
+
+                if (lp_idmap_uid(&low_uid, &high_uid)) {
+                        ctx->filter_low_id = low_uid;
+                        ctx->filter_high_id = high_uid;
+                } else {
+                        DEBUG(3, ("Warning: 'idmap uid' not set!\n"));
+                }
+
+                if (lp_idmap_gid(&low_gid, &high_gid)) {
+                        if ((low_gid != low_uid) || (high_gid != high_uid)) {
+                                DEBUG(1, ("Warning: 'idmap uid' and 'idmap gid'"
+                                      " ranges do not agree -- building "
+                                      "intersection\n"));
+                                ctx->filter_low_id = MAX(ctx->filter_low_id,
+                                                         low_gid);
+                                ctx->filter_high_id = MIN(ctx->filter_high_id,
+                                                          high_gid);
+                        }
+                } else {
+                        DEBUG(3, ("Warning: 'idmap gid' not set!\n"));
+                }
+        } else {
+                char *config_option = NULL;
+                const char *range;
+                config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
+                if ( ! config_option) {
+                        DEBUG(0, ("Out of memory!\n"));
+                        ret = NT_STATUS_NO_MEMORY;
+                        goto failed;
+                }
+
+                range = lp_parm_const_string(-1, config_option, "range", NULL);
+                if (( ! range) ||
+                    (sscanf(range, "%u - %u", &ctx->filter_low_id, &ctx->filter_high_id) != 2))
+                {
+                        ctx->filter_low_id = 0;
+                        ctx->filter_high_id = 0;
+                }
+
+                talloc_free(config_option);
+        }
+
+        if (ctx->filter_low_id > ctx->filter_high_id) {
+                ctx->filter_low_id = 0;
+                ctx->filter_high_id = 0;
         }
 
         dom->private_data = ctx;
 
-        talloc_free(config_option);
         return NT_STATUS_OK;