summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-06-09 02:26:26 +0000
committerJeremy Allison <jra@samba.org>1998-06-09 02:26:26 +0000
commite85295d9241bcdad3723898ab8ad88d8f11d5f28 (patch)
treeab70331ce6bf518879e9a4128e879f5508b0c247 /source3/include
parent75e909f27db1e1ff69897e477a2c4704faf9a2fb (diff)
downloadsamba-e85295d9241bcdad3723898ab8ad88d8f11d5f28.tar.gz
samba-e85295d9241bcdad3723898ab8ad88d8f11d5f28.tar.bz2
samba-e85295d9241bcdad3723898ab8ad88d8f11d5f28.zip
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)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/rpc_lsa.h8
-rw-r--r--source3/include/rpc_misc.h26
2 files changed, 17 insertions, 17 deletions
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 008f8866c0..39f42dcd56 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -34,16 +34,16 @@ enum SID_NAME_USE
};
/* ntlsa pipe */
-#define LSA_OPENPOLICY 0x2c
+#define LSA_CLOSE 0x00
#define LSA_QUERYINFOPOLICY 0x07
#define LSA_ENUMTRUSTDOM 0x0d
-#define LSA_CLOSE 0x00
-#define LSA_OPENSECRET 0x1C
+#define LSA_LOOKUPNAMES 0x0e
#define LSA_LOOKUPSIDS 0x0f
+#define LSA_OPENPOLICY 0x2c
+#define LSA_OPENSECRET 0x1C
/* XXXX these are here to get a compile! */
#define LSA_LOOKUPRIDS 0xFD
-#define LSA_LOOKUPNAMES 0xFC
#define LSA_MAX_GROUPS 32
#define LSA_MAX_SIDS 32
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index e8ffcd4a16..3e1a6052b5 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -50,28 +50,28 @@
#define DOMAIN_GROUP_RID_GUESTS (0x00000202L)
/* RIDs - well-known aliases ... */
-#define DOMAIN_ALIAS_RID_ADMINS (0x00000220L)
-#define DOMAIN_ALIAS_RID_USERS (0x00000221L)
-#define DOMAIN_ALIAS_RID_GUESTS (0x00000222L)
-#define DOMAIN_ALIAS_RID_POWER_USERS (0x00000223L)
+#define BUILTIN_ALIAS_RID_ADMINS (0x00000220L)
+#define BUILTIN_ALIAS_RID_USERS (0x00000221L)
+#define BUILTIN_ALIAS_RID_GUESTS (0x00000222L)
+#define BUILTIN_ALIAS_RID_POWER_USERS (0x00000223L)
-#define DOMAIN_ALIAS_RID_ACCOUNT_OPS (0x00000224L)
-#define DOMAIN_ALIAS_RID_SYSTEM_OPS (0x00000225L)
-#define DOMAIN_ALIAS_RID_PRINT_OPS (0x00000226L)
-#define DOMAIN_ALIAS_RID_BACKUP_OPS (0x00000227L)
+#define BUILTIN_ALIAS_RID_ACCOUNT_OPS (0x00000224L)
+#define BUILTIN_ALIAS_RID_SYSTEM_OPS (0x00000225L)
+#define BUILTIN_ALIAS_RID_PRINT_OPS (0x00000226L)
+#define BUILTIN_ALIAS_RID_BACKUP_OPS (0x00000227L)
-#define DOMAIN_ALIAS_RID_REPLICATOR (0x00000228L)
+#define BUILTIN_ALIAS_RID_REPLICATOR (0x00000228L)
/*
* Masks for mappings between unix uid and gid types and
* NT RIDS.
*/
-/* Take the 3 bottom bits. */
-#define RID_TYPE_MASK 7
-#define RID_MULTIPLIER 8
+/* Take the bottom bit. */
+#define RID_TYPE_MASK 1
+#define RID_MULTIPLIER 2
-/* The two common types for now. */
+/* The two common types. */
#define USER_RID_TYPE 0
#define GROUP_RID_TYPE 1