6 files changed, 22 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html
index 533dcc79e..67ff1fc36 100644
--- a/src/lib/Bcfg2/Reporting/templates/base.html
+++ b/src/lib/Bcfg2/Reporting/templates/base.html
@@ -88,7 +88,7 @@
   <div style='clear:both'></div>
 </div><!-- document -->
   <div id="footer">
-    <span>Bcfg2 Version 1.3.0rc2</span>
+    <span>Bcfg2 Version 1.3.0</span>
     </div>
 
 <div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>
diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index 14065980d..f2d6d7efa 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -174,8 +174,6 @@ class Init(Bcfg2.Server.Admin.Mode):
             self.data['certpath'] = os.path.join(basepath, 'bcfg2.crt')
 
     def __call__(self, args):
-        Bcfg2.Server.Admin.Mode.__call__(self, args)
-
         # Parse options
         opts = Bcfg2.Options.OptionParser(self.options)
         opts.parse(args)
@@ -292,7 +290,7 @@ class Init(Bcfg2.Server.Admin.Mode):
                              "created [%s]: " % self.data['keypath'])
         if keypath:
             self.data['keypath'] = keypath
-        certpath = safe_input("Path where Bcfg2 server cert will be created"
+        certpath = safe_input("Path where Bcfg2 server cert will be created "
                               "[%s]: " % self.data['certpath'])
         if certpath:
             self.data['certpath'] = certpath
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 782aafbf1..6f642e347 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -2,13 +2,14 @@
 implementations inherit from. """
 
 import os
-import atexit
-import logging
-import select
 import sys
-import threading
 import time
+import atexit
+import select
+import signal
+import logging
 import inspect
+import threading
 import lxml.etree
 import Bcfg2.settings
 import Bcfg2.Server
@@ -285,6 +286,14 @@ class BaseCore(object):
         #: The CA that signed the server cert
         self.ca = setup['ca']
 
+        def hdlr(sig, frame):  # pylint: disable=W0613
+            """ Handle SIGINT/Ctrl-C by shutting down the core and exiting
+            properly. """
+            self.shutdown()
+            os._exit(1)  # pylint: disable=W0212
+
+        signal.signal(signal.SIGINT, hdlr)
+
         #: The FAM :class:`threading.Thread`,
         #: :func:`_file_monitor_thread`
         self.fam_thread = \
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index 33565b4ad..2a10da417 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -43,7 +43,7 @@ def is_octal_mode(val):
 def is_username(val):
     """ Return True if val is a string giving either a positive
     integer uid, or a valid Unix username """
-    return re.match(r'^([a-z][-_a-z0-9]{0,30}|\d+)$', val)
+    return re.match(r'^([A-z][-_A-z0-9]{0,30}|\d+)$', val)
 
 
 def is_device_mode(val):
diff --git a/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py b/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py
index 0dd42c9cb..490ee6f20 100644
--- a/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py
+++ b/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py
@@ -15,6 +15,11 @@ class POSIXCompat(Bcfg2.Server.Plugin.Plugin,
 
     def validate_goals(self, metadata, goals):
         """Verify that we are generating correct old POSIX entries."""
+        if metadata.version_info and metadata.version_info > (1, 3, 0, '', 0):
+            # do not care about a client that is _any_ 1.3.0 release
+            # (including prereleases and RCs)
+            return
+
         for goal in goals:
             for entry in goal.getchildren():
                 if entry.tag == 'Path' and 'mode' in entry.keys():
diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py
index 8223d7543..9ecd7f32d 100644
--- a/src/lib/Bcfg2/version.py
+++ b/src/lib/Bcfg2/version.py
@@ -2,7 +2,7 @@
 
 import re
 
-__version__ = "1.3.0rc2"
+__version__ = "1.3.0"
 
 
 class Bcfg2VersionInfo(tuple):