[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-324-g10e9e95

[Tim Prouty]

The branch, master has been updated
       via  10e9e95ce8bb94c6a2547dd1148cd20a171b3583 (commit)
      from  d96248a9b46559552f53b0ecd3861387ea7ff050 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 10e9e95ce8bb94c6a2547dd1148cd20a171b3583
Author: Tim Prouty <tpro...@samba.org>
Date:   Sun Feb 1 23:59:53 2009 -0800

    s3 build: Fix "assignment discards qualifiers from pointer target type" 
warnings

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_group.c |    8 ++------
 source3/winbindd/winbindd_user.c  |   11 ++++-------
 2 files changed, 6 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_group.c 
b/source3/winbindd/winbindd_group.c
index 48e6577..9d9b264 100644
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -1306,7 +1306,6 @@ void winbindd_getgrent(struct winbindd_cli_state *state)
                char *gr_mem;
                DOM_SID group_sid;
                struct winbindd_domain *domain;
-               char *domain_name_idmap;
 
                /* Do we need to fetch another chunk of groups? */
 
@@ -1354,11 +1353,8 @@ void winbindd_getgrent(struct winbindd_cli_state *state)
                sid_copy(&group_sid, &domain->sid);
                sid_append_rid(&group_sid, name_list[ent->sam_entry_index].rid);
 
-               domain_name_idmap = domain->have_idmap_config
-                                 ? domain->name
-                                 : "";
-
-               if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain_name_idmap,
+               if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain->have_idmap_config
+                                                     ? domain->name : "",
                                                      &group_sid, &group_gid)))
                {
                        union unid_t id;
diff --git a/source3/winbindd/winbindd_user.c b/source3/winbindd/winbindd_user.c
index b01e184..62fd4d7 100644
--- a/source3/winbindd/winbindd_user.c
+++ b/source3/winbindd/winbindd_user.c
@@ -76,7 +76,6 @@ static bool winbindd_fill_pwent(TALLOC_CTX *ctx, char 
*dom_name, char *user_name
        char *mapped_name = NULL;
        struct winbindd_domain *domain = NULL;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       char *dom_name_idmap = "";
 
        if (!pw || !dom_name || !user_name)
                return False;
@@ -88,13 +87,10 @@ static bool winbindd_fill_pwent(TALLOC_CTX *ctx, char 
*dom_name, char *user_name
                nt_status = NT_STATUS_NO_SUCH_DOMAIN;
        }
 
-       if (domain->have_idmap_config) {
-               dom_name_idmap = dom_name;
-       }
-
        /* Resolve the uid number */
 
-       if (!NT_STATUS_IS_OK(idmap_sid_to_uid(dom_name_idmap, 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",
                          sid_string_dbg(user_sid)));
@@ -103,7 +99,8 @@ static bool winbindd_fill_pwent(TALLOC_CTX *ctx, char 
*dom_name, char *user_name
 
        /* Resolve the gid number */
 
-       if (!NT_STATUS_IS_OK(idmap_sid_to_gid(dom_name_idmap, 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",
                          sid_string_dbg(group_sid)));


-- 
Samba Shared Repository