summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cobbler.spec4
-rw-r--r--cobbler/item.py5
-rw-r--r--cobbler/item_repo.py8
-rw-r--r--cobbler/item_system.py9
-rw-r--r--cobbler/webui/master.py4
5 files changed, 16 insertions, 14 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 911399a..a84d634 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -3,7 +3,7 @@ Summary: Boot server configurator
Name: cobbler
AutoReq: no
Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
@@ -190,7 +190,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1
+* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-2
- Upstream changes (see CHANGELOG)
* Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1
diff --git a/cobbler/item.py b/cobbler/item.py
index db73820..78c8041 100644
--- a/cobbler/item.py
+++ b/cobbler/item.py
@@ -116,8 +116,9 @@ class Item(serializable.Serializable):
raise CX(_("self parentage is weird"))
if type(name) != type(""):
raise CX(_("name must be a string"))
- if not name.isalnum():
- raise CX(_("name must be alphanumeric"))
+ for x in name:
+ if not x.isalnum() and not x in [ "-", ".", ":", "+" ] :
+ raise CX(_("invalid characters in name"))
self.name = name
return True
diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py
index a7b1f3b..ca9e94f 100644
--- a/cobbler/item_repo.py
+++ b/cobbler/item_repo.py
@@ -57,14 +57,6 @@ class Repo(item.Item):
return self
- def set_name(self,name):
- """
- A name can be anything. It's a string, though best values are something like "fc6extras"
- or "myrhel4stuff"
- """
- self.name = name # we check it add time, but store the original value.
- return True
-
def set_mirror(self,mirror):
"""
A repo is (initially, as in right now) is something that can be rsynced.
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index 936f1dd..f5b16ca 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -147,6 +147,15 @@ class System(item.Item):
"""
intf = self.__get_interface("intf0")
+
+ if self.name not in ["",None] and self.parent not in ["",None] and self.name == self.parent:
+ raise CX(_("self parentage is weird"))
+ if type(name) != type(""):
+ raise CX(_("name must be a string"))
+ for x in name:
+ if not x.isalnum() and not x in [ "-", ".", ":", "+" ] :
+ raise CX(_("invalid characters in name"))
+
if utils.is_mac(name):
if intf["mac_address"] == "":
intf["mac_address"] = name
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index 6881059..56b93f6 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,8 +33,8 @@ VFN=valueForName
currentTime=time.time
__CHEETAH_version__ = '2.0.1'
__CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0)
-__CHEETAH_genTime__ = 1207674205.841289
-__CHEETAH_genTimestamp__ = 'Tue Apr 8 13:03:25 2008'
+__CHEETAH_genTime__ = 1207678316.193969
+__CHEETAH_genTimestamp__ = 'Tue Apr 8 14:11:56 2008'
__CHEETAH_src__ = 'webui_templates/master.tmpl'
__CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008'
__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'