mirror of
https://github.com/samba-team/samba.git
synced 2025-11-30 20:23:49 +03:00
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
f049fd463b
commit
939c3cb5d7
@@ -21,9 +21,6 @@
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "ntdomain.h"
|
||||
#include "rpc_dce.h"
|
||||
|
||||
#ifndef _RPC_MISC_H /* _RPC_MISC_H */
|
||||
#define _RPC_MISC_H
|
||||
|
||||
@@ -302,8 +299,7 @@ typedef struct {
|
||||
**********************************************************************/
|
||||
|
||||
/* DOM_CLNT_SRV - client / server names */
|
||||
typedef struct clnt_srv_info
|
||||
{
|
||||
typedef struct clnt_srv_info {
|
||||
uint32 undoc_buffer; /* undocumented 32 bit buffer pointer */
|
||||
UNISTR2 uni_logon_srv; /* logon server name */
|
||||
uint32 undoc_buffer2; /* undocumented 32 bit buffer pointer */
|
||||
@@ -311,8 +307,7 @@ typedef struct clnt_srv_info
|
||||
} DOM_CLNT_SRV;
|
||||
|
||||
/* DOM_LOG_INFO - login info */
|
||||
typedef struct log_info
|
||||
{
|
||||
typedef struct log_info {
|
||||
uint32 undoc_buffer; /* undocumented 32 bit buffer pointer */
|
||||
UNISTR2 uni_logon_srv; /* logon server name */
|
||||
UNISTR2 uni_acct_name; /* account name */
|
||||
@@ -321,89 +316,44 @@ typedef struct log_info
|
||||
} DOM_LOG_INFO;
|
||||
|
||||
/* DOM_CHAL - challenge info */
|
||||
typedef struct chal_info
|
||||
{
|
||||
typedef struct chal_info {
|
||||
uchar data[8]; /* credentials */
|
||||
} DOM_CHAL;
|
||||
|
||||
/* DOM_CREDs - timestamped client or server credentials */
|
||||
typedef struct cred_info
|
||||
{
|
||||
typedef struct cred_info {
|
||||
DOM_CHAL challenge; /* credentials */
|
||||
UTIME timestamp; /* credential time-stamp */
|
||||
} DOM_CRED;
|
||||
|
||||
/* DOM_CLNT_INFO - client info */
|
||||
typedef struct clnt_info
|
||||
{
|
||||
typedef struct clnt_info {
|
||||
DOM_LOG_INFO login;
|
||||
DOM_CRED cred;
|
||||
} DOM_CLNT_INFO;
|
||||
|
||||
/* DOM_CLNT_INFO2 - client info */
|
||||
typedef struct clnt_info2
|
||||
{
|
||||
typedef struct clnt_info2 {
|
||||
DOM_CLNT_SRV login;
|
||||
uint32 ptr_cred;
|
||||
DOM_CRED cred;
|
||||
} DOM_CLNT_INFO2;
|
||||
|
||||
/* DOM_LOGON_ID - logon id */
|
||||
typedef struct logon_info
|
||||
{
|
||||
typedef struct logon_info {
|
||||
uint32 low;
|
||||
uint32 high;
|
||||
} DOM_LOGON_ID;
|
||||
|
||||
/* OWF INFO */
|
||||
typedef struct owf_info
|
||||
{
|
||||
typedef struct owf_info {
|
||||
uint8 data[16];
|
||||
} OWF_INFO;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* A client connection's state, pipe name,
|
||||
* user credentials, etc...
|
||||
*/
|
||||
typedef struct _cli_auth_fns cli_auth_fns;
|
||||
struct user_creds;
|
||||
struct cli_connection {
|
||||
|
||||
char *srv_name;
|
||||
char *pipe_name;
|
||||
struct user_creds usr_creds;
|
||||
|
||||
struct cli_state *pCli_state;
|
||||
|
||||
cli_auth_fns *auth;
|
||||
|
||||
void *auth_info;
|
||||
void *auth_creds;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Associate a POLICY_HND with a cli_connection
|
||||
*/
|
||||
typedef struct rpc_hnd_node {
|
||||
|
||||
POLICY_HND hnd;
|
||||
struct cli_connection *cli;
|
||||
|
||||
} RPC_HND_NODE;
|
||||
|
||||
typedef struct uint64_s
|
||||
{
|
||||
uint32 low;
|
||||
uint32 high;
|
||||
} UINT64_S;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif /* _RPC_MISC_H */
|
||||
|
||||
Reference in New Issue
Block a user