sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Merge from HEAD.

Browse Source 
Volker
(This used to be commit 7977a025ae)
This commit is contained in:
Volker Lendecke 2003-01-07 10:39:23 +00:00
parent e8a70338d9
commit b59dc9ee58
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/utils/pdbedit.c
View File

@ -346,12 +346,9 @@ static int new_machine (struct pdb_context *in, const char *machine_in)
{
SAM_ACCOUNT *sam_pwent=NULL;
fstring machinename;
struct passwd *pwd = NULL;
char name[16];
if (!NT_STATUS_IS_OK(pdb_init_sam (&sam_pwent))) {
return -1;
}
fstrcpy(machinename, machine_in);
if (machinename[strlen (machinename) -1] == '$')
@ -362,6 +359,19 @@ static int new_machine (struct pdb_context *in, const char *machine_in)
safe_strcpy (name, machinename, 16);
safe_strcat (name, "$", 16);
if ((pwd = getpwnam_alloc(name))) {
if (!NT_STATUS_IS_OK(pdb_init_sam_pw( &sam_pwent, pwd))) {
fprintf(stderr, "Could not init sam from pw\n");
passwd_free(&pwd);
return -1;
}
} else {
if (!NT_STATUS_IS_OK(pdb_init_sam (&sam_pwent))) {
fprintf(stderr, "Could not init sam from pw\n");
return -1;
}
}
pdb_set_plaintext_passwd (sam_pwent, machinename);
pdb_set_username (sam_pwent, name, PDB_CHANGED);