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

Minor code cleanup; one minor bug fix.

* initramfs-tools-hook: Bug fix: Use the primary group of the first
                        suitable user found, do not look for a
                        group separately.
* mandos: Unconditionally import "struct" and "fcntl".  Use unicode
          strings everywhere possible.
  (Client._datetime_to_milliseconds): New static method.
  (Client.timeout_milliseconds, Client.interval_milliseconds): Use
                                                               above
                                                               method.
  (ClientDBus.CheckedOK,
  ClientDBus.Enable, ClientDBus.StopChecker): Define normally.
  (if_nametoindex): Document non-acceptance of unicode strings.  All
                    callers adjusted.  Do not import "struct" or
                    "fcntl".  Log warning message if if_nametoindex
                    cannot be found using ctypes modules.
  (main): Bug fix: Do not look for user named "nogroup".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
90
90
    case "$base" in
91
91
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
92
92
            : ;;
93
 
        "*") echo "W: Mandos client plugin directory is empty." >&2 ;;
 
93
        */"*")
 
94
            echo "W: Mandos client plugin directory is empty." >&2 ;;
94
95
        *) copy_exec "$file" "${PLUGINDIR}" ;;
95
96
    esac
96
97
done
101
102
    case "$base" in
102
103
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
103
104
            : ;;
104
 
        "*") : ;;
 
105
        */"*") : ;;
105
106
        *) copy_exec "$file" "${PLUGINDIR}" ;;
106
107
    esac
107
108
done
122
123
done
123
124
 
124
125
if [ ${mandos_user} != 65534 ]; then
125
 
    sed --in-place --expression="1i--userid=${mandos_user}" \
126
 
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
126
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
127
    cat <<-EOF >> "$PLUGINRUNNERCONF"
 
128
        
 
129
        --userid=${mandos_user}
 
130
EOF
127
131
fi
128
132
 
129
133
if [ ${mandos_group} != 65534 ]; then
130
 
    sed --in-place --expression="1i--groupid=${mandos_group}" \
131
 
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
134
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
135
    cat <<-EOF >> "$PLUGINRUNNERCONF"
 
136
        
 
137
        --groupid=${mandos_group}
 
138
EOF
132
139
fi
133
140
 
134
141
# Key files