security.idl: change ORGANISATION into ORGANIZATION

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index d88cd92671aaaa43bbba8e33f3ea6e3c00cc7b02..b0a6a39011a76262977c906b5effd678f36aa6f0 100644 (file)
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -251,7 +251,7 @@ interface security
        const string SID_NT_RESTRICTED            = "S-1-5-12";
        const string SID_NT_TERMINAL_SERVER_USERS = "S-1-5-13";
        const string SID_NT_REMOTE_INTERACTIVE    = "S-1-5-14";
-       const string SID_NT_THIS_ORGANISATION     = "S-1-5-15";
+       const string SID_NT_THIS_ORGANIZATION     = "S-1-5-15";
        const string SID_NT_IUSR                  = "S-1-5-17";
        const string SID_NT_SYSTEM                = "S-1-5-18";
        const string SID_NT_LOCAL_SERVICE         = "S-1-5-19";
@@ -259,7 +259,7 @@ interface security
        const string SID_NT_DIGEST_AUTHENTICATION = "S-1-5-64-21";
        const string SID_NT_NTLM_AUTHENTICATION   = "S-1-5-64-10";
        const string SID_NT_SCHANNEL_AUTHENTICATION = "S-1-5-64-14";
-       const string SID_NT_OTHER_ORGANISATION    = "S-1-5-1000";
+       const string SID_NT_OTHER_ORGANIZATION    = "S-1-5-1000";
 
        /* SECURITY_BUILTIN_DOMAIN_RID */
        const string NAME_BUILTIN                  = "BUILTIN";

diff --git a/python/samba/tests/krb5/test_ldap.py b/python/samba/tests/krb5/test_ldap.py
index eaf79e7fa01d692d4238e8d31b8049d0bbe562d7..259fb8c3ccd2a3607f17b812b58ff3cf0113d8a3 100755 (executable)
--- a/python/samba/tests/krb5/test_ldap.py
+++ b/python/samba/tests/krb5/test_ldap.py
@@ -133,7 +133,7 @@ class LdapTests(KDCBaseTest):
             self.assertEqual(security.SID_NT_NETWORK, str(token_sid))
             if len(token_groups) >= 3:
                 token_sid = ndr_unpack(security.dom_sid, token_groups[2])
-                self.assertEqual(security.SID_NT_THIS_ORGANISATION,
+                self.assertEqual(security.SID_NT_THIS_ORGANIZATION,
                                  str(token_sid))
         else:
             # Ensure that they match.