cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build, undo remove config

Browse Source
This commit is contained in:
Misha
2021-12-09 22:51:35 -05:00
parent c87dc3de93
commit 6870e3c370
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meson.build
View File

@ -97,6 +97,7 @@ pam_dep = cc.find_library('pam',
required: get_option('pam'), required: get_option('pam'),
has_headers: 'security/pam_modules.h', has_headers: 'security/pam_modules.h',
) )
pthread_dep = dependency('threads')
pod2man = find_program('pod2man', required: get_option('man')) pod2man = find_program('pod2man', required: get_option('man'))
xsltproc = find_program('xsltproc', required: get_option('gtk_doc')) xsltproc = find_program('xsltproc', required: get_option('gtk_doc'))
@ -170,16 +171,16 @@ config_h = configure_file(
configuration: cdata configuration: cdata
) )
subdir('src') #subdir('src')
subdir('data') #subdir('data')
subdir('utils') #subdir('utils')
if get_option('pam') if get_option('pam')
subdir('pam') subdir('pam')
endif endif
if get_option('gtk_doc') #if get_option('gtk_doc')
subdir('doc') # subdir('doc')
endif #endif
subdir('tests') #subdir('tests')
subdir('po') subdir('po')
output = [] output = []
@ -202,6 +203,6 @@ output += ' Manuals: ' + get_option('man').to_string()
output += ' GTK Doc: ' + get_option('gtk_doc').to_string() output += ' GTK Doc: ' + get_option('gtk_doc').to_string()
output += ' XML Linter ' + xmllint.found().to_string() output += ' XML Linter ' + xmllint.found().to_string()
output += '\nTest setup:\n' 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') message('\n'+'\n'.join(output)+'\n')

4
meson_options.txt
View File

@ -5,11 +5,11 @@ option('pam',
option('man', option('man',
description: 'Generate the man files', description: 'Generate the man files',
type: 'boolean', type: 'boolean',
value: true) value: false)
option('systemd', option('systemd',
description: 'Install system service files', description: 'Install system service files',
type: 'boolean', type: 'boolean',
value: true) value: false)
option('systemd_system_unit_dir', option('systemd_system_unit_dir',
description: 'Directory for systemd service files', description: 'Directory for systemd service files',
type: 'string') type: 'string')

1
pam/meson.build
View File

@ -16,6 +16,7 @@ pam_fprintd = shared_module('pam_fprintd',
dependencies: [ dependencies: [
libsystemd_dep, libsystemd_dep,
pam_dep, pam_dep,
pthread_dep,
], ],
c_args: [ c_args: [
'-DLOCALEDIR="@0@"'.format(localedir), '-DLOCALEDIR="@0@"'.format(localedir),

4
pam/pam_fprintd.c
View File

@ -18,6 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <config.h>
#define _GNU_SOURCE #define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -781,7 +783,7 @@ do_auth (pam_handle_t *pamh, const char *username)
release_device (pamh, bus, data->dev); release_device (pamh, bus, data->dev);
sd_bus_close (bus); sd_bus_close (bus);
return ret; return *ret;
} }
sd_bus_close (bus); sd_bus_close (bus);