summaryrefslogtreecommitdiff
path: root/source3/passdb/smbpass.c
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-05-18 14:55:17 +0000
committerLuke Leighton <lkcl@samba.org>1998-05-18 14:55:17 +0000
commit4d63fdc430ff9ff6cd141280c024e83f41bd6744 (patch)
tree1a308b5721ba48743338ba1d38429a6f8dec74fe /source3/passdb/smbpass.c
parentc7890d44c76d1746f4dfe994b24acc3799075028 (diff)
downloadsamba-4d63fdc430ff9ff6cd141280c024e83f41bd6744.tar.gz
samba-4d63fdc430ff9ff6cd141280c024e83f41bd6744.tar.bz2
samba-4d63fdc430ff9ff6cd141280c024e83f41bd6744.zip
creating and using some pdb_init_(sam/smb) routines. putting ldap headers
back in (they had been taken out of includes.h because they are only local to ldap.c. (This used to be commit 98ab085b93fb25a4d9275c0d54a863fd9fae2548)
Diffstat (limited to 'source3/passdb/smbpass.c')
-rw-r--r--source3/passdb/smbpass.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c
index f2f0b27153..c9d0ec8d44 100644
--- a/source3/passdb/smbpass.c
+++ b/source3/passdb/smbpass.c
@@ -111,7 +111,7 @@ struct sam_passwd *getsmb21pwent(void *vp)
pwfile = getpwnam(pw_buf->smb_name);
if (pwfile == NULL) return NULL;
- bzero(&user, sizeof(user));
+ pdb_init_sam(&user);
pstrcpy(samlogon_user, pw_buf->smb_name);
@@ -154,13 +154,6 @@ struct sam_passwd *getsmb21pwent(void *vp)
pstrcpy(workstations , "");
}
- user.logon_time = (time_t)-1;
- user.logoff_time = (time_t)-1;
- user.kickoff_time = (time_t)-1;
- user.pass_last_set_time = pw_buf->pass_last_set_time;
- user.pass_can_change_time = (time_t)-1;
- user.pass_must_change_time = (time_t)-1;
-
user.smb_name = pw_buf->smb_name;
user.full_name = full_name;
user.home_dir = home_dir;
@@ -213,8 +206,9 @@ struct smb_passwd *getsmbpwent(void *vp)
return NULL;
}
+ pdb_init_smb(&pw_buf);
+
pw_buf.acct_ctrl = ACB_NORMAL;
- pw_buf.pass_last_set_time = (time_t)-1;
/*
* Scan the file, a line at a time and check if the name matches.