diff options
| -rw-r--r-- | source3/include/includes.h | 23 | ||||
| -rw-r--r-- | source3/include/privileges.h | 45 | ||||
| -rw-r--r-- | source3/include/rpc_lsa.h | 20 | ||||
| -rw-r--r-- | source3/include/smb.h | 10 |
4 files changed, 65 insertions, 33 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index a54c302738..8fc09c2cae 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -769,8 +769,9 @@ extern int errno; #include "version.h" #include "smb.h" - +/* #include "smbw.h" +*/ #include "nameserv.h" @@ -778,14 +779,26 @@ extern int errno; #include "byteorder.h" +#include "privileges.h" + +#include "rpc_creds.h" + +#include "mapping.h" + +#include "passdb.h" + #include "ntdomain.h" +#include "rpc_misc.h" + +#include "rpc_secdes.h" + +#include "nt_printing.h" + #include "msdfs.h" #include "smbprofile.h" -#include "mapping.h" - #include "rap.h" #include "md5.h" @@ -795,14 +808,14 @@ extern int errno; #include "auth.h" -#include "passdb.h" - #include "sam.h" #include "gums.h" #include "idmap.h" +#include "client.h" +#include "smbw.h" #include "session.h" #include "asn_1.h" diff --git a/source3/include/privileges.h b/source3/include/privileges.h new file mode 100644 index 0000000000..404c5d246b --- /dev/null +++ b/source3/include/privileges.h @@ -0,0 +1,45 @@ +/* + Unix SMB/CIFS implementation. + SMB parameters and setup + Copyright (C) Andrew Tridgell 1992-1997 + Copyright (C) Luke Kenneth Casson Leighton 1996-1997 + Copyright (C) Paul Ashton 1997 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef PRIVILEGES_H +#define PRIVILEGES_H + +typedef struct LUID +{ + uint32 low; + uint32 high; +} LUID; + +typedef struct LUID_ATTR +{ + LUID luid; + uint32 attr; +} LUID_ATTR ; + +typedef struct privilege_set +{ + uint32 count; + uint32 control; + LUID_ATTR *set; +} PRIVILEGE_SET; + +#endif /* _RPC_LSA_H */ diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h index 8e1368810f..d4136a9fde 100644 --- a/source3/include/rpc_lsa.h +++ b/source3/include/rpc_lsa.h @@ -661,26 +661,6 @@ typedef struct lsa_q_enumprivsaccount POLICY_HND pol; /* policy handle */ } LSA_Q_ENUMPRIVSACCOUNT; - -typedef struct LUID -{ - uint32 low; - uint32 high; -} LUID; - -typedef struct LUID_ATTR -{ - LUID luid; - uint32 attr; -} LUID_ATTR ; - -typedef struct privilege_set -{ - uint32 count; - uint32 control; - LUID_ATTR *set; -} PRIVILEGE_SET; - typedef struct lsa_r_enumprivsaccount { uint32 ptr; diff --git a/source3/include/smb.h b/source3/include/smb.h index 92457bd647..2ca65ec275 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -585,9 +585,6 @@ typedef struct { #define NT_HASH_LEN 16 #define LM_HASH_LEN 16 -#include "mapping.h" -#include "passdb.h" - /* * Flags for account policy. */ @@ -1519,11 +1516,6 @@ struct pwd_info uchar sess_key[16]; }; -#include "rpc_creds.h" -#include "rpc_misc.h" -#include "rpc_secdes.h" -#include "nt_printing.h" - typedef struct user_struct { struct user_struct *next, *prev; @@ -1563,9 +1555,11 @@ struct unix_error_map { NTSTATUS nt_error; }; +/* #include "ntdomain.h" #include "client.h" +*/ /* * Size of new password account encoding string. This is enough space to |