Fix comment

[kai/samba.git] / source3 / passdb / machine_sid.c

diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 0b4a4ffeba30951bb96d04f3692ccc597afdd893..e1f7dec2a9bfa46222aa6c090e2327a5ab7d6000 100644 (file)
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -4,6 +4,7 @@
    Copyright (C) Jeremy Allison                1996-2002
    Copyright (C) Andrew Tridgell               2002
    Copyright (C) Gerald (Jerry) Carter         2000
+   Copyright (C) Stefan (metze) Metzmacher     2002
       
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,6 +23,11 @@
 
 #include "includes.h"
 
+/* NOTE! the global_sam_sid is the SID of our local SAM. This is only
+   equal to the domain SID when we are a DC, otherwise its our
+   workstation SID */
+static DOM_SID *global_sam_sid=NULL;
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
 
@@ -70,13 +76,17 @@ static void generate_random_sid(DOM_SID *sid)
  Generate the global machine sid.
 ****************************************************************************/
 
-BOOL pdb_generate_sam_sid(void)
+static BOOL pdb_generate_sam_sid(void)
 {
        char *fname = NULL;
        extern pstring global_myname;
        extern fstring global_myworkgroup;
        BOOL is_dc = False;
 
+       if(global_sam_sid==NULL)
+               if(!(global_sam_sid=(DOM_SID *)malloc(sizeof(DOM_SID))))
+                       return False;
+                       
        generate_wellknown_sids();
 
        switch (lp_server_role()) {
@@ -89,7 +99,7 @@ BOOL pdb_generate_sam_sid(void)
                break;
        }
 
-       if (secrets_fetch_domain_sid(global_myname, &global_sam_sid)) {
+       if (secrets_fetch_domain_sid(global_myname, global_sam_sid)) {
                DOM_SID domain_sid;
 
                /* We got our sid. If not a pdc/bdc, we're done. */
@@ -100,19 +110,19 @@ BOOL pdb_generate_sam_sid(void)
 
                        /* No domain sid and we're a pdc/bdc. Store it */
 
-                       if (!secrets_store_domain_sid(global_myworkgroup, &global_sam_sid)) {
+                       if (!secrets_store_domain_sid(global_myworkgroup, global_sam_sid)) {
                                DEBUG(0,("pdb_generate_sam_sid: Can't store domain SID as a pdc/bdc.\n"));
                                return False;
                        }
                        return True;
                }
 
-               if (!sid_equal(&domain_sid, &global_sam_sid)) {
+               if (!sid_equal(&domain_sid, global_sam_sid)) {
 
                        /* Domain name sid doesn't match global sam sid. Re-store global sam sid as domain sid. */
 
                        DEBUG(0,("pdb_generate_sam_sid: Mismatched SIDs as a pdc/bdc.\n"));
-                       if (!secrets_store_domain_sid(global_myworkgroup, &global_sam_sid)) {
+                       if (!secrets_store_domain_sid(global_myworkgroup, global_sam_sid)) {
                                DEBUG(0,("pdb_generate_sam_sid: Can't re-store domain SID as a pdc/bdc.\n"));
                                return False;
                        }
@@ -126,24 +136,23 @@ BOOL pdb_generate_sam_sid(void)
        /* check for an old MACHINE.SID file for backwards compatibility */
        asprintf(&fname, "%s/MACHINE.SID", lp_private_dir());
 
-       if (read_sid_from_file(fname, &global_sam_sid)) {
+       if (read_sid_from_file(fname, global_sam_sid)) {
                /* remember it for future reference and unlink the old MACHINE.SID */
-               if (!secrets_store_domain_sid(global_myname, &global_sam_sid)) {
+               if (!secrets_store_domain_sid(global_myname, global_sam_sid)) {
                        DEBUG(0,("pdb_generate_sam_sid: Failed to store SID from file.\n"));
                        SAFE_FREE(fname);
                        return False;
                }
                unlink(fname);
                if (is_dc) {
-                       if (!secrets_store_domain_sid(global_myworkgroup, &global_sam_sid)) {
+                       if (!secrets_store_domain_sid(global_myworkgroup, global_sam_sid)) {
                                DEBUG(0,("pdb_generate_sam_sid: Failed to store domain SID from file.\n"));
                                SAFE_FREE(fname);
                                return False;
                        }
                }
 
-               /* Stored the old sid from MACHINE.SID successfully.
-                       Patch from Stefan "metze" Metzmacher <metze@metzemix.de>*/
+               /* Stored the old sid from MACHINE.SID successfully.*/
                SAFE_FREE(fname);
                return True;
        }
@@ -152,14 +161,14 @@ BOOL pdb_generate_sam_sid(void)
 
        /* we don't have the SID in secrets.tdb, we will need to
            generate one and save it */
-       generate_random_sid(&global_sam_sid);
+       generate_random_sid(global_sam_sid);
 
-       if (!secrets_store_domain_sid(global_myname, &global_sam_sid)) {
+       if (!secrets_store_domain_sid(global_myname, global_sam_sid)) {
                DEBUG(0,("pdb_generate_sam_sid: Failed to store generated machine SID.\n"));
                return False;
        }
        if (is_dc) {
-               if (!secrets_store_domain_sid(global_myworkgroup, &global_sam_sid)) {
+               if (!secrets_store_domain_sid(global_myworkgroup, global_sam_sid)) {
                        DEBUG(0,("pdb_generate_sam_sid: Failed to store generated domain SID.\n"));
                        return False;
                }
@@ -167,3 +176,19 @@ BOOL pdb_generate_sam_sid(void)
 
        return True;
 }   
+
+/* return our global_sam_sid */
+DOM_SID *get_global_sam_sid(void)
+{
+       if (global_sam_sid != NULL)
+               return global_sam_sid;
+       
+       /* memory for global_sam_sid is allocated in 
+          pdb_generate_sam_sid() as needed */
+
+       if (!pdb_generate_sam_sid())
+               global_sam_sid=NULL;    
+       
+       return global_sam_sid;
+}
+