mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-08 20:03:34 +02:00
Fix build, undo remove config
This commit is contained in:
17
meson.build
17
meson.build
@ -97,6 +97,7 @@ pam_dep = cc.find_library('pam',
|
||||
required: get_option('pam'),
|
||||
has_headers: 'security/pam_modules.h',
|
||||
)
|
||||
pthread_dep = dependency('threads')
|
||||
|
||||
pod2man = find_program('pod2man', required: get_option('man'))
|
||||
xsltproc = find_program('xsltproc', required: get_option('gtk_doc'))
|
||||
@ -170,16 +171,16 @@ config_h = configure_file(
|
||||
configuration: cdata
|
||||
)
|
||||
|
||||
subdir('src')
|
||||
subdir('data')
|
||||
subdir('utils')
|
||||
#subdir('src')
|
||||
#subdir('data')
|
||||
#subdir('utils')
|
||||
if get_option('pam')
|
||||
subdir('pam')
|
||||
endif
|
||||
if get_option('gtk_doc')
|
||||
subdir('doc')
|
||||
endif
|
||||
subdir('tests')
|
||||
#if get_option('gtk_doc')
|
||||
# subdir('doc')
|
||||
#endif
|
||||
#subdir('tests')
|
||||
subdir('po')
|
||||
|
||||
output = []
|
||||
@ -202,6 +203,6 @@ output += ' Manuals: ' + get_option('man').to_string()
|
||||
output += ' GTK Doc: ' + get_option('gtk_doc').to_string()
|
||||
output += ' XML Linter ' + xmllint.found().to_string()
|
||||
output += '\nTest setup:\n'
|
||||
output += ' With address sanitizer: ' + address_sanitizer.to_string()
|
||||
#output += ' With address sanitizer: ' + address_sanitizer.to_string()
|
||||
|
||||
message('\n'+'\n'.join(output)+'\n')
|
||||
|
||||
@ -5,11 +5,11 @@ option('pam',
|
||||
option('man',
|
||||
description: 'Generate the man files',
|
||||
type: 'boolean',
|
||||
value: true)
|
||||
value: false)
|
||||
option('systemd',
|
||||
description: 'Install system service files',
|
||||
type: 'boolean',
|
||||
value: true)
|
||||
value: false)
|
||||
option('systemd_system_unit_dir',
|
||||
description: 'Directory for systemd service files',
|
||||
type: 'string')
|
||||
|
||||
@ -16,6 +16,7 @@ pam_fprintd = shared_module('pam_fprintd',
|
||||
dependencies: [
|
||||
libsystemd_dep,
|
||||
pam_dep,
|
||||
pthread_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DLOCALEDIR="@0@"'.format(localedir),
|
||||
|
||||
@ -18,6 +18,8 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -781,7 +783,7 @@ do_auth (pam_handle_t *pamh, const char *username)
|
||||
release_device (pamh, bus, data->dev);
|
||||
|
||||
sd_bus_close (bus);
|
||||
return ret;
|
||||
return *ret;
|
||||
}
|
||||
|
||||
sd_bus_close (bus);
|
||||
|
||||
Reference in New Issue
Block a user