Commit 8126c2e0 authored by Andreas Jung's avatar Andreas Jung

fixed some wrong isinstance() conversations

parent 40e83ab4
...@@ -733,7 +733,7 @@ try: ...@@ -733,7 +733,7 @@ try:
zLOG.LOG("z2", zLOG.WARNING, 'Monitor server not started' zLOG.LOG("z2", zLOG.WARNING, 'Monitor server not started'
' because no emergency user exists.') ' because no emergency user exists.')
if pw: if pw:
if ininstance(MONITOR_PORT, IntType): if isinstance(MONITOR_PORT, IntType):
MONITOR_PORT=((IP_ADDRESS, MONITOR_PORT),) MONITOR_PORT=((IP_ADDRESS, MONITOR_PORT),)
for address, port in MONITOR_PORT: for address, port in MONITOR_PORT:
monitor=secure_monitor_server( monitor=secure_monitor_server(
...@@ -792,10 +792,10 @@ try: ...@@ -792,10 +792,10 @@ try:
try: UID = string.atoi(UID) try: UID = string.atoi(UID)
except: pass except: pass
gid = None gid = None
if instance(UID, StringType): if isinstance(UID, StringType):
uid = pwd.getpwnam(UID)[2] uid = pwd.getpwnam(UID)[2]
gid = pwd.getpwnam(UID)[3] gid = pwd.getpwnam(UID)[3]
elif instance(UID, IntType): elif isinstance(UID, IntType):
uid = pwd.getpwuid(UID)[2] uid = pwd.getpwuid(UID)[2]
gid = pwd.getpwuid(UID)[3] gid = pwd.getpwuid(UID)[3]
UID = pwd.getpwuid(UID)[0] UID = pwd.getpwuid(UID)[0]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment