|
 |
1070a0 |
diff -rupN cobbler-2.0.7.old/cobbler/api.py cobbler-2.0.7/cobbler/api.py
|
|
|
1070a0 |
--- cobbler-2.0.7.old/cobbler/api.py 2015-05-06 14:47:57.860206615 -0400
|
|
|
1070a0 |
+++ cobbler-2.0.7/cobbler/api.py 2015-05-06 15:09:40.455772584 -0400
|
|
|
1070a0 |
@@ -179,11 +179,9 @@ class BootAPI:
|
|
|
1070a0 |
API instance, regardless of the serializer type.
|
|
|
1070a0 |
"""
|
|
|
1070a0 |
if not os.path.exists("/var/lib/cobbler/.mtime"):
|
|
|
1070a0 |
- old = os.umask(0x777)
|
|
|
1070a0 |
- fd = open("/var/lib/cobbler/.mtime","w")
|
|
|
1070a0 |
- fd.write("0")
|
|
|
1070a0 |
- fd.close()
|
|
|
1070a0 |
- os.umask(old)
|
|
|
1070a0 |
+ fd = os.open("/var/lib/cobbler/.mtime", os.O_CREAT|os.O_RDWR, 0200)
|
|
|
1070a0 |
+ os.write(fd, "0")
|
|
|
1070a0 |
+ os.close(fd)
|
|
|
1070a0 |
return 0
|
|
|
1070a0 |
fd = open("/var/lib/cobbler/.mtime")
|
|
|
1070a0 |
data = fd.read().strip()
|
|
|
1070a0 |
diff -rupN cobbler-2.0.7.old/cobbler/cobblerd.py cobbler-2.0.7/cobbler/cobblerd.py
|
|
|
1070a0 |
--- cobbler-2.0.7.old/cobbler/cobblerd.py 2015-05-06 14:47:57.856206586 -0400
|
|
|
1070a0 |
+++ cobbler-2.0.7/cobbler/cobblerd.py 2015-05-06 15:23:17.605662935 -0400
|
|
|
1070a0 |
@@ -58,10 +58,9 @@ def regen_ss_file():
|
|
|
1070a0 |
fd = open("/dev/urandom")
|
|
|
1070a0 |
data = fd.read(512)
|
|
|
1070a0 |
fd.close()
|
|
|
1070a0 |
- fd = open("/var/lib/cobbler/web.ss","w+")
|
|
|
1070a0 |
- fd.write(binascii.hexlify(data))
|
|
|
1070a0 |
- fd.close()
|
|
|
1070a0 |
- utils.os_system("chmod 700 /var/lib/cobbler/web.ss")
|
|
|
1070a0 |
+ fd = os.open("/var/lib/cobbler/web.ss", os.O_CREAT|os.O_RDWR, 0600)
|
|
|
1070a0 |
+ os.write(fd, binascii.hexlify(data))
|
|
|
1070a0 |
+ os.close(fd)
|
|
|
1070a0 |
utils.os_system("chown apache /var/lib/cobbler/web.ss")
|
|
|
1070a0 |
return 1
|
|
|
1070a0 |
|
|
|
1070a0 |
diff -rupN cobbler-2.0.7.old/cobbler/serializer.py cobbler-2.0.7/cobbler/serializer.py
|
|
|
1070a0 |
--- cobbler-2.0.7.old/cobbler/serializer.py 2015-05-06 14:47:57.858206601 -0400
|
|
|
1070a0 |
+++ cobbler-2.0.7/cobbler/serializer.py 2015-05-06 15:24:31.318192455 -0400
|
|
|
1070a0 |
@@ -64,11 +64,9 @@ def __release_lock(with_changes=False):
|
|
|
1070a0 |
# this file is used to know when the last config change
|
|
|
1070a0 |
# was made -- allowing the API to work more smoothly without
|
|
|
1070a0 |
# a lot of unneccessary reloads.
|
|
|
1070a0 |
- old = os.umask(0x777)
|
|
|
1070a0 |
- fd = open("/var/lib/cobbler/.mtime","w")
|
|
|
1070a0 |
- fd.write("%f" % time.time())
|
|
|
1070a0 |
- fd.close()
|
|
|
1070a0 |
- os.umask(old)
|
|
|
1070a0 |
+ fd = os.open("/var/lib/cobbler/.mtime", os.O_CREAT|os.O_RDWR, 0200)
|
|
|
1070a0 |
+ os.write(fd, "%f" % time.time())
|
|
|
1070a0 |
+ os.close(fd)
|
|
|
1070a0 |
if LOCK_ENABLED:
|
|
|
1070a0 |
LOCK_HANDLE = open("/var/lib/cobbler/lock","r")
|
|
|
1070a0 |
fcntl.flock(LOCK_HANDLE.fileno(), fcntl.LOCK_UN)
|