From dbe4bc877fd1bf6f495844b1c445eb823d9ebaad Mon Sep 17 00:00:00 2001
From: bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>
Date: Sun, 21 Sep 2003 19:00:35 +0000
Subject: Fixed some --restrict options

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@446 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
---
 rdiff-backup/CHANGELOG                      | 7 +++++++
 rdiff-backup/rdiff_backup/Security.py       | 8 ++++++--
 rdiff-backup/rdiff_backup/SetConnections.py | 8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 8daadba..d36af8b 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,3 +1,10 @@
+New in v0.13.3 (??????????)
+---------------------------
+
+Fixed some of the --restrict options which would cause spurious
+violation errors.
+
+
 New in v0.13.2 (2003/09/16)
 ---------------------------
 
diff --git a/rdiff-backup/rdiff_backup/Security.py b/rdiff-backup/rdiff_backup/Security.py
index 6ee6aa6..c3059d3 100644
--- a/rdiff-backup/rdiff_backup/Security.py
+++ b/rdiff-backup/rdiff_backup/Security.py
@@ -131,7 +131,9 @@ def set_allowed_requests(sec_level):
 			 "Time.setcurtime_local",
 			 "rpath.gzip_open_local_read",
 			 "rpath.open_local_read",
-			 "Hardlink.initialize_dictionaries"])
+			 "Hardlink.initialize_dictionaries",
+			 "user_group.uid2uname",
+			 "user_group.gid2gname"])
 		if sec_level == "read-only":
 			allowed_requests.extend(
 				["fs_abilities.get_fsabilities_readonly",
@@ -166,7 +168,9 @@ def set_allowed_requests(sec_level):
 			 "Globals.postset_regexp_local",
 			 "Globals.set_select",
 			 "backup.SourceStruct.set_session_info",
-			 "backup.DestinationStruct.set_session_info"])
+			 "backup.DestinationStruct.set_session_info",
+			 "user_group.init_user_mapping",
+			 "user_group.init_group_mapping"])
 
 def vet_request(request, arglist):
 	"""Examine request for security violations"""
diff --git a/rdiff-backup/rdiff_backup/SetConnections.py b/rdiff-backup/rdiff_backup/SetConnections.py
index 6846953..fb23a1c 100644
--- a/rdiff-backup/rdiff_backup/SetConnections.py
+++ b/rdiff-backup/rdiff_backup/SetConnections.py
@@ -25,7 +25,7 @@ the related connections.
 
 """
 
-import os
+import os, sys
 from log import Log
 import Globals, connection, rpath
 
@@ -223,9 +223,9 @@ def test_connection(conn_number):
 	print "Testing server started by: ", __conn_remote_cmds[conn_number]
 	conn = Globals.connections[conn_number]
 	try:
-		assert conn.pow(2,3) == 8
-		assert conn.os.path.join("a", "b") == "a/b"
-		version = conn.reval("lambda: Globals.version")
+		assert conn.Globals.get('current_time') is None
+		assert type(conn.os.getuid()) is int
+		version = conn.Globals.get('version')
 	except:
 		sys.stderr.write("Server tests failed\n")
 		raise
-- 
cgit v1.2.1