[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  3fe82d0 s3-smbd: avoid using pipes_struct when only session_info is needed.
       via  87cd7c5 s3-printing: include ../librpc/ndr/libndr.h  in ads printing.
      from  a68a2b0 s3-winbindd: remove unused headers.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 3fe82d0152f9760326e905516c6959fb4b9973e5
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 30 00:37:05 2011 +0200

    s3-smbd: avoid using pipes_struct when only session_info is needed.
    
    Guenther
    (cherry picked from commit 61cd1067efacd91e22b4acbdf0d1d92dc2efc162)

commit 87cd7c5fe13d8a1a2e7c251feed75900a338ad34
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 30 00:40:28 2011 +0200

    s3-printing: include ../librpc/ndr/libndr.h  in ads printing.
    
    Guenther
    (cherry picked from commit f7d6a0a1121c355a87dd113d2cb2a4985cdc06ce)

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/nt_printing_ads.c |    1 +
 source3/rpc_server/srv_pipe.c      |    2 +-
 source3/smbd/proto.h               |    2 +-
 source3/smbd/uid.c                 |    9 ++++-----
 4 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index ea41471..1ab1b0e 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -28,6 +28,7 @@
 #include "krb5_env.h"
 #include "../libcli/registry/util_reg.h"
 #include "auth.h"
+#include "../librpc/ndr/libndr.h"
 
 #ifdef HAVE_ADS
 /*****************************************************************
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 73a3486..a608a4f 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1559,7 +1559,7 @@ static bool api_pipe_request(struct pipes_struct *p,
 	    ((p->auth.auth_type == DCERPC_AUTH_TYPE_NTLMSSP) ||
 	     (p->auth.auth_type == DCERPC_AUTH_TYPE_KRB5) ||
 	     (p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO))) {
-		if(!become_authenticated_pipe_user(p)) {
+		if(!become_authenticated_pipe_user(p->session_info)) {
 			data_blob_free(&p->out_data.rdata);
 			return False;
 		}
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index e7dd7f3..31defc6 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1056,7 +1056,7 @@ bool change_to_user(connection_struct *conn, uint16 vuid);
 bool change_to_user_by_session(connection_struct *conn,
 			       const struct auth_serversupplied_info *session_info);
 bool change_to_root_user(void);
-bool become_authenticated_pipe_user(struct pipes_struct *p);
+bool become_authenticated_pipe_user(struct auth_serversupplied_info *session_info);
 bool unbecome_authenticated_pipe_user(void);
 void become_root(void);
 void unbecome_root(void);
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index b554b36..7b04713 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -25,7 +25,6 @@
 #include "libcli/security/security.h"
 #include "passdb/lookup_sid.h"
 #include "auth.h"
-#include "ntdomain.h"
 
 /* what user is current? */
 extern struct current_user current_user;
@@ -409,14 +408,14 @@ bool change_to_root_user(void)
  user. Doesn't modify current_user.
 ****************************************************************************/
 
-bool become_authenticated_pipe_user(struct pipes_struct *p)
+bool become_authenticated_pipe_user(struct auth_serversupplied_info *session_info)
 {
 	if (!push_sec_ctx())
 		return False;
 
-	set_sec_ctx(p->session_info->utok.uid, p->session_info->utok.gid,
-		    p->session_info->utok.ngroups, p->session_info->utok.groups,
-		    p->session_info->security_token);
+	set_sec_ctx(session_info->utok.uid, session_info->utok.gid,
+		    session_info->utok.ngroups, session_info->utok.groups,
+		    session_info->security_token);
 
 	return True;
 }


-- 
Samba Shared Repository