From: Ralph Boehme <slow@samba.org>
Date: Thu, 27 Dec 2018 10:42:45 +0000 (+0100)
Subject: Revert "smbd: add [un]become_guest() helper functions"
X-Git-Tag: talloc-2.1.15~169
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=78fa44083218adef59a27c35794be51b8bfd1caa;p=samba.git

Revert "smbd: add [un]become_guest() helper functions"

This reverts commit 7b5a47b84696e8e5c26207bd398742b883e598c2.

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 ba9ab501adb..3662a925dd6 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1225,8 +1225,6 @@ void become_root(void);
 void unbecome_root(void);
 void smbd_become_root(void);
 void smbd_unbecome_root(void);
-bool become_guest(void);
-void unbecome_guest(void);
 bool become_user(connection_struct *conn, uint64_t vuid);
 bool become_user_by_fsp(struct files_struct *fsp);
 bool become_user_by_session(connection_struct *conn,
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index adf9e8c1c51..f902f2aeae3 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -599,34 +599,6 @@ void smbd_unbecome_root(void)
 	pop_conn_ctx();
 }
 
-bool become_guest(void)
-{
-	bool ok;
-
-	ok = push_sec_ctx();
-	if (!ok) {
-		return false;
-	}
-
-	push_conn_ctx();
-
-	ok = change_to_guest();
-	if (!ok) {
-		pop_sec_ctx();
-		pop_conn_ctx();
-		return false;
-	}
-
-	return true;
-}
-
-void unbecome_guest(void)
-{
-	pop_sec_ctx();
-	pop_conn_ctx();
-	return;
-}
-
 /****************************************************************************
  Push the current security context then force a change via change_to_user().
  Saves and restores the connection context.