samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r13553 - in branches/SAMBA_3_0/source: include libsmb

Subject: svn commit: samba r13553 - in branches/SAMBA_3_0/source: include libsmb rpc_server utils
From:
Date: Sat, 18 Feb 2006 00:27:33 +0000 GMT
Author: jra
Date: 2006-02-18 00:27:31 +0000 (Sat, 18 Feb 2006)
New Revision: 13553

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

Log:
Fix all our warnings at -O6 on an x86_64 box.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/include/hmacmd5.h
   branches/SAMBA_3_0/source/include/ntdomain.h
   branches/SAMBA_3_0/source/include/rpc_misc.h
   branches/SAMBA_3_0/source/libsmb/credentials.c
   branches/SAMBA_3_0/source/libsmb/smbencrypt.c
   branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c
   branches/SAMBA_3_0/source/utils/passwd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/hmacmd5.h
===================================================================
--- branches/SAMBA_3_0/source/include/hmacmd5.h 2006-02-17 23:57:28 UTC (rev 
13552)
+++ branches/SAMBA_3_0/source/include/hmacmd5.h 2006-02-18 00:27:31 UTC (rev 
13553)
@@ -21,12 +21,10 @@
 
 #ifndef _HMAC_MD5_H
 
-typedef struct 
-{
-        struct MD5Context ctx;
-        uchar k_ipad[65];    
-        uchar k_opad[65];
-
+typedef struct {
+       struct MD5Context ctx;
+       unsigned char k_ipad[65];    
+       unsigned char k_opad[65];
 } HMACMD5Context;
 
 #endif /* _HMAC_MD5_H */

Modified: branches/SAMBA_3_0/source/include/ntdomain.h
===================================================================
--- branches/SAMBA_3_0/source/include/ntdomain.h        2006-02-17 23:57:28 UTC 
(rev 13552)
+++ branches/SAMBA_3_0/source/include/ntdomain.h        2006-02-18 00:27:31 UTC 
(rev 13553)
@@ -140,8 +140,8 @@
        DOM_CHAL clnt_chal; /* Client credential */
        DOM_CHAL srv_chal;  /* Server credential */
  
-       uchar  sess_key[16]; /* Session key - 8 bytes followed by 8 zero bytes 
*/
-       uchar  mach_pw[16];   /* md4(machine password) */
+       unsigned char  sess_key[16]; /* Session key - 8 bytes followed by 8 
zero bytes */
+       unsigned char  mach_pw[16];   /* md4(machine password) */
 
        fstring mach_acct;  /* Machine name we've authenticated. */
 
@@ -187,7 +187,7 @@
 
 /* auth state for schannel. */
 struct schannel_auth_struct {
-       uchar sess_key[16];
+       unsigned char sess_key[16];
        uint32 seq_num;
 };
 

Modified: branches/SAMBA_3_0/source/include/rpc_misc.h
===================================================================
--- branches/SAMBA_3_0/source/include/rpc_misc.h        2006-02-17 23:57:28 UTC 
(rev 13552)
+++ branches/SAMBA_3_0/source/include/rpc_misc.h        2006-02-18 00:27:31 UTC 
(rev 13553)
@@ -324,7 +324,7 @@
 
 /* DOM_CHAL - challenge info */
 typedef struct chal_info {
-       uchar data[8]; /* credentials */
+       unsigned char data[8]; /* credentials */
 } DOM_CHAL;
  
 /* DOM_CREDs - timestamped client or server credentials */

Modified: branches/SAMBA_3_0/source/libsmb/credentials.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/credentials.c      2006-02-17 23:57:28 UTC 
(rev 13552)
+++ branches/SAMBA_3_0/source/libsmb/credentials.c      2006-02-18 00:27:31 UTC 
(rev 13553)
@@ -43,7 +43,7 @@
 static void creds_init_128(struct dcinfo *dc,
                                const DOM_CHAL *clnt_chal_in,
                                const DOM_CHAL *srv_chal_in,
-                               const char mach_pw[16])
+                               const unsigned char mach_pw[16])
 {
        unsigned char zero[4], tmp[16];
        HMACMD5Context ctx;
@@ -95,7 +95,7 @@
 static void creds_init_64(struct dcinfo *dc,
                        const DOM_CHAL *clnt_chal_in,
                        const DOM_CHAL *srv_chal_in,
-                       const char mach_pw[16])
+                       const unsigned char mach_pw[16])
 {
        uint32 sum[2];
        unsigned char sum2[8];
@@ -176,13 +176,13 @@
                        struct dcinfo *dc,
                        DOM_CHAL *clnt_chal,
                        DOM_CHAL *srv_chal,
-                       const char mach_pw[16],
+                       const unsigned char mach_pw[16],
                        DOM_CHAL *init_chal_out)
 {
        DEBUG(10,("creds_server_init: neg_flags : %x\n", (unsigned 
int)neg_flags));
        DEBUG(10,("creds_server_init: client chal : %s\n", 
credstr(clnt_chal->data) ));
        DEBUG(10,("creds_server_init: server chal : %s\n", 
credstr(srv_chal->data) ));
-       dump_data_pw("creds_server_init: machine pass", (const unsigned char 
*)mach_pw, 16);
+       dump_data_pw("creds_server_init: machine pass", mach_pw, 16);
 
        /* Generate the session key and the next client and server creds. */
        if (neg_flags & NETLOGON_NEG_128BIT) {

Modified: branches/SAMBA_3_0/source/libsmb/smbencrypt.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/smbencrypt.c       2006-02-17 23:57:28 UTC 
(rev 13552)
+++ branches/SAMBA_3_0/source/libsmb/smbencrypt.c       2006-02-18 00:27:31 UTC 
(rev 13553)
@@ -534,7 +534,7 @@
  Decode an arc4 encrypted password change buffer.
 ************************************************************/
 
-void encode_or_decode_arc4_passwd_buffer(char pw_buf[532], const DATA_BLOB 
*psession_key)
+void encode_or_decode_arc4_passwd_buffer(unsigned char pw_buf[532], const 
DATA_BLOB *psession_key)
 {
        struct MD5Context tctx;
        unsigned char key_out[16];

Modified: branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c   2006-02-17 23:57:28 UTC 
(rev 13552)
+++ branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c   2006-02-18 00:27:31 UTC 
(rev 13553)
@@ -137,12 +137,12 @@
 static NTSTATUS lookup_lsa_rids(TALLOC_CTX *mem_ctx,
                        DOM_R_REF *ref,
                        DOM_RID *prid,
-                       int num_entries,
+                       uint32 num_entries,
                        const UNISTR2 *name,
                        int flags,
-                       int *pmapped_count)
+                       uint32 *pmapped_count)
 {
-       int mapped_count, i;
+       uint32 mapped_count, i;
 
        SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
 
@@ -212,12 +212,12 @@
 static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
                        DOM_R_REF *ref,
                        LSA_TRANSLATED_SID3 *trans_sids,
-                       int num_entries,
+                       uint32 num_entries,
                        const UNISTR2 *name,
                        int flags,
-                       int *pmapped_count)
+                       uint32 *pmapped_count)
 {
-       int mapped_count, i;
+       uint32 mapped_count, i;
 
        SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
 
@@ -1030,7 +1030,7 @@
 {
        struct lsa_info *handle;
        UNISTR2 *names = q_u->uni_name;
-       int num_entries = q_u->num_entries;
+       uint32 num_entries = q_u->num_entries;
        DOM_R_REF *ref;
        DOM_RID *rids;
        uint32 mapped_count = 0;
@@ -1090,7 +1090,7 @@
 {
        struct lsa_info *handle;
        UNISTR2 *names = q_u->uni_name;
-       int num_entries = q_u->num_entries;
+       uint32 num_entries = q_u->num_entries;
        DOM_R_REF *ref;
        DOM_RID *rids;
        DOM_RID2 *rids2;
@@ -1163,7 +1163,7 @@
 {
        struct lsa_info *handle;
        UNISTR2 *names = q_u->uni_name;
-       int num_entries = q_u->num_entries;
+       uint32 num_entries = q_u->num_entries;
        DOM_R_REF *ref = NULL;
        LSA_TRANSLATED_SID3 *trans_sids = NULL;
        uint32 mapped_count = 0;
@@ -1224,7 +1224,7 @@
 NTSTATUS _lsa_lookup_names4(pipes_struct *p, LSA_Q_LOOKUP_NAMES4 *q_u, 
LSA_R_LOOKUP_NAMES4 *r_u)
 {
        UNISTR2 *names = q_u->uni_name;
-       int num_entries = q_u->num_entries;
+       uint32 num_entries = q_u->num_entries;
        DOM_R_REF *ref = NULL;
        LSA_TRANSLATED_SID3 *trans_sids = NULL;
        uint32 mapped_count = 0;

Modified: branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c        2006-02-17 
23:57:28 UTC (rev 13552)
+++ branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c        2006-02-18 
00:27:31 UTC (rev 13553)
@@ -338,7 +338,7 @@
                        p->dc,
                        &p->dc->clnt_chal,      /* Stored client chal. */
                        &p->dc->srv_chal,       /* Stored server chal. */
-                       (const char *)p->dc->mach_pw,
+                       p->dc->mach_pw,
                        &srv_chal_out); 
 
        /* Check client credentials are valid. */
@@ -416,7 +416,7 @@
                        p->dc,
                        &p->dc->clnt_chal,      /* Stored client chal. */
                        &p->dc->srv_chal,       /* Stored server chal. */
-                       (const char *)p->dc->mach_pw,
+                       p->dc->mach_pw,
                        &srv_chal_out); 
 
        /* Check client credentials are valid. */

Modified: branches/SAMBA_3_0/source/utils/passwd_util.c
===================================================================
--- branches/SAMBA_3_0/source/utils/passwd_util.c       2006-02-17 23:57:28 UTC 
(rev 13552)
+++ branches/SAMBA_3_0/source/utils/passwd_util.c       2006-02-18 00:27:31 UTC 
(rev 13553)
@@ -57,7 +57,7 @@
  Used if the '-s' (smbpasswd) or '-t' (pdbedit) option is set
  to silently get passwords to enable scripting.
 *************************************************************/
-char *get_pass( char *prompt, BOOL stdin_get)
+char *get_pass( const char *prompt, BOOL stdin_get)
 {
        char *p;
        if (stdin_get) {

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r13553 - in branches/SAMBA_3_0/source: include libsmb rpc_server utils, jra <=