From: Ralph Boehme <slow@samba.org>
Date: Mon, 16 Dec 2019 17:00:26 +0000 (+0100)
Subject: python: move system_session_unix to new auth_util.py
X-Git-Tag: ldb-2.1.0~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfc0ca73374c8a0c418d6738753a10ab872688f6;p=thirdparty%2Fsamba.git

python: move system_session_unix to new auth_util.py

system_session_unix() will be used by many more callers soon.

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

diff --git a/python/samba/auth_util.py b/python/samba/auth_util.py
new file mode 100644
index 00000000000..570c638fbeb
--- /dev/null
+++ b/python/samba/auth_util.py
@@ -0,0 +1,34 @@
+# Unix SMB/CIFS implementation.
+# auth util helpers
+#
+# Copyright (C) Ralph Boehme <slow@sambba.org> 2019
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from samba.auth import (
+    system_session,
+    session_info_fill_unix,
+    copy_session_info,
+)
+
+def system_session_unix():
+    """
+    Return a copy of the system session_info with a valid UNIX token
+    """
+
+    session_info = system_session()
+    session_info_unix = copy_session_info(session_info)
+    session_info_fill_unix(session_info_unix, None)
+
+    return session_info_unix
diff --git a/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py
index 4cc7737ae77..bd15cc4548a 100644
--- a/python/samba/netcmd/ntacl.py
+++ b/python/samba/netcmd/ntacl.py
@@ -25,13 +25,10 @@ from samba.ndr import ndr_unpack, ndr_print
 from samba.samdb import SamDB
 from samba.samba3 import param as s3param, passdb, smbd
 from samba import provision
+from samba.auth_util import system_session_unix
 import os
 
-from samba.auth import (
-    system_session,
-    session_info_fill_unix,
-    copy_session_info,
-)
+from samba.auth import system_session
 
 from samba.netcmd import (
     Command,
@@ -40,13 +37,6 @@ from samba.netcmd import (
     Option,
 )
 
-def system_session_unix():
-    session_info = system_session()
-    session_info_unix = copy_session_info(session_info)
-    session_info_fill_unix(session_info_unix, None)
-
-    return session_info_unix
-
 def get_local_domain_sid(lp):
     is_ad_dc = False
     server_role = lp.server_role()