diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-17 22:04:24 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 00:44:26 +0200 |
| commit | 3b529d50be5613f37cf853714ecf78887df1d01b (patch) | |
| tree | d3253ac410fbc74898d8a6543569670b68d2f511 /source3/utils | |
| parent | 2deff342b949ef7f91134115aa77c4051e2a4c33 (diff) | |
| download | samba-3b529d50be5613f37cf853714ecf78887df1d01b.tar.gz samba-3b529d50be5613f37cf853714ecf78887df1d01b.tar.bz2 samba-3b529d50be5613f37cf853714ecf78887df1d01b.zip | |
s3-rpc_misc: clean out include/rpc_misc.h.
Well known rids don't really belong into an rpc header, just use the ones
defined in security.idl.
Guenther
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_groupmap.c | 4 | ||||
| -rw-r--r-- | source3/utils/net_sam.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c index b39a52ed02..9b46808b8b 100644 --- a/source3/utils/net_groupmap.c +++ b/source3/utils/net_groupmap.c @@ -200,10 +200,10 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv) for ( i=0; i<argc; i++ ) { if ( !StrnCaseCmp(argv[i], "rid", strlen("rid")) ) { rid = get_int_param(argv[i]); - if ( rid < DOMAIN_GROUP_RID_ADMINS ) { + if ( rid < DOMAIN_RID_ADMINS ) { d_fprintf(stderr, _("RID must be greater than %d\n"), - (uint32)DOMAIN_GROUP_RID_ADMINS-1); + (uint32)DOMAIN_RID_ADMINS-1); return -1; } } diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index 5c3f4e5b96..9b842aedd3 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -1639,7 +1639,7 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv) d_printf(_("Checking for Domain Users group.\n")); - sid_compose(&gsid, get_global_sam_sid(), DOMAIN_GROUP_RID_USERS); + sid_compose(&gsid, get_global_sam_sid(), DOMAIN_RID_USERS); if (!pdb_getgrsid(&gmap, gsid)) { LDAPMod **mods = NULL; @@ -1696,7 +1696,7 @@ domu_done: d_printf(_("Checking for Domain Admins group.\n")); - sid_compose(&gsid, get_global_sam_sid(), DOMAIN_GROUP_RID_ADMINS); + sid_compose(&gsid, get_global_sam_sid(), DOMAIN_RID_ADMINS); if (!pdb_getgrsid(&gmap, gsid)) { LDAPMod **mods = NULL; @@ -1803,7 +1803,7 @@ doma_done: goto failed; } - sid_compose(&sid, get_global_sam_sid(), DOMAIN_USER_RID_ADMIN); + sid_compose(&sid, get_global_sam_sid(), DOMAIN_RID_ADMINISTRATOR); smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_ACCOUNT); smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_POSIXACCOUNT); @@ -1880,7 +1880,7 @@ doma_done: } } - sid_compose(&sid, get_global_sam_sid(), DOMAIN_USER_RID_GUEST); + sid_compose(&sid, get_global_sam_sid(), DOMAIN_RID_GUEST); dn = talloc_asprintf(tc, "uid=%s,%s", pwd->pw_name, lp_ldap_user_suffix ()); uidstr = talloc_asprintf(tc, "%u", (unsigned int)pwd->pw_uid); @@ -1959,7 +1959,7 @@ doma_done: goto failed; } - sid_compose(&gsid, get_global_sam_sid(), DOMAIN_GROUP_RID_GUESTS); + sid_compose(&gsid, get_global_sam_sid(), DOMAIN_RID_GUESTS); smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_POSIXGROUP); smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_GROUPMAP); |