func/commonconfig.py func/forkbomb.py

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



 func/commonconfig.py |    2 ++
 func/forkbomb.py     |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2fb87602b573b6e6dd21ab000da79804b3ea10f5
Author: Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>
Date:   Mon Jul 26 12:52:30 2010 -0400

    - add a crl_option to the config
    - use mkstemp not mktemp b/c it is not insecure

diff --git a/func/commonconfig.py b/func/commonconfig.py
index 76607a4..ab2ce04 100644
--- a/func/commonconfig.py
+++ b/func/commonconfig.py
@@ -33,6 +33,7 @@ class FuncdConfig(BaseConfig):
     ca_file = Option('')
     cert_file = Option('')
     key_file = Option('')
+    crl_location = Option('')
 
 class OverlordConfig(BaseConfig):
     socket_timeout = FloatOption(0)
@@ -47,4 +48,5 @@ class OverlordConfig(BaseConfig):
     puppet_signed_certs_dir = Option('/var/lib/puppet/ssl/ca/signed')
     puppet_crl = Option('/var/lib/puppet/ssl/ca/ca_crl.pem')
     host_down_list = Option('/var/lib/func/hosts_down.lst')
+
     
diff --git a/func/forkbomb.py b/func/forkbomb.py
index 0168e8a..71e068b 100644
--- a/func/forkbomb.py
+++ b/func/forkbomb.py
@@ -31,7 +31,7 @@ def __get_storage(dir):
     dir = os.path.expanduser(dir)
     if not os.path.exists(dir):
         os.makedirs(dir)
-    return tempfile.mktemp(suffix='', prefix='asynctmp', dir=dir)
+    return tempfile.mkstemp(suffix='', prefix='asynctmp', dir=dir)
 
 def __access_buckets(filename,clear,new_key=None,new_value=None):
     """


_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list


[Index of Archives]     [Fedora Users]     [Linux Networking]     [Fedora Legacy List]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux