sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r13622: Allow to rename machine accounts in a Samba Domain. This still uses the

Browse Source 
"rename user script" to do the rename of the posix machine account (this
might be changed later). Fixes #2331.

Guenther
This commit is contained in:
Günther Deschner 2006-02-22 10:28:02 +00:00 committed by Gerald (Jerry) Carter
parent 7de1ee1861
commit b2eac2e6eb
6 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/lib/util_str.c
View File

@ -923,7 +923,7 @@ BOOL string_set(char **dest,const char *src)
**/
void string_sub2(char *s,const char *pattern, const char *insert, size_t len,
BOOL remove_unsafe_characters, BOOL replace_once)
BOOL remove_unsafe_characters, BOOL replace_once, BOOL allow_trailing_dollar)
{
char *p;
ssize_t ls,lp,li, i;
@ -955,6 +955,11 @@ void string_sub2(char *s,const char *pattern, const char *insert, size_t len,
case '\'':
case ';':
case '$':
/* allow a trailing $ (as in machine accounts) */
if (allow_trailing_dollar && (i == li - 1 )) {
p[i] = insert[i];
break;
}
case '%':
case '\r':
case '\n':
@ -978,12 +983,12 @@ void string_sub2(char *s,const char *pattern, const char *insert, size_t len,
void string_sub_once(char *s, const char *pattern, const char *insert, size_t len)
{
string_sub2( s, pattern, insert, len, True, True );
string_sub2( s, pattern, insert, len, True, True, False );
}
void string_sub(char *s,const char *pattern, const char *insert, size_t len)
{
string_sub2( s, pattern, insert, len, True, False );
string_sub2( s, pattern, insert, len, True, False, False );
}
void fstring_sub(char *s,const char *pattern,const char *insert)

7
source/passdb/pdb_ldap.c
View File

@ -1837,8 +1837,11 @@ static NTSTATUS ldapsam_rename_sam_account(struct pdb_methods *my_methods,
DEBUG (3, ("ldapsam_rename_sam_account: Renaming user %s to %s.\n",
oldname, newname));
pstring_sub(rename_script, "%unew", newname);
pstring_sub(rename_script, "%uold", oldname);
/* we have to allow the account name to end with a '$' */
string_sub2(rename_script, "%unew", newname, sizeof(pstring),
True, False, True);
string_sub2(rename_script, "%uold", oldname, sizeof(pstring),
True, False, True);
rc = smbrun(rename_script, NULL);
DEBUG(rc ? 0 : 3,("Running the command `%s' gave %d\n",

8
source/passdb/pdb_smbpasswd.c
View File

@ -1490,9 +1490,11 @@ static NTSTATUS smbpasswd_rename_sam_account (struct pdb_methods *my_methods,
if (*rename_script) {
int rename_ret;
pstring_sub(rename_script, "%unew", newname);
pstring_sub(rename_script, "%uold",
pdb_get_username(old_acct));
string_sub2(rename_script, "%unew", newname, sizeof(pstring),
True, False, True);
string_sub2(rename_script, "%uold", pdb_get_username(old_acct),
sizeof(pstring), True, False, True);
rename_ret = smbrun(rename_script, NULL);
DEBUG(rename_ret ? 0 : 3,("Running the command `%s' gave %d\n", rename_script, rename_ret));

7
source/passdb/pdb_tdb.c
View File

@ -1200,9 +1200,10 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods,
}
/* rename the posix user */
pstring_sub(rename_script, "%unew", newname);
pstring_sub(rename_script, "%uold", pdb_get_username(old_acct));
string_sub2(rename_script, "%unew", newname, sizeof(pstring),
True, False, True);
string_sub2(rename_script, "%uold", pdb_get_username(old_acct),
sizeof(pstring), True, False, True);
rename_ret = smbrun(rename_script, NULL);
DEBUG(rename_ret ? 0 : 3,("Running the command `%s' gave %d\n", rename_script, rename_ret));

6
source/printing/printing.c
View File

@ -1447,11 +1447,13 @@ static void print_queue_update(int snum, BOOL force)
/* don't strip out characters like '$' from the printername */
pstrcpy( lpqcommand, lp_lpqcommand(snum));
string_sub2( lpqcommand, "%p", PRINTERNAME(snum), sizeof(lpqcommand), False, False );
string_sub2( lpqcommand, "%p", PRINTERNAME(snum), sizeof(lpqcommand),
False, False, False );
standard_sub_snum( snum, lpqcommand, sizeof(lpqcommand) );
pstrcpy( lprmcommand, lp_lprmcommand(snum));
string_sub2( lprmcommand, "%p", PRINTERNAME(snum), sizeof(lprmcommand), False, False );
string_sub2( lprmcommand, "%p", PRINTERNAME(snum), sizeof(lprmcommand),
False, False, False );
standard_sub_snum( snum, lprmcommand, sizeof(lprmcommand) );
/*

38
source/rpc_server/srv_samr_nt.c
View File

@ -3071,13 +3071,47 @@ static BOOL set_user_info_20(SAM_USER_INFO_20 *id20, struct samu *pwd)
static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21,
struct samu *pwd)
{
fstring new_name;
NTSTATUS status;
if (id21 == NULL) {
DEBUG(5, ("set_user_info_21: NULL id21\n"));
return NT_STATUS_INVALID_PARAMETER;
}
/* we need to separately check for an account rename first */
if (rpcstr_pull(new_name, id21->uni_user_name.buffer,
sizeof(new_name), id21->uni_user_name.uni_str_len*2, 0) &&
(!strequal(new_name, pdb_get_username(pwd)))) {
/* check to see if the new username already exists. Note: we can't
reliably lock all backends, so there is potentially the
possibility that a user can be created in between this check and
the rename. The rename should fail, but may not get the
exact same failure status code. I think this is small enough
of a window for this type of operation and the results are
simply that the rename fails with a slightly different status
code (like UNSUCCESSFUL instead of ALREADY_EXISTS). */
status = can_create(mem_ctx, new_name);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
status = pdb_rename_sam_account(pwd, new_name);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("set_user_info_21: failed to rename account: %s\n",
nt_errstr(status)));
TALLOC_FREE(pwd);
return status;
}
/* set the new username so that later
functions can work on the new account */
pdb_set_username(pwd, new_name, PDB_SET);
}
copy_id21_to_sam_passwd(pwd, id21);
/*