docs: fix a typo in history file

[bbaumbach/samba-autobuild/.git] / source3 / passdb / machine_sid.c

diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index f3a4402d47c4a05deae774a50cfdeb1fa22cc685..fa420d8edfed1cc666cf631ead2d74f5e1d985b5 100644 (file)
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Password and authentication handling
    Copyright (C) Jeremy Allison                1996-2002
@@ -65,11 +65,11 @@ static void generate_random_sid(struct dom_sid *sid)
        int i;
        uchar raw_sid_data[12];
 
-       ZERO_STRUCTP(sid);
+       *sid = (struct dom_sid) {
+               .sid_rev_num = 1,
+               .id_auth[5] = 5,
+       };
 
-       sid->sid_rev_num = 1;
-       sid->id_auth[5] = 5;
-       sid->num_auths = 0;
        sid->sub_auths[sid->num_auths++] = 21;
 
        generate_random_buffer(raw_sid_data, 12);
@@ -180,7 +180,7 @@ static struct dom_sid *pdb_generate_sam_sid(void)
        }
 
        return sam_sid;
-}   
+}
 
 /* return our global_sam_sid */
 struct dom_sid *get_global_sam_sid(void)
@@ -194,7 +194,7 @@ struct dom_sid *get_global_sam_sid(void)
         * memory for global_sam_sid is allocated in
         * pdb_generate_sam_sid() as needed
         *
-        * Note: this is garded by a transaction
+        * Note: this is guarded by a transaction
         *       to prevent races on startup which
         *       can happen with some dbwrap backends
         */
@@ -220,8 +220,8 @@ struct dom_sid *get_global_sam_sid(void)
        return global_sam_sid;
 }
 
-/** 
- * Force get_global_sam_sid to requery the backends 
+/**
+ * Force get_global_sam_sid to requery the backends
  */
 void reset_global_sam_sid(void) 
 {
@@ -230,7 +230,7 @@ void reset_global_sam_sid(void)
 
 /*****************************************************************
  Check if the SID is our sam SID (S-1-5-21-x-y-z).
-*****************************************************************/  
+*****************************************************************/
 
 bool sid_check_is_our_sam(const struct dom_sid *sid)
 {
@@ -239,9 +239,9 @@ bool sid_check_is_our_sam(const struct dom_sid *sid)
 
 /*****************************************************************
  Check if the SID is our domain SID (S-1-5-21-x-y-z).
-*****************************************************************/  
+*****************************************************************/
 
-bool sid_check_is_in_our_domain(const struct dom_sid *sid)
+bool sid_check_is_in_our_sam(const struct dom_sid *sid)
 {
        struct dom_sid dom_sid;