From 63e937cf144f0c61811bb6d842cfc22838a6b851 Mon Sep 17 00:00:00 2001
From: James Bowes <jbowes@redhat.com>
Date: Tue, 2 Oct 2007 21:51:13 -0400
Subject: Fix up recursive pylint and pychecker rules.

---
 scripts/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Makefile b/scripts/Makefile
index 86a3db8..a4cc7e1 100755
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -15,5 +15,6 @@ pychecker::
 	@$(PYCHECKER) $(PYFILES) || exit 0
 
 pyflakes::
+ifneq ($(PYFILES)x, x)
 	@$(PYFLAKES) $(PYFILES) || exit 0
-
+endif
-- 
cgit 


From 5dfdff8f110d8336b4812497428cd5dd1fae2db0 Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Wed, 3 Oct 2007 17:33:43 -0400
Subject: - add certmaster-ca --clean option to clean out other certs/csrs -
 make certmaster-ca output usage if no options passed

---
 scripts/certmaster-ca | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/certmaster-ca b/scripts/certmaster-ca
index d103265..f7982ca 100755
--- a/scripts/certmaster-ca
+++ b/scripts/certmaster-ca
@@ -6,6 +6,8 @@
 # --clean? not sure what it will do
 
 import sys
+import glob
+import os
 
 import func
 import func.certs
@@ -20,23 +22,35 @@ def errorprint(stuff):
 
 
 def parseargs(args):
-    usage = 'certmaster-ca [options]'
+    usage = 'certmaster-ca <option> [args]'
     parser = OptionParser(usage=usage)
     
     parser.add_option('-l', '--list', default=False, action="store_true",
           help='list signing requests remaining')
     parser.add_option('-s', '--sign', default=False, action="store_true",
           help='sign requests of hosts specified')
-    
+    parser.add_option('-c', '--clean', default=False, action="store_true",
+          help="clean out all certs or csrs for the hosts specified")
+          
     (opts, args) = parser.parse_args()
-    # XXX FIXME check for obviously impossible things and exit, etc
     
+    
+    if not opts.list and not opts.sign and not opts.clean:
+        parser.print_help()
+        sys.exit(1)
+            
     return (opts, args)
 
 def main(args):
+    if os.geteuid() != 0:
+        errorprint('Must be root to run certmaster-ca')
+        return 1
+        
     cm = func.certmaster.CertMaster('/etc/func/certmaster.conf')
     
     (opts, args) = parseargs(args)
+
+        
     if opts.list:
         hns = cm.get_csrs_waiting()
         if hns:
@@ -57,7 +71,26 @@ def main(args):
             certfile = cm.sign_this_csr(csrfile)
             print '%s signed - cert located at %s' % (hn, certfile)
         return 0
+    
+    if opts.clean:
+        if not args:
+            errorprint('Need hostname(s) to clean up')
+            return 1
+        
+        for hn in args:
+            csrglob = '%s/%s.csr' % (cm.cfg.csrroot, hn)
+            csrs = glob.glob(csrglob)
+            certglob = '%s/%s.cert' % (cm.cfg.certroot, hn)
+            certs = glob.glob(certglob)
+            if not csrs and not certs:
+                errorprint('No match for %s to clean up' % hn)
+                continue
+            
+            for fn in csrs + certs:
+                print 'Cleaning out %s for host matching %s' % (fn, hn)
+                os.unlink(fn)
         
+        return 0
 
 if __name__ == "__main__":
     sys.exit(main(sys.argv[1:]))
-- 
cgit