s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/

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

diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 0f735c40efb476caab99d5fa15eb639b65b40671..458ffc619dc702519bc1a1778dc4d8b456bf2178 100644 (file)
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -21,7 +21,10 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "secrets.h"
+#include "dbwrap/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
@@ -94,7 +97,7 @@ static struct dom_sid *pdb_generate_sam_sid(void)
                }
        }
 
-       if (secrets_fetch_domain_sid(global_myname(), sam_sid)) {
+       if (secrets_fetch_domain_sid(lp_netbios_name(), sam_sid)) {
 
                /* We got our sid. If not a pdc/bdc, we're done. */
                if ( !IS_DC )
@@ -112,12 +115,12 @@ static struct dom_sid *pdb_generate_sam_sid(void)
                        return sam_sid;
                }
 
-               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. */
 
                        DEBUG(0,("pdb_generate_sam_sid: Mismatched SIDs as a pdc/bdc.\n"));
-                       if (!secrets_store_domain_sid(global_myname(), &domain_sid)) {
+                       if (!secrets_store_domain_sid(lp_netbios_name(), &domain_sid)) {
                                DEBUG(0,("pdb_generate_sam_sid: Can't re-store domain SID for local sid as PDC/BDC.\n"));
                                SAFE_FREE(sam_sid);
                                return NULL;
@@ -136,7 +139,7 @@ static struct dom_sid *pdb_generate_sam_sid(void)
 
        if (read_sid_from_file(fname, sam_sid)) {
                /* remember it for future reference and unlink the old MACHINE.SID */
-               if (!secrets_store_domain_sid(global_myname(), sam_sid)) {
+               if (!secrets_store_domain_sid(lp_netbios_name(), sam_sid)) {
                        DEBUG(0,("pdb_generate_sam_sid: Failed to store SID from file.\n"));
                        SAFE_FREE(fname);
                        SAFE_FREE(sam_sid);
@@ -163,7 +166,7 @@ static struct dom_sid *pdb_generate_sam_sid(void)
            generate one and save it */
        generate_random_sid(sam_sid);
 
-       if (!secrets_store_domain_sid(global_myname(), sam_sid)) {
+       if (!secrets_store_domain_sid(lp_netbios_name(), sam_sid)) {
                DEBUG(0,("pdb_generate_sam_sid: Failed to store generated machine SID.\n"));
                SAFE_FREE(sam_sid);
                return NULL;
@@ -231,7 +234,7 @@ void reset_global_sam_sid(void)
 
 bool sid_check_is_domain(const struct dom_sid *sid)
 {
-       return sid_equal(sid, get_global_sam_sid());
+       return dom_sid_equal(sid, get_global_sam_sid());
 }
 
 /*****************************************************************
@@ -241,9 +244,8 @@ bool sid_check_is_domain(const struct dom_sid *sid)
 bool sid_check_is_in_our_domain(const struct dom_sid *sid)
 {
        struct dom_sid dom_sid;
-       uint32 rid;
 
        sid_copy(&dom_sid, sid);
-       sid_split_rid(&dom_sid, &rid);
+       sid_split_rid(&dom_sid, NULL);
        return sid_check_is_domain(&dom_sid);
 }