/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-hook

  • Committer: Teddy Hogeborn
  • Date: 2016-02-21 12:43:51 UTC
  • Revision ID: teddy@recompile.se-20160221124351-3g9bc5eu90at8yis
plugin-runner.c: Use size_t to realloc() for custom plugin args.

* plugin-runner.c (main): Cast argument to realloc() to size_t when
                          allocating additional custom plugin command
                          line arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
232
232
    esac
233
233
done
234
234
# Use Diffie-Hellman parameters file if available
235
 
if [ -e "${DESTDIR}${CONFDIR}"/client-dhparams.pem ]; then
 
235
if [ -e "${DESTDIR}${CONFDIR}"/dhparams.pem ]; then
236
236
    sed --in-place \
237
 
        --expression="1i--options-for=mandos-client:--dh-params=${CONFDIR}/client-dhparams.pem" \
 
237
        --expression="1i--options-for=mandos-client:--dh-params=${CONFDIR}/dhparams.pem" \
238
238
        "${DESTDIR}/${CONFDIR}/plugin-runner.conf"
239
239
fi
240
240
 
266
266
done
267
267
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
268
268
    if [ -d "$dir" ]; then
269
 
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
270
 
            | xargs --null --no-run-if-empty chmod a+rX
 
269
        find "$dir" \! -perm -u+rw,g+r -prune -or \! -type l -print0 \
 
270
            | xargs --null --no-run-if-empty chmod a+rX --
271
271
    fi
272
272
done