diff options
| author | Christian Heimes <cheimes@redhat.com> | 2015-09-10 11:54:32 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-09-10 13:29:56 +0200 |
| commit | a3d077443fc7f15c005f86aeed40443d0a0843a1 (patch) | |
| tree | f1c20de093344a91a829dacdf412bab989e9084d /install | |
| parent | 9ffe7f49987bf788449a2007a33f0a3d83ea4553 (diff) | |
| download | freeipa-a3d077443fc7f15c005f86aeed40443d0a0843a1.tar.gz freeipa-a3d077443fc7f15c005f86aeed40443d0a0843a1.tar.xz freeipa-a3d077443fc7f15c005f86aeed40443d0a0843a1.zip | |
Handle timeout error in ipa-httpd-kdcproxy
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>
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-httpd-kdcproxy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/install/tools/ipa-httpd-kdcproxy b/install/tools/ipa-httpd-kdcproxy index 60b22f2cc..5e9863f8b 100755 --- a/install/tools/ipa-httpd-kdcproxy +++ b/install/tools/ipa-httpd-kdcproxy @@ -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. """ import os +import socket import sys from ipalib import api, errors @@ -81,7 +82,7 @@ class KDCProxyConfig(object): # EXTERNAL bind as root user self.con.ldapi = True 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 raise CheckError(msg) except errors.AuthorizationError as e: |