loadparm.c: Removed 'domain other sids' parameter.

lib/rpc/include/rpc_lsa.h: Changed #defines for RPC calls - moved some, made LSA_LOOKUPNAMES correct.
lib/rpc/include/rpc_misc.h: Changed DOMAIN_ALIAS_xxx to BUILTIN_ALIAS_xxx.
                            Changed bitmasks for uid to rid to be 1 bit.
lib/rpc/parse/parse_misc.c: Changed make_unistr2 to put length as given, max length as one more.
lib/rpc/server/srv_netlog.c: Removed 'domain other sids' parameter.
lib/rpc/server/srv_samr.c: Changed DOMAIN_ALIAS_xxx to BUILTIN_ALIAS_xxx.
lib/rpc/server/srv_util.c: Changed DOMAIN_ALIAS_xxx to BUILTIN_ALIAS_xxx.
Jeremy.
(This used to be commit 34c91840a3d8c252715dc2f749b7a3b171a5b74f)

3 files changed, 13 insertions, 15 deletions

diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index 0679e876e2..38481cd2d3 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -691,7 +691,6 @@ static void api_net_sam_logon( int uid,
     pstring my_name;
     pstring my_workgroup;
     pstring domain_groups;
-    pstring other_sids;
     uint32 r_uid;
     uint32 r_gid;
 
@@ -708,7 +707,6 @@ static void api_net_sam_logon( int uid,
     pstrcpy(logon_script, lp_logon_script());
     pstrcpy(profile_path, lp_logon_path());
 
-    pstrcpy(other_sids, lp_domain_other_sids());
     pstrcpy(my_workgroup, lp_workgroup());
 
     pstrcpy(home_drive, lp_logon_drive());
@@ -767,7 +765,7 @@ static void api_net_sam_logon( int uid,
                           my_workgroup, /* char *logon_dom */
 
                           &global_machine_sid,     /* DOM_SID *dom_sid */
-                          other_sids); /* char *other_sids */
+                          NULL); /* char *other_sids */
     }
     else
     {
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index d0304d0dd6..5ca37f4b83 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -414,7 +414,7 @@ static void samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
 	got_aliases = True;
 	num_entries = 1;
 	make_unistr2(&(pass[0].uni_user_name), dummy_alias, strlen(dummy_alias));
-	pass[0].user_rid = DOMAIN_ALIAS_RID_ADMINS;
+	pass[0].user_rid = BUILTIN_ALIAS_RID_ADMINS;
 
 	if (r_e.status == 0 && got_aliases)
 	{
@@ -637,7 +637,7 @@ static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
 #endif
 
 	num_rids = 1;
-	rid[0] = DOMAIN_ALIAS_RID_USERS;
+	rid[0] = BUILTIN_ALIAS_RID_USERS;
 
 	make_samr_r_lookup_ids(&r_u, num_rids, rid, status);
 
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 64f2e7a0d9..1ccd14c813 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -48,16 +48,16 @@ extern int DEBUGLEVEL;
    i.e the DOMAIN_GROUP_RID_ADMIN/USER/GUEST.  */
 rid_name domain_alias_rids[] = 
 {
-	{ DOMAIN_ALIAS_RID_ADMINS       , "admins" },
-	{ DOMAIN_ALIAS_RID_USERS        , "users" },
-	{ DOMAIN_ALIAS_RID_GUESTS       , "guests" },
-	{ DOMAIN_ALIAS_RID_POWER_USERS  , "power_users" },
-
-	{ DOMAIN_ALIAS_RID_ACCOUNT_OPS  , "account_ops" },
-	{ DOMAIN_ALIAS_RID_SYSTEM_OPS   , "system_ops" },
-	{ DOMAIN_ALIAS_RID_PRINT_OPS    , "print_ops" },
-	{ DOMAIN_ALIAS_RID_BACKUP_OPS   , "backup_ops" },
-	{ DOMAIN_ALIAS_RID_REPLICATOR   , "replicator" },
+	{ BUILTIN_ALIAS_RID_ADMINS       , "admins" },
+	{ BUILTIN_ALIAS_RID_USERS        , "users" },
+	{ BUILTIN_ALIAS_RID_GUESTS       , "guests" },
+	{ BUILTIN_ALIAS_RID_POWER_USERS  , "power_users" },
+
+	{ BUILTIN_ALIAS_RID_ACCOUNT_OPS  , "account_ops" },
+	{ BUILTIN_ALIAS_RID_SYSTEM_OPS   , "system_ops" },
+	{ BUILTIN_ALIAS_RID_PRINT_OPS    , "print_ops" },
+	{ BUILTIN_ALIAS_RID_BACKUP_OPS   , "backup_ops" },
+	{ BUILTIN_ALIAS_RID_REPLICATOR   , "replicator" },
 	{ 0                             , NULL }
 };