1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-14 20:23:54 +03:00

Moved cruft out of smb.h into ntdomain.h where it belongs. dc struct

now in pipe struct (where used) rather than user_struct.
Secured machine account password changing in srv_netlog_nt.c - ensure
that only the given machine can change its own password. May need to
free this up later for NT admin tools, but this is a fail-safe secure
position for now.
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent be9933ce35
commit 46b12f2275
6 changed files with 77 additions and 134 deletions

View File

@@ -425,25 +425,12 @@ typedef struct domain_grp_member_info
} DOMAIN_GRP_MEMBER;
/* DOM_CHAL - challenge info */
typedef struct chal_info
{
uchar data[8]; /* credentials */
} DOM_CHAL;
/* 32 bit time (sec) since 01jan1970 - cifs6.txt, section 3.5, page 30 */
typedef struct time_info
{
uint32 time;
} UTIME;
/* DOM_CREDs - timestamped client or server credentials */
typedef struct cred_info
{
DOM_CHAL challenge; /* credentials */
UTIME timestamp; /* credential time-stamp */
} DOM_CRED;
/* Structure used when SMBwritebmpx is active */
typedef struct
{
@@ -581,19 +568,6 @@ struct current_user
#define EXCLUSIVE_BREAK_SENT 1
#define LEVEL_II_BREAK_SENT 2
/* Domain controller authentication protocol info */
struct dcinfo
{
DOM_CHAL clnt_chal; /* Initial challenge received from client */
DOM_CHAL srv_chal; /* Initial server challenge */
DOM_CRED clnt_cred; /* Last client credential */
DOM_CRED srv_cred; /* Last server credential */
uchar sess_key[8]; /* Session key */
uchar md4pw[16]; /* md4(machine password) */
};
typedef struct {
fstring smb_name; /* user name from the client */
fstring unix_name; /* unix user name of a validated user */
@@ -1600,21 +1574,6 @@ struct pwd_info
uchar sess_key[16];
};
struct ntdom_info
{
unsigned char sess_key[16]; /* Current session key. */
unsigned char ntlmssp_hash[258]; /* ntlmssp data. */
uint32 ntlmssp_cli_flgs; /* ntlmssp client flags */
uint32 ntlmssp_srv_flgs; /* ntlmssp server flags */
uint32 ntlmssp_seq_num; /* ntlmssp sequence number */
DOM_CRED clnt_cred; /* Client credential. */
int max_recv_frag;
int max_xmit_frag;
vuser_key key;
};
/*
* Network Computing Architechture Context Name Named Pipe
* See MSDN docs for more information
@@ -1648,10 +1607,6 @@ typedef struct user_struct
gid_t *groups;
NT_USER_TOKEN *nt_user_token;
/* per-user authentication information on NT RPCs */
/* lkclXXXX - THIS SHOULD NOT BE HERE! */
struct dcinfo dc;
} user_struct;
#include "ntdomain.h"