Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Samir
bind-dnssec
Commits
c6444033
Commit
c6444033
authored
Sep 03, 2016
by
Valentin Samir
Browse files
style
parent
4c472095
Changes
1
Hide whitespace changes
Inline
Side-by-side
routine.py
View file @
c6444033
...
@@ -76,6 +76,7 @@ def bind_chown(path):
...
@@ -76,6 +76,7 @@ def bind_chown(path):
except
KeyError
:
except
KeyError
:
sys
.
stderr
.
write
(
"User bind not found, failing to give keys ownership to bind
\n
"
)
sys
.
stderr
.
write
(
"User bind not found, failing to give keys ownership to bind
\n
"
)
def
bind_reload
():
def
bind_reload
():
cmd
=
[
"/usr/sbin/rndc"
,
"reload"
]
cmd
=
[
"/usr/sbin/rndc"
,
"reload"
]
p
=
subprocess
.
Popen
(
cmd
)
p
=
subprocess
.
Popen
(
cmd
)
...
@@ -268,16 +269,16 @@ class Key(object):
...
@@ -268,16 +269,16 @@ class Key(object):
needed_date_name
,
needed_date_name
,
self
.
keyid
,
self
.
keyid
,
self
.
zone_name
self
.
zone_name
)
)
)
)
def
_date_check2
(
self
,
value
,
needed_date
,
value_name
,
needed_date_name
):
def
_date_check2
(
self
,
value
,
needed_date
,
value_name
,
needed_date_name
):
msg
=
"Cannot set %s date after %s date on key %s on zone %s"
%
(
msg
=
"Cannot set %s date after %s date on key %s on zone %s"
%
(
value_name
,
value_name
,
needed_date_name
,
needed_date_name
,
self
.
keyid
,
self
.
keyid
,
self
.
zone_name
self
.
zone_name
)
)
if
value
is
None
and
needed_date
is
not
None
:
if
value
is
None
and
needed_date
is
not
None
:
raise
RuntimeError
(
msg
)
raise
RuntimeError
(
msg
)
elif
value
is
not
None
and
needed_date
is
not
None
:
elif
value
is
not
None
and
needed_date
is
not
None
:
...
@@ -569,7 +570,10 @@ if __name__ == '__main__':
...
@@ -569,7 +570,10 @@ if __name__ == '__main__':
if
args
.
ZSK
:
if
args
.
ZSK
:
for
zone
in
zones
:
for
zone
in
zones
:
zone
.
key
(
show_zsk
=
True
)
zone
.
key
(
show_zsk
=
True
)
if
not
any
([
args
.
make
,
args
.
cron
,
args
.
ds
,
args
.
key
,
args
.
ds_seen
,
args
.
nsec3
,
args
.
KSK
,
args
.
ZSK
]):
if
not
any
([
args
.
make
,
args
.
cron
,
args
.
ds
,
args
.
key
,
args
.
ds_seen
,
args
.
nsec3
,
args
.
KSK
,
args
.
ZSK
]):
parser
.
print_help
()
parser
.
print_help
()
except
ValueError
as
error
:
except
ValueError
as
error
:
sys
.
stderr
.
write
(
"%s
\n
"
%
error
)
sys
.
stderr
.
write
(
"%s
\n
"
%
error
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment