diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-22 16:06:45 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2 (patch) | |
| tree | e14721c8fee437c408319276568954cf81310600 /ipaserver/dcerpc.py | |
| parent | f919ab4ee0ec26d77ee6978e75de5daba4073402 (diff) | |
| download | freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.tar.gz freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.tar.xz freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.zip | |
ipautil: remove SHARE_DIR and PLUGIN_SHARE_DIR
SHARE_DIR and PLUGIN_SHARE_DIR depend on ipaplatform.
Replace all uses of SHARE_DIR with paths.USR_SHARE_IPA_DIR and remove
both SHARE_DIR and PLUGIN_SHARE_DIR.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/dcerpc.py')
| -rw-r--r-- | ipaserver/dcerpc.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index 097637f75..e37d0ebdd 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -804,7 +804,8 @@ class DomainValidator(object): if not self._creds: self._parm = param.LoadParm() - self._parm.load(os.path.join(ipautil.SHARE_DIR, "smb.conf.empty")) + self._parm.load( + os.path.join(paths.USR_SHARE_IPA_DIR, "smb.conf.empty")) self._parm.set('netbios name', self.flatname) self._creds = credentials.Credentials() self._creds.set_kerberos_state(credentials.MUST_USE_KERBEROS) @@ -868,7 +869,7 @@ class TrustDomainInstance(object): def __init__(self, hostname, creds=None): self.parm = param.LoadParm() - self.parm.load(os.path.join(ipautil.SHARE_DIR, "smb.conf.empty")) + self.parm.load(os.path.join(paths.USR_SHARE_IPA_DIR, "smb.conf.empty")) if len(hostname) > 0: self.parm.set('netbios name', hostname) self.creds = creds |