svn commit: samba r13024 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/nsswitch trunk/source/lib trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-01-19 00:03:07 +0000 (Thu, 19 Jan 2006)
New Revision: 13024

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13024

Log:
Add is_null_sid.

GUenther

Modified:
   branches/SAMBA_3_0/source/lib/util_sid.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   trunk/source/lib/util_sid.c
   trunk/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_sid.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_sid.c	2006-01-18 23:42:29 UTC (rev 13023)
+++ branches/SAMBA_3_0/source/lib/util_sid.c	2006-01-19 00:03:07 UTC (rev 13024)
@@ -619,3 +619,9 @@
 	
 	return;
 }
+
+BOOL is_null_sid(const DOM_SID *sid)
+{
+	static const DOM_SID null_sid = {0};
+	return sid_equal(sid, &null_sid);
+}

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-01-18 23:42:29 UTC (rev 13023)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-01-19 00:03:07 UTC (rev 13024)
@@ -106,7 +106,6 @@
 {
 	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 @@
 			}
 		}
 		if (sid) {
-			if (sid_equal(sid, &null_sid) ) {
+			if (is_null_sid(sid)) {
 				
 			} else if (sid_equal(sid, &domain->sid)) {
 				return domain;

Modified: trunk/source/lib/util_sid.c
===================================================================
--- trunk/source/lib/util_sid.c	2006-01-18 23:42:29 UTC (rev 13023)
+++ trunk/source/lib/util_sid.c	2006-01-19 00:03:07 UTC (rev 13024)
@@ -624,3 +624,9 @@
 	
 	return;
 }
+
+BOOL is_null_sid(const DOM_SID *sid)
+{
+	static const DOM_SID null_sid = {0};
+	return sid_equal(sid, &null_sid);
+}

Modified: trunk/source/nsswitch/winbindd_util.c
===================================================================
--- trunk/source/nsswitch/winbindd_util.c	2006-01-18 23:42:29 UTC (rev 13023)
+++ trunk/source/nsswitch/winbindd_util.c	2006-01-19 00:03:07 UTC (rev 13024)
@@ -106,7 +106,6 @@
 {
 	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 @@
 			}
 		}
 		if (sid) {
-			if (sid_equal(sid, &null_sid) ) {
+			if (is_null_sid(sid)) {
 				
 			} else if (sid_equal(sid, &domain->sid)) {
 				return domain;