diff options
| author | Gerald Carter <jerry@samba.org> | 2004-02-12 17:12:06 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-02-12 17:12:06 +0000 |
| commit | 4bfc270e088b8b17f27a162cdcafe9848e54ada0 (patch) | |
| tree | dc1375afc4ff59a9018b45c327a15330b8cd31b5 /source3 | |
| parent | 45fd0e4dd0ff4b64cd343c8691580f5b983825ab (diff) | |
| download | samba-4bfc270e088b8b17f27a162cdcafe9848e54ada0.tar.gz samba-4bfc270e088b8b17f27a162cdcafe9848e54ada0.tar.bz2 samba-4bfc270e088b8b17f27a162cdcafe9848e54ada0.zip | |
merges from 3.0
(This used to be commit 2478501d402a07248d6181d4c9de253b203ff67c)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/pdb_interface.c | 4 | ||||
| -rw-r--r-- | source3/utils/pdbedit.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 8c93aaae1e..91f790711e 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -824,7 +824,7 @@ BOOL pdb_add_sam_account(SAM_ACCOUNT *sam_acct) been allowed by the ACB_PWNOTREQ bit */ lm_pw = pdb_get_lanman_passwd( sam_acct ); - nt_pw = pdb_get_lanman_passwd( sam_acct ); + nt_pw = pdb_get_nt_passwd( sam_acct ); acb_flags = pdb_get_acct_ctrl( sam_acct ); if ( !lm_pw && !nt_pw && !(acb_flags&ACB_PWNOTREQ) ) { acb_flags |= ACB_DISABLED; @@ -849,7 +849,7 @@ BOOL pdb_update_sam_account(SAM_ACCOUNT *sam_acct) been allowed by the ACB_PWNOTREQ bit */ lm_pw = pdb_get_lanman_passwd( sam_acct ); - nt_pw = pdb_get_lanman_passwd( sam_acct ); + nt_pw = pdb_get_nt_passwd( sam_acct ); acb_flags = pdb_get_acct_ctrl( sam_acct ); if ( !lm_pw && !nt_pw && !(acb_flags&ACB_PWNOTREQ) ) { acb_flags |= ACB_DISABLED; diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c index f402567b74..83663c52b6 100644 --- a/source3/utils/pdbedit.c +++ b/source3/utils/pdbedit.c @@ -251,13 +251,15 @@ static int fix_users_list (struct pdb_context *in) if (!(NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)))) return 1; while (check && (ret = NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent)))) { + printf("Updating record for user %s\n", pdb_get_username(sam_pwent)); + if (!pdb_update_sam_account(sam_pwent)) { - DEBUG(0, ("Update of user %s failed!\n", pdb_get_username(sam_pwent))); + printf("Update of user %s failed!\n", pdb_get_username(sam_pwent)); } pdb_free_sam(&sam_pwent); check = NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)); if (!check) { - DEBUG(0, ("Failed to initialise new SAM_ACCOUNT structure (out of memory?)\n")); + fprintf(stderr, "Failed to initialise new SAM_ACCOUNT structure (out of memory?)\n"); } } |