Changeset 221 for branches/samba-3.3.x/source/winbindd

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

branches/samba-3.3.x/source/winbindd

Files:

• winbindd.c (modified) (1 diff)
• winbindd_cache.c (modified) (6 diffs)
• winbindd_dual.c (modified) (1 diff)
• winbindd_group.c (modified) (1 diff)
• winbindd_user.c (modified) (3 diffs)

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

@@ -260 +260 @@
                 /* parent */
                 DEBUG(5, ("winbind_msg_validate_cache: child created with "
-                          "pid %d.\n", child_pid));
+                          "pid %d.\n", (int)child_pid));
                 return;
         }

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

@@ -2625 +2625 @@
 
         DEBUG(10, ("Storing response for pid %d, len %d\n",
-                   pid, response->length));
-
-        fstr_sprintf(key_str, "DR/%d", pid);
+                   (int)pid, response->length));
+
+        fstr_sprintf(key_str, "DR/%d", (int)pid);
         if (tdb_store(wcache->tdb, string_tdb_data(key_str), 
                       make_tdb_data((uint8 *)response, sizeof(*response)),
@@ -2641 +2641 @@
                    (int)(response->length - sizeof(*response))));
 
-        fstr_sprintf(key_str, "DE/%d", pid);
+        fstr_sprintf(key_str, "DE/%d", (int)pid);
         if (tdb_store(wcache->tdb, string_tdb_data(key_str),
                       make_tdb_data((uint8 *)response->extra_data.data,
@@ -2651 +2651 @@
          * contain a main record with wrong dangling extra data */
 
-        fstr_sprintf(key_str, "DR/%d", pid);
+        fstr_sprintf(key_str, "DR/%d", (int)pid);
         tdb_delete(wcache->tdb, string_tdb_data(key_str));
 
@@ -2665 +2665 @@
                 return false;
 
-        DEBUG(10, ("Retrieving response for pid %d\n", pid));
-
-        fstr_sprintf(key_str, "DR/%d", pid);
+        DEBUG(10, ("Retrieving response for pid %d\n", (int)pid));
+
+        fstr_sprintf(key_str, "DR/%d", (int)pid);
         data = tdb_fetch(wcache->tdb, string_tdb_data(key_str));
 
@@ -2689 +2689 @@
                    (int)(response->length - sizeof(*response))));
 
-        fstr_sprintf(key_str, "DE/%d", pid);
+        fstr_sprintf(key_str, "DE/%d", (int)pid);
         data = tdb_fetch(wcache->tdb, string_tdb_data(key_str));
 
@@ -2716 +2716 @@
                 return;
 
-        fstr_sprintf(key_str, "DR/%d", pid);
+        fstr_sprintf(key_str, "DR/%d", (int)pid);
         tdb_delete(wcache->tdb, string_tdb_data(key_str));
 
-        fstr_sprintf(key_str, "DE/%d", pid);
+        fstr_sprintf(key_str, "DE/%d", (int)pid);
         tdb_delete(wcache->tdb, string_tdb_data(key_str));
 

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

@@ -184 +184 @@
         DEBUG(0,("async_request_timeout_handler: child pid %u is not responding. "
                 "Closing connection to it.\n",
-                state->child_pid ));
+                (unsigned int)state->child_pid ));
 
         /* Deal with the reply - set to error. */

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

@@ -1354 +1354 @@
                 sid_append_rid(&group_sid, name_list[ent->sam_entry_index].rid);
 
-                if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain->name, &group_sid,
-                                                      &group_gid))) {
+                if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain->have_idmap_config
+                                                      ? domain->name : "",
+                                                      &group_sid, &group_gid)))
+                {
                         union unid_t id;
                         enum lsa_SidType type;

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

@@ -81 +81 @@
                 return False;
 
+        domain = find_domain_from_name_noinit(dom_name);
+        if (domain == NULL) {
+                DEBUG(5,("winbindd_fill_pwent: Failed to find domain for %s.\n",
+                         dom_name));
+                nt_status = NT_STATUS_NO_SUCH_DOMAIN;
+                return false;
+        }
+
         /* Resolve the uid number */
 
-        if (!NT_STATUS_IS_OK(idmap_sid_to_uid(dom_name, user_sid,
+        if (!NT_STATUS_IS_OK(idmap_sid_to_uid(domain->have_idmap_config ?
+                                              dom_name : "", user_sid,
                                               &pw->pw_uid))) {
                 DEBUG(1, ("error getting user id for sid %s\n",
@@ -92 +101 @@
         /* Resolve the gid number */
 
-        if (!NT_STATUS_IS_OK(idmap_sid_to_gid(dom_name, group_sid,
+        if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain->have_idmap_config ?
+                                              dom_name : "", group_sid,
                                               &pw->pw_gid))) {
                 DEBUG(1, ("error getting group id for sid %s\n",
@@ -99 +109 @@
         }
 
+        /* Username */
+
         strlower_m(user_name);
-
-        /* Username */
-
-        domain = find_domain_from_name_noinit(dom_name);
-        if (domain) {
-                nt_status = normalize_name_map(ctx, domain, user_name,
-                                               &mapped_name);
-        } else {
-                DEBUG(5,("winbindd_fill_pwent: Failed to find domain for %s.  "
-                         "Disabling name alias support\n", dom_name));
-                nt_status = NT_STATUS_NO_SUCH_DOMAIN;
-        }
+        nt_status = normalize_name_map(ctx, domain, user_name, &mapped_name);
 
         /* Basic removal of whitespace */