svn commit: samba r26199 - in branches/SAMBA_4_0: . source/libcli/security source/libcli/security/tests

jelmer at samba.org jelmer at samba.org
Thu Nov 29 15:08:22 GMT 2007


Author: jelmer
Date: 2007-11-29 15:08:22 +0000 (Thu, 29 Nov 2007)
New Revision: 26199

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

Log:
Allow constructing new sids, implement __eq__ for sids.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/libcli/security/security.i
   branches/SAMBA_4_0/source/libcli/security/tests/bindings.py


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/libcli/security/security.i
===================================================================
--- branches/SAMBA_4_0/source/libcli/security/security.i	2007-11-29 14:51:02 UTC (rev 26198)
+++ branches/SAMBA_4_0/source/libcli/security/security.i	2007-11-29 15:08:22 UTC (rev 26199)
@@ -84,7 +84,7 @@
         NTSTATUS dacl_del(const struct security_ace *ace);
         NTSTATUS sacl_del(const struct security_ace *ace);
 #ifdef SWIGPYTHON
-        %rename(equal) __eq__;
+        %rename(__eq__) equal;
 #endif
         bool equal(const struct security_descriptor *other);
     }
@@ -94,12 +94,17 @@
 
 typedef struct dom_sid {
     %extend {
-        bool equal(const struct dom_sid *other);
+        dom_sid(TALLOC_CTX *mem_ctx, const char *text) {
+            return dom_sid_parse_talloc(mem_ctx, text);
+        }
+        ~dom_sid() { talloc_free($self); }
 #ifdef SWIGPYTHON
         const char *__str__(TALLOC_CTX *mem_ctx) {
             return dom_sid_string(mem_ctx, $self);
         }
+        %rename(__eq__) equal;
 #endif
+        bool equal(const struct dom_sid *other);
     }
 } dom_sid;
 

Modified: branches/SAMBA_4_0/source/libcli/security/tests/bindings.py
===================================================================
--- branches/SAMBA_4_0/source/libcli/security/tests/bindings.py	2007-11-29 14:51:02 UTC (rev 26198)
+++ branches/SAMBA_4_0/source/libcli/security/tests/bindings.py	2007-11-29 15:08:22 UTC (rev 26199)
@@ -50,7 +50,17 @@
         self.descriptor = security.SecurityDescriptor()
 
 
-class RandomSidTests(unittest.TestCase):
+class DomSidTests(unittest.TestCase):
+    def test_parse_sid(self):
+        sid = security.Sid("S-1-5-21")
+        self.assertEquals("S-1-5-21", str(sid))
+
+    def test_sid_equal(self):
+        sid1 = security.Sid("S-1-5-21")
+        sid2 = security.Sid("S-1-5-21")
+        self.assertTrue(sid1.__eq__(sid1))
+        self.assertTrue(sid1.__eq__(sid2))
+
     def test_random(self):
         sid = security.random_sid()
         self.assertTrue(str(sid).startswith("S-1-5-21-"))



More information about the samba-cvs mailing list