sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-29 02:50:28 +03:00
Code

Revert "wbinfo: remove --remove-gid-mapping - winbindd does not implement that any more."

Browse Source 
This reverts commit 48ad64aa78568c4ce743345448c9d39305752d73.

Undo the library version bump.
This commit is contained in:
Michael Adam 2011-02-10 11:04:41 +01:00
parent 0def826ec5
commit 1ea1043f8d
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nsswitch/wbinfo.c
View File

@ -1040,6 +1040,35 @@ static bool wbinfo_allocate_gid(void)
return true;
}
static bool wbinfo_remove_gid_mapping(gid_t gid, const char *sid_str)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcDomainSid sid;
/* Send request */
wbc_status = wbcStringToSid(sid_str, &sid);
if (!WBC_ERROR_IS_OK(wbc_status)) {
d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
wbcErrorString(wbc_status));
return false;
}
wbc_status = wbcRemoveGidMapping(gid, &sid);
if (!WBC_ERROR_IS_OK(wbc_status)) {
d_fprintf(stderr, "failed to call wbcRemoveGidMapping: %s\n",
wbcErrorString(wbc_status));
return false;
}
/* Display response */
d_printf("Removed gid %u to sid %s mapping\n",
(unsigned int)gid, sid_str);
return true;
}
/* Convert sid to string */
static bool wbinfo_lookupsid(const char *sid_str)
@ -1836,6 +1865,7 @@ enum {
OPT_USERSIDS,
OPT_ALLOCATE_UID,
OPT_ALLOCATE_GID,
OPT_REMOVE_GID_MAPPING,
OPT_SEPARATOR,
OPT_LIST_ALL_DOMAINS,
OPT_LIST_OWN_DOMAIN,
@ -1896,6 +1926,7 @@ int main(int argc, char **argv, char **envp)
"Get a new UID out of idmap" },
{ "allocate-gid", 0, POPT_ARG_NONE, 0, OPT_ALLOCATE_GID,
"Get a new GID out of idmap" },
{ "remove-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_GID_MAPPING, "Remove gid to sid mapping in idmap", "GID,SID" },
{ "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
{ "change-secret", 'c', POPT_ARG_NONE, 0, 'c', "Change shared secret" },
{ "ping-dc", 'P', POPT_ARG_NONE, 0, 'P',
@ -2095,6 +2126,17 @@ int main(int argc, char **argv, char **envp)
goto done;
}
break;
case OPT_REMOVE_GID_MAPPING:
if (!parse_mapping_arg(string_arg, &int_subarg,
&string_subarg) ||
!wbinfo_remove_gid_mapping(int_subarg,
string_subarg))
{
d_fprintf(stderr, "Could not remove gid to sid "
"mapping\n");
goto done;
}
break;
case 't':
if (!wbinfo_check_secret(opt_domain_name)) {
d_fprintf(stderr, "Could not check secret\n");