set_secret_data() parameter typecast constant (16) to a pointer. nggggh!

added decls for setresuid.

const issues.

diff --git a/source/include/includes.h b/source/include/includes.h
index e4c037122e3e39c991dfcc1d7b4741857ca8a8ca..2f1413bf2f67193a425f50579465330f18d52661 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -766,9 +766,11 @@ time_t mktime(struct tm *t);
 int ftruncate(int f,long l);
 #endif
 
-#if (defined(HAVE_SETRESUID) && !defined(HAVE_SETRESUID_DECL))
+#if (defined(USE_SETRESUID) && !defined(HAVE_SETRESUID_DECL))
 /* stupid glibc */
 int setresuid(uid_t ruid, uid_t euid, uid_t suid);
+#endif
+#if (defined(USE_SETRESUID) && !defined(HAVE_SETRESGID_DECL))
 int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
 #endif
 

diff --git a/source/include/lib_smb_proto.h b/source/include/lib_smb_proto.h
index be8ef4681da47959bf301c06400944927e97c588..4752a83edf2681532fc0c4995f4f43ca636fb3b6 100644 (file)
--- a/source/include/lib_smb_proto.h
+++ b/source/include/lib_smb_proto.h
@@ -211,7 +211,7 @@ BOOL get_any_dc_name(const char *domain, char *srv_name);
 
 char *credstr(const uchar *cred);
 void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
-                     const uchar session_key[8]);
+                     uchar session_key[8]);
 void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
                 DOM_CHAL *cred);
 int cred_assert(const DOM_CHAL *cred, uchar session_key[8],
@@ -257,7 +257,7 @@ void E_P16(uchar *p14,uchar *p16);
 void E_P24(const uchar *p21, const uchar *c8, uchar *p24);
 void D_P16(const uchar *p14, const uchar *in, uchar *out);
 void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out);
-void cred_hash1(uchar *out,uchar *in,uchar *key);
+void cred_hash1(uchar *out, const uchar *in, const uchar *key);
 void cred_hash2(uchar *out,uchar *in,uchar *key);
 void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw);
 void SamOEMhash( uchar *data, const uchar *key, int val);

diff --git a/source/include/proto.h b/source/include/proto.h
index 3c4461a0cd702000e723c904746c9ed0fe852cfa..9b7dfafbc767b65aed7e7db39b73628dd0472b61 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -971,7 +971,7 @@ BOOL get_any_dc_name(const char *domain, char *srv_name);
 
 char *credstr(const uchar *cred);
 void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
-                     const uchar session_key[8]);
+                     uchar session_key[8]);
 void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
                 DOM_CHAL *cred);
 int cred_assert(const DOM_CHAL *cred, uchar session_key[8],
@@ -1059,7 +1059,7 @@ void E_P16(uchar *p14,uchar *p16);
 void E_P24(const uchar *p21, const uchar *c8, uchar *p24);
 void D_P16(const uchar *p14, const uchar *in, uchar *out);
 void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out);
-void cred_hash1(uchar *out,uchar *in,uchar *key);
+void cred_hash1(uchar *out, const uchar *in, const uchar *key);
 void cred_hash2(uchar *out,uchar *in,uchar *key);
 void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw);
 void SamOEMhash( uchar *data, const uchar *key, int val);
@@ -2425,7 +2425,7 @@ BOOL samr_open_domain(  const POLICY_HND *connect_pol,
 BOOL samr_query_lookup_domain(  POLICY_HND *pol, const char *dom_name,
                              DOM_SID *dom_sid);
 BOOL samr_query_lookup_names(const POLICY_HND *pol, uint32 flags,
-                            uint32 num_names, const char **names,
+                            uint32 num_names, char **names,
                             uint32 *num_rids, uint32 **rids, uint32 **types);
 BOOL samr_query_lookup_rids(  const POLICY_HND *pol, uint32 flags,
                                uint32 num_rids, const uint32 *rids,

diff --git a/source/include/rpc_client_proto.h b/source/include/rpc_client_proto.h
index 7296e18434708210b4fe19ca0f4026428d01e47c..140801c04758b2d9b11b16bcb98db1ab8c5dbdad 100644 (file)
--- a/source/include/rpc_client_proto.h
+++ b/source/include/rpc_client_proto.h
@@ -336,7 +336,7 @@ BOOL samr_open_domain(  const POLICY_HND *connect_pol,
 BOOL samr_query_lookup_domain(  POLICY_HND *pol, const char *dom_name,
                              DOM_SID *dom_sid);
 BOOL samr_query_lookup_names(const POLICY_HND *pol, uint32 flags,
-                            uint32 num_names, const char **names,
+                            uint32 num_names, char **names,
                             uint32 *num_rids, uint32 **rids, uint32 **types);
 BOOL samr_query_lookup_rids(  const POLICY_HND *pol, uint32 flags,
                                uint32 num_rids, const uint32 *rids,

diff --git a/source/include/rpc_parse_proto.h b/source/include/rpc_parse_proto.h
index 9d28786bcece25f353d9bbfd54bf1357c9005177..8301c147c464ed62ddc0db57a185f173472d08a6 100644 (file)
--- a/source/include/rpc_parse_proto.h
+++ b/source/include/rpc_parse_proto.h
@@ -520,7 +520,7 @@ BOOL make_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM *r_u,
 BOOL samr_io_r_query_aliasmem(char *desc,  SAMR_R_QUERY_ALIASMEM *r_u, prs_struct *ps, int depth);
 BOOL make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
                              const POLICY_HND *pol, uint32 flags,
-                             uint32 num_names, const char **name);
+                             uint32 num_names, char **name);
 BOOL samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *ps, int depth);
 void samr_free_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_l);
 BOOL make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,

diff --git a/source/include/winbindd_proto.h b/source/include/winbindd_proto.h
index 80b7933c2ba654e41682b382ea727471d5dfc0f4..acd01cd9acd87cd6d32e216e3a8673d39171c687 100644 (file)
--- a/source/include/winbindd_proto.h
+++ b/source/include/winbindd_proto.h
@@ -760,7 +760,7 @@ BOOL get_any_dc_name(const char *domain, char *srv_name);
 
 char *credstr(const uchar *cred);
 void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
-                     const uchar session_key[8]);
+                     uchar session_key[8]);
 void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
                 DOM_CHAL *cred);
 int cred_assert(const DOM_CHAL *cred, uchar session_key[8],
@@ -842,7 +842,7 @@ void E_P16(uchar *p14,uchar *p16);
 void E_P24(const uchar *p21, const uchar *c8, uchar *p24);
 void D_P16(const uchar *p14, const uchar *in, uchar *out);
 void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out);
-void cred_hash1(uchar *out,uchar *in,uchar *key);
+void cred_hash1(uchar *out, const uchar *in, const uchar *key);
 void cred_hash2(uchar *out,uchar *in,uchar *key);
 void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw);
 void SamOEMhash( uchar *data, const uchar *key, int val);
@@ -1395,7 +1395,7 @@ BOOL samr_open_domain(  const POLICY_HND *connect_pol,
 BOOL samr_query_lookup_domain(  POLICY_HND *pol, const char *dom_name,
                              DOM_SID *dom_sid);
 BOOL samr_query_lookup_names(const POLICY_HND *pol, uint32 flags,
-                            uint32 num_names, const char **names,
+                            uint32 num_names, char **names,
                             uint32 *num_rids, uint32 **rids, uint32 **types);
 BOOL samr_query_lookup_rids(  const POLICY_HND *pol, uint32 flags,
                                uint32 num_rids, const uint32 *rids,
@@ -2361,7 +2361,7 @@ BOOL make_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM *r_u,
 BOOL samr_io_r_query_aliasmem(char *desc,  SAMR_R_QUERY_ALIASMEM *r_u, prs_struct *ps, int depth);
 BOOL make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
                              const POLICY_HND *pol, uint32 flags,
-                             uint32 num_names, const char **name);
+                             uint32 num_names, char **name);
 BOOL samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *ps, int depth);
 void samr_free_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_l);
 BOOL make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,

diff --git a/source/libsmb/credentials.c b/source/libsmb/credentials.c
index 7d6c7c33b8108b807107c0afe779118214285966..a4416b885b89b168df8802c4593b878ab873e70f 100644 (file)
--- a/source/libsmb/credentials.c
+++ b/source/libsmb/credentials.c
@@ -47,10 +47,10 @@ Output:
       8 byte session key
 ****************************************************************************/
 void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
-                     const uchar session_key[8])
+                     uchar session_key[8])
 {
        uint32 sum[2];
-       unsigned char sum2[8];
+       uchar sum2[8];
 
        sum[0] = IVAL(clnt_chal->data, 0) + IVAL(srv_chal->data, 0);
        sum[1] = IVAL(clnt_chal->data, 4) + IVAL(srv_chal->data, 4);
@@ -58,7 +58,7 @@ void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
        SIVAL(sum2,0,sum[0]);
        SIVAL(sum2,4,sum[1]);
 
-       cred_hash1(session_key, sum2,(unsigned char *)pass);
+       cred_hash1(session_key, sum2,(const uchar *)pass);
 
        /* debug output */
        DEBUG(4,("cred_session_key\n"));

diff --git a/source/libsmb/smbdes.c b/source/libsmb/smbdes.c
index 0e782795fd71c9f30ed6b1be17580185d5873844..0d0908605d35d38ae273607432d191fcd852b2e4 100644 (file)
--- a/source/libsmb/smbdes.c
+++ b/source/libsmb/smbdes.c
@@ -331,7 +331,7 @@ void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out)
         smbhash(out+8, in+8, p14+7, 1);
 }
 
-void cred_hash1(uchar *out,uchar *in,uchar *key)
+void cred_hash1(uchar *out, const uchar *in, const uchar *key)
 {
        uchar buf[8];
 

diff --git a/source/lsarpcd/lsarpcd.c b/source/lsarpcd/lsarpcd.c
index 8f584096348e0acf5cd2e87189587a0d1f4e23db..15eeee20040381b29a7a93cc7e045516dc319624 100644 (file)
--- a/source/lsarpcd/lsarpcd.c
+++ b/source/lsarpcd/lsarpcd.c
@@ -106,7 +106,8 @@ static void update_trust_account(void)
        }
        if (s2 == NT_STATUS_NOPROBLEMO)
        {
-               if (!secret_get_data(&secret, old_trust, 16))
+               int len;
+               if (!secret_get_data(&secret, old_trust, &len) || len != 16)
                {
                        s2 = NT_STATUS_ACCESS_DENIED;
                }

diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index b5945ec4f252d7fb6cc69e429775b5a44d863b05..1c842f68e0e9259d921fa4025bc82b168b0a8daa 100644 (file)
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -1761,7 +1761,7 @@ BOOL samr_query_lookup_domain(  POLICY_HND *pol, const char *dom_name,
 do a SAMR Query Lookup Names
 ****************************************************************************/
 BOOL samr_query_lookup_names(const POLICY_HND *pol, uint32 flags,
-                            uint32 num_names, const char **names,
+                            uint32 num_names, char **names,
                             uint32 *num_rids, uint32 **rids, uint32 **types)
 {
        prs_struct data;

diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 93ea5dd702e6650c5bf2aa70e217d26310b46bba..1d4b8950029993b25b89051cd2ade037baec9156 100644 (file)
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -4121,7 +4121,7 @@ makes a SAMR_Q_LOOKUP_NAMES structure.
 ********************************************************************/
 BOOL make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
                              const POLICY_HND *pol, uint32 flags,
-                             uint32 num_names, const char **name)
+                             uint32 num_names, char **name)
 {
        uint32 i;
        if (q_u == NULL) return False;

diff --git a/source/web/cgi.c b/source/web/cgi.c
index 92754d7bcdecb7f5b8cebb446087ecea0c674baa..48ffbfc62bc2e65e3e95313dabf1f24aa0312cc6 100644 (file)
--- a/source/web/cgi.c
+++ b/source/web/cgi.c
@@ -333,7 +333,7 @@ handle a http authentication line
 static BOOL cgi_handle_authorization(char *line)
 {
        char *p, *user, *user_pass;
-       struct passwd *pass = NULL;
+       const struct passwd *pass = NULL;
        BOOL ret = False;
 
        if (strncasecmp(line,"Basic ", 6)) {