summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-05-07 19:59:32 +0000
committerLuke Leighton <lkcl@samba.org>1998-05-07 19:59:32 +0000
commitb543829dfceae6781624bebe11a2365c34e2d159 (patch)
tree6ff2af6dada6447e556f199b4b63508a8dd02cf0 /source3/utils
parent01df1ed95f880a671ead7bc92b3bcff01a2e2dc0 (diff)
downloadsamba-b543829dfceae6781624bebe11a2365c34e2d159.tar.gz
samba-b543829dfceae6781624bebe11a2365c34e2d159.tar.bz2
samba-b543829dfceae6781624bebe11a2365c34e2d159.zip
moving gethexpwd into util.c, because it's used in both smbpass.c and ldap.c
(This used to be commit abe261b2f5ea7036e7be6230876176d134ef4ee4)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/smbpasswd.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index cc883ff51b..2504727bd6 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -637,13 +637,13 @@ int main(int argc, char **argv)
/*
* Open the smbpaswd file.
*/
- vp = startsmbpwent(True);
+ vp = startsampwent(True);
if (!vp && errno == ENOENT) {
fp = fopen(lp_smb_passwd_file(), "w");
if (fp) {
fprintf(fp, "# Samba SMB password file\n");
fclose(fp);
- vp = startsmbpwent(True);
+ vp = startsampwent(True);
}
}
if (!fp) {
@@ -656,12 +656,12 @@ int main(int argc, char **argv)
}
/* Get the smb passwd entry for this user */
- smb_pwent = getsmbpwnam(user_name);
+ smb_pwent = getsampwnam(user_name);
if (smb_pwent == NULL) {
if(add_user == False) {
fprintf(stderr, "%s: Failed to find entry for user %s.\n",
prog_name, pwd->pw_name);
- endsmbpwent(vp);
+ endsampwent(vp);
exit(1);
}
@@ -684,14 +684,14 @@ int main(int argc, char **argv)
new_smb_pwent.smb_nt_passwd = new_nt_p16;
}
- if(add_smbpwd_entry(&new_smb_pwent) == False) {
+ if(add_sampwd_entry(&new_smb_pwent) == False) {
fprintf(stderr, "%s: Failed to add entry for user %s.\n",
prog_name, pwd->pw_name);
- endsmbpwent(vp);
+ endsampwent(vp);
exit(1);
}
- endsmbpwent(vp);
+ endsampwent(vp);
printf("%s: Added user %s.\n", prog_name, user_name);
exit(0);
}
@@ -726,14 +726,14 @@ int main(int argc, char **argv)
smb_pwent->smb_nt_passwd = new_nt_p16;
}
- if(mod_smbpwd_entry(smb_pwent,True) == False) {
+ if(mod_sampwd_entry(smb_pwent,True) == False) {
fprintf(stderr, "%s: Failed to modify entry for user %s.\n",
prog_name, pwd->pw_name);
- endsmbpwent(vp);
+ endsampwent(vp);
exit(1);
}
- endsmbpwent(vp);
+ endsampwent(vp);
if(disable_user)
printf("User %s disabled.\n", user_name);
else if (set_no_password)