r5905: Fix two warnings found by AIX. They might actually be bugs on 64-bit

platforms.

Volker
(This used to be commit f7218d1c66ae91fa79f5a40e0ba618beba038bbc)

diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 540acfc22509629214626cca3d68f6fa60e20aba..989fc4d68c659ca81b23e8bb823ddb82d587aa96 100644 (file)
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -943,7 +943,8 @@ static BOOL check_passwd_history(SAM_ACCOUNT *sampass, const char *plaintext)
        const uint8 *nt_pw;
        const uint8 *pwhistory;
        BOOL found = False;
-       int i, pwHisLen, curr_pwHisLen;
+       int i;
+       uint32 pwHisLen, curr_pwHisLen;
 
        account_policy_get(AP_PASSWORD_HISTORY, &pwHisLen);
        if (pwHisLen == 0) {

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 684d49c56aeab39adbabe430fa442373263cc41d..7bbf8d7f2a559d71d06f810e7096f5a04bfeee5a 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -272,7 +272,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
        struct passwd *pass = NULL;
        BOOL guest = False;
        connection_struct *conn;
-       struct stat st;
+       SMB_STRUCT_STAT st;
        fstring user;
        fstring dev;