Author: idra
Date: 2006-12-12 15:16:26 +0000 (Tue, 12 Dec 2006)
New Revision: 20118

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20118

Log:

Fix some more warnings


Modified:
   branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
   branches/SAMBA_3_0/source/nsswitch/idmap_rid.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap_ad.c       2006-12-12 15:14:27 UTC 
(rev 20117)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_ad.c       2006-12-12 15:16:26 UTC 
(rev 20118)
@@ -145,11 +145,9 @@
 /* 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 @@
        }
 
        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 @@
        }
 
        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);

Modified: branches/SAMBA_3_0/source/nsswitch/idmap_rid.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap_rid.c      2006-12-12 15:14:27 UTC 
(rev 20117)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_rid.c      2006-12-12 15:16:26 UTC 
(rev 20118)
@@ -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_close(struct idmap_domain *dom)
 {
-       struct idmap_tdb_context *ctx;
-
        if (dom->private_data) {
                TALLOC_FREE(dom->private_data);
        }

Reply via email to