summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-08-01 18:32:34 +0000
committerJeremy Allison <jra@samba.org>2000-08-01 18:32:34 +0000
commit7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b (patch)
tree97f6e250200b3ecfdb820da3bf38117f86ab4184 /source3/passdb
parentd95777ac34f68a3525786103b9217f6397d9f1d4 (diff)
downloadsamba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.tar.gz
samba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.tar.bz2
samba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.zip
Tidyup removing many of the 0xC0000000 | NT_STATUS_XXX stuff (only need NT_STATUS_XXX).
Removed IS_BITS_xxx macros as they were just reproducing "C" syntax in a more obscure way. Jeremy. (This used to be commit c55bcec817f47d6162466b193d533c877194124a)
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/passdb.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 6556503dca..04f02e3704 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -703,24 +703,15 @@ void pdb_set_last_set_time(char *p, int max_len, time_t t)
**************************************************************/
void pdb_sethexpwd(char *p, unsigned char *pwd, uint16 acct_ctrl)
{
- if (pwd != NULL)
- {
+ if (pwd != NULL) {
int i;
for (i = 0; i < 16; i++)
- {
slprintf(&p[i*2], 3, "%02X", pwd[i]);
- }
- }
- else
- {
- if (IS_BITS_SET_ALL(acct_ctrl, ACB_PWNOTREQ))
- {
+ } else {
+ if (acct_ctrl & ACB_PWNOTREQ)
safe_strcpy(p, "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX", 33);
- }
else
- {
safe_strcpy(p, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 33);
- }
}
}
/*************************************************************