Merge of uint32/uid_t mismatch from 3.0

(This used to be commit a9f0e69dbefdaf8daee3943782817bcc536d2fb3)

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index c9e66a4715873edc71590b724439942f93f5bcaa..c392846d93585dbc591656d579a1599c1afe3640 100644 (file)
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -64,8 +64,8 @@ struct smbpasswd_privates
 
        BOOL permit_non_unix_accounts;
 
-       uint32 low_nua_userid; 
-       uint32 high_nua_userid; 
+       uid_t low_nua_userid; 
+       uid_t high_nua_userid; 
 
 };
 

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 93fa4e1886bb0137a8bfdcb97a92d25cf7e56e3b..7f8c2a26f76f74a9b5df334b66a29d96a671070c 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -916,7 +916,7 @@ NTSTATUS pdb_init_tdbsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, con
 {
        NTSTATUS nt_status;
        struct tdbsam_privates *tdb_state;
-       uint32 low_nua_uid, high_nua_uid;
+       uid_t low_nua_uid, high_nua_uid;
 
        if (!NT_STATUS_IS_OK(nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) {
                return nt_status;