/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 initramfs-tools-script

  • Committer: Teddy Hogeborn
  • Date: 2014-03-06 02:26:04 UTC
  • Revision ID: teddy@recompile.se-20140306022604-4uc43taz25cflgi3
Bug fix: Free all memory and give better messages when memory is full.

* plugin-runner.c (add_to_char_array): Bug fix: If realloc fails, do
                                       not change old array pointer.
  (add_environment): Bug fix: If realloc fails, do not change old
                     environment pointer.  Also rename "e" to "envdef"
                     for clarity.
  (main): Bug fix: If realloc fails, do not change old pointers.  Also
          wrap "#pragma GCC" with "#ifdef ___GNUC___".
* plugins.d/mandos-client.c (incbuffer): Bug fix: if realloc fails,
                                         free old buffer.
  (run_network_hooks): Moved variables "directory" and "ret" to their
                       innermost possible scope.
  (take_down_interface): Moved variables "sd", "ret_errno", and
                         "ret_setflags" to their innermost possible
                         scope.
  (main): Removed variable "interfaces_hooks_size".  Also, if argz_add
          fails when adding all found interfaces, the error message
          will now be correct.  Also print error message if, after
          having taken up an interface, argz_add fails to add
          interface to list of interfaces to be taken down.
* plugins.d/mandos-client.xml (OPTIONS): Explain better what "none"
                                         means as argument to
                                         "--interface" by negating
                                         sense.
* plugins.d/password-prompt.c (fprintf_plus): Removed (unused).

Show diffs side-by-side

added added

removed removed

Lines of Context:
108
108
 
109
109
# Our keyscript
110
110
mandos=/lib/mandos/plugin-runner
 
111
test -x "$mandos"
111
112
 
112
113
# parse /conf/conf.d/cryptroot.  Format:
113
114
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz
149
150
else
150
151
    rm /conf/conf.d/cryptroot.mandos
151
152
fi
152
 
 
153
 
## Work around Debian bug #633582: <http://bugs.debian.org/633582>
154
 
# First determine the mandos user and group ID
155
 
mandos_user="65534"
156
 
mandos_group="65534"
157
 
while read line; do
158
 
    line="${line%%#*}"
159
 
    TEMP=`getopt --quiet --longoptions userid:,groupid: -- $line`
160
 
    eval set -- "$TEMP"
161
 
    while true; do
162
 
        case "$1" in
163
 
            --userid) mandos_user="$2"; shift 2;;
164
 
            --groupid) mandos_group="$2"; shift 2;;
165
 
            --) shift; break;;
166
 
        esac
167
 
    done
168
 
done < /conf/conf.d/mandos/plugin-runner.conf
169
 
chown "${mandos_user}:${mandos_group}" \
170
 
    /lib/mandos/plugins.d \
171
 
    /conf/conf.d/mandos/pubkey.txt \
172
 
    /conf/conf.d/mandos/seckey.txt