diff options
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/includes.h | 12 | ||||
| -rw-r--r-- | source/include/rpc_ds.h | 10 | ||||
| -rwxr-xr-x | source/include/rpc_spoolss.h | 1 | ||||
| -rw-r--r-- | source/include/smb.h | 10 |
4 files changed, 25 insertions, 8 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index bdd92f219ee..ca8f2ded8cc 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -173,6 +173,15 @@ #if HAVE_LBER_H #include <lber.h> +#ifdef HPUX +/* Define ber_tag_t and ber_int_t for using + * HP LDAP-UX Integration products' LDAP libraries. +*/ +#ifndef ber_tag_t +typedef unsigned long ber_tag_t; +typedef int ber_int_t; +#endif +#endif /* HPUX */ #ifndef LBER_USE_DER #define LBER_USE_DER 0x01 #endif @@ -1123,7 +1132,10 @@ int create_kerberos_key_from_string(krb5_context context, krb5_principal host_pr int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); BOOL get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); +krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); +#if defined(HAVE_KRB5_LOCATE_KDC) krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); +#endif krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry); diff --git a/source/include/rpc_ds.h b/source/include/rpc_ds.h index bfe5179490c..4ca49871f6d 100644 --- a/source/include/rpc_ds.h +++ b/source/include/rpc_ds.h @@ -44,6 +44,7 @@ /* machine role */ +#define DSROLE_DOMAIN_MEMBER_WKS 1 #define DSROLE_STANDALONE_SRV 2 #define DSROLE_DOMAIN_MEMBER_SRV 3 #define DSROLE_BDC 4 @@ -60,18 +61,13 @@ typedef struct { uint16 machine_role; - uint16 unknown; /* 0x6173 -- maybe just alignment? */ - - uint32 flags; - + uint32 flags; uint32 netbios_ptr; uint32 dnsname_ptr; uint32 forestname_ptr; - struct GUID domain_guid; - + struct GUID domain_guid; UNISTR2 netbios_domain; - UNISTR2 dns_domain; /* our dns domain */ UNISTR2 forest_domain; /* root domain of the forest to which we belong */ } DSROLE_PRIMARY_DOMAIN_INFO_BASIC; diff --git a/source/include/rpc_spoolss.h b/source/include/rpc_spoolss.h index 069d2b3bf74..baa120445eb 100755 --- a/source/include/rpc_spoolss.h +++ b/source/include/rpc_spoolss.h @@ -961,7 +961,6 @@ PRINTER_INFO_2; typedef struct printer_info_3 { - uint32 flags; SEC_DESC *secdesc; } PRINTER_INFO_3; diff --git a/source/include/smb.h b/source/include/smb.h index a8fb39797b2..2ad3202ef9d 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -1249,17 +1249,24 @@ struct bitmap { /* Mapping of generic access rights for files to specific rights. */ +/* This maps to 0x1F01FF */ #define FILE_GENERIC_ALL (STANDARD_RIGHTS_REQUIRED_ACCESS| SYNCHRONIZE_ACCESS|FILE_ALL_ACCESS) +/* This maps to 0x120089 */ #define FILE_GENERIC_READ (STANDARD_RIGHTS_READ_ACCESS|FILE_READ_DATA|FILE_READ_ATTRIBUTES|\ FILE_READ_EA|SYNCHRONIZE_ACCESS) +/* This maps to 0x120116 */ #define FILE_GENERIC_WRITE (STD_RIGHT_READ_CONTROL_ACCESS|FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|\ FILE_WRITE_EA|FILE_APPEND_DATA|SYNCHRONIZE_ACCESS) #define FILE_GENERIC_EXECUTE (STANDARD_RIGHTS_EXECUTE_ACCESS|\ FILE_EXECUTE|SYNCHRONIZE_ACCESS) +/* Share specific rights. */ +#define SHARE_ALL_ACCESS FILE_GENERIC_ALL +#define SHARE_READ_ONLY (FILE_GENERIC_READ|FILE_EXECUTE) + /* Mapping of access rights to UNIX perms. */ #define UNIX_ACCESS_RWX FILE_GENERIC_ALL #define UNIX_ACCESS_R FILE_GENERIC_READ @@ -1487,6 +1494,9 @@ char *strdup(char *s); #define FLAGS2_WIN2K_SIGNATURE 0xC852 /* Hack alert ! For now... JRA. */ +/* TCONX Flag (smb_vwv2). */ +#define TCONX_FLAG_EXTENDED_RESPONSE 0x8 + /* Capabilities. see ftp.microsoft.com/developr/drg/cifs/cifs/cifs4.txt */ #define CAP_RAW_MODE 0x0001 |