summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-01-14 17:34:41 +0000
committerGerald Carter <jerry@samba.org>2004-01-14 17:34:41 +0000
commit1dce4ebed861a6dfbd19da20601d92bc9be3484a (patch)
tree07849c76e9b54dc8d5a7843526365e5c81b90e3a /source3/rpc_server
parentfe48d1c800abd9224fef3885adbeade5e3ff4a18 (diff)
downloadsamba-1dce4ebed861a6dfbd19da20601d92bc9be3484a.tar.gz
samba-1dce4ebed861a6dfbd19da20601d92bc9be3484a.tar.bz2
samba-1dce4ebed861a6dfbd19da20601d92bc9be3484a.zip
revert the cracklib changes until post 3.0.2
(This used to be commit 6202e0fa727a4307f51bf42f5ced401a7c7b8214)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_samr_nt.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 7edd34c8dd..b9974cba8a 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -2834,17 +2834,11 @@ static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, DOM_SID *sid)
DEBUG(5, ("Changing trust account or non-unix-user password, not updating /etc/passwd\n"));
} else {
/* update the UNIX password */
- if (lp_unix_password_sync() ) {
- struct passwd *passwd = Get_Pwnam(pdb_get_username(pwd));
- if (!passwd) {
- DEBUG(1, ("chgpasswd: Username does not exist in system !?!\n"));
- }
-
- if(!chgpasswd(pdb_get_username(pwd), passwd, "", plaintext_buf, True)) {
+ if (lp_unix_password_sync() )
+ if(!chgpasswd(pdb_get_username(pwd), "", plaintext_buf, True)) {
pdb_free_sam(&pwd);
return False;
}
- }
}
ZERO_STRUCT(plaintext_buf);
@@ -2905,12 +2899,7 @@ static BOOL set_user_info_pw(char *pass, DOM_SID *sid)
} else {
/* update the UNIX password */
if (lp_unix_password_sync()) {
- struct passwd *passwd = Get_Pwnam(pdb_get_username(pwd));
- if (!passwd) {
- DEBUG(1, ("chgpasswd: Username does not exist in system !?!\n"));
- }
-
- if(!chgpasswd(pdb_get_username(pwd), passwd, "", plaintext_buf, True)) {
+ if(!chgpasswd(pdb_get_username(pwd), "", plaintext_buf, True)) {
pdb_free_sam(&pwd);
return False;
}