diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-05-18 14:55:17 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-05-18 14:55:17 +0000 |
| commit | 4d63fdc430ff9ff6cd141280c024e83f41bd6744 (patch) | |
| tree | 1a308b5721ba48743338ba1d38429a6f8dec74fe /source3/passdb/ldap.c | |
| parent | c7890d44c76d1746f4dfe994b24acc3799075028 (diff) | |
| download | samba-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/ldap.c')
| -rw-r--r-- | source3/passdb/ldap.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c index 9693ab1e73..6d4d2f8dcf 100644 --- a/source3/passdb/ldap.c +++ b/source3/passdb/ldap.c @@ -24,8 +24,8 @@ #include "includes.h" -#include <ldap.h> #include <lber.h> +#include <ldap.h> #define ADD_USER 1 #define MODIFY_USER 2 @@ -223,11 +223,7 @@ static void ldap_get_smb_passwd(LDAP *ldap_struct,LDAPMessage *entry, static unsigned char smblmpwd[16]; static unsigned char smbntpwd[16]; - user->smb_name = NULL; - user->smb_passwd = NULL; - user->smb_nt_passwd = NULL; - user->smb_userid = 0; - user->pass_last_set_time = (time_t)-1; + pdb_init_smb(user); bzero(smblmpwd, sizeof(smblmpwd)); bzero(smbntpwd, sizeof(smbntpwd)); @@ -292,16 +288,11 @@ static void ldap_get_sam_passwd(LDAP *ldap_struct, LDAPMessage *entry, static pstring temp; static struct smb_passwd pw_buf; + pdb_init_sam(user); + ldap_get_smb_passwd(ldap_struct, entry, &pw_buf); - bzero(user, sizeof(*user)); - - 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; get_single_attribute(ldap_struct, entry, "logonTime", temp); user->pass_last_set_time = (time_t)strtol(temp, NULL, 16); |