Some more sec_ctx changes. Modified some fields in the pipe_struct

structure so authenticated pipe users can have their unix groups set when
become_authenticated_pipe_user() is called.
(This used to be commit 55c9bf124dc661df43bfe582ef14b1297aeaf0fa)

2 files changed, 19 insertions, 18 deletions

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 424a99c700..7b652cad05 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -164,23 +164,23 @@ typedef struct pipes_struct
 	/*
 	 * Unix user name and credentials.
 	 */
-	fstring unix_user_name;
-	uid_t uid;
-	gid_t gid;
 
-    /*
-     * Set to true when an RPC bind has been done on this pipe.
-     */
-
-    BOOL pipe_bound;
-
-    /*
-     * Set to true when we should return fault PDU's for everything.
-     */
-
-    BOOL fault_state;
+	fstring pipe_user_name;
+	user_struct pipe_user;
 
 	/*
+	 * Set to true when an RPC bind has been done on this pipe.
+	 */
+	
+	BOOL pipe_bound;
+	
+	/*
+	 * Set to true when we should return fault PDU's for everything.
+	 */
+	
+	BOOL fault_state;
+	
+	/*
 	 * Struct to deal with multiple pdu inputs.
 	 */
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index cb53e7b59e..fdd987457b 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1687,10 +1687,6 @@ struct ncacn_np
 #include "rpc_creds.h"
 #include "rpc_secdes.h"
 #include "nt_printing.h"
-#include "ntdomain.h"
-
-#include "client.h"
-#include "rpcclient.h"
 
 typedef struct
 {
@@ -1717,6 +1713,11 @@ typedef struct
 	struct dcinfo dc;
 } user_struct;
 
+#include "ntdomain.h"
+
+#include "client.h"
+#include "rpcclient.h"
+
 /*
  * Size of new password account encoding string. DO NOT CHANGE.
  */