gpo: Move Group Policy code below gp directory

Moves the Group Policy extensions and supporting
code within the existing python/samba/gp directory.
Meant to clean up the clutter that's accumulating
in python/samba.

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue May 31 20:15:45 UTC 2022 on sn-devel-184

diff --git a/python/samba/gp_centrify_crontab_ext.py b/python/samba/gp/gp_centrify_crontab_ext.py
similarity index 99%
rename from python/samba/gp_centrify_crontab_ext.py
rename to python/samba/gp/gp_centrify_crontab_ext.py
index eace6a973cd362c1377a63ac071520686f36fc8c..220feb776a5dae839639ba73f25a22942090d357 100644 (file)
--- a/python/samba/gp_centrify_crontab_ext.py
+++ b/python/samba/gp/gp_centrify_crontab_ext.py
@@ -16,7 +16,7 @@
 
 import os, re
 from subprocess import Popen, PIPE
-from samba.gpclass import gp_pol_ext, drop_privileges
+from samba.gp.gpclass import gp_pol_ext, drop_privileges
 from hashlib import blake2b
 from tempfile import NamedTemporaryFile
 

diff --git a/python/samba/gp_centrify_sudoers_ext.py b/python/samba/gp/gp_centrify_sudoers_ext.py
similarity index 98%
rename from python/samba/gp_centrify_sudoers_ext.py
rename to python/samba/gp/gp_centrify_sudoers_ext.py
index 4af5140605084130c4f5f00753ce1584ee5165c2..2d03a4871a4c88ba6c7e3162a1108f6f248ff45b 100644 (file)
--- a/python/samba/gp_centrify_sudoers_ext.py
+++ b/python/samba/gp/gp_centrify_sudoers_ext.py
@@ -15,11 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from base64 import b64encode
 from tempfile import NamedTemporaryFile
 from subprocess import Popen, PIPE
-from samba.gp_sudoers_ext import visudo, intro
+from samba.gp.gp_sudoers_ext import visudo, intro
 from samba.gp.util.logging import log
 
 def ext_enabled(entries):

diff --git a/python/samba/gp_cert_auto_enroll_ext.py b/python/samba/gp/gp_cert_auto_enroll_ext.py
similarity index 99%
rename from python/samba/gp_cert_auto_enroll_ext.py
rename to python/samba/gp/gp_cert_auto_enroll_ext.py
index fe86d7f34289da1f19f833aeae7d86ad7bbc57cb..f1dcf6bbafb2102fdb47f7ba15041a48defd3d78 100644 (file)
--- a/python/samba/gp_cert_auto_enroll_ext.py
+++ b/python/samba/gp/gp_cert_auto_enroll_ext.py
@@ -17,11 +17,11 @@
 import os
 import operator
 import requests
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from samba import Ldb
 from ldb import SCOPE_SUBTREE, SCOPE_BASE
 from samba.auth import system_session
-from samba.gpclass import get_dc_hostname
+from samba.gp.gpclass import get_dc_hostname
 import base64
 from shutil import which
 from subprocess import Popen, PIPE

diff --git a/python/samba/gp_chromium_ext.py b/python/samba/gp/gp_chromium_ext.py
similarity index 99%
rename from python/samba/gp_chromium_ext.py
rename to python/samba/gp/gp_chromium_ext.py
index befce47085d72ebab4564c8eae6bb1159db7455a..ae4bc8a7a80775300f466f534c2f78ce66f8a053 100644 (file)
--- a/python/samba/gp_chromium_ext.py
+++ b/python/samba/gp/gp_chromium_ext.py
@@ -16,7 +16,7 @@
 
 import os
 import json
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from samba.dcerpc import misc
 from samba.common import get_string
 from samba.gp.util.logging import log

diff --git a/python/samba/gp_ext_loader.py b/python/samba/gp/gp_ext_loader.py
similarity index 96%
rename from python/samba/gp_ext_loader.py
rename to python/samba/gp/gp_ext_loader.py
index 3db8442ea3f617495080969f6ec4cefb447c0aa9..bd702de55a5f88b62639348572ab1134ebd05d03 100644 (file)
--- a/python/samba/gp_ext_loader.py
+++ b/python/samba/gp/gp_ext_loader.py
@@ -14,8 +14,8 @@
 # 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.gpclass import list_gp_extensions
-from samba.gpclass import gp_ext
+from samba.gp.gpclass import list_gp_extensions
+from samba.gp.gpclass import gp_ext
 from samba.gp.util.logging import log
 
 try:

diff --git a/python/samba/gp_firefox_ext.py b/python/samba/gp/gp_firefox_ext.py
similarity index 99%
rename from python/samba/gp_firefox_ext.py
rename to python/samba/gp/gp_firefox_ext.py
index 6dbded0cae74de8f9697c4ea18ce5b0ea564e8a9..06ae31d7afb021d2ed21eaeafeb29fdacdac91c1 100644 (file)
--- a/python/samba/gp_firefox_ext.py
+++ b/python/samba/gp/gp_firefox_ext.py
@@ -16,7 +16,7 @@
 
 import os
 import json
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from samba.dcerpc import misc
 from samba.common import get_string
 from samba.gp.util.logging import log

diff --git a/python/samba/gp_firewalld_ext.py b/python/samba/gp/gp_firewalld_ext.py
similarity index 99%
rename from python/samba/gp_firewalld_ext.py
rename to python/samba/gp/gp_firewalld_ext.py
index 3b60cf44ad399eee9814d1513c7cb61ff916ecad..7947961a9eea1610ca91812ad311ba75ff677632 100644 (file)
--- a/python/samba/gp_firewalld_ext.py
+++ b/python/samba/gp/gp_firewalld_ext.py
@@ -19,7 +19,7 @@ from subprocess import Popen, PIPE
 from hashlib import blake2b
 from shutil import which
 import json
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from samba.gp.util.logging import log
 
 def firewall_cmd(*args):

diff --git a/python/samba/gp_gnome_settings_ext.py b/python/samba/gp/gp_gnome_settings_ext.py
similarity index 99%
rename from python/samba/gp_gnome_settings_ext.py
rename to python/samba/gp/gp_gnome_settings_ext.py
index 1a5e73bea0a49ae041ae73ef43486e96b74c058a..cbf01a14ade15c0d72d14b357e4f388eab0fd952 100644 (file)
--- a/python/samba/gp_gnome_settings_ext.py
+++ b/python/samba/gp/gp_gnome_settings_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os, re
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from tempfile import NamedTemporaryFile
 import shutil
 from configparser import ConfigParser

diff --git a/python/samba/gp_msgs_ext.py b/python/samba/gp/gp_msgs_ext.py
similarity index 98%
rename from python/samba/gp_msgs_ext.py
rename to python/samba/gp/gp_msgs_ext.py
index 9366cd826856bb77465aa111174bd8f9eb81d918..267c7456ad11bf1d5de328eced8c4e9234619c09 100644 (file)
--- a/python/samba/gp_msgs_ext.py
+++ b/python/samba/gp/gp_msgs_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 
 class gp_msgs_ext(gp_pol_ext):
     def __str__(self):

diff --git a/python/samba/gp_scripts_ext.py b/python/samba/gp/gp_scripts_ext.py
similarity index 99%
rename from python/samba/gp_scripts_ext.py
rename to python/samba/gp/gp_scripts_ext.py
index 33049ff6dc0b25d917ad71c16de0c51f51a4514d..3ff650996bb1ea75d3cdb7965504ead1c5575699 100644 (file)
--- a/python/samba/gp_scripts_ext.py
+++ b/python/samba/gp/gp_scripts_ext.py
@@ -16,7 +16,7 @@
 
 import os, re
 from subprocess import Popen, PIPE
-from samba.gpclass import gp_pol_ext, drop_privileges
+from samba.gp.gpclass import gp_pol_ext, drop_privileges
 from base64 import b64encode
 from hashlib import blake2b
 from tempfile import NamedTemporaryFile

diff --git a/python/samba/gp_sec_ext.py b/python/samba/gp/gp_sec_ext.py
similarity index 99%
rename from python/samba/gp_sec_ext.py
rename to python/samba/gp/gp_sec_ext.py
index df18a3ac7dac2faabc0e30125fb7b1e809be32c1..667bc4cd48b5bbf0f9ee83119b36d06b52d7db21 100644 (file)
--- a/python/samba/gp_sec_ext.py
+++ b/python/samba/gp/gp_sec_ext.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os.path
-from samba.gpclass import gp_inf_ext
+from samba.gp.gpclass import gp_inf_ext
 from samba.auth import system_session
 from samba.common import get_string
 try:

diff --git a/python/samba/gp_smb_conf_ext.py b/python/samba/gp/gp_smb_conf_ext.py
similarity index 98%
rename from python/samba/gp_smb_conf_ext.py
rename to python/samba/gp/gp_smb_conf_ext.py
index 61ac2ff198c6acc711398e3181a73756e44c6c9b..598d0ac9b2e28e5245c4e621afb589dc7ee6adb9 100644 (file)
--- a/python/samba/gp_smb_conf_ext.py
+++ b/python/samba/gp/gp_smb_conf_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os, re, numbers
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from tempfile import NamedTemporaryFile
 from samba.gp.util.logging import log
 

diff --git a/python/samba/gp_sudoers_ext.py b/python/samba/gp/gp_sudoers_ext.py
similarity index 99%
rename from python/samba/gp_sudoers_ext.py
rename to python/samba/gp/gp_sudoers_ext.py
index 47e8778d68df2100980b6cadb973b931013d802c..b3a37efb61abdb75eb30cd10678e047ade519b7b 100644 (file)
--- a/python/samba/gp_sudoers_ext.py
+++ b/python/samba/gp/gp_sudoers_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_pol_ext
+from samba.gp.gpclass import gp_pol_ext
 from base64 import b64encode
 from tempfile import NamedTemporaryFile
 from subprocess import Popen, PIPE

diff --git a/python/samba/gpclass.py b/python/samba/gp/gpclass.py
similarity index 100%
rename from python/samba/gpclass.py
rename to python/samba/gp/gpclass.py

diff --git a/python/samba/vgp_access_ext.py b/python/samba/gp/vgp_access_ext.py
similarity index 99%
rename from python/samba/vgp_access_ext.py
rename to python/samba/gp/vgp_access_ext.py
index cdbda991c05edeb96b3415c46e12a0d44ba0b9ea..efd91ef93fb5298686341a71bfc5ad1c8b4ddc10 100644 (file)
--- a/python/samba/vgp_access_ext.py
+++ b/python/samba/gp/vgp_access_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os, re
-from samba.gpclass import gp_xml_ext
+from samba.gp.gpclass import gp_xml_ext
 from hashlib import blake2b
 from tempfile import NamedTemporaryFile
 from samba.common import get_bytes

diff --git a/python/samba/vgp_files_ext.py b/python/samba/gp/vgp_files_ext.py
similarity index 99%
rename from python/samba/vgp_files_ext.py
rename to python/samba/gp/vgp_files_ext.py
index 0c1dcae479f295e62d2817c9af8e77f3654e76a1..bd26212793ec46914392e527a29235dd8ed9f570 100644 (file)
--- a/python/samba/vgp_files_ext.py
+++ b/python/samba/gp/vgp_files_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os, pwd, grp
-from samba.gpclass import gp_xml_ext, check_safe_path
+from samba.gp.gpclass import gp_xml_ext, check_safe_path
 from tempfile import NamedTemporaryFile
 from shutil import copyfile, move
 from hashlib import blake2b

diff --git a/python/samba/vgp_issue_ext.py b/python/samba/gp/vgp_issue_ext.py
similarity index 98%
rename from python/samba/vgp_issue_ext.py
rename to python/samba/gp/vgp_issue_ext.py
index b4b08901149ffdd471584c73d93a1d2751ced774..c622fa094b6ae21e43d29794a1758e9c06426c0f 100644 (file)
--- a/python/samba/vgp_issue_ext.py
+++ b/python/samba/gp/vgp_issue_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_xml_ext
+from samba.gp.gpclass import gp_xml_ext
 
 class vgp_issue_ext(gp_xml_ext):
     def __str__(self):

diff --git a/python/samba/vgp_motd_ext.py b/python/samba/gp/vgp_motd_ext.py
similarity index 98%
rename from python/samba/vgp_motd_ext.py
rename to python/samba/gp/vgp_motd_ext.py
index 1ac152c29e936e2dbc163ebe836588f506f8e264..8a5f8a6458b02e273dedfb401e30798ae399787a 100644 (file)
--- a/python/samba/vgp_motd_ext.py
+++ b/python/samba/gp/vgp_motd_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_xml_ext
+from samba.gp.gpclass import gp_xml_ext
 
 class vgp_motd_ext(gp_xml_ext):
     def __str__(self):

diff --git a/python/samba/vgp_openssh_ext.py b/python/samba/gp/vgp_openssh_ext.py
similarity index 99%
rename from python/samba/vgp_openssh_ext.py
rename to python/samba/gp/vgp_openssh_ext.py
index 44cde4c86274581f120de29dd5f22b2f5b3eb085..e8b888ffbaa8d65327b1854f9ed87b02f13f8d72 100644 (file)
--- a/python/samba/vgp_openssh_ext.py
+++ b/python/samba/gp/vgp_openssh_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_xml_ext
+from samba.gp.gpclass import gp_xml_ext
 from base64 import b64encode
 from tempfile import NamedTemporaryFile
 from samba.common import get_bytes, get_string

diff --git a/python/samba/vgp_startup_scripts_ext.py b/python/samba/gp/vgp_startup_scripts_ext.py
similarity index 98%
rename from python/samba/vgp_startup_scripts_ext.py
rename to python/samba/gp/vgp_startup_scripts_ext.py
index cc5c8682019386a0bc61e84806a655be2ccd8999..71be4c0e32c56e97286c73ea3551c4fa748b398c 100644 (file)
--- a/python/samba/vgp_startup_scripts_ext.py
+++ b/python/samba/gp/vgp_startup_scripts_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_xml_ext, check_safe_path
+from samba.gp.gpclass import gp_xml_ext, check_safe_path
 from tempfile import NamedTemporaryFile
 from samba.common import get_bytes
 from subprocess import Popen, PIPE

diff --git a/python/samba/vgp_sudoers_ext.py b/python/samba/gp/vgp_sudoers_ext.py
similarity index 98%
rename from python/samba/vgp_sudoers_ext.py
rename to python/samba/gp/vgp_sudoers_ext.py
index 8d2255beae8ee4114d8bd0d8d32dcfbce3143d67..c0137d5f49eb5a5445962f4bf9b24932816edac2 100644 (file)
--- a/python/samba/vgp_sudoers_ext.py
+++ b/python/samba/gp/vgp_sudoers_ext.py
@@ -15,11 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_xml_ext
+from samba.gp.gpclass import gp_xml_ext
 from base64 import b64encode
 from tempfile import NamedTemporaryFile
 from subprocess import Popen, PIPE
-from samba.gp_sudoers_ext import visudo, intro
+from samba.gp.gp_sudoers_ext import visudo, intro
 from samba.gp.util.logging import log
 
 class vgp_sudoers_ext(gp_xml_ext):

diff --git a/python/samba/vgp_symlink_ext.py b/python/samba/gp/vgp_symlink_ext.py
similarity index 98%
rename from python/samba/vgp_symlink_ext.py
rename to python/samba/gp/vgp_symlink_ext.py
index 0bca7572d02dc4e4487852eba511d04585c38c48..3dd6241fede33837deb0eecfe1cc39cb71f4c3a7 100644 (file)
--- a/python/samba/vgp_symlink_ext.py
+++ b/python/samba/gp/vgp_symlink_ext.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from samba.gpclass import gp_xml_ext
+from samba.gp.gpclass import gp_xml_ext
 from tempfile import NamedTemporaryFile
 from subprocess import Popen, PIPE
 from samba.gp.util.logging import log

diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index 784c1676467a7a8bded54a4298eeb4a1313ba632..3b21dc6128c6559ab9a0bc86192df006ba1f8564 100644 (file)
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -67,7 +67,7 @@ from samba.netcmd.common import attr_default
 from samba.common import get_bytes, get_string
 from configparser import ConfigParser
 from io import StringIO, BytesIO
-from samba.vgp_files_ext import calc_mode, stat_from_mode
+from samba.gp.vgp_files_ext import calc_mode, stat_from_mode
 import hashlib
 
 

diff --git a/python/samba/tests/gpo.py b/python/samba/tests/gpo.py
index e1f81e8a50d5334cd8dc35211b8be7498d2717b2..48f794b490cc5c255f88cdb10e285bd3902d78fd 100644 (file)
--- a/python/samba/tests/gpo.py
+++ b/python/samba/tests/gpo.py
@@ -17,39 +17,39 @@
 import os, grp, pwd
 import errno
 from samba import gpo, tests
-from samba.gpclass import register_gp_extension, list_gp_extensions, \
+from samba.gp.gpclass import register_gp_extension, list_gp_extensions, \
     unregister_gp_extension, GPOStorage
 from samba.param import LoadParm
-from samba.gpclass import check_refresh_gpo_list, check_safe_path, \
+from samba.gp.gpclass import check_refresh_gpo_list, check_safe_path, \
     check_guid, parse_gpext_conf, atomic_write_conf, get_deleted_gpos_list
 from subprocess import Popen, PIPE
 from tempfile import NamedTemporaryFile, TemporaryDirectory
-from samba import gpclass
+from samba.gp import gpclass
 # Disable privilege dropping for testing
 gpclass.drop_privileges = lambda _, func, *args : func(*args)
-from samba.gp_sec_ext import gp_krb_ext, gp_access_ext
-from samba.gp_scripts_ext import gp_scripts_ext, gp_user_scripts_ext
-from samba.gp_sudoers_ext import gp_sudoers_ext
-from samba.vgp_sudoers_ext import vgp_sudoers_ext
-from samba.vgp_symlink_ext import vgp_symlink_ext
-from samba.gpclass import gp_inf_ext
-from samba.gp_smb_conf_ext import gp_smb_conf_ext
-from samba.vgp_files_ext import vgp_files_ext
-from samba.vgp_openssh_ext import vgp_openssh_ext
-from samba.vgp_startup_scripts_ext import vgp_startup_scripts_ext
-from samba.vgp_motd_ext import vgp_motd_ext
-from samba.vgp_issue_ext import vgp_issue_ext
-from samba.vgp_access_ext import vgp_access_ext
-from samba.gp_gnome_settings_ext import gp_gnome_settings_ext
-from samba import gp_cert_auto_enroll_ext as cae
-from samba.gp_firefox_ext import gp_firefox_ext
-from samba.gp_chromium_ext import gp_chromium_ext
-from samba.gp_firewalld_ext import gp_firewalld_ext
+from samba.gp.gp_sec_ext import gp_krb_ext, gp_access_ext
+from samba.gp.gp_scripts_ext import gp_scripts_ext, gp_user_scripts_ext
+from samba.gp.gp_sudoers_ext import gp_sudoers_ext
+from samba.gp.vgp_sudoers_ext import vgp_sudoers_ext
+from samba.gp.vgp_symlink_ext import vgp_symlink_ext
+from samba.gp.gpclass import gp_inf_ext
+from samba.gp.gp_smb_conf_ext import gp_smb_conf_ext
+from samba.gp.vgp_files_ext import vgp_files_ext
+from samba.gp.vgp_openssh_ext import vgp_openssh_ext
+from samba.gp.vgp_startup_scripts_ext import vgp_startup_scripts_ext
+from samba.gp.vgp_motd_ext import vgp_motd_ext
+from samba.gp.vgp_issue_ext import vgp_issue_ext
+from samba.gp.vgp_access_ext import vgp_access_ext
+from samba.gp.gp_gnome_settings_ext import gp_gnome_settings_ext
+from samba.gp import gp_cert_auto_enroll_ext as cae
+from samba.gp.gp_firefox_ext import gp_firefox_ext
+from samba.gp.gp_chromium_ext import gp_chromium_ext
+from samba.gp.gp_firewalld_ext import gp_firewalld_ext
 from samba.credentials import Credentials
-from samba.gp_msgs_ext import gp_msgs_ext
-from samba.gp_centrify_sudoers_ext import gp_centrify_sudoers_ext
-from samba.gp_centrify_crontab_ext import gp_centrify_crontab_ext, \
-                                          gp_user_centrify_crontab_ext
+from samba.gp.gp_msgs_ext import gp_msgs_ext
+from samba.gp.gp_centrify_sudoers_ext import gp_centrify_sudoers_ext
+from samba.gp.gp_centrify_crontab_ext import gp_centrify_crontab_ext, \
+                                             gp_user_centrify_crontab_ext
 from samba.common import get_bytes
 from samba.dcerpc import preg
 from samba.ndr import ndr_pack
@@ -60,7 +60,7 @@ import hashlib
 from samba.gp_parse.gp_pol import GPPolParser
 from glob import glob
 from configparser import ConfigParser
-from samba.gpclass import get_dc_hostname
+from samba.gp.gpclass import get_dc_hostname
 from samba import Ldb
 import ldb as _ldb
 from samba.auth import system_session
@@ -7221,7 +7221,7 @@ class GPOTests(tests.TestCase):
     def test_gpt_ext_register(self):
         this_path = os.path.dirname(os.path.realpath(__file__))
         samba_path = os.path.realpath(os.path.join(this_path, '../../../'))
-        ext_path = os.path.join(samba_path, 'python/samba/gp_sec_ext.py')
+        ext_path = os.path.join(samba_path, 'python/samba/gp/gp_sec_ext.py')
         ext_guid = '{827D319E-6EAC-11D2-A4EA-00C04F79F83A}'
         ret = register_gp_extension(ext_guid, 'gp_access_ext', ext_path,
                                     smb_conf=self.lp.configfile,

diff --git a/python/samba/tests/gpo_member.py b/python/samba/tests/gpo_member.py
index 605d4f33cce286ee371aae87f8521b2d3db893a5..642eb13a639961901c662aa58c66fafce8b277d9 100644 (file)
--- a/python/samba/tests/gpo_member.py
+++ b/python/samba/tests/gpo_member.py
@@ -16,10 +16,10 @@
 
 import os
 from samba import gpo, tests
-from samba.gpclass import GPOStorage
+from samba.gp.gpclass import GPOStorage
 from samba.param import LoadParm
 from samba.credentials import Credentials
-from samba.gp_sec_ext import gp_access_ext
+from samba.gp.gp_sec_ext import gp_access_ext
 import logging
 
 class GPOTests(tests.TestCase):

diff --git a/source4/scripting/bin/samba-gpupdate b/source4/scripting/bin/samba-gpupdate
index 079ae485f105c68e57240f149cb71a507c03576b..8c4923aa68f06ab1c4c35aa9ad35967f4f86ef46 100755 (executable)
--- a/source4/scripting/bin/samba-gpupdate
+++ b/source4/scripting/bin/samba-gpupdate
@@ -29,29 +29,29 @@ sys.path.insert(0, "bin/python")
 
 import optparse
 from samba import getopt as options
-from samba.gpclass import apply_gp, unapply_gp, GPOStorage, rsop
-from samba.gp_sec_ext import gp_krb_ext, gp_access_ext
-from samba.gp_ext_loader import get_gp_client_side_extensions
-from samba.gp_scripts_ext import gp_scripts_ext, gp_user_scripts_ext
-from samba.gp_sudoers_ext import gp_sudoers_ext
-from samba.vgp_sudoers_ext import vgp_sudoers_ext
-from samba.gp_smb_conf_ext import gp_smb_conf_ext
-from samba.gp_msgs_ext import gp_msgs_ext
-from samba.vgp_symlink_ext import vgp_symlink_ext
-from samba.vgp_files_ext import vgp_files_ext
-from samba.vgp_openssh_ext import vgp_openssh_ext
-from samba.vgp_motd_ext import vgp_motd_ext
-from samba.vgp_issue_ext import vgp_issue_ext
-from samba.vgp_startup_scripts_ext import vgp_startup_scripts_ext
-from samba.vgp_access_ext import vgp_access_ext
-from samba.gp_gnome_settings_ext import gp_gnome_settings_ext
-from samba.gp_cert_auto_enroll_ext import gp_cert_auto_enroll_ext
-from samba.gp_firefox_ext import gp_firefox_ext
-from samba.gp_chromium_ext import gp_chromium_ext, gp_chrome_ext
-from samba.gp_firewalld_ext import gp_firewalld_ext
-from samba.gp_centrify_sudoers_ext import gp_centrify_sudoers_ext
-from samba.gp_centrify_crontab_ext import gp_centrify_crontab_ext, \
-                                          gp_user_centrify_crontab_ext
+from samba.gp.gpclass import apply_gp, unapply_gp, GPOStorage, rsop
+from samba.gp.gp_sec_ext import gp_krb_ext, gp_access_ext
+from samba.gp.gp_ext_loader import get_gp_client_side_extensions
+from samba.gp.gp_scripts_ext import gp_scripts_ext, gp_user_scripts_ext
+from samba.gp.gp_sudoers_ext import gp_sudoers_ext
+from samba.gp.vgp_sudoers_ext import vgp_sudoers_ext
+from samba.gp.gp_smb_conf_ext import gp_smb_conf_ext
+from samba.gp.gp_msgs_ext import gp_msgs_ext
+from samba.gp.vgp_symlink_ext import vgp_symlink_ext
+from samba.gp.vgp_files_ext import vgp_files_ext
+from samba.gp.vgp_openssh_ext import vgp_openssh_ext
+from samba.gp.vgp_motd_ext import vgp_motd_ext
+from samba.gp.vgp_issue_ext import vgp_issue_ext
+from samba.gp.vgp_startup_scripts_ext import vgp_startup_scripts_ext
+from samba.gp.vgp_access_ext import vgp_access_ext
+from samba.gp.gp_gnome_settings_ext import gp_gnome_settings_ext
+from samba.gp.gp_cert_auto_enroll_ext import gp_cert_auto_enroll_ext
+from samba.gp.gp_firefox_ext import gp_firefox_ext
+from samba.gp.gp_chromium_ext import gp_chromium_ext, gp_chrome_ext
+from samba.gp.gp_firewalld_ext import gp_firewalld_ext
+from samba.gp.gp_centrify_sudoers_ext import gp_centrify_sudoers_ext
+from samba.gp.gp_centrify_crontab_ext import gp_centrify_crontab_ext, \
+                                             gp_user_centrify_crontab_ext
 from samba.credentials import Credentials
 from samba.gp.util.logging import logger_init