r13024: Add is_null_sid.

GUenther
(This used to be commit 3a6e41a0cb2872a656ea79c8d4fc4b8bce436492)

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index f3fc5af9eaa3ece2fe9a57c8f81277230a58377a..e2b2ebf28ca6b2fc906b4f4af809b2d2ddd57c44 100644 (file)
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -619,3 +619,9 @@ void del_sid_from_array(const DOM_SID *sid, DOM_SID **sids, size_t *num)
        
        return;
 }
+
+BOOL is_null_sid(const DOM_SID *sid)
+{
+       static const DOM_SID null_sid = {0};
+       return sid_equal(sid, &null_sid);
+}

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index efae956884522f7787e5df99d1cdca1a000fc261..4c3306a8acab7eaa99d0ca0f38e7d20d52e5e2c5 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -106,7 +106,6 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
 {
        struct winbindd_domain *domain;
        const char *alternative_name = NULL;
-       static const DOM_SID null_sid = {0};
        
        /* ignore alt_name if we are not in an AD domain */
        
@@ -128,7 +127,7 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
                        }
                }
                if (sid) {
-                       if (sid_equal(sid, &null_sid) ) {
+                       if (is_null_sid(sid)) {
                                
                        } else if (sid_equal(sid, &domain->sid)) {
                                return domain;