Added _misc.headerVersion. Updated versions mismatch warning.

diff --git a/rsbac/__init__.py b/rsbac/__init__.py
index 2a0ddb5..ae0cdda 100644 (file)
--- a/rsbac/__init__.py
+++ b/rsbac/__init__.py
@@ -38,28 +38,21 @@ from rsbac import rc, um, data, jail, acl, daz, roles, auth
 __all__ += _data.__all__
 __all__ += _misc.__all__
 
-import headers
-headerVersion = ( headers.RSBAC_VERSION_MAJOR ,
-                  headers.RSBAC_VERSION_MID ,
-                  headers.RSBAC_VERSION_MINOR )
-
 # Note: overwrite the functions with their values
+headerVersion  = headerVersion()
 libraryVersion = libraryVersion()
-kernelVersion = kernelVersion()
+kernelVersion  = kernelVersion()
 
 if ( not 0 <= kernelVersion[ 0 ] < 10
      or not 0 <= kernelVersion[ 1 ] < 100
      or not 0 <= kernelVersion[ 2 ] < 100 ) : # ok up to 10.100.100 version
     print >> sys.stderr , 'Warning: RSBAC kernel version (%s) doesn\'t look right. Wrong librsbac.so?' \
         % ( '.'.join( map( str , kernelVersion ) ) )
-if libraryVersion != kernelVersion :
-    print >> sys.stderr , 'Warning: RSBAC version mismatch (library: %s, kernel: %s)' \
-        % ( '.'.join( map( str , libraryVersion ) ) ,
+if not ( headerVersion == libraryVersion == kernelVersion ) :
+    print >> sys.stderr , 'Warning: RSBAC version mismatch (header: %s, library: %s, kernel: %s)' \
+        % ( '.'.join( map( str , headerVersion ) ) ,
+            '.'.join( map( str , libraryVersion ) ) ,
             '.'.join( map( str , kernelVersion ) ) )
-if libraryVersion != headerVersion :
-    print >> sys.stderr , 'Warning: RSBAC version mismatch (library: %s, header: %s)' \
-        % ( '.'.join( map( str , libraryVersion ) ) ,
-            '.'.join( map( str , headerVersion ) ) )
 del sys
 
 # Local Variables:

diff --git a/rsbac/_misc.py b/rsbac/_misc.py
index c2e17ed..a1314c8 100644 (file)
--- a/rsbac/_misc.py
+++ b/rsbac/_misc.py
@@ -30,6 +30,15 @@ def export( fun ) :
     return fun
 
 @export
+def headerVersion() :
+    """Return the RSBAC header version as a 3-tuple.
+
+    """
+    return ( headers.RSBAC_VERSION_MAJOR ,
+             headers.RSBAC_VERSION_MID ,
+             headers.RSBAC_VERSION_MINOR )
+
+@export
 def libraryVersion() :
     """Return the RSBAC library version as a 3-tuple.