diff options
| -rw-r--r-- | source3/nsswitch/idmap_ad.c | 8 | ||||
| -rw-r--r-- | source3/nsswitch/idmap_rid.c | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/source3/nsswitch/idmap_ad.c b/source3/nsswitch/idmap_ad.c index 00438d8ab0..6195684d96 100644 --- a/source3/nsswitch/idmap_ad.c +++ b/source3/nsswitch/idmap_ad.c @@ -145,11 +145,9 @@ struct idmap_ad_context { /* Initialize and check conf is appropriate */ static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom, const char *params) { - NTSTATUS ret; struct idmap_ad_context *ctx; char *config_option; const char *range; - const char *tmp; ADS_STRUCT *ads; /* verify AD is reachable (not critical, we may just be offline at start) */ @@ -375,13 +373,12 @@ again: } for (i = 0; i < count; i++) { - LDAPMessage *entry; + LDAPMessage *entry = NULL; DOM_SID sid; enum id_type type; struct id_map *map; uint32_t id; uint32_t atype; - int n; if (i == 0) { /* first entry */ entry = ads_first_entry(ads, res); @@ -587,13 +584,12 @@ again: } for (i = 0; i < count; i++) { - LDAPMessage *entry; + LDAPMessage *entry = NULL; DOM_SID sid; enum id_type type; struct id_map *map; uint32_t id; uint32_t atype; - int n; if (i == 0) { /* first entry */ entry = ads_first_entry(ads, res); diff --git a/source3/nsswitch/idmap_rid.c b/source3/nsswitch/idmap_rid.c index 55b04df9aa..0cbfd75196 100644 --- a/source3/nsswitch/idmap_rid.c +++ b/source3/nsswitch/idmap_rid.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "winbindd.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP @@ -240,8 +241,6 @@ static NTSTATUS idmap_rid_sids_to_unixids(struct idmap_domain *dom, struct id_ma static NTSTATUS idmap_rid_close(struct idmap_domain *dom) { - struct idmap_tdb_context *ctx; - if (dom->private_data) { TALLOC_FREE(dom->private_data); } |