s3-passdb: move some defines out of rpc headers (they really belong to passdb).

[ira/wip.git] / source3 / include / rpc_misc.h

diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index cdcfb01eff23e0dd325a085eb8742d983cdfaaf6..e86c47f39a7f57838002a70dfeea4bf3d41e456c 100644 (file)
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -24,10 +24,6 @@
 #define _RPC_MISC_H 
 
 #define SMB_RPC_INTERFACE_VERSION 1
-#define PRS_POINTER_CAST bool (*)(const char*, prs_struct*, int, void*)
-
-enum unistr2_term_codes { UNI_FLAGS_NONE = 0, UNI_STR_TERMINATE = 1, UNI_MAXLEN_TERMINATE = 2, UNI_BROKEN_NON_NULL = 3, UNI_STR_DBLTERMINATE = 4 };
-
 
 
 /********************************************************************** 
@@ -70,28 +66,10 @@ enum unistr2_term_codes { UNI_FLAGS_NONE = 0, UNI_STR_TERMINATE = 1, UNI_MAXLEN_
 #define BUILTIN_ALIAS_RID_PRE_2K_ACCESS (0x0000022aL)
 
 
-/********************************************************************** 
- * Masks for mappings between unix uid and gid types and
- * NT RIDS.
- **********************************************************************/
-
-#define BASE_RID (0x000003E8L)
-
-/* Take the bottom bit. */
-#define RID_TYPE_MASK          1
-#define RID_MULTIPLIER                 2
-
-/* The two common types. */
-#define USER_RID_TYPE          0
-#define GROUP_RID_TYPE                 1
-
-
 
 /********************************************************************** 
  * RPC policy handle used pretty much everywhere
  **********************************************************************/
- 
-typedef struct policy_handle POLICY_HND;
 
 #define OUR_HANDLE(hnd) (((hnd)==NULL) ? "NULL" :\
        ( IVAL((hnd)->uuid.node,2) == (uint32)sys_getpid() ? "OURS" : \
@@ -109,33 +87,4 @@ typedef struct {            /* UNISTR - unicode string size and buffer */
                                   little-endian. ***MUST*** be null-terminated */
 } UNISTR;
 
-typedef struct {               /* UNISTR2 - unicode string size (in 
-                                  uint16 unicode chars) and buffer */
-       uint32 uni_max_len;
-       uint32 offset;
-       uint32 uni_str_len;
-       uint16 *buffer;         /* unicode characters. ***MUST*** be little-endian. 
-                                 **must** be null-terminated and the uni_str_len 
-                                 should include the NULL character */
-} UNISTR2;
-
-/*
- * I'm really wondering how many different time formats
- * I will have to cope with
- *
- * JFM, 09/13/98 In a mad mood ;-(
-*/
-typedef struct systemtime
-{
-       uint16 year;
-       uint16 month;
-       uint16 dayofweek;
-       uint16 day;
-       uint16 hour;
-       uint16 minute;
-       uint16 second;
-       uint16 milliseconds;
-}
-SYSTEMTIME;
-
 #endif /* _RPC_MISC_H */