Changeset 745 for trunk/server/source3/passdb/machine_sid.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/passdb/machine_sid.c (modified) (12 diffs)

trunk/server/source3/passdb/machine_sid.c

@@ -6 +6 @@
    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
    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,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.
@@ -22 +22 @@
 
 #include "includes.h"
+#include "passdb.h"
+#include "secrets.h"
+#include "dbwrap.h"
+#include "../libcli/security/security.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;
+static struct dom_sid *global_sam_sid=NULL;
 
 #undef DBGC_CLASS
@@ -36 +40 @@
 ****************************************************************************/
 
-static bool read_sid_from_file(const char *fname, DOM_SID *sid)
+static bool read_sid_from_file(const char *fname, struct dom_sid *sid)
 {
         char **lines;
@@ -43 +47 @@
 
         lines = file_lines_load(fname, &numlines,0, NULL);
-        
+
         if (!lines || numlines < 1) {
-                if (lines) TALLOC_FREE(lines);
+                TALLOC_FREE(lines);
                 return False;
         }
-        
+
         ret = string_to_sid(sid, lines[0]);
         TALLOC_FREE(lines);
@@ -57 +61 @@
   generate a random sid - used to build our own sid if we don't have one
 */
-static void generate_random_sid(DOM_SID *sid)
+static void generate_random_sid(struct dom_sid *sid)
 {
         int i;
         uchar raw_sid_data[12];
 
-        memset((char *)sid, '\0', sizeof(*sid));
+        ZERO_STRUCTP(sid);
+
         sid->sid_rev_num = 1;
         sid->id_auth[5] = 5;
@@ -77 +82 @@
 ****************************************************************************/
 
-static DOM_SID *pdb_generate_sam_sid(void)
-{
-        DOM_SID domain_sid;
+static struct dom_sid *pdb_generate_sam_sid(void)
+{
+        struct dom_sid domain_sid;
         char *fname = NULL;
-        DOM_SID *sam_sid;
-        
-        if(!(sam_sid=SMB_MALLOC_P(DOM_SID)))
+        struct dom_sid *sam_sid;
+
+        if(!(sam_sid=SMB_MALLOC_P(struct dom_sid)))
                 return NULL;
 
@@ -111 +116 @@
                 }
 
-                if (!sid_equal(&domain_sid, sam_sid)) {
+                if (!dom_sid_equal(&domain_sid, sam_sid)) {
 
                         /* Domain name sid doesn't match global sam sid. Re-store domain sid as 'local' sid. */
@@ -125 +130 @@
 
                 return sam_sid;
-                
         }
 
@@ -180 +184 @@
 
 /* return our global_sam_sid */
-DOM_SID *get_global_sam_sid(void)
+struct dom_sid *get_global_sam_sid(void)
 {
         struct db_context *db;
@@ -186 +190 @@
         if (global_sam_sid != NULL)
                 return global_sam_sid;
-        
+
         /*
          * memory for global_sam_sid is allocated in
@@ -229 +233 @@
 *****************************************************************/  
 
-bool sid_check_is_domain(const DOM_SID *sid)
-{
-        return sid_equal(sid, get_global_sam_sid());
+bool sid_check_is_domain(const struct dom_sid *sid)
+{
+        return dom_sid_equal(sid, get_global_sam_sid());
 }
 
@@ -238 +242 @@
 *****************************************************************/  
 
-bool sid_check_is_in_our_domain(const DOM_SID *sid)
-{
-        DOM_SID dom_sid;
-        uint32 rid;
+bool sid_check_is_in_our_domain(const struct dom_sid *sid)
+{
+        struct dom_sid dom_sid;
 
         sid_copy(&dom_sid, sid);
-        sid_split_rid(&dom_sid, &rid);
+        sid_split_rid(&dom_sid, NULL);
         return sid_check_is_domain(&dom_sid);
 }