domain aliases added a bit better: does local aliases if you query

for sid S-1-5-20 and does (nothing at the moment) if you query for
your own sid.
(This used to be commit da40f26f4b2f7ce286076b4e39dffd76aa2ef8e6)

1 files changed, 6 insertions, 5 deletions

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 0cd2f6ef2e..aae59b32f6 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -27,10 +27,11 @@ extern int DEBUGLEVEL;
 
 /*
  * This is set on startup - it defines the SID for this
- * machine.
+ * machine, and therefore the SAM database for which it is
+ * responsible.
  */
 
-DOM_SID global_machine_sid;
+DOM_SID global_sam_sid;
 
 /*
  * NOTE. All these functions are abstracted into a structure
@@ -805,7 +806,7 @@ static BOOL read_sid_from_file(int fd, char *sid_file)
    */
 
   fline[sizeof(fline)-1] = '\0';
-  if(!string_to_sid( &global_machine_sid, fline)) {
+  if(!string_to_sid( &global_sam_sid, fline)) {
     DEBUG(0,("unable to generate machine SID.\n"));
     return False;
   }
@@ -817,7 +818,7 @@ static BOOL read_sid_from_file(int fd, char *sid_file)
  Generate the global machine sid. Look for the MACHINE.SID file first, if
  not found then look in smb.conf and use it to create the MACHINE.SID file.
 ****************************************************************************/
-BOOL pdb_generate_machine_sid(void)
+BOOL pdb_generate_sam_sid(void)
 {
 	int fd;
 	char *p;
@@ -901,7 +902,7 @@ BOOL pdb_generate_machine_sid(void)
 	 * Ensure our new SID is valid.
 	 */
 	
-	if(!string_to_sid( &global_machine_sid, sid_string)) {
+	if(!string_to_sid( &global_sam_sid, sid_string)) {
 		DEBUG(0,("unable to generate machine SID.\n"));
 		return False;
 	}