Ignore:
Timestamp:
Nov 29, 2012, 1:59:04 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.9

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/source3/winbindd/winbindd_group.c

    r414 r751  
    3636        fstring full_group_name;
    3737        char *mapped_name = NULL;
    38         struct winbindd_domain *domain = find_domain_from_name_noinit(dom_name);
     38        struct winbindd_domain *domain;
    3939        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
     40
     41        domain = find_domain_from_name_noinit(dom_name);
     42        if (domain == NULL) {
     43                DEBUG(0, ("Failed to find domain '%s'. "
     44                          "Check connection to trusted domains!\n",
     45                          dom_name));
     46                return false;
     47        }
    4048
    4149        nt_status = normalize_name_map(mem_ctx, domain, gr_name,
     
    116124
    117125        res = talloc_dict_traverse(members, getgr_calc_memberlen, &c);
    118         if (res != 0) {
     126        if (res == -1) {
    119127                DEBUG(5, ("talloc_dict_traverse failed\n"));
    120128                return NT_STATUS_INTERNAL_ERROR;
     
    129137
    130138        res = talloc_dict_traverse(members, getgr_unparse_members, &m);
    131         if (res != 0) {
     139        if (res == -1) {
    132140                DEBUG(5, ("talloc_dict_traverse failed\n"));
    133141                TALLOC_FREE(m.buf);
Note: See TracChangeset for help on using the changeset viewer.