diff options
| author | Michael Adam <obnox@samba.org> | 2011-01-26 22:00:22 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-01-27 21:43:49 +0100 |
| commit | 9de1fd4352346cb71b232b7198155e157396f6ec (patch) | |
| tree | 1fc249a1fdcdabe9a43a4acadebdfe3a26304b94 | |
| parent | 0e90d01d53ee197a6451b7c55c2afa74e0d8b0bb (diff) | |
| download | samba-9de1fd4352346cb71b232b7198155e157396f6ec.tar.gz samba-9de1fd4352346cb71b232b7198155e157396f6ec.tar.bz2 samba-9de1fd4352346cb71b232b7198155e157396f6ec.zip | |
wbinfo: remove --set-gid-mapping - winbindd does not implement that any more.
| -rw-r--r-- | nsswitch/wbinfo.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index e97abbf0ef..3d14d21ad6 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -1040,35 +1040,6 @@ 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; @@ -1923,7 +1894,6 @@ enum { OPT_USERSIDS, OPT_ALLOCATE_UID, OPT_ALLOCATE_GID, - OPT_SET_GID_MAPPING, OPT_REMOVE_UID_MAPPING, OPT_REMOVE_GID_MAPPING, OPT_SEPARATOR, @@ -1986,7 +1956,6 @@ 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" }, @@ -2188,16 +2157,6 @@ 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) || |