mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
Fix pam_winbind build against newer iniparser library
iniparser_getstr is deprecated and has been removed in newer libraries available in Fedora. Use iniparse_getstring instead. Autobuild-User: Simo Sorce <idra@samba.org> Autobuild-Date: Tue Apr 24 02:56:10 CEST 2012 on sn-devel-104
This commit is contained in:
parent
360c11eaaa
commit
adbace20a2
@ -437,13 +437,13 @@ static int _pam_parse(const pam_handle_t *pamh,
|
||||
ctrl |= WINBIND_SILENT;
|
||||
}
|
||||
|
||||
if (iniparser_getstr(d, discard_const_p(char, "global:krb5_ccache_type")) != NULL) {
|
||||
if (iniparser_getstring(d, discard_const_p(char, "global:krb5_ccache_type"), NULL) != NULL) {
|
||||
ctrl |= WINBIND_KRB5_CCACHE_TYPE;
|
||||
}
|
||||
|
||||
if ((iniparser_getstr(d, discard_const_p(char, "global:require-membership-of"))
|
||||
if ((iniparser_getstring(d, discard_const_p(char, "global:require-membership-of"), NULL)
|
||||
!= NULL) ||
|
||||
(iniparser_getstr(d, discard_const_p(char, "global:require_membership_of"))
|
||||
(iniparser_getstring(d, discard_const_p(char, "global:require_membership_of"), NULL)
|
||||
!= NULL)) {
|
||||
ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
|
||||
}
|
||||
@ -2278,7 +2278,7 @@ static const char *get_conf_item_string(struct pwb_context *ctx,
|
||||
goto out;
|
||||
}
|
||||
|
||||
parm_opt = iniparser_getstr(ctx->dict, key);
|
||||
parm_opt = iniparser_getstring(ctx->dict, key, NULL);
|
||||
TALLOC_FREE(key);
|
||||
|
||||
_pam_log_debug(ctx, LOG_INFO, "CONFIG file: %s '%s'\n",
|
||||
|
Loading…
x
Reference in New Issue
Block a user