diff options
| author | Gerald Carter <jerry@samba.org> | 2005-01-26 21:06:48 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-01-26 21:06:48 +0000 |
| commit | d9abdd45339e2d65445a1fd685cb0294729ac4e7 (patch) | |
| tree | ef5e8cff95f9ffda2e7c29ff1790dd705c250fd7 /source/include | |
| parent | 4b3500c58d177e2b48e6e04e027efffd4d079d8a (diff) | |
| download | samba-d9abdd45339e2d65445a1fd685cb0294729ac4e7.tar.gz | |
r5021: Starting to look at final code for 3.0.11rc1.
Set VERSION and merged important and/or low risk
fixes from 3_0
svn merge -r4905:4907 $SVNURL/branches/SAMBA_3_0
svn merge -r4907:4913 $SVNURL/branches/SAMBA_3_0
svn merge -r4932:4933 $SVNURL/branches/SAMBA_3_0
svn merge -r4933:4946 $SVNURL/branches/SAMBA_3_0
svn merge -r4946:4963 $SVNURL/branches/SAMBA_3_0
svn merge -r4963:4964 $SVNURL/branches/SAMBA_3_0
svn merge -r4964:4965 $SVNURL/branches/SAMBA_3_0
svn merge -r4965:4966 $SVNURL/branches/SAMBA_3_0
svn merge -r4966:4967 $SVNURL/branches/SAMBA_3_0
svn merge -r4967:4970 $SVNURL/branches/SAMBA_3_0
svn merge -r4972:4976 $SVNURL/branches/SAMBA_3_0
svn merge -r4970:4972 $SVNURL/branches/SAMBA_3_0
svn merge -r4976:4988 $SVNURL/branches/SAMBA_3_0
svn merge -r4988:4989 $SVNURL/branches/SAMBA_3_0
svn merge -r4994:4995 $SVNURL/branches/SAMBA_3_0
svn merge -r4995:4996 $SVNURL/branches/SAMBA_3_0
svn merge -r5000:5002 $SVNURL/branches/SAMBA_3_0
svn merge -r5002:5012 $SVNURL/branches/SAMBA_3_0
svn merge -r5012:5014 $SVNURL/branches/SAMBA_3_0
svn merge -r5014:5015 $SVNURL/branches/SAMBA_3_0
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/auth.h | 4 | ||||
| -rw-r--r-- | source/include/client.h | 1 | ||||
| -rw-r--r-- | source/include/libsmbclient.h | 6 | ||||
| -rw-r--r-- | source/include/rpc_netlogon.h | 3 | ||||
| -rw-r--r-- | source/include/rpc_secdes.h | 5 |
5 files changed, 16 insertions, 3 deletions
diff --git a/source/include/auth.h b/source/include/auth.h index 188cf58643d..91751e71804 100644 --- a/source/include/auth.h +++ b/source/include/auth.h @@ -112,6 +112,10 @@ typedef struct auth_methods const struct auth_usersupplied_info *user_info, auth_serversupplied_info **server_info); + /* If you are using this interface, then you are probably + * getting something wrong. This interface is only for + * security=server, and makes a number of compromises to allow + * that. It is not compatible with being a PDC. */ DATA_BLOB (*get_chal)(const struct auth_context *auth_context, void **my_private_data, TALLOC_CTX *mem_ctx); diff --git a/source/include/client.h b/source/include/client.h index c182544362f..8ae8faf90dc 100644 --- a/source/include/client.h +++ b/source/include/client.h @@ -144,6 +144,7 @@ struct cli_state { uint16 max_recv_frag; BOOL use_kerberos; + BOOL fallback_after_kerberos; BOOL use_spnego; BOOL use_oplocks; /* should we use oplocks? */ diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h index aaa19cb191b..efb04285a7f 100644 --- a/source/include/libsmbclient.h +++ b/source/include/libsmbclient.h @@ -455,9 +455,15 @@ struct _SMBCCTX { * do _NOT_ touch this from your program ! */ struct smbc_internal_data * internal; + + int flags; }; +/* Flags for SMBCCTX->flags */ +#define SMB_CTX_FLAG_USE_KERBEROS (1 << 0) +#define SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS (1 << 1) +#define SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON (1 << 2) /* don't try to do automatic anon login */ /**@ingroup misc * Create a new SBMCCTX (a context). diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h index b865d05b340..3ba1ce6465b 100644 --- a/source/include/rpc_netlogon.h +++ b/source/include/rpc_netlogon.h @@ -190,9 +190,8 @@ typedef struct net_user_info_3 DOM_SID2 dom_sid; /* domain SID */ - uint32 num_other_groups; /* other groups */ - DOM_GID *other_gids; /* group info */ DOM_SID2 *other_sids; /* foreign/trusted domain SIDs */ + uint32 *other_sids_attrib; } NET_USER_INFO_3; diff --git a/source/include/rpc_secdes.h b/source/include/rpc_secdes.h index 56145ac024c..1279007220c 100644 --- a/source/include/rpc_secdes.h +++ b/source/include/rpc_secdes.h @@ -401,7 +401,10 @@ typedef struct standard_mapping { #define GENERIC_RIGHTS_USER_WRITE \ (STANDARD_RIGHTS_WRITE_ACCESS | \ SA_RIGHT_USER_CHANGE_PASSWORD | \ - SA_RIGHT_USER_SET_LOC_COM) /* 0x00020044 */ + SA_RIGHT_USER_SET_LOC_COM | \ + SA_RIGHT_USER_SET_ATTRIBUTES | \ + SA_RIGHT_USER_SET_PASSWORD | \ + SA_RIGHT_USER_CHANGE_GROUP_MEM) /* 0x000204e4 */ #define GENERIC_RIGHTS_USER_EXECUTE \ (STANDARD_RIGHTS_EXECUTE_ACCESS | \ |