summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-28 00:45:44 +0000
committerTim Potter <tpot@samba.org>2003-05-28 00:45:44 +0000
commit4c6b3131bc79322f5b4461770ed664aef5d2f6f3 (patch)
tree72108cd99ea9a2888c29a3989337044d100f883d /source3
parent174fbc9764f8bad8b78579135877c9dfaafa7df9 (diff)
downloadsamba-4c6b3131bc79322f5b4461770ed664aef5d2f6f3.tar.gz
samba-4c6b3131bc79322f5b4461770ed664aef5d2f6f3.tar.bz2
samba-4c6b3131bc79322f5b4461770ed664aef5d2f6f3.zip
Merge of uint32/uid_t mismatch from 3.0
(This used to be commit a9f0e69dbefdaf8daee3943782817bcc536d2fb3)
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/pdb_smbpasswd.c4
-rw-r--r--source3/passdb/pdb_tdb.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index c9e66a4715..c392846d93 100644
--- 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 93fa4e1886..7f8c2a26f7 100644
--- 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;