From: Ralph Boehme <slow@samba.org>
Date: Thu, 27 Dec 2018 10:38:36 +0000 (+0100)
Subject: Revert "smbd: add simple noop smbd_impersonate_{conn_vuid,conn_sess,root,guest}_creat... 
X-Git-Tag: talloc-2.1.15~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e717c9035ef643b8de97c0ee473670d693690900;p=thirdparty%2Fsamba.git

Revert "smbd: add simple noop smbd_impersonate_{conn_vuid,conn_sess,root,guest}_create() wrappers"

This reverts commit 5285966e67cbee8519015df12a15e938e85e6ee7.

See the discussion in

https://lists.samba.org/archive/samba-technical/2018-December/131731.html

for the reasoning behind this revert.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index eb35a94862a..8d088785164 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1244,17 +1244,6 @@ const struct security_unix_token *get_current_utok(connection_struct *conn);
 const struct security_token *get_current_nttok(connection_struct *conn);
 uint64_t get_current_vuid(connection_struct *conn);
 
-struct tevent_context *smbd_impersonate_conn_vuid_create(
-				struct tevent_context *main_ev,
-				struct connection_struct *conn,
-				uint64_t vuid);
-struct tevent_context *smbd_impersonate_conn_sess_create(
-				struct tevent_context *main_ev,
-				struct connection_struct *conn,
-				struct auth_session_info *session_info);
-struct tevent_context *smbd_impersonate_root_create(struct tevent_context *main_ev);
-struct tevent_context *smbd_impersonate_guest_create(struct tevent_context *main_ev);
-
 /* The following definitions come from smbd/utmp.c  */
 
 void sys_utmp_claim(const char *username, const char *hostname,
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 2ce5366b775..c850708bbe8 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -958,53 +958,3 @@ uint64_t get_current_vuid(connection_struct *conn)
 {
 	return current_user.vuid;
 }
-
-struct tevent_context *smbd_impersonate_conn_vuid_create(
-				struct tevent_context *main_ev,
-				struct connection_struct *conn,
-				uint64_t vuid)
-{
-	struct tevent_context *wrap_ev = NULL;
-
-	wrap_ev = smbd_impersonate_debug_create(main_ev,
-						"conn_vuid",
-						DBGLVL_DEBUG);
-
-	return wrap_ev;
-}
-
-struct tevent_context *smbd_impersonate_conn_sess_create(
-				struct tevent_context *main_ev,
-				struct connection_struct *conn,
-				struct auth_session_info *session_info)
-{
-	struct tevent_context *wrap_ev = NULL;
-
-	wrap_ev = smbd_impersonate_debug_create(main_ev,
-						"conn_sess",
-						DBGLVL_DEBUG);
-
-	return wrap_ev;
-}
-
-struct tevent_context *smbd_impersonate_root_create(struct tevent_context *main_ev)
-{
-	struct tevent_context *wrap_ev = NULL;
-
-	wrap_ev = smbd_impersonate_debug_create(main_ev,
-						"root",
-						DBGLVL_DEBUG);
-
-	return wrap_ev;
-}
-
-struct tevent_context *smbd_impersonate_guest_create(struct tevent_context *main_ev)
-{
-	struct tevent_context *wrap_ev = NULL;
-
-	wrap_ev = smbd_impersonate_debug_create(main_ev,
-						"guest",
-						DBGLVL_DEBUG);
-
-	return wrap_ev;
-}