From 03d5867d529f126da368ebda70bf2d997aa602e0 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 11 Jul 2003 05:33:40 +0000 Subject: moving more code around. * move rid allocation into IDMAP. See comments in _api_samr_create_user() * add winbind delete user/group functions I'm checking this in to sync up with everyone. But I'm going to split the add a separate winbindd_allocate_rid() function for systems that have an 'add user script' but need idmap to give them a RID. Life would be so much simplier without 'enable rid algorithm'. The current RID allocation is horrible due to this one fact. Tested idmap_tdb but not idmap_ldap yet. Will do that tomorrow. Nothing has changed in the way a samba domain is represented, stored, or search in the directory so things should be ok with previous installations. going to bed now. (This used to be commit 0463045cc7ff177fab44b25faffad5bf7140244d) --- source3/groupdb/mapping.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source3/groupdb/mapping.c') diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index e769b4dd9d..8a6f514860 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -756,7 +756,7 @@ int smb_create_group(char *unix_group, gid_t *new_gid) /* Try winbindd */ - if ( winbind_create_group( unix_group ) ) { + if ( winbind_create_group( unix_group, NULL ) ) { DEBUG(3,("smb_create_group: winbindd created the group (%s)\n", unix_group)); return 0; @@ -783,15 +783,13 @@ int smb_delete_group(char *unix_group) DEBUG(3,("smb_delete_group: Running the command `%s' gave %d\n",del_script,ret)); return ret; } -#if 0 + if ( winbind_delete_group( unix_group ) ) { DEBUG(3,("smb_delete_group: winbindd deleted the group (%s)\n", unix_group)); return 0; } -#endif - return -1; } -- cgit