From 450e8d5749504f8392c0cfe8b79218f03b88076a Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 31 May 2005 02:23:47 +0000 Subject: r7130: remove 'winbind enable local accounts' code from the 3.0 tree (This used to be commit 318c3db4cb1c85be40b2f812f781bcf5f1da5c19) --- source3/nsswitch/wbinfo.c | 211 ---------------------------------------------- 1 file changed, 211 deletions(-) (limited to 'source3/nsswitch/wbinfo.c') diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 69f464f446..baa35d7cfb 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -697,175 +697,6 @@ static BOOL wbinfo_klog(char *username) return True; } -/****************************************************************** - create a winbindd user -******************************************************************/ - -static BOOL wbinfo_create_user(char *username) -{ - struct winbindd_request request; - struct winbindd_response response; - NSS_STATUS result; - - /* Send off request */ - - ZERO_STRUCT(request); - ZERO_STRUCT(response); - - request.flags = WBFLAG_ALLOCATE_RID; - fstrcpy(request.data.acct_mgt.username, username); - - result = winbindd_request(WINBINDD_CREATE_USER, &request, &response); - - if ( result == NSS_STATUS_SUCCESS ) - d_printf("New RID is %d\n", response.data.rid); - - return result == NSS_STATUS_SUCCESS; -} - -/****************************************************************** - remove a winbindd user -******************************************************************/ - -static BOOL wbinfo_delete_user(char *username) -{ - struct winbindd_request request; - struct winbindd_response response; - NSS_STATUS result; - - /* Send off request */ - - ZERO_STRUCT(request); - ZERO_STRUCT(response); - - fstrcpy(request.data.acct_mgt.username, username); - - result = winbindd_request(WINBINDD_DELETE_USER, &request, &response); - - return result == NSS_STATUS_SUCCESS; -} - -/****************************************************************** - create a winbindd group -******************************************************************/ - -static BOOL wbinfo_create_group(char *groupname) -{ - struct winbindd_request request; - struct winbindd_response response; - NSS_STATUS result; - - /* Send off request */ - - ZERO_STRUCT(request); - ZERO_STRUCT(response); - - fstrcpy(request.data.acct_mgt.groupname, groupname); - - result = winbindd_request(WINBINDD_CREATE_GROUP, &request, &response); - - return result == NSS_STATUS_SUCCESS; -} - -/****************************************************************** - remove a winbindd group -******************************************************************/ - -static BOOL wbinfo_delete_group(char *groupname) -{ - struct winbindd_request request; - struct winbindd_response response; - NSS_STATUS result; - - /* Send off request */ - - ZERO_STRUCT(request); - ZERO_STRUCT(response); - - fstrcpy(request.data.acct_mgt.groupname, groupname); - - result = winbindd_request(WINBINDD_DELETE_GROUP, &request, &response); - - return result == NSS_STATUS_SUCCESS; -} - -/****************************************************************** - parse a string in the form user:group -******************************************************************/ - -static BOOL parse_user_group( const char *string, fstring user, fstring group ) -{ - char *p; - - if ( !string ) - return False; - - if ( !(p = strchr( string, ':' )) ) - return False; - - *p = '\0'; - p++; - - fstrcpy( user, string ); - fstrcpy( group, p ); - - return True; -} - -/****************************************************************** - add a user to a winbindd group -******************************************************************/ - -static BOOL wbinfo_add_user_to_group(char *string) -{ - struct winbindd_request request; - struct winbindd_response response; - NSS_STATUS result; - - /* Send off request */ - - ZERO_STRUCT(request); - ZERO_STRUCT(response); - - if ( !parse_user_group( string, request.data.acct_mgt.username, - request.data.acct_mgt.groupname)) - { - d_printf("Can't parse user:group from %s\n", string); - return False; - } - - result = winbindd_request(WINBINDD_ADD_USER_TO_GROUP, &request, &response); - - return result == NSS_STATUS_SUCCESS; -} - -/****************************************************************** - remove a user from a winbindd group -******************************************************************/ - -static BOOL wbinfo_remove_user_from_group(char *string) -{ - struct winbindd_request request; - struct winbindd_response response; - NSS_STATUS result; - - /* Send off request */ - - ZERO_STRUCT(request); - ZERO_STRUCT(response); - - if ( !parse_user_group( string, request.data.acct_mgt.username, - request.data.acct_mgt.groupname)) - { - d_printf("Can't parse user:group from %s\n", string); - return False; - } - - result = winbindd_request(WINBINDD_REMOVE_USER_FROM_GROUP, &request, &response); - - return result == NSS_STATUS_SUCCESS; -} - /* Print domain users */ static BOOL print_domain_users(const char *domain) @@ -1088,12 +919,6 @@ int main(int argc, char **argv) { "sid-to-uid", 'S', POPT_ARG_STRING, &string_arg, 'S', "Converts sid to uid", "SID" }, { "sid-to-gid", 'Y', POPT_ARG_STRING, &string_arg, 'Y', "Converts sid to gid", "SID" }, { "allocate-rid", 'A', POPT_ARG_NONE, 0, 'A', "Get a new RID out of idmap" }, - { "create-user", 'c', POPT_ARG_STRING, &string_arg, 'c', "Create a local user account", "name" }, - { "delete-user", 'x', POPT_ARG_STRING, &string_arg, 'x', "Delete a local user account", "name" }, - { "create-group", 'C', POPT_ARG_STRING, &string_arg, 'C', "Create a local group", "name" }, - { "delete-group", 'X', POPT_ARG_STRING, &string_arg, 'X', "Delete a local group", "name" }, - { "add-to-group", 'o', POPT_ARG_STRING, &string_arg, 'o', "Add user to group", "user:group" }, - { "del-from-group", 'O', POPT_ARG_STRING, &string_arg, 'O', "Remove user from group", "user:group" }, { "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" }, { "trusted-domains", 'm', POPT_ARG_NONE, 0, 'm', "List trusted domains" }, { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Show sequence numbers of all domains" }, @@ -1279,42 +1104,6 @@ int main(int argc, char **argv) goto done; } break; - case 'c': - if ( !wbinfo_create_user(string_arg) ) { - d_printf("Could not create user account\n"); - goto done; - } - break; - case 'C': - if ( !wbinfo_create_group(string_arg) ) { - d_printf("Could not create group\n"); - goto done; - } - break; - case 'o': - if ( !wbinfo_add_user_to_group(string_arg) ) { - d_printf("Could not add user to group\n"); - goto done; - } - break; - case 'O': - if ( !wbinfo_remove_user_from_group(string_arg) ) { - d_printf("Could not remove user from group\n"); - goto done; - } - break; - case 'x': - if ( !wbinfo_delete_user(string_arg) ) { - d_printf("Could not delete user account\n"); - goto done; - } - break; - case 'X': - if ( !wbinfo_delete_group(string_arg) ) { - d_printf("Could not delete group\n"); - goto done; - } - break; case 'p': if (!wbinfo_ping()) { d_printf("could not ping winbindd!\n"); -- cgit