- adding builtin[alias]db.

- lib/sids.c:

	generate_sam_sid() modified to take a domain name: it now
	generates "DOMAIN_NAME.SID".  reasons:

	1) if you run multiple samba servers on the same machine
	under different netbios names as members of a domain,
	they won't all use the same SID, which is a _big_ mistake
	but it would happen _by default_.

	2) we have (had) a problem with sid_to_string() and string_to_sid()
	which cause SIDs to be incorrectly read.  one of the major
	reasons for *NOT* making this change was so as not to disrupt
	existing users.  but as they will be anyway by this bug,
	we might as well go ahead.

- passdb/smbpass.c:

	wanted to change the meaning of the name in the smbpasswd
	file to an "nt" name not a "unix" name.  this is probably
	not a good idea: reverted this.

- output formatting / bug-fixing in rpcclient query_useraliases code.
(This used to be commit e4930f5f48f8246ceec8add8bf769954a963190c)

1 files changed, 5 insertions, 4 deletions

diff --git a/source3/lib/util_pwdb.c b/source3/lib/util_pwdb.c
index 50cc0510d8..74d5ff6794 100644
--- a/source3/lib/util_pwdb.c
+++ b/source3/lib/util_pwdb.c
@@ -176,8 +176,6 @@ uint32 lookup_builtin_alias_name(const char *alias_name, const char *domain,
 		rid      = builtin_alias_rids[i].rid;
 		als_name = builtin_alias_rids[i].name;
 
-		i++;
-
 		if (strequal(als_name, alias_name))
 		{
 			if (sid != NULL)
@@ -193,6 +191,8 @@ uint32 lookup_builtin_alias_name(const char *alias_name, const char *domain,
 			return 0x0;
 		}
 			
+		i++;
+
 	} while (als_name != NULL);
 
 	return 0xC0000000 | NT_STATUS_NONE_MAPPED;
@@ -431,9 +431,10 @@ BOOL pwdb_initialise(void)
 
 	generate_wellknown_sids();
 
-	if (!generate_sam_sid())
+	if (!generate_sam_sid(global_sam_name))
 	{
-		DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
+		DEBUG(0,("ERROR: Samba cannot create a SAM SID for its domain (%s).\n",
+		          global_sam_name));
 		return False;
 	}