diff options
| author | Gerald Carter <jerry@samba.org> | 2001-12-31 00:06:51 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2001-12-31 00:06:51 +0000 |
| commit | 7fdb821ef32459b6cdcdf6f7656d14804d4c94ed (patch) | |
| tree | 5ffb3cbad140bcbf8f8a4186d1cc20dce7123fdf /source3/passdb/pdb_smbpasswd.c | |
| parent | 78528b4ec6cb675bfb81a1b8c1b7e62ae19db8ef (diff) | |
| download | samba-7fdb821ef32459b6cdcdf6f7656d14804d4c94ed.tar.gz samba-7fdb821ef32459b6cdcdf6f7656d14804d4c94ed.tar.bz2 samba-7fdb821ef32459b6cdcdf6f7656d14804d4c94ed.zip | |
some merges from 2.2. Still need to merge in changes from pdb_tdb.c
but it will take more time as I don't want to loose any fixes that
are only in HEAD.
(This used to be commit efcde5d9d8ce44c0613764504d797be54ba21473)
Diffstat (limited to 'source3/passdb/pdb_smbpasswd.c')
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index e82e94dae5..3d81c0c457 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -34,7 +34,7 @@ struct smb_passwd { uid_t smb_userid; /* this is actually the unix uid_t */ - const char *smb_name; /* username string */ + char *smb_name; /* username string */ const unsigned char *smb_passwd; /* Null if no password */ const unsigned char *smb_nt_passwd; /* Null if no password */ @@ -1149,7 +1149,7 @@ static BOOL build_smb_pass (struct smb_passwd *smb_pw, const SAM_ACCOUNT *sampas ZERO_STRUCTP(smb_pw); smb_pw->smb_userid=uid; - smb_pw->smb_name=pdb_get_username(sampass); + smb_pw->smb_name=(char*)pdb_get_username(sampass); smb_pw->smb_passwd=pdb_get_lanman_passwd(sampass); smb_pw->smb_nt_passwd=pdb_get_nt_passwd(sampass); @@ -1234,7 +1234,7 @@ static BOOL build_sam_account(SAM_ACCOUNT *sam_pass, const struct smb_passwd *pw pdb_set_pass_can_change_time (sam_pass, pw_buf->pass_last_set_time); pdb_set_domain (sam_pass, lp_workgroup()); - pdb_set_dir_drive (sam_pass, lp_logon_drive()); + pdb_set_dir_drive (sam_pass, lp_logon_drive(), False); #if 0 /* JERRY */ /* the smbpasswd format doesn't have a must change time field, so @@ -1250,19 +1250,19 @@ static BOOL build_sam_account(SAM_ACCOUNT *sam_pass, const struct smb_passwd *pw pstrcpy(str, lp_logon_path()); standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str); - pdb_set_profile_path(sam_pass, str); + pdb_set_profile_path(sam_pass, str, False); pstrcpy(str, lp_logon_home()); standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str); - pdb_set_homedir(sam_pass, str); + pdb_set_homedir(sam_pass, str, False); pstrcpy(str, lp_logon_drive()); standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str); - pdb_set_dir_drive(sam_pass, str); + pdb_set_dir_drive(sam_pass, str, False); pstrcpy(str, lp_logon_script()); standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str); - pdb_set_logon_script(sam_pass, str); + pdb_set_logon_script(sam_pass, str, False); } else { /* lkclXXXX this is OBSERVED behaviour by NT PDCs, enforced here. */ |