/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 plugins.d/splashy

  • Committer: Teddy Hogeborn
  • Date: 2014-03-10 06:55:54 UTC
  • Revision ID: teddy@recompile.se-20140310065554-of3kz8jdhlll42l3
Use "struct sockaddr_storage" instead of a union in mandos-client.

Apparently using struct sockaddr_storage the way POSIX intended is
incompatible with strict aliasing, so turn that off in the Makefile.

* plugins.d/mandos-client.c (start_mandos_communication): Change "to"
                                                          from a union
                                                          to a struct
                                                          sockaddr_storage.
* Makefile (OPTIMIZE): Add "-fno-strict-aliasing".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy
1
 
#!/bin/sh -e
2
 
 
3
 
# If not on a tty, then get rid of possibly disrupting stderr output
4
 
if ! tty -s; then
5
 
    exec 2>/dev/null
6
 
fi
7
 
 
8
 
test -x /sbin/splashy_update
9
 
 
10
 
# We get some variables from cryptsetup:
11
 
# $cryptsource  the device node, like "/dev/sda3"
12
 
# $crypttarget  the device mapper name, like "sda3_crypt".
13
 
 
14
 
prompt="Enter passphrase to unlock"
15
 
if [ -n "$crypttarget" ]; then
16
 
    prompt="$prompt the disk $crypttarget"
17
 
fi
18
 
if [ -n "$cryptsource" ]; then
19
 
    prompt="$prompt ($cryptsource)"
20
 
fi
21
 
 
22
 
splash_input_password(){
23
 
    /sbin/splashy_update "getpass $1"
24
 
}
25
 
 
26
 
password="`splash_input_password \"$prompt: \"`"
27
 
 
28
 
echo -n "$password"