/mandos/trunk

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

« back to all changes in this revision

Viewing changes to init.d-mandos

  • Committer: teddy at bsnet
  • Date: 2011-12-25 00:40:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20111225004009-n5uimmac6h8djtv8
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
  (add_argument): Added "nonnull" attribute on the "arg" argument.
  (add_environment): Added "nonnull" attribute on the "def" argument.
  (print_out_password, free_plugin): Added "nonnull" attribute.
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/mandos-client.c (perror_plus): Bug fix; restore errno
                                           after fprintf().
* plugins.d/password-prompt.c (fprintf_plus): New.
 (conflict_detection/is_plymouth, main/parse_opt): Added "nonnull"
                                                   attribute.
 (conflict_detection/is_plymouth, conflict_detection, main): Bug fix;
                                                             Call
                                                             error_plus()
                                                             instead
                                                             of
                                                             error().
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/plymouth.c (exec_and_wait): Added "nonnull" attribute on
                                        the "path" and "argv"
                                        arguments.
  (is_plymouth): Added "nonnull" attribute.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init.d-mandos
1
1
#! /bin/sh
2
2
### BEGIN INIT INFO
3
3
# Provides:          mandos
4
 
# Required-Start:    $remote_fs $syslog avahi-daemon
5
 
# Required-Stop:     $remote_fs $syslog avahi-daemon
 
4
# Required-Start:    $remote_fs $syslog avahi
 
5
# Required-Stop:     $remote_fs $syslog avahi
6
6
# Default-Start:     2 3 4 5
7
7
# Default-Stop:      0 1 6
8
8
# Short-Description: Mandos server
9
 
# Description:       Server of encrypted passwords to Mandos clients
 
9
# Description:       Gives encrypted passwords to Mandos clients
10
10
### END INIT INFO
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.
14
17
 
15
18
# Do NOT "set -e"
16
19
 
20
23
NAME=mandos
21
24
DAEMON=/usr/sbin/$NAME
22
25
DAEMON_ARGS=""
23
 
if [ -d /run/. ]; then
24
 
    PIDFILE=/run/$NAME.pid
25
 
else
26
 
    PIDFILE=/var/run/$NAME.pid
27
 
fi
 
26
PIDFILE=/var/run/$NAME.pid
28
27
SCRIPTNAME=/etc/init.d/$NAME
29
28
 
30
29
# Exit if the package is not installed
41
40
. /lib/init/vars.sh
42
41
 
43
42
# Define LSB log_* functions.
44
 
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
45
 
# and status_of_proc is working.
 
43
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
46
44
. /lib/lsb/init-functions
47
45
 
48
46
#
120
118
                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
121
119
        esac
122
120
        ;;
123
 
  status)
124
 
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE" && exit 0 || exit $?
125
 
        ;;
126
121
  #reload|force-reload)
127
122
        #
128
123
        # If do_reload() is not implemented then leave this commented out
149
144
                esac
150
145
                ;;
151
146
          *)
152
 
                # Failed to stop
 
147
                # Failed to stop
153
148
                log_end_msg 1
154
149
                ;;
155
150
        esac
156
151
        ;;
157
152
  *)
158
153
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
159
 
        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 
154
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
160
155
        exit 3
161
156
        ;;
162
157
esac