Do not use a variable format string

[ira/wip.git] / source3 / passdb / machine_sid.c

diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 87ec27d34eacb91d16a3506e2d2403d433365854..c7c3cc474b9dcb213036191fa1b716e0ceb2d1d4 100644 (file)
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -8,7 +8,7 @@
       
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -35,21 +34,22 @@ static DOM_SID *global_sam_sid=NULL;
  Read a SID from a file. This is for compatibility with the old MACHINE.SID
  style of SID storage
 ****************************************************************************/
-static BOOL read_sid_from_file(const char *fname, DOM_SID *sid)
+
+static bool read_sid_from_file(const char *fname, DOM_SID *sid)
 {
        char **lines;
        int numlines;
-       BOOL ret;
+       bool ret;
 
-       lines = file_lines_load(fname, &numlines);
+       lines = file_lines_load(fname, &numlines,0, NULL);
        
        if (!lines || numlines < 1) {
-               if (lines) file_lines_free(lines);
+               if (lines) TALLOC_FREE(lines);
                return False;
        }
        
        ret = string_to_sid(sid, lines[0]);
-       file_lines_free(lines);
+       TALLOC_FREE(lines);
        return ret;
 }
 
@@ -128,7 +128,10 @@ static DOM_SID *pdb_generate_sam_sid(void)
        }
 
        /* check for an old MACHINE.SID file for backwards compatibility */
-       asprintf(&fname, "%s/MACHINE.SID", lp_private_dir());
+       if (asprintf(&fname, "%s/MACHINE.SID", lp_private_dir()) == -1) {
+               SAFE_FREE(sam_sid);
+               return NULL;
+       }
 
        if (read_sid_from_file(fname, sam_sid)) {
                /* remember it for future reference and unlink the old MACHINE.SID */
@@ -178,14 +181,36 @@ static DOM_SID *pdb_generate_sam_sid(void)
 /* return our global_sam_sid */
 DOM_SID *get_global_sam_sid(void)
 {
+       struct db_context *db;
+
        if (global_sam_sid != NULL)
                return global_sam_sid;
        
-       /* memory for global_sam_sid is allocated in 
-          pdb_generate_sam_sid() as needed */
+       /*
+        * memory for global_sam_sid is allocated in
+        * pdb_generate_sam_sid() as needed
+        *
+        * Note: this is garded by a transaction
+        *       to prevent races on startup which
+        *       can happen with some dbwrap backends
+        */
+
+       db = secrets_db_ctx();
+       if (!db) {
+               smb_panic("could not open secrets db");
+       }
+
+       if (db->transaction_start(db) != 0) {
+               smb_panic("could not start transaction on secrets db");
+       }
 
        if (!(global_sam_sid = pdb_generate_sam_sid())) {
-               smb_panic("Could not generate a machine SID\n");
+               db->transaction_cancel(db);
+               smb_panic("could not generate a machine SID");
+       }
+
+       if (db->transaction_commit(db) != 0) {
+               smb_panic("could not start commit secrets db");
        }
 
        return global_sam_sid;
@@ -198,3 +223,26 @@ void reset_global_sam_sid(void)
 {
        SAFE_FREE(global_sam_sid);
 }
+
+/*****************************************************************
+ Check if the SID is our domain SID (S-1-5-21-x-y-z).
+*****************************************************************/  
+
+bool sid_check_is_domain(const DOM_SID *sid)
+{
+       return sid_equal(sid, get_global_sam_sid());
+}
+
+/*****************************************************************
+ Check if the SID is our domain SID (S-1-5-21-x-y-z).
+*****************************************************************/  
+
+bool sid_check_is_in_our_domain(const DOM_SID *sid)
+{
+       DOM_SID dom_sid;
+       uint32 rid;
+
+       sid_copy(&dom_sid, sid);
+       sid_split_rid(&dom_sid, &rid);
+       return sid_check_is_domain(&dom_sid);
+}