r16803: Fixes from IRIX, some C++ warnings

diff --git a/source/libads/sasl.c b/source/libads/sasl.c
index a12af43eb37d18dfb1f1e41bb6bb32086e2d3355..3c0bea93d6c8e77e14ef53493c6b59d5df18aef4 100644 (file)
--- a/source/libads/sasl.c
+++ b/source/libads/sasl.c
@@ -278,7 +278,6 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads)
        uint8 *p;
        uint32 max_msg_size;
        char *sname;
-       unsigned sec_layer;
        ADS_STATUS status;
        krb5_principal principal;
        krb5_context ctx = NULL;
@@ -391,7 +390,6 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads)
        file_save("sasl_gssapi.dat", output_token.value, output_token.length);
 #endif
        max_msg_size = (p[1]<<16) | (p[2]<<8) | p[3];
-       sec_layer = *p;
 
        gss_release_buffer(&minor_status, &output_token);
 

diff --git a/source/libndr/ndr_string.c b/source/libndr/ndr_string.c
index ae34fe542fd5c9b311689563cb983fef4f19b14c..d6c842a65373ea501060b8d98a819ef58a9b286e 100644 (file)
--- a/source/libndr/ndr_string.c
+++ b/source/libndr/ndr_string.c
@@ -31,7 +31,7 @@ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
        uint32_t len1, ofs, len2;
        uint16_t len3;
        int ret;
-       int chset = CH_UCS2;
+       charset_t chset = CH_UCS2;
        unsigned byte_mul = 2;
        unsigned flags = ndr->flags;
        unsigned c_len_term = 0;
@@ -282,7 +282,7 @@ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
 NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
 {
        ssize_t s_len, c_len, d_len;
-       int chset = CH_UCS2;
+       charset_t chset = CH_UCS2;
        unsigned flags = ndr->flags;
        unsigned byte_mul = 2;
        uint8_t *dest = NULL;
@@ -575,7 +575,8 @@ NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var,
        return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, int chset)
+NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var,
+                         uint32_t length, uint8_t byte_mul, charset_t chset)
 {
        ssize_t ret, required;
 

diff --git a/source/nsswitch/winbindd_async.c b/source/nsswitch/winbindd_async.c
index a19f44626ff1e085acbb4d29c43611754544c9cc..cf15df86c060c1dcc49a6e4fac0d871823c9a178 100644 (file)
--- a/source/nsswitch/winbindd_async.c
+++ b/source/nsswitch/winbindd_async.c
@@ -567,7 +567,8 @@ static void lookupsid_recv(TALLOC_CTX *mem_ctx, BOOL success,
        }
 
        cont(private_data, True, response->data.name.dom_name,
-            response->data.name.name, response->data.name.type);
+            response->data.name.name,
+            (enum SID_NAME_USE)response->data.name.type);
 }
 
 void winbindd_lookupsid_async(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
@@ -659,7 +660,8 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, BOOL success,
                return;
        }
 
-       cont(private_data, True, &sid, response->data.sid.type);
+       cont(private_data, True, &sid,
+            (enum SID_NAME_USE)response->data.sid.type);
 }
 
 void winbindd_lookupname_async(TALLOC_CTX *mem_ctx, const char *dom_name,

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index d7975a337924634c3abb7f6860566edeff971813..15ae107949792afb95ad89c0c7b20ef3fba62a06 100644 (file)
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/winbindd_cache.c
@@ -223,8 +223,9 @@ static NTTIME centry_nttime(struct cache_entry *centry)
 }
 
 /*
-  pull a time_t from a cache entry 
+  pull a time_t from a cache entry -- apparently unused 
 */
+#if 0 
 static time_t centry_time(struct cache_entry *centry)
 {
        time_t ret;
@@ -237,6 +238,7 @@ static time_t centry_time(struct cache_entry *centry)
        centry->ofs += sizeof(time_t);
        return ret;
 }
+#endif
 
 /* pull a string from a cache entry, using the supplied
    talloc context 
@@ -259,7 +261,7 @@ static char *centry_string(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
                smb_panic("centry_string");
        }
 
-       ret = TALLOC(mem_ctx, len+1);
+       ret = TALLOC_ARRAY(mem_ctx, char, len+1);
        if (!ret) {
                smb_panic("centry_string out of memory\n");
        }
@@ -567,7 +569,8 @@ static void centry_expand(struct cache_entry *centry, uint32 len)
        if (centry->len - centry->ofs >= len)
                return;
        centry->len *= 2;
-       centry->data = SMB_REALLOC(centry->data, centry->len);
+       centry->data = SMB_REALLOC_ARRAY(centry->data, unsigned char,
+                                        centry->len);
        if (!centry->data) {
                DEBUG(0,("out of memory: needed %d bytes in centry_expand\n", centry->len));
                smb_panic("out of memory in centry_expand");
@@ -840,7 +843,6 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain,
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       time_t t;
        uint32 rid;
 
        if (!cache->tdb) {
@@ -863,7 +865,6 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain,
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       t = centry_time(centry);
        *cached_nt_pass = (const uint8 *)centry_string(centry, mem_ctx);
 
 #if DEBUG_PASSWORD
@@ -2035,7 +2036,7 @@ void cache_store_response(pid_t pid, struct winbindd_response *response)
 
        fstr_sprintf(key_str, "DR/%d", pid);
        if (tdb_store(wcache->tdb, string_tdb_data(key_str), 
-                     make_tdb_data((void *)response, sizeof(*response)),
+                     make_tdb_data((const char *)response, sizeof(*response)),
                      TDB_REPLACE) == -1)
                return;
 
@@ -2049,7 +2050,7 @@ void cache_store_response(pid_t pid, struct winbindd_response *response)
 
        fstr_sprintf(key_str, "DE/%d", pid);
        if (tdb_store(wcache->tdb, string_tdb_data(key_str),
-                     make_tdb_data(response->extra_data.data,
+                     make_tdb_data((const char *)response->extra_data.data,
                                    response->length - sizeof(*response)),
                      TDB_REPLACE) == 0)
                return;

diff --git a/source/nsswitch/winbindd_rpc.c b/source/nsswitch/winbindd_rpc.c
index e23c8636482ac90a85c00075a3c8cf934bce8dfe..d8797ee2bc6e15d6c2cec49525b6fb637c06bda4 100644 (file)
--- a/source/nsswitch/winbindd_rpc.c
+++ b/source/nsswitch/winbindd_rpc.c
@@ -824,7 +824,6 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
        NTSTATUS result;
        POLICY_HND dom_pol;
        BOOL got_seq_num = False;
-       int retry;
        struct rpc_pipe_client *cli;
 
        DEBUG(10,("rpc: fetch sequence_number for %s\n", domain->name));
@@ -834,8 +833,6 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
        if (!(mem_ctx = talloc_init("sequence_number[rpc]")))
                return NT_STATUS_NO_MEMORY;
 
-       retry = 0;
-
 #ifdef HAVE_LDAP
        if ( domain->native_mode ) 
        {

diff --git a/source/smbd/connection.c b/source/smbd/connection.c
index 7e412f43db4f3b443b8c403bd7be062656cd94c0..0442a9441add06a5fd30af001222c8f7a64419ec 100644 (file)
--- a/source/smbd/connection.c
+++ b/source/smbd/connection.c
@@ -356,5 +356,5 @@ BOOL delete_pipe_opendb( smb_np_struct *p )
        
 done:
        TALLOC_FREE( prec );
-       return True;
+       return ret;
 }

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index e58b7bebf27260b83588d57c1e842eadb1a5dc27..7a2682c44b30b1c4ad9ba810aa57e31b8d9074b7 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -4404,7 +4404,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
                case SMB_FILE_RENAME_INFORMATION:
                {
                        BOOL overwrite;
-                       uint32 root_fid;
+                       /* uint32 root_fid; */  /* Not used */
                        uint32 len;
                        pstring newname;
                        pstring base_name;
@@ -4415,7 +4415,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
                        }
 
                        overwrite = (CVAL(pdata,0) ? True : False);
-                       root_fid = IVAL(pdata,4);
+                       /* root_fid = IVAL(pdata,4); */
                        len = IVAL(pdata,8);
                        srvstr_get_path(inbuf, newname, &pdata[12], sizeof(newname), len, 0, &status);
                        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source/utils/net.c b/source/utils/net.c
index 8d73cf91db6618819cce9ff4ece0129b670602e2..8b4fb042fcf73d928261ee4c8887251d1eb12d25 100644 (file)
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -77,6 +77,7 @@ const char *opt_target_workgroup = NULL;
 int opt_machine_pass = 0;
 BOOL opt_localgroup = False;
 BOOL opt_domaingroup = False;
+static BOOL do_talloc_report=False;
 const char *opt_newntname = "";
 int opt_rid = 0;
 int opt_acls = 0;
@@ -852,7 +853,6 @@ static struct functable net_func[] = {
        int argc_new = 0;
        const char ** argv_new;
        poptContext pc;
-       BOOL do_talloc_report=False;
 
        struct poptOption long_options[] = {
                {"help",        'h', POPT_ARG_NONE,   0, 'h'},

diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 16bba0b201ed248e951f22729bf758d031327fef..bfbc80759aa9ae0f495c63c66a625f1f8046ff0c 100644 (file)
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -506,7 +506,8 @@ static int ads_user_info(int argc, const char **argv)
                return -1;
        }
        
-       grouplist = ldap_get_values(ads->ld, res, "memberOf");
+       grouplist = ldap_get_values((LDAP *)ads->ld,
+                                   (LDAPMessage *)res, "memberOf");
 
        if (grouplist) {
                int i;
@@ -591,7 +592,7 @@ int net_ads_user(int argc, const char **argv)
                                          shortattrs, usergrp_display, 
                                          disp_fields);
                ads_destroy(&ads);
-               return 0;
+               return ADS_ERR_OK(rc) ? 0 : -1;
        }
 
        return net_run_function(argc, argv, func, net_ads_user_usage);
@@ -716,7 +717,7 @@ int net_ads_group(int argc, const char **argv)
                                          disp_fields);
 
                ads_destroy(&ads);
-               return 0;
+               return ADS_ERR_OK(rc) ? 0 : -1;
        }
        return net_run_function(argc, argv, func, net_ads_group_usage);
 }
@@ -1340,7 +1341,7 @@ static int net_ads_printer_publish(int argc, const char **argv)
                return -1;
        }
 
-       srv_dn = ldap_get_dn(ads->ld, res);
+       srv_dn = ldap_get_dn((LDAP *)ads->ld, (LDAPMessage *)res);
        srv_cn = ldap_explode_dn(srv_dn, 1);
 
        asprintf(&prt_dn, "cn=%s-%s,%s", srv_cn[0], printername, srv_dn);