revert ...
[metze/samba/wip.git] / source4 / scripting / python / samba / netcmd / gpo.py
index e59b79dbc0ca5ad5f999b48784ee57a9858a1c5f..23b562eb6358fba17dd5151203ff4ca67c2ea1d7 100644 (file)
@@ -1,10 +1,7 @@
-#!/usr/bin/env python
-#
 # implement samba_tool gpo commands
 #
 # Copyright Andrew Tridgell 2010
-# Copyright Giampaolo Lauria 2011 <lauria2@yahoo.com>
-# Copyright Amitay Isaacs 2011 <amitay@gmail.com>
+# Copyright Amitay Isaacs 2011-2012 <amitay@gmail.com>
 #
 # based on C implementation by Guenther Deschner and Wilco Baan Hofman
 #
@@ -34,14 +31,19 @@ from samba.netcmd import (
     SuperCommand,
     )
 from samba.samdb import SamDB
-from samba import drs_utils, nttime2string, dsdb, dcerpc
-from samba.dcerpc import misc
+from samba import dsdb
+from samba.dcerpc import security
 from samba.ndr import ndr_unpack
 import samba.security
 import samba.auth
 from samba.auth import AUTH_SESSION_INFO_DEFAULT_GROUPS, AUTH_SESSION_INFO_AUTHENTICATED, AUTH_SESSION_INFO_SIMPLE_PRIVILEGES
 from samba.netcmd.common import netcmd_finddc
+from samba import policy
 from samba import smb
+import uuid
+from samba.ntacls import dsacl2fsacl
+from samba.dcerpc import nbt
+from samba.net import Net
 
 
 def samdb_connect(ctx):
@@ -61,18 +63,24 @@ def attr_default(msg, attrname, default):
     return default
 
 
-def flags_string(flags, value):
-    '''return a set of flags as a string'''
-    if value == 0:
-        return 'NONE'
-    ret = ''
-    for (str, val) in flags:
-        if val & value:
-            ret += str + ' '
-            value &= ~val
-    if value != 0:
-        ret += '0x%08x' % value
-    return ret.rstrip()
+def gpo_flags_string(value):
+    '''return gpo flags string'''
+    flags = policy.get_gpo_flags(value)
+    if not flags:
+        ret = 'NONE'
+    else:
+        ret = ' '.join(flags)
+    return ret
+
+
+def gplink_options_string(value):
+    '''return gplink options string'''
+    options = policy.get_gplink_options(value)
+    if not options:
+        ret = 'NONE'
+    else:
+        ret = ' '.join(options)
+    return ret
 
 
 def parse_gplink(gplink):
@@ -106,7 +114,7 @@ def dc_url(lp, creds, url=None, dc=None):
             try:
                 dc = netcmd_finddc(lp, creds)
             except Exception, e:
-                raise RunTimeError("Could not find a DC for domain", e)
+                raise RuntimeError("Could not find a DC for domain", e)
         url = 'ldap://' + dc
     return url
 
@@ -115,12 +123,13 @@ def get_gpo_dn(samdb, gpo):
     '''Construct the DN for gpo'''
 
     dn = samdb.get_default_basedn()
-    dn.add_child(ldb.Dn(samdb, "CN=Policies,DC=System"))
+    dn.add_child(ldb.Dn(samdb, "CN=Policies,CN=System"))
     dn.add_child(ldb.Dn(samdb, "CN=%s" % gpo))
     return dn
 
 
-def get_gpo_info(samdb, gpo=None, displayname=None, dn=None):
+def get_gpo_info(samdb, gpo=None, displayname=None, dn=None,
+                 sd_flags=security.SECINFO_OWNER|security.SECINFO_GROUP|security.SECINFO_DACL|security.SECINFO_SACL):
     '''Get GPO information using gpo, displayname or dn'''
 
     policies_dn = samdb.get_default_basedn()
@@ -148,7 +157,8 @@ def get_gpo_info(samdb, gpo=None, displayname=None, dn=None):
                                     'flags',
                                     'name',
                                     'displayName',
-                                    'gPCFileSysPath'])
+                                    'gPCFileSysPath'],
+                            controls=['sd_flags:1:%d' % sd_flags])
     except Exception, e:
         if gpo is not None:
             mesg = "Cannot get information for GPO %s" % gpo
@@ -159,20 +169,70 @@ def get_gpo_info(samdb, gpo=None, displayname=None, dn=None):
     return msg
 
 
+def get_gpo_containers(samdb, gpo):
+    '''lists dn of containers for a GPO'''
+
+    search_expr = "(&(objectClass=*)(gPLink=*%s*))" % gpo
+    try:
+        msg = samdb.search(expression=search_expr, attrs=['gPLink'])
+    except Exception, e:
+        raise CommandError("Could not find container(s) with GPO %s" % gpo, e)
+
+    return msg
+
+
+def del_gpo_link(samdb, container_dn, gpo):
+    '''delete GPO link for the container'''
+    # Check if valid Container DN and get existing GPlinks
+    try:
+        msg = samdb.search(base=container_dn, scope=ldb.SCOPE_BASE,
+                            expression="(objectClass=*)",
+                            attrs=['gPLink'])[0]
+    except Exception, e:
+        raise CommandError("Container '%s' does not exist" % container_dn, e)
+
+    found = False
+    gpo_dn = str(get_gpo_dn(samdb, gpo))
+    if 'gPLink' in msg:
+        gplist = parse_gplink(msg['gPLink'][0])
+        for g in gplist:
+            if g['dn'].lower() == gpo_dn.lower():
+                gplist.remove(g)
+                found = True
+                break
+    else:
+        raise CommandError("No GPO(s) linked to this container")
+
+    if not found:
+        raise CommandError("GPO '%s' not linked to this container" % gpo)
+
+    m = ldb.Message()
+    m.dn = container_dn
+    if gplist:
+        gplink_str = encode_gplink(gplist)
+        m['r0'] = ldb.MessageElement(gplink_str, ldb.FLAG_MOD_REPLACE, 'gPLink')
+    else:
+        m['d0'] = ldb.MessageElement(msg['gPLink'][0], ldb.FLAG_MOD_DELETE, 'gPLink')
+    try:
+        samdb.modify(m)
+    except Exception, e:
+        raise CommandError("Error removing GPO from container", e)
+
+
 def parse_unc(unc):
     '''Parse UNC string into a hostname, a service, and a filepath'''
     if unc.startswith('\\\\') and unc.startswith('//'):
-        return []
+        raise ValueError("UNC doesn't start with \\\\ or //")
     tmp = unc[2:].split('/', 2)
     if len(tmp) == 3:
         return tmp
     tmp = unc[2:].split('\\', 2)
     if len(tmp) == 3:
-        return tmp;
-    return []
+        return tmp
+    raise ValueError("Invalid UNC string: %s" % unc)
 
 
-def copy_directory_recurse(conn, remotedir, localdir):
+def copy_directory_remote_to_local(conn, remotedir, localdir):
     if not os.path.isdir(localdir):
         os.mkdir(localdir)
     r_dirs = [ remotedir ]
@@ -184,21 +244,59 @@ def copy_directory_recurse(conn, remotedir, localdir):
         dirlist = conn.list(r_dir)
         for e in dirlist:
             r_name = r_dir + '\\' + e['name']
-            l_name = l_dir + os.path.sep + e['name']
+            l_name = os.path.join(l_dir, e['name'])
 
             if e['attrib'] & smb.FILE_ATTRIBUTE_DIRECTORY:
                 r_dirs.append(r_name)
                 l_dirs.append(l_name)
                 os.mkdir(l_name)
-            elif e['attrib'] & smb.FILE_ATTRIBUTE_ARCHIVE:
+            else:
                 data = conn.loadfile(r_name)
                 file(l_name, 'w').write(data)
 
 
+def copy_directory_local_to_remote(conn, localdir, remotedir):
+    if not conn.chkpath(remotedir):
+        conn.mkdir(remotedir)
+    l_dirs = [ localdir ]
+    r_dirs = [ remotedir ]
+    while l_dirs:
+        l_dir = l_dirs.pop()
+        r_dir = r_dirs.pop()
+
+        dirlist = os.listdir(l_dir)
+        for e in dirlist:
+            l_name = os.path.join(l_dir, e)
+            r_name = r_dir + '\\' + e
+
+            if os.path.isdir(l_name):
+                l_dirs.append(l_name)
+                r_dirs.append(r_name)
+                conn.mkdir(r_name)
+            else:
+                data = file(l_name, 'r').read()
+                conn.savefile(r_name, data)
+
+
+def create_directory_hier(conn, remotedir):
+    elems = remotedir.replace('/', '\\').split('\\')
+    path = ""
+    for e in elems:
+        path = path + '\\' + e
+        if not conn.chkpath(path):
+            conn.mkdir(path)
+
+
 class cmd_listall(Command):
-    """list all GPOs"""
+    """List all GPOs."""
 
-    synopsis = "%prog gpo listall [options]"
+    synopsis = "%prog [options]"
+
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
 
     takes_options = [
         Option("-H", "--URL", help="LDB URL for database or target server", type=str,
@@ -214,32 +312,33 @@ class cmd_listall(Command):
 
         samdb_connect(self)
 
-        gpo_flags = [
-            ("GPO_FLAG_USER_DISABLE", dsdb.GPO_FLAG_USER_DISABLE ),
-            ( "GPO_FLAG_MACHINE_DISABLE", dsdb.GPO_FLAG_MACHINE_DISABLE ) ]
-
         msg = get_gpo_info(self.samdb, None)
 
         for m in msg:
-            print("GPO          : %s" % m['name'][0])
-            print("display name : %s" % m['displayName'][0])
-            print("path         : %s" % m['gPCFileSysPath'][0])
-            print("dn           : %s" % m.dn)
-            print("version      : %s" % attr_default(m, 'versionNumber', '0'))
-            print("flags        : %s" % flags_string(gpo_flags, int(attr_default(m, 'flags', 0))))
-            print("")
+            self.outf.write("GPO          : %s\n" % m['name'][0])
+            self.outf.write("display name : %s\n" % m['displayName'][0])
+            self.outf.write("path         : %s\n" % m['gPCFileSysPath'][0])
+            self.outf.write("dn           : %s\n" % m.dn)
+            self.outf.write("version      : %s\n" % attr_default(m, 'versionNumber', '0'))
+            self.outf.write("flags        : %s\n" % gpo_flags_string(int(attr_default(m, 'flags', 0))))
+            self.outf.write("\n")
 
 
 class cmd_list(Command):
-    """list GPOs for an account"""
+    """List GPOs for an account."""
 
-    synopsis = "%prog gpo list <username> [options]"
+    synopsis = "%prog <username> [options]"
 
-    takes_args = [ 'username' ]
+    takes_args = ['username']
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
 
     takes_options = [
-        Option("-H", "--URL", help="LDB URL for database or target server", type=str,
-               metavar="URL", dest="H")
+        Option("-H", "--URL", help="LDB URL for database or target server",
+            type=str, metavar="URL", dest="H")
         ]
 
     def run(self, username, H=None, sambaopts=None, credopts=None, versionopts=None):
@@ -255,15 +354,15 @@ class cmd_list(Command):
             msg = self.samdb.search(expression='(&(|(samAccountName=%s)(samAccountName=%s$))(objectClass=User))' %
                                                 (ldb.binary_encode(username),ldb.binary_encode(username)))
             user_dn = msg[0].dn
-        except Exception, e:
-            raise CommandError("Failed to find account %s" % username, e)
+        except Exception:
+            raise CommandError("Failed to find account %s" % username)
 
         # check if its a computer account
         try:
             msg = self.samdb.search(base=user_dn, scope=ldb.SCOPE_BASE, attrs=['objectClass'])[0]
             is_computer = 'computer' in msg['objectClass']
-        except Exception, e:
-            raise CommandError("Failed to find objectClass for user %s" % username, e)
+        except Exception:
+            raise CommandError("Failed to find objectClass for user %s" % username)
 
         session_info_flags = ( AUTH_SESSION_INFO_DEFAULT_GROUPS |
                                AUTH_SESSION_INFO_AUTHENTICATED )
@@ -292,23 +391,25 @@ class cmd_list(Command):
                         continue
 
                     try:
+                        sd_flags=security.SECINFO_OWNER|security.SECINFO_GROUP|security.SECINFO_DACL
                         gmsg = self.samdb.search(base=g['dn'], scope=ldb.SCOPE_BASE,
                                                  attrs=['name', 'displayName', 'flags',
-                                                        'ntSecurityDescriptor'])
+                                                        'nTSecurityDescriptor'],
+                                                 controls=['sd_flags:1:%d' % sd_flags])
+                        secdesc_ndr = gmsg[0]['nTSecurityDescriptor'][0]
+                        secdesc = ndr_unpack(security.descriptor, secdesc_ndr)
                     except Exception:
-                        print("Failed to fetch gpo object %s" % g['dn'])
+                        self.outf.write("Failed to fetch gpo object with nTSecurityDescriptor %s\n" %
+                            g['dn'])
                         continue
 
-                    secdesc_ndr = gmsg[0]['ntSecurityDescriptor'][0]
-                    secdesc = ndr_unpack(dcerpc.security.descriptor, secdesc_ndr)
-
                     try:
                         samba.security.access_check(secdesc, token,
-                                                    dcerpc.security.SEC_STD_READ_CONTROL |
-                                                    dcerpc.security.SEC_ADS_LIST |
-                                                    dcerpc.security.SEC_ADS_READ_PROP)
+                                                    security.SEC_STD_READ_CONTROL |
+                                                    security.SEC_ADS_LIST |
+                                                    security.SEC_ADS_READ_PROP)
                     except RuntimeError:
-                        print("Failed access check on %s" % msg.dn)
+                        self.outf.write("Failed access check on %s\n" % msg.dn)
                         continue
 
                     # check the flags on the GPO
@@ -333,15 +434,15 @@ class cmd_list(Command):
         else:
             msg_str = 'user'
 
-        print("GPOs for %s %s" % (msg_str, username))
+        self.outf.write("GPOs for %s %s\n" % (msg_str, username))
         for g in gpos:
-            print("    %s %s" % (g[0], g[1]))
+            self.outf.write("    %s %s\n" % (g[0], g[1]))
 
 
 class cmd_show(Command):
-    """Show information for a GPO"""
+    """Show information for a GPO."""
 
-    synopsis = "%prog gpo show <gpo> [options]"
+    synopsis = "%prog <gpo> [options]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -349,7 +450,7 @@ class cmd_show(Command):
         "credopts": options.CredentialsOptions,
     }
 
-    takes_args = [ 'gpo' ]
+    takes_args = ['gpo']
 
     takes_options = [
         Option("-H", help="LDB URL for database or target server", type=str)
@@ -364,32 +465,32 @@ class cmd_show(Command):
 
         samdb_connect(self)
 
-        gpo_flags = [
-            ("GPO_FLAG_USER_DISABLE", dsdb.GPO_FLAG_USER_DISABLE ),
-            ( "GPO_FLAG_MACHINE_DISABLE", dsdb.GPO_FLAG_MACHINE_DISABLE ) ]
-
         try:
             msg = get_gpo_info(self.samdb, gpo)[0]
-        except Exception, e:
-            raise CommandError("GPO %s does not exist" % gpo, e)
-
-        secdesc_ndr = msg['ntSecurityDescriptor'][0]
-        secdesc = ndr_unpack(dcerpc.security.descriptor, secdesc_ndr)
+        except Exception:
+            raise CommandError("GPO '%s' does not exist" % gpo)
 
-        print("GPO          : %s" % msg['name'][0])
-        print("display name : %s" % msg['displayName'][0])
-        print("path         : %s" % msg['gPCFileSysPath'][0])
-        print("dn           : %s" % msg.dn)
-        print("version      : %s" % attr_default(msg, 'versionNumber', '0'))
-        print("flags        : %s" % flags_string(gpo_flags, int(attr_default(msg, 'flags', 0))))
-        print("ACL          : %s" % secdesc.as_sddl())
-        print("")
+        try:
+            secdesc_ndr = msg['nTSecurityDescriptor'][0]
+            secdesc = ndr_unpack(security.descriptor, secdesc_ndr)
+            secdesc_sddl = secdesc.as_sddl()
+        except Exception:
+            secdesc_sddl = "<hidden>"
+
+        self.outf.write("GPO          : %s\n" % msg['name'][0])
+        self.outf.write("display name : %s\n" % msg['displayName'][0])
+        self.outf.write("path         : %s\n" % msg['gPCFileSysPath'][0])
+        self.outf.write("dn           : %s\n" % msg.dn)
+        self.outf.write("version      : %s\n" % attr_default(msg, 'versionNumber', '0'))
+        self.outf.write("flags        : %s\n" % gpo_flags_string(int(attr_default(msg, 'flags', 0))))
+        self.outf.write("ACL          : %s\n" % secdesc_sddl)
+        self.outf.write("\n")
 
 
 class cmd_getlink(Command):
-    """List GPO Links for a container"""
+    """List GPO Links for a container."""
 
-    synopsis = "%prog gpo getlink <container_dn> [options]"
+    synopsis = "%prog <container_dn> [options]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -397,7 +498,7 @@ class cmd_getlink(Command):
         "credopts": options.CredentialsOptions,
     }
 
-    takes_args = [ 'container_dn' ]
+    takes_args = ['container_dn']
 
     takes_options = [
         Option("-H", help="LDB URL for database or target server", type=str)
@@ -413,35 +514,30 @@ class cmd_getlink(Command):
 
         samdb_connect(self)
 
-        gplink_options = [
-                ("GPLINK_OPT_DISABLE", dsdb.GPLINK_OPT_DISABLE),
-                ("GPLINK_OPT_ENFORCE", dsdb.GPLINK_OPT_ENFORCE),
-            ]
-
         try:
             msg = self.samdb.search(base=container_dn, scope=ldb.SCOPE_BASE,
                                     expression="(objectClass=*)",
-                                    attrs=['gPlink'])[0]
-        except Exception, e:
-            raise CommandError("Could not find Container DN %s (%s)" % container_dn, e)
+                                    attrs=['gPLink'])[0]
+        except Exception:
+            raise CommandError("Container '%s' does not exist" % container_dn)
 
-        if 'gPLink' in msg:
-            print("GPO(s) linked to DN %s" % container_dn)
+        if msg['gPLink']:
+            self.outf.write("GPO(s) linked to DN %s\n" % container_dn)
             gplist = parse_gplink(msg['gPLink'][0])
             for g in gplist:
                 msg = get_gpo_info(self.samdb, dn=g['dn'])
-                print("    GPO     : %s" % msg[0]['name'][0])
-                print("    Name    : %s" % msg[0]['displayName'][0])
-                print("    Options : %s" % flags_string(gplink_options, g['options']))
-                print("")
+                self.outf.write("    GPO     : %s\n" % msg[0]['name'][0])
+                self.outf.write("    Name    : %s\n" % msg[0]['displayName'][0])
+                self.outf.write("    Options : %s\n" % gplink_options_string(g['options']))
+                self.outf.write("\n")
         else:
-            print("No GPO(s) linked to DN=%s" % container_dn)
+            self.outf.write("No GPO(s) linked to DN=%s\n" % container_dn)
 
 
 class cmd_setlink(Command):
-    """Add or Update a GPO link to a container"""
+    """Add or update a GPO link to a container."""
 
-    synopsis = "%prog gpo setlink <container_dn> <gpo> [options]"
+    synopsis = "%prog <container_dn> <gpo> [options]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -449,7 +545,7 @@ class cmd_setlink(Command):
         "credopts": options.CredentialsOptions,
     }
 
-    takes_args = [ 'container_dn', 'gpo' ]
+    takes_args = ['container_dn', 'gpo']
 
     takes_options = [
         Option("-H", help="LDB URL for database or target server", type=str),
@@ -478,17 +574,17 @@ class cmd_setlink(Command):
         # Check if valid GPO DN
         try:
             msg = get_gpo_info(self.samdb, gpo=gpo)[0]
-        except Exception, e:
-            raise CommandError("GPO %s does not exist" % gpo_dn, e)
-        gpo_dn = get_gpo_dn(self.samdb, gpo)
+        except Exception:
+            raise CommandError("GPO '%s' does not exist" % gpo)
+        gpo_dn = str(get_gpo_dn(self.samdb, gpo))
 
         # Check if valid Container DN
         try:
             msg = self.samdb.search(base=container_dn, scope=ldb.SCOPE_BASE,
                                     expression="(objectClass=*)",
-                                    attrs=['gPlink'])[0]
-        except Exception, e:
-            raise CommandError("Could not find container DN %s" % container_dn, e)
+                                    attrs=['gPLink'])[0]
+        except Exception:
+            raise CommandError("Container '%s' does not exist" % container_dn)
 
         # Update existing GPlinks or Add new one
         existing_gplink = False
@@ -501,7 +597,9 @@ class cmd_setlink(Command):
                     g['options'] = gplink_options
                     found = True
                     break
-            if not found:
+            if found:
+                raise CommandError("GPO '%s' already linked to this container" % gpo)
+            else:
                 gplist.insert(0, { 'dn' : gpo_dn, 'options' : gplink_options })
         else:
             gplist = []
@@ -522,14 +620,14 @@ class cmd_setlink(Command):
         except Exception, e:
             raise CommandError("Error adding GPO Link", e)
 
-        print("Added/Updated GPO link")
+        self.outf.write("Added/Updated GPO link\n")
         cmd_getlink().run(container_dn, H, sambaopts, credopts, versionopts)
 
 
 class cmd_dellink(Command):
-    """Delete GPO link from a container"""
+    """Delete GPO link from a container."""
 
-    synopsis = "%prog gpo dellink <container_dn> <gpo> [options]"
+    synopsis = "%prog <container_dn> <gpo> [options]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -537,13 +635,13 @@ class cmd_dellink(Command):
         "credopts": options.CredentialsOptions,
     }
 
-    takes_args = [ 'container_dn', 'gpo' ]
+    takes_args = ['container', 'gpo']
 
     takes_options = [
         Option("-H", help="LDB URL for database or target server", type=str),
         ]
 
-    def run(self, container_dn, gpo_dn, H=None, sambaopts=None, credopts=None,
+    def run(self, container, gpo, H=None, sambaopts=None, credopts=None,
                 versionopts=None):
 
         self.lp = sambaopts.get_loadparm()
@@ -555,50 +653,56 @@ class cmd_dellink(Command):
 
         # Check if valid GPO
         try:
-            msg = get_gpo_info(self.sambdb, gpo=gpo)[0]
-        except Exception, e:
-                raise CommandError("GPO %s does not exist" % gpo, e)
-        gpo_dn = get_gpo_dn(self.samdb, gpo)
+            get_gpo_info(self.samdb, gpo=gpo)[0]
+        except Exception:
+            raise CommandError("GPO '%s' does not exist" % gpo)
 
-        # Check if valid Container DN and get existing GPlinks
-        try:
-            msg = self.samdb.search(base=container_dn, scope=ldb.SCOPE_BASE,
-                                    expression="(objectClass=*)",
-                                    attrs=['gPlink'])[0]
-        except Exception, e:
-            raise CommandError("Could not find container DN %s" % dn, e)
+        container_dn = ldb.Dn(self.samdb, container)
+        del_gpo_link(self.samdb, container_dn, gpo)
+        self.outf.write("Deleted GPO link.\n")
+        cmd_getlink().run(container_dn, H, sambaopts, credopts, versionopts)
 
-        if 'gPLink' in msg:
-            gplist = parse_gplink(msg['gPLink'][0])
-            for g in gplist:
-                if g['dn'].lower() == gpo_dn.lower():
-                    gplist.remove(g)
-                    break
-        else:
-            raise CommandError("Specified GPO is not linked to this container");
 
-        m = ldb.Message()
-        m.dn = ldb.Dn(self.samdb, container_dn)
+class cmd_listcontainers(Command):
+    """List all linked containers for a GPO."""
 
-        if gplist:
-            gplink_str = encode_gplink(gplist)
-            m['new_value'] = ldb.MessageElement(gplink_str, ldb.FLAG_MOD_REPLACE, 'gPLink')
-        else:
-            m['new_value'] = ldb.MessageElement('', ldb.FLAG_MOD_DELETE, 'gPLink')
+    synopsis = "%prog <gpo> [options]"
 
-        try:
-            self.samdb.modify(m)
-        except Exception, e:
-            raise CommandError("Error Removing GPO Link (%s)" % e)
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
 
-        print("Deleted GPO link.")
-        cmd_getlink().run(container_dn, H, sambaopts, credopts, versionopts)
+    takes_args = ['gpo']
+
+    takes_options = [
+        Option("-H", help="LDB URL for database or target server", type=str)
+        ]
+
+    def run(self, gpo, H=None, sambaopts=None, credopts=None,
+                versionopts=None):
+
+        self.lp = sambaopts.get_loadparm()
+        self.creds = credopts.get_credentials(self.lp, fallback_machine=True)
+
+        self.url = dc_url(self.lp, self.creds, H)
+
+        samdb_connect(self)
+
+        msg = get_gpo_containers(self.samdb, gpo)
+        if len(msg):
+            self.outf.write("Container(s) using GPO %s\n" % gpo)
+            for m in msg:
+                self.outf.write("    DN: %s\n" % m['dn'])
+        else:
+            self.outf.write("No Containers using GPO %s\n" % gpo)
 
 
 class cmd_getinheritance(Command):
-    """Get inheritance flag for a container"""
+    """Get inheritance flag for a container."""
 
-    synopsis = "%prog gpo getinheritance <container_dn> [options]"
+    synopsis = "%prog <container_dn> [options]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -606,7 +710,7 @@ class cmd_getinheritance(Command):
         "credopts": options.CredentialsOptions,
     }
 
-    takes_args = [ 'container_dn' ]
+    takes_args = ['container_dn']
 
     takes_options = [
         Option("-H", help="LDB URL for database or target server", type=str)
@@ -615,34 +719,34 @@ class cmd_getinheritance(Command):
     def run(self, container_dn, H=None, sambaopts=None, credopts=None,
                 versionopts=None):
 
-        self.url = H
         self.lp = sambaopts.get_loadparm()
-
         self.creds = credopts.get_credentials(self.lp, fallback_machine=True)
 
+        self.url = dc_url(self.lp, self.creds, H)
+
         samdb_connect(self)
 
         try:
             msg = self.samdb.search(base=container_dn, scope=ldb.SCOPE_BASE,
                                     expression="(objectClass=*)",
                                     attrs=['gPOptions'])[0]
-        except Exception, e:
-            raise CommandError("Could not find Container DN %s" % container_dn, e)
+        except Exception:
+            raise CommandError("Container '%s' does not exist" % container_dn)
 
         inheritance = 0
         if 'gPOptions' in msg:
-            inheritance = int(msg['gPOptions'][0]);
+            inheritance = int(msg['gPOptions'][0])
 
         if inheritance == dsdb.GPO_BLOCK_INHERITANCE:
-            print("Container has GPO_BLOCK_INHERITANCE")
+            self.outf.write("Container has GPO_BLOCK_INHERITANCE\n")
         else:
-            print("Container has GPO_INHERIT")
+            self.outf.write("Container has GPO_INHERIT\n")
 
 
 class cmd_setinheritance(Command):
-    """Set inheritance flag on a container"""
+    """Set inheritance flag on a container."""
 
-    synopsis = "%prog gpo setinheritance <container_dn> <block|inherit> [options]"
+    synopsis = "%prog <container_dn> <block|inherit> [options]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -666,19 +770,18 @@ class cmd_setinheritance(Command):
         else:
             raise CommandError("Unknown inheritance state (%s)" % inherit_state)
 
-        self.url = H
         self.lp = sambaopts.get_loadparm()
-
         self.creds = credopts.get_credentials(self.lp, fallback_machine=True)
 
-        samdb_connect(self)
+        self.url = dc_url(self.lp, self.creds, H)
 
+        samdb_connect(self)
         try:
             msg = self.samdb.search(base=container_dn, scope=ldb.SCOPE_BASE,
                                     expression="(objectClass=*)",
                                     attrs=['gPOptions'])[0]
-        except Exception, e:
-            raise CommandError("Could not find Container DN %s" % container_dn, e)
+        except Exception:
+            raise CommandError("Container '%s' does not exist" % container_dn)
 
         m = ldb.Message()
         m.dn = ldb.Dn(self.samdb, container_dn)
@@ -686,7 +789,7 @@ class cmd_setinheritance(Command):
         if 'gPOptions' in msg:
             m['new_value'] = ldb.MessageElement(str(inheritance), ldb.FLAG_MOD_REPLACE, 'gPOptions')
         else:
-            m['new_value'] = ldb.MessageElement(str(inheritance), ldb.FLAG_MOD_ADD, 'gPOptions');
+            m['new_value'] = ldb.MessageElement(str(inheritance), ldb.FLAG_MOD_ADD, 'gPOptions')
 
         try:
             self.samdb.modify(m)
@@ -695,9 +798,9 @@ class cmd_setinheritance(Command):
 
 
 class cmd_fetch(Command):
-    """Download a GPO"""
+    """Download a GPO."""
 
-    synopsis = "%prog gpo fetch <gpo> [options]"
+    synopsis = "%prog <gpo> [options]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -705,7 +808,7 @@ class cmd_fetch(Command):
         "credopts": options.CredentialsOptions,
     }
 
-    takes_args = [ 'gpo' ]
+    takes_args = ['gpo']
 
     takes_options = [
         Option("-H", help="LDB URL for database or target server", type=str),
@@ -717,51 +820,346 @@ class cmd_fetch(Command):
         self.lp = sambaopts.get_loadparm()
         self.creds = credopts.get_credentials(self.lp, fallback_machine=True)
 
-        dc_hostname = netcmd_finddc(self.lp, self.creds)
-        self.url = dc_url(self.lp, self.creds, H, dc=dc_hostname)
+        # We need to know writable DC to setup SMB connection
+        if H and H.startswith('ldap://'):
+            dc_hostname = H[7:]
+            self.url = H
+        else:
+            dc_hostname = netcmd_finddc(self.lp, self.creds)
+            self.url = dc_url(self.lp, self.creds, dc=dc_hostname)
 
         samdb_connect(self)
         try:
             msg = get_gpo_info(self.samdb, gpo)[0]
-        except Exception, e:
-            raise CommandError("GPO %s does not exist" % gpo)
+        except Exception:
+            raise CommandError("GPO '%s' does not exist" % gpo)
 
+        # verify UNC path
         unc = msg['gPCFileSysPath'][0]
         try:
             [dom_name, service, sharepath] = parse_unc(unc)
-        except:
+        except ValueError:
             raise CommandError("Invalid GPO path (%s)" % unc)
 
+        # SMB connect to DC
         try:
             conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
-        except Exception, e:
-            raise CommandError("Error connecting to '%s' using SMB" % dc_hostname, e)
+        except Exception:
+            raise CommandError("Error connecting to '%s' using SMB" % dc_hostname)
 
+        # Copy GPT
         if tmpdir is None:
             tmpdir = "/tmp"
+        if not os.path.isdir(tmpdir):
+            raise CommandError("Temoprary directory '%s' does not exist" % tmpdir)
+
+        localdir = os.path.join(tmpdir, "policy")
+        if not os.path.isdir(localdir):
+            os.mkdir(localdir)
+
+        gpodir = os.path.join(localdir, gpo)
+        if os.path.isdir(gpodir):
+            raise CommandError("GPO directory '%s' already exists, refusing to overwrite" % gpodir)
 
         try:
-            localdir = tmpdir + os.path.sep + "policy"
-            if not os.path.isdir(localdir):
-                os.mkdir(localdir)
-            gpodir = localdir + os.path.sep + gpo
-            if not os.path.isdir(gpodir):
-                os.mkdir(gpodir)
-            copy_directory_recurse(conn, sharepath, gpodir)
+            os.mkdir(gpodir)
+            copy_directory_remote_to_local(conn, sharepath, gpodir)
         except Exception, e:
-            raise CommandError("Error copying GPO", e)
-        print('GPO copied to %s' % gpodir)
+            # FIXME: Catch more specific exception
+            raise CommandError("Error copying GPO from DC", e)
+        self.outf.write('GPO copied to %s\n' % gpodir)
 
 
 class cmd_create(Command):
-    """Create a GPO"""
+    """Create an empty GPO."""
+
+    synopsis = "%prog <displayname> [options]"
+
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
+
+    takes_args = ['displayname']
+
+    takes_options = [
+        Option("-H", help="LDB URL for database or target server", type=str),
+        Option("--tmpdir", help="Temporary directory for copying policy files", type=str)
+        ]
+
+    def run(self, displayname, H=None, tmpdir=None, sambaopts=None, credopts=None,
+            versionopts=None):
+
+        self.lp = sambaopts.get_loadparm()
+        self.creds = credopts.get_credentials(self.lp, fallback_machine=True)
+
+        net = Net(creds=self.creds, lp=self.lp)
+
+        # We need to know writable DC to setup SMB connection
+        if H and H.startswith('ldap://'):
+            dc_hostname = H[7:]
+            self.url = H
+            flags = (nbt.NBT_SERVER_LDAP |
+                     nbt.NBT_SERVER_DS |
+                     nbt.NBT_SERVER_WRITABLE)
+            cldap_ret = net.finddc(address=dc_hostname, flags=flags)
+        else:
+            flags = (nbt.NBT_SERVER_LDAP |
+                     nbt.NBT_SERVER_DS |
+                     nbt.NBT_SERVER_WRITABLE)
+            cldap_ret = net.finddc(domain=self.lp.get('realm'), flags=flags)
+            dc_hostname = cldap_ret.pdc_dns_name
+            self.url = dc_url(self.lp, self.creds, dc=dc_hostname)
+
+        samdb_connect(self)
+
+        msg = get_gpo_info(self.samdb, displayname=displayname)
+        if msg.count > 0:
+            raise CommandError("A GPO already existing with name '%s'" % displayname)
+
+        # Create new GUID
+        guid  = str(uuid.uuid4())
+        gpo = "{%s}" % guid.upper()
+        realm = cldap_ret.dns_domain
+        unc_path = "\\\\%s\\sysvol\\%s\\Policies\\%s" % (realm, realm, gpo)
+
+        # Create GPT
+        if tmpdir is None:
+            tmpdir = "/tmp"
+        if not os.path.isdir(tmpdir):
+            raise CommandError("Temporary directory '%s' does not exist" % tmpdir)
+
+        localdir = os.path.join(tmpdir, "policy")
+        if not os.path.isdir(localdir):
+            os.mkdir(localdir)
+
+        gpodir = os.path.join(localdir, gpo)
+        if os.path.isdir(gpodir):
+            raise CommandError("GPO directory '%s' already exists, refusing to overwrite" % gpodir)
+
+        try:
+            os.mkdir(gpodir)
+            os.mkdir(os.path.join(gpodir, "Machine"))
+            os.mkdir(os.path.join(gpodir, "User"))
+            gpt_contents = "[General]\r\nVersion=0\r\n"
+            file(os.path.join(gpodir, "GPT.INI"), "w").write(gpt_contents)
+        except Exception, e:
+            raise CommandError("Error Creating GPO files", e)
+
+        # Connect to DC over SMB
+        [dom_name, service, sharepath] = parse_unc(unc_path)
+        try:
+            conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
+        except Exception, e:
+            raise CommandError("Error connecting to '%s' using SMB" % dc_hostname, e)
+
+        self.samdb.transaction_start()
+        try:
+            # Add cn=<guid>
+            gpo_dn = get_gpo_dn(self.samdb, gpo)
+
+            m = ldb.Message()
+            m.dn = gpo_dn
+            m['a01'] = ldb.MessageElement("groupPolicyContainer", ldb.FLAG_MOD_ADD, "objectClass")
+            self.samdb.add(m)
+
+            # Add cn=User,cn=<guid>
+            m = ldb.Message()
+            m.dn = ldb.Dn(self.samdb, "CN=User,%s" % str(gpo_dn))
+            m['a01'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD, "objectClass")
+            self.samdb.add(m)
+
+            # Add cn=Machine,cn=<guid>
+            m = ldb.Message()
+            m.dn = ldb.Dn(self.samdb, "CN=Machine,%s" % str(gpo_dn))
+            m['a01'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD, "objectClass")
+            self.samdb.add(m)
+
+            # Get new security descriptor
+            ds_sd_flags = ( security.SECINFO_OWNER |
+                            security.SECINFO_GROUP |
+                            security.SECINFO_DACL )
+            msg = get_gpo_info(self.samdb, gpo=gpo, sd_flags=ds_sd_flags)[0]
+            ds_sd_ndr = msg['nTSecurityDescriptor'][0]
+            ds_sd = ndr_unpack(security.descriptor, ds_sd_ndr).as_sddl()
+
+            # Create a file system security descriptor
+            domain_sid = security.dom_sid(self.samdb.get_domain_sid())
+            sddl = dsacl2fsacl(ds_sd, domain_sid)
+            fs_sd = security.descriptor.from_sddl(sddl, domain_sid)
+
+            # Copy GPO directory
+            create_directory_hier(conn, sharepath)
+
+            # Set ACL
+            sio = ( security.SECINFO_OWNER |
+                    security.SECINFO_GROUP |
+                    security.SECINFO_DACL |
+                    security.SECINFO_PROTECTED_DACL )
+            conn.set_acl(sharepath, fs_sd, sio)
+
+            # Copy GPO files over SMB
+            copy_directory_local_to_remote(conn, gpodir, sharepath)
+
+            m = ldb.Message()
+            m.dn = gpo_dn
+            m['a02'] = ldb.MessageElement(displayname, ldb.FLAG_MOD_REPLACE, "displayName")
+            m['a03'] = ldb.MessageElement(unc_path, ldb.FLAG_MOD_REPLACE, "gPCFileSysPath")
+            m['a05'] = ldb.MessageElement("0", ldb.FLAG_MOD_REPLACE, "versionNumber")
+            m['a07'] = ldb.MessageElement("2", ldb.FLAG_MOD_REPLACE, "gpcFunctionalityVersion")
+            m['a04'] = ldb.MessageElement("0", ldb.FLAG_MOD_REPLACE, "flags")
+            controls=["permissive_modify:0"]
+            self.samdb.modify(m, controls=controls)
+        except Exception:
+            self.samdb.transaction_cancel()
+            raise
+        else:
+            self.samdb.transaction_commit()
+
+        self.outf.write("GPO '%s' created as %s\n" % (displayname, gpo))
+
+
+class cmd_del(Command):
+    """Delete a GPO."""
+
+    synopsis = "%prog <gpo> [options]"
+
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
+
+    takes_args = ['gpo']
+
+    takes_options = [
+        Option("-H", help="LDB URL for database or target server", type=str),
+        ]
+
+    def run(self, gpo, H=None, sambaopts=None, credopts=None,
+                versionopts=None):
+
+        self.lp = sambaopts.get_loadparm()
+        self.creds = credopts.get_credentials(self.lp, fallback_machine=True)
+
+        # We need to know writable DC to setup SMB connection
+        if H and H.startswith('ldap://'):
+            dc_hostname = H[7:]
+            self.url = H
+        else:
+            dc_hostname = netcmd_finddc(self.lp, self.creds)
+            self.url = dc_url(self.lp, self.creds, dc=dc_hostname)
+
+        samdb_connect(self)
+
+        # Check if valid GPO
+        try:
+            msg = get_gpo_info(self.samdb, gpo=gpo)[0]
+            unc_path = msg['gPCFileSysPath'][0]
+        except Exception:
+            raise CommandError("GPO '%s' does not exist" % gpo)
+
+        # Connect to DC over SMB
+        [dom_name, service, sharepath] = parse_unc(unc_path)
+        try:
+            conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
+        except Exception, e:
+            raise CommandError("Error connecting to '%s' using SMB" % dc_hostname, e)
+
+        self.samdb.transaction_start()
+        try:
+            # Check for existing links
+            msg = get_gpo_containers(self.samdb, gpo)
+
+            if len(msg):
+                self.outf.write("GPO %s is linked to containers\n" % gpo)
+                for m in msg:
+                    del_gpo_link(self.samdb, m['dn'], gpo)
+                    self.outf.write("    Removed link from %s.\n" % m['dn'])
+
+            # Remove LDAP entries
+            gpo_dn = get_gpo_dn(self.samdb, gpo)
+            self.samdb.delete(ldb.Dn(self.samdb, "CN=User,%s" % str(gpo_dn)))
+            self.samdb.delete(ldb.Dn(self.samdb, "CN=Machine,%s" % str(gpo_dn)))
+            self.samdb.delete(gpo_dn)
+
+            # Remove GPO files
+            conn.deltree(sharepath)
+
+        except Exception:
+            self.samdb.transaction_cancel()
+            raise
+        else:
+            self.samdb.transaction_commit()
+
+        self.outf.write("GPO %s deleted.\n" % gpo)
+
+
+class cmd_aclcheck(Command):
+    """Check all GPOs have matching LDAP and DS ACLs."""
+
+    synopsis = "%prog [options]"
+
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
+
+    takes_options = [
+        Option("-H", "--URL", help="LDB URL for database or target server", type=str,
+               metavar="URL", dest="H")
+        ]
+
+    def run(self, H=None, sambaopts=None, credopts=None, versionopts=None):
+
+        self.lp = sambaopts.get_loadparm()
+        self.creds = credopts.get_credentials(self.lp, fallback_machine=True)
+
+        self.url = dc_url(self.lp, self.creds, H)
+
+        # We need to know writable DC to setup SMB connection
+        if H and H.startswith('ldap://'):
+            dc_hostname = H[7:]
+            self.url = H
+        else:
+            dc_hostname = netcmd_finddc(self.lp, self.creds)
+            self.url = dc_url(self.lp, self.creds, dc=dc_hostname)
+
+        samdb_connect(self)
+
+        msg = get_gpo_info(self.samdb, None)
+
+        for m in msg:
+            # verify UNC path
+            unc = m['gPCFileSysPath'][0]
+            try:
+                [dom_name, service, sharepath] = parse_unc(unc)
+            except ValueError:
+                raise CommandError("Invalid GPO path (%s)" % unc)
+
+            # SMB connect to DC
+            try:
+                conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
+            except Exception:
+                raise CommandError("Error connecting to '%s' using SMB" % dc_hostname)
+
+            fs_sd = conn.get_acl(sharepath, security.SECINFO_OWNER | security.SECINFO_GROUP | security.SECINFO_DACL, security.SEC_FLAG_MAXIMUM_ALLOWED)
+
+            ds_sd_ndr = m['nTSecurityDescriptor'][0]
+            ds_sd = ndr_unpack(security.descriptor, ds_sd_ndr).as_sddl()
+
+            # Create a file system security descriptor
+            domain_sid = security.dom_sid(self.samdb.get_domain_sid())
+            expected_fs_sddl = dsacl2fsacl(ds_sd, domain_sid)
 
-class cmd_setacl(Command):
-    """Set ACL on a GPO"""
+            if (fs_sd.as_sddl(domain_sid) != expected_fs_sddl):
+                raise CommandError("Invalid GPO ACL %s on path (%s), should be %s" % (fs_sd.as_sddl(domain_sid), sharepath, expected_fs_sddl))
 
 
 class cmd_gpo(SuperCommand):
-    """Group Policy Object (GPO) commands"""
+    """Group Policy Object (GPO) management."""
 
     subcommands = {}
     subcommands["listall"] = cmd_listall()
@@ -770,8 +1168,10 @@ class cmd_gpo(SuperCommand):
     subcommands["getlink"] = cmd_getlink()
     subcommands["setlink"] = cmd_setlink()
     subcommands["dellink"] = cmd_dellink()
+    subcommands["listcontainers"] = cmd_listcontainers()
     subcommands["getinheritance"] = cmd_getinheritance()
     subcommands["setinheritance"] = cmd_setinheritance()
     subcommands["fetch"] = cmd_fetch()
     subcommands["create"] = cmd_create()
-    subcommands["setacl"] = cmd_setacl()
+    subcommands["del"] = cmd_del()
+    subcommands["aclcheck"] = cmd_aclcheck()