IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle timeout error in ipa-httpd-kdcproxy

Browse Source 
The ipa-httpd-kdcproxy script now handles LDAP timeout errors correctly.
A timeout does no longer result into an Apache startup error.

https://fedorahosted.org/freeipa/ticket/5292

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Christian Heimes
2015-09-10 11:54:32 +02:00
committed by Martin Basti
parent 9ffe7f4998
commit a3d077443f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install/tools/ipa-httpd-kdcproxy
View File

@@ -24,6 +24,7 @@ This script creates or removes the symlink from /etc/ipa/ipa-kdc-proxy.conf
to /etc/httpd/conf.d/. It's called from ExecStartPre hook in httpd.service. to /etc/httpd/conf.d/. It's called from ExecStartPre hook in httpd.service.
""" """
import os import os
import socket
import sys import sys
from ipalib import api, errors from ipalib import api, errors
@@ -81,7 +82,7 @@ class KDCProxyConfig(object):
# EXTERNAL bind as root user # EXTERNAL bind as root user
self.con.ldapi = True self.con.ldapi = True
self.con.do_bind(timeout=self.time_limit) self.con.do_bind(timeout=self.time_limit)
except errors.NetworkError as e: except (errors.NetworkError, socket.timeout) as e:
msg = 'Unable to connect to dirsrv: %s' % e msg = 'Unable to connect to dirsrv: %s' % e
raise CheckError(msg) raise CheckError(msg)
except errors.AuthorizationError as e: except errors.AuthorizationError as e: