sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-18 00:59:12 +03:00
Code Activity

s4-sites: Document, fix under optimal coding, use exceptions

Browse Source 
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Wed Nov  2 22:35:00 CET 2011 on sn-devel-104
This commit is contained in:
Matthieu Patou
2011-11-02 20:24:20 +01:00
committed by Matthieu Patou
parent 23d3880725
commit 2db221c384
3 changed files with 104 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source4/scripting/python/samba/netcmd/sites.py
View File

@ -23,7 +23,7 @@
import os
from samba import sites
from samba import Ldb
from samba.samdb import SamDB
from samba.auth import system_session
from samba.netcmd import (
Command,
@ -42,20 +42,20 @@ class cmd_sites_create(Command):
def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
name = "sam.ldb"
path = lp.get("private dir")
url = os.path.join(path, name)
url = lp.private_path("sam.ldb")
if not os.path.exists(url):
raise CommandError("secret database not found at %s " % url)
samdb = Ldb(url=url, session_info=system_session(),
credentials=creds, lp=lp)
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp)
samdb.transaction_start()
ok = sites.create_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
if not ok:
raise CommandError("Error while creating site %s" % sitename)
try:
ok = sites.create_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
except sites.SiteAlreadyExistsException, e:
samdb.transaction_cancel()
raise CommandError("Error while creating site %s, error: %s" % (sitename, str(e)))
self.outf.write("Site %s created !\n" % sitename)
@ -69,20 +69,20 @@ class cmd_sites_delete(Command):
def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
name = "sam.ldb"
path = lp.get("private dir")
url = os.path.join(path, name)
url = lp.private_path("sam.ldb")
if not os.path.exists(url):
raise CommandError("secret database not found at %s " % url)
samdb = Ldb(url=url, session_info=system_session(),
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp)
samdb.transaction_start()
ok = sites.delete_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
if not ok:
raise CommandError("Error while creating site %s" % sitename)
try:
ok = sites.delete_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
except sites.SiteException, e:
samdb.transaction_cancel()
raise CommandError("Error while removing site %s, error: %s" % (sitename, str(e)))
self.outf.write("Site %s removed!\n" % sitename)