[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2548-g9e7d32e

Günther Deschner gd at samba.org
Wed Feb 27 16:14:39 GMT 2008


The branch, v3-2-test has been updated
       via  9e7d32e28ce40ff158f3705354e8673f99b462bc (commit)
       via  360220a6a358bb36dd705213f3c9fd2bb463e49a (commit)
       via  61da5b8c003f9c8785a901fadb06f0dbb8139c5f (commit)
       via  64e7f3f1422eb56c153ea0ad764b38e46410d594 (commit)
       via  8f54ba22d21eb014624670d8fdba7a63d1af684d (commit)
      from  58cca9faf9db506bd2f6eab4a99ef85153797ab2 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 9e7d32e28ce40ff158f3705354e8673f99b462bc
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 27 16:14:27 2008 +0100

    Move LSA_AUDIT_NUM_CATEGORIES defines to lsa rpc_server.
    
    Guenther

commit 360220a6a358bb36dd705213f3c9fd2bb463e49a
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 27 17:06:03 2008 +0100

    Re-run make idl.
    
    Guenther

commit 61da5b8c003f9c8785a901fadb06f0dbb8139c5f
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 27 16:03:17 2008 +0100

    Move MAX_LOOKUP_SIDS to lsa.idl.
    
    Guenther

commit 64e7f3f1422eb56c153ea0ad764b38e46410d594
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 27 17:05:31 2008 +0100

    Re-run make idl.
    
    Guenther

commit 8f54ba22d21eb014624670d8fdba7a63d1af684d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 27 16:13:39 2008 +0100

    Move MAX_REF_DOMAINS to lsa.idl.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/include/rpc_lsa.h       |   10 ----------
 source/librpc/gen_ndr/lsa.h    |    2 ++
 source/librpc/idl/lsa.idl      |    5 +++++
 source/rpc_server/srv_lsa_nt.c |    4 ++++
 4 files changed, 11 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index a5316c4..b4021af 100644
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -23,10 +23,6 @@
 #ifndef _RPC_LSA_H /* _RPC_LSA_H */
 #define _RPC_LSA_H 
 
-#define LSA_AUDIT_NUM_CATEGORIES_NT4	7
-#define LSA_AUDIT_NUM_CATEGORIES_WIN2K	9
-#define LSA_AUDIT_NUM_CATEGORIES LSA_AUDIT_NUM_CATEGORIES_NT4
-
 #define LSA_POLICY_ALL_ACCESS ( STANDARD_RIGHTS_REQUIRED_ACCESS  |\
                             LSA_POLICY_VIEW_LOCAL_INFORMATION    |\
                             LSA_POLICY_VIEW_AUDIT_INFORMATION    |\
@@ -60,10 +56,4 @@
                             LSA_POLICY_VIEW_LOCAL_INFORMATION    |\
                             LSA_POLICY_LOOKUP_NAMES )
 
-/*******************************************************/
-#define MAX_REF_DOMAINS 32
-
-/* This number is based on Win2k and later maximum response allowed */
-#define MAX_LOOKUP_SIDS 20480	/* 0x5000 */
-
 #endif /* _RPC_LSA_H */
diff --git a/source/librpc/gen_ndr/lsa.h b/source/librpc/gen_ndr/lsa.h
index 0840149..0f0ed14 100644
--- a/source/librpc/gen_ndr/lsa.h
+++ b/source/librpc/gen_ndr/lsa.h
@@ -8,6 +8,8 @@
 
 #define LSA_ENUM_TRUST_DOMAIN_MULTIPLIER	( 60 )
 #define LSA_REF_DOMAIN_LIST_MULTIPLIER	( 32 )
+#define MAX_REF_DOMAINS	( LSA_REF_DOMAIN_LIST_MULTIPLIER )
+#define MAX_LOOKUP_SIDS	( 0x5000 )
 #define LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER	( 82 )
 struct lsa_String {
 	uint16_t length;/* [value(2*strlen_m(string))] */
diff --git a/source/librpc/idl/lsa.idl b/source/librpc/idl/lsa.idl
index 228634e..68dc049 100644
--- a/source/librpc/idl/lsa.idl
+++ b/source/librpc/idl/lsa.idl
@@ -375,6 +375,8 @@ import "security.idl";
 	} lsa_TransSidArray;
 
 	const int LSA_REF_DOMAIN_LIST_MULTIPLIER = 32;
+	const int MAX_REF_DOMAINS = LSA_REF_DOMAIN_LIST_MULTIPLIER;
+
 	typedef struct {
 		[range(0,1000)] uint32 count;
 		[size_is(count)] lsa_DomainInfo *domains;
@@ -423,6 +425,9 @@ import "security.idl";
 		[size_is(count)] lsa_TranslatedName *names;
 	} lsa_TransNameArray;
 
+	/* This number is based on Win2k and later maximum response allowed */
+	const int MAX_LOOKUP_SIDS = 0x5000; /* 20480 */
+
 	[public] NTSTATUS lsa_LookupSids (
 		[in]         policy_handle *handle,
 		[in,ref]     lsa_SidArray *sids,
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index ec9da32..788fdb3 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -529,6 +529,10 @@ NTSTATUS _lsa_EnumTrustDom(pipes_struct *p,
 	return nt_status;
 }
 
+#define LSA_AUDIT_NUM_CATEGORIES_NT4	7
+#define LSA_AUDIT_NUM_CATEGORIES_WIN2K	9
+#define LSA_AUDIT_NUM_CATEGORIES LSA_AUDIT_NUM_CATEGORIES_NT4
+
 /***************************************************************************
  _lsa_QueryInfoPolicy
  ***************************************************************************/


-- 
Samba Shared Repository


More information about the samba-cvs mailing list