summaryrefslogtreecommitdiffstats
path: root/source/include/smb.h
diff options
context:
space:
mode:
Diffstat (limited to 'source/include/smb.h')
-rw-r--r--source/include/smb.h34
1 files changed, 20 insertions, 14 deletions
diff --git a/source/include/smb.h b/source/include/smb.h
index 7072d65e761..b2b4a57cb1d 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -596,16 +596,6 @@ typedef struct connection_struct
} connection_struct;
-struct current_user
-{
- connection_struct *conn;
- uint16 vuid;
- uid_t uid;
- gid_t gid;
- int ngroups;
- gid_t *groups;
-};
-
/* Domain controller authentication protocol info */
struct dcinfo
{
@@ -1683,6 +1673,14 @@ extern int unix_ERR_code;
#include "smb_macros.h"
#include "nt_printing.h"
+
+typedef struct
+{
+ uint32 pid;
+ uint16 vuid;
+
+} vuser_key;
+
#include "ntdomain.h"
typedef struct
@@ -1704,6 +1702,16 @@ typedef struct
} user_struct;
+struct current_user
+{
+ connection_struct *conn;
+ vuser_key key;
+ uid_t uid;
+ gid_t gid;
+ int ngroups;
+ gid_t *groups;
+};
+
/* A netbios name structure. */
struct nmb_name {
char name[17];
@@ -1811,6 +1819,8 @@ struct ntdom_info
int max_recv_frag;
int max_xmit_frag;
+
+ vuser_key key;
};
struct msrpc_state
@@ -1826,14 +1836,10 @@ struct msrpc_state
BOOL initialised;
char *inbuf;
char *outbuf;
-
- uint32 pid;
};
typedef struct netsec_creds
{
- uint32 pid;
-
fstring domain;
fstring myname;