summaryrefslogtreecommitdiffstats
path: root/ipa-radius-server
diff options
context:
space:
mode:
Diffstat (limited to 'ipa-radius-server')
-rw-r--r--ipa-radius-server/Makefile4
-rw-r--r--ipa-radius-server/ipa-radius-install1
-rwxr-xr-xipa-radius-server/ipa-radius-server.spec11
-rwxr-xr-xipa-radius-server/ipa-radius-server.spec.in13
-rw-r--r--ipa-radius-server/plugins/radiusinstance.py4
5 files changed, 13 insertions, 20 deletions
diff --git a/ipa-radius-server/Makefile b/ipa-radius-server/Makefile
index 7de51b469..fa73de97c 100644
--- a/ipa-radius-server/Makefile
+++ b/ipa-radius-server/Makefile
@@ -7,7 +7,7 @@ all:
install:
-mkdir -p $(PLUGINS_SHARE)
-mkdir -p $(PLUGINS_PYTHON)
- -mkdir -p $(PLUGINS_SBINDIR)
+ -mkdir -p $(SBINDIR)
install -m 644 plugins/*.py $(PLUGINS_PYTHON)
install -m 644 share/*.template $(PLUGINS_SHARE)
install -m 755 ipa-radius-install $(SBINDIR)
@@ -17,4 +17,4 @@ clean:
distclean: clean
-test: \ No newline at end of file
+test:
diff --git a/ipa-radius-server/ipa-radius-install b/ipa-radius-server/ipa-radius-install
index 3e759d8d2..8ed3aabb6 100644
--- a/ipa-radius-server/ipa-radius-install
+++ b/ipa-radius-server/ipa-radius-install
@@ -19,7 +19,6 @@
#
import sys
-sys.path.append("/usr/share/ipa")
import traceback, logging, krbV
diff --git a/ipa-radius-server/ipa-radius-server.spec b/ipa-radius-server/ipa-radius-server.spec
index 4c533fda3..6ce2abe88 100755
--- a/ipa-radius-server/ipa-radius-server.spec
+++ b/ipa-radius-server/ipa-radius-server.spec
@@ -1,10 +1,10 @@
Name: ipa-radius-server
Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: IPA authentication server - radius plugin
Group: System Environment/Base
-License: GPL
+License: GPLv2+
URL: http://www.freeipa.org
Source0: %{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,12 +42,11 @@ rm -rf %{buildroot}
%{_usr}/share/ipa/ipaserver/plugins/*
%changelog
+* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-2
+- Fixed License in specfile
+
* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
- Version bump for release
* Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Initial version
-
-
-
-
diff --git a/ipa-radius-server/ipa-radius-server.spec.in b/ipa-radius-server/ipa-radius-server.spec.in
index f6569b691..02d6328ee 100755
--- a/ipa-radius-server/ipa-radius-server.spec.in
+++ b/ipa-radius-server/ipa-radius-server.spec.in
@@ -1,10 +1,10 @@
Name: ipa-radius-server
Version: VERSION
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: IPA authentication server - radius plugin
Group: System Environment/Base
-License: GPL
+License: GPLv2+
URL: http://www.freeipa.org
Source0: %{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,12 +42,11 @@ rm -rf %{buildroot}
%{_usr}/share/ipa/ipaserver/plugins/*
%changelog
-* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - VERSION-1
+* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-2
+- Fixed License in specfile
+
+* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
- Version bump for release
* Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Initial version
-
-
-
-
diff --git a/ipa-radius-server/plugins/radiusinstance.py b/ipa-radius-server/plugins/radiusinstance.py
index 731cd65a1..2048788a4 100644
--- a/ipa-radius-server/plugins/radiusinstance.py
+++ b/ipa-radius-server/plugins/radiusinstance.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
# Authors: John Dennis <jdennis@redhat.com>
#
# Copyright (C) 2007 Red Hat
@@ -18,9 +17,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-import sys
-sys.path.append("/usr/share/ipa")
-
import subprocess
import string
import tempfile