/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to init.d-mandos

  • Committer: Teddy Hogeborn
  • Date: 2019-02-10 08:41:14 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 372.
  • Revision ID: teddy@recompile.se-20190210084114-u91mijrxtifvzra5
Bug fix: Only create TLS key with certtool, and read correct key file

* debian/mandos-client.postinst (create_keys): Remove any bad keys
                                               created by 1.8.0-1.
                                               Only create TLS keys if
                                               certtool succeeds.
* debian/mandos.postinst (configure): Remove any bad keys from
                                      clients.conf, and inform the
                                      user if any were found.
* debian/mandos.templates (mandos/removed_bad_key_ids): New message.
* mandos (MandosServer.handle_ipc): Do not trust a key_id with a known
                                    bad key ID.
* mandos-keygen (keygen): Only create TLS keys if certtool succeeds.
  (password): Bug fix: Generate key_id correctly, and only output
              key_id if TLS key exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init.d-mandos
11
11
 
12
12
# Author: Teddy Hogeborn <teddy@recompile.se>
13
13
# Author: Björn Påhlsson <belorn@recompile.se>
14
 
#
15
 
# Please remove the "Author" lines above and replace them
16
 
# with your own name if you copy and modify this script.
17
14
 
18
15
# Do NOT "set -e"
19
16
 
44
41
. /lib/init/vars.sh
45
42
 
46
43
# Define LSB log_* functions.
47
 
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present.
 
44
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
 
45
# and status_of_proc is working.
48
46
. /lib/lsb/init-functions
49
47
 
50
48
#
122
120
                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
123
121
        esac
124
122
        ;;
 
123
  status)
 
124
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE" && exit 0 || exit $?
 
125
        ;;
125
126
  #reload|force-reload)
126
127
        #
127
128
        # If do_reload() is not implemented then leave this commented out
148
149
                esac
149
150
                ;;
150
151
          *)
151
 
                # Failed to stop
 
152
                # Failed to stop
152
153
                log_end_msg 1
153
154
                ;;
154
155
        esac
155
156
        ;;
156
 
  status)
157
 
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE"
158
 
        ;;
159
157
  *)
160
158
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
161
 
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
 
159
        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
162
160
        exit 3
163
161
        ;;
164
162
esac