diff options
| author | Jeremy Allison <jra@samba.org> | 1998-05-06 18:45:57 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-05-06 18:45:57 +0000 |
| commit | 346abceb277e3354214599cc3c0f9bac6d44dfc8 (patch) | |
| tree | 64fa7b94faceb66ebf6564841d4a261b89cdbc50 /source3/smbd | |
| parent | b54509045d7186fc0526d91bcf429659cba8be1d (diff) | |
| download | samba-346abceb277e3354214599cc3c0f9bac6d44dfc8.tar.gz samba-346abceb277e3354214599cc3c0f9bac6d44dfc8.tar.bz2 samba-346abceb277e3354214599cc3c0f9bac6d44dfc8.zip | |
smbpass.c: Fixed machine_passwd_lock() problems.
password.c: Fixed machine_passwd_lock() problems.
lib/rpc/server/srv_ldap_helpers.c: Oops - broke proto.h with dummy function. Fixed now.
Jeremy.
(This used to be commit d28427f21fff49da6b38c24625e3e2dae49a9713)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/password.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 53ed8c85f1..1056269490 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -1922,7 +1922,6 @@ BOOL domain_client_validate( char *user, char *domain, struct cli_state cli; uint32 smb_uid_low; BOOL connected_ok = False; - void *vp; /* * Check that the requested domain is not our own machine name. @@ -1971,20 +1970,20 @@ BOOL domain_client_validate( char *user, char *domain, /* * Get the machine account password. */ - if((vp = machine_password_lock( global_myworkgroup, global_myname, False)) == NULL) { + if(!machine_password_lock( global_myworkgroup, global_myname, False)) { DEBUG(0,("domain_client_validate: unable to open the machine account password file for \ machine %s in domain %s.\n", global_myname, global_myworkgroup )); return False; } - if(get_machine_account_password( vp, machine_passwd, &lct) == False) { + if(get_machine_account_password( machine_passwd, &lct) == False) { DEBUG(0,("domain_client_validate: unable to read the machine account password for \ machine %s in domain %s.\n", global_myname, global_myworkgroup )); - machine_password_unlock(vp); + machine_password_unlock(); return False; } - machine_password_unlock(vp); + machine_password_unlock(); unbecome_root(False); |