From aae6c396c5161b2ba3debe2af8609f344dbb2c6e Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 29 Jan 2013 13:46:16 +0100
Subject: [PATCH] remove other historical differences from the senslab branch

---
 sfa/rspecs/pl_rspec_version.py | 16 --------
 sfa/senslab/sfa-bare           | 69 ----------------------------------
 sfa/trust/auth.py              |  9 ++---
 3 files changed, 3 insertions(+), 91 deletions(-)
 delete mode 100644 sfa/rspecs/pl_rspec_version.py
 delete mode 100755 sfa/senslab/sfa-bare

diff --git a/sfa/rspecs/pl_rspec_version.py b/sfa/rspecs/pl_rspec_version.py
deleted file mode 100644
index eb4f9a68..00000000
--- a/sfa/rspecs/pl_rspec_version.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from sfa.rspecs.sfa_rspec import sfa_rspec_version
-from sfa.rspecs.pg_rspec import pg_rspec_ad_version, pg_rspec_request_version 
-
-ad_rspec_versions = [
-    pg_rspec_ad_version,
-    sfa_rspec_version
-    ]
-
-request_rspec_versions = ad_rspec_versions
-
-default_rspec_version = { 'type': 'SFA', 'version': '1' }
-
-supported_rspecs = {'ad_rspec_versions': ad_rspec_versions,
-                    'request_rspec_versions': request_rspec_versions,
-                    'default_ad_rspec': default_rspec_version}
-
diff --git a/sfa/senslab/sfa-bare b/sfa/senslab/sfa-bare
deleted file mode 100755
index 745955c1..00000000
--- a/sfa/senslab/sfa-bare
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# sfa  starts sfa service
-#
-# chkconfig: 2345 61 39
-#
-# description:   starts sfa service
-#
-
-# Source config
-[ -f /etc/sfa/sfa_config ] && . /etc/sfa/sfa_config
-
-# source function library
-. /etc/init.d/functions
-
-start() {
-
-    if [ "$SFA_REGISTRY_ENABLED" -eq 1 ]; then
-        action $"SFA Registry" daemon /usr/bin/sfa-server.py -r -d $OPTIONS
-    fi
-
-    if [ "$SFA_AGGREGATE_ENABLED" -eq 1 ]; then
-        action $"SFA Aggregate" daemon /usr/bin/sfa-server.py -a -d $OPTIONS
-    fi
-        
-    if [ "$SFA_SM_ENABLED" -eq 1 ]; then
-        action "SFA SliceMgr" daemon /usr/bin/sfa-server.py -s -d $OPTIONS
-    fi
-
-    if [ "$SFA_FLASHPOLICY_ENABLED" -eq 1 ]; then
-        action "Flash Policy Server" daemon /usr/bin/sfa_flashpolicy.py --file="$SFA_FLASHPOLICY_CONFIG_FILE" --port=$SFA_FLASHPOLICY_PORT -d
-    fi
-
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa-server.py
-
-}
-
-stop() {
-    action $"Shutting down SFA" killproc sfa-server.py
-    RETVAL=$?
-
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa-server.py
-}
-
-
-case "$1" in
-    start) start ;;
-    stop) stop ;;
-    reload) reload force ;;
-    restart) stop; start ;;
-    condrestart)
-	if [ -f /var/lock/subsys/sfa-server.py ]; then
-            stop
-            start
-	fi
-	;;
-    status)
-	status sfa-server.py
-	RETVAL=$?
-	;;
-    *)
-	echo $"Usage: $0 {start|stop|reload|restart|condrestart|status}"
-	exit 1
-	;;
-esac
-
-exit $RETVAL
-
diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py
index 54fd9d23..0c032792 100644
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@ -225,12 +225,9 @@ class Auth:
         @param name human readable name to test  
         """
         object_hrn = self.object_gid.get_hrn()
-	#strname = str(name).strip("['']")
-	if object_hrn == name:
-        #if object_hrn == strname:
-            return 
-        if name.startswith(object_hrn + ".") :
-        #if strname.startswith((object_hrn + ".")) is True:
+        if object_hrn == name:
+            return
+        if name.startswith(object_hrn + "."):
             return
         #if name.startswith(get_authority(name)):
             #return
-- 
2.47.0