diff options
| author | Gerald Carter <jerry@samba.org> | 2004-03-04 15:59:11 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-03-04 15:59:11 +0000 |
| commit | e7efbb588afe94236a602bd2598eccf67beea1f7 (patch) | |
| tree | 15474bb9310637ebb67789bfb4a5e56c9b11b979 /source3/nsswitch | |
| parent | 43dd09f9da14eb54f957c4f63e714d27400ad944 (diff) | |
| download | samba-e7efbb588afe94236a602bd2598eccf67beea1f7.tar.gz samba-e7efbb588afe94236a602bd2598eccf67beea1f7.tar.bz2 samba-e7efbb588afe94236a602bd2598eccf67beea1f7.zip | |
BUG 848: don't create winbind local users/groups that already exist in the tdb
(This used to be commit 89da3df07b7d90ad19852046d0533673cff8fdc6)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_acct.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd_acct.c b/source3/nsswitch/winbindd_acct.c index 0d96756fdb..34c7238b84 100644 --- a/source3/nsswitch/winbindd_acct.c +++ b/source3/nsswitch/winbindd_acct.c @@ -853,7 +853,7 @@ enum winbindd_result winbindd_create_user(struct winbindd_cli_state *state) { char *user, *group; unid_t id; - WINBINDD_PW pw; + WINBINDD_PW pw, *pw_check; WINBINDD_GR *wb_grp; struct group *unix_grp; gid_t primary_gid; @@ -874,6 +874,13 @@ enum winbindd_result winbindd_create_user(struct winbindd_cli_state *state) DEBUG(3, ("[%5lu]: create_user: user=>(%s), group=>(%s)\n", (unsigned long)state->pid, user, group)); + + if ( (pw_check=wb_getpwnam(user)) != NULL ) { + DEBUG(0,("winbindd_create_user: Refusing to create user that already exists (%s)\n", + user)); + return WINBINDD_ERROR; + } + if ( !*group ) group = lp_template_primary_group(); @@ -949,7 +956,7 @@ enum winbindd_result winbindd_create_group(struct winbindd_cli_state *state) { char *group; unid_t id; - WINBINDD_GR grp; + WINBINDD_GR grp, *grp_check; uint32 flags = state->request.flags; uint32 rid; @@ -964,7 +971,13 @@ enum winbindd_result winbindd_create_group(struct winbindd_cli_state *state) DEBUG(3, ("[%5lu]: create_group: (%s)\n", (unsigned long)state->pid, group)); - /* get a new uid */ + if ( (grp_check=wb_getgrnam(group)) != NULL ) { + DEBUG(0,("winbindd_create_group: Refusing to create group that already exists (%s)\n", + group)); + return WINBINDD_ERROR; + } + + /* get a new gid */ if ( !NT_STATUS_IS_OK(idmap_allocate_id( &id, ID_GROUPID)) ) { DEBUG(0,("winbindd_create_group: idmap_allocate_id() failed!\n")); |