From 70ebfc16b4b5e6fc8f1a809aa16110b77f3c8a0e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 10 Feb 2011 11:04:47 +0100 Subject: Revert "wbinfo: remove --set-gid-mapping - winbindd does not implement that any more." This reverts commit 9de1fd4352346cb71b232b7198155e157396f6ec. Undo the library version bump. --- nsswitch/wbinfo.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'nsswitch') diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index 3d14d21ad6..e97abbf0ef 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -1040,6 +1040,35 @@ static bool wbinfo_allocate_gid(void) return true; } +static bool wbinfo_set_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 = wbcSetGidMapping(gid, &sid); + if (!WBC_ERROR_IS_OK(wbc_status)) { + d_fprintf(stderr, "failed to call wbcSetGidMapping: %s\n", + wbcErrorString(wbc_status)); + return false; + } + + /* Display response */ + + d_printf("gid %u now mapped to sid %s\n", + (unsigned int)gid, sid_str); + + return true; +} + static bool wbinfo_remove_uid_mapping(uid_t uid, const char *sid_str) { wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE; @@ -1894,6 +1923,7 @@ enum { OPT_USERSIDS, OPT_ALLOCATE_UID, OPT_ALLOCATE_GID, + OPT_SET_GID_MAPPING, OPT_REMOVE_UID_MAPPING, OPT_REMOVE_GID_MAPPING, OPT_SEPARATOR, @@ -1956,6 +1986,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" }, + { "set-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_SET_GID_MAPPING, "Create or modify gid to sid mapping in idmap", "GID,SID" }, { "remove-uid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_UID_MAPPING, "Remove uid to sid mapping in idmap", "UID,SID" }, { "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" }, @@ -2157,6 +2188,16 @@ int main(int argc, char **argv, char **envp) goto done; } break; + case OPT_SET_GID_MAPPING: + if (!parse_mapping_arg(string_arg, &int_subarg, + &string_subarg) || + !wbinfo_set_gid_mapping(int_subarg, string_subarg)) + { + d_fprintf(stderr, "Could not create or modify " + "gid to sid mapping\n"); + goto done; + } + break; case OPT_REMOVE_UID_MAPPING: if (!parse_mapping_arg(string_arg, &int_subarg, &string_subarg) || -- cgit