summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-09-26 16:35:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:14:47 -0500
commitf1c239872387fbfd5d52de2fe60c62108a4a7926 (patch)
tree6aacbaee3d474a2e81b7c2b0e8e82fdac7e8589e
parentf7633eca1824f7a5bda733e6753d5d1f850f78c3 (diff)
downloadsamba-f1c239872387fbfd5d52de2fe60c62108a4a7926.tar.gz
samba-f1c239872387fbfd5d52de2fe60c62108a4a7926.tar.bz2
samba-f1c239872387fbfd5d52de2fe60c62108a4a7926.zip
r18924: Minor cleanup.
Guenther (This used to be commit 143a48927b0e21d31a9f54cfc720b5d04a4b6751)
-rw-r--r--source3/nsswitch/pam_winbind.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 3bd90106ec..5d5e903c42 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -119,33 +119,33 @@ static int _pam_parse(const pam_handle_t *pamh, int flags, int argc, const char
config_file = PAM_WINBIND_CONFIG_FILE;
}
- *d = iniparser_load(CONST_DISCARD(char *, config_file));
+ *d = iniparser_load(config_file);
if (*d == NULL) {
goto config_from_pam;
}
- if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:debug"), False)) {
+ if (iniparser_getboolean(*d, ("global:debug", False))) {
ctrl |= WINBIND_DEBUG_ARG;
}
- if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:cached_login"), False)) {
+ if (iniparser_getboolean(*d, "global:cached_login", False)) {
ctrl |= WINBIND_CACHED_LOGIN;
}
- if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:krb5_auth"), False)) {
+ if (iniparser_getboolean(*d, "global:krb5_auth", False)) {
ctrl |= WINBIND_KRB5_AUTH;
}
- if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:silent"), False)) {
+ if (iniparser_getboolean(*d, "global:silent", False)) {
ctrl |= WINBIND_SILENT;
}
- if (iniparser_getstr(*d, CONST_DISCARD(char *,"global:krb5_ccache_type")) != NULL) {
+ if (iniparser_getstr(*d, "global:krb5_ccache_type")) != NULL) {
ctrl |= WINBIND_KRB5_CCACHE_TYPE;
}
- if ((iniparser_getstr(*d, CONST_DISCARD(char *, "global:require-membership-of")) != NULL) ||
- (iniparser_getstr(*d, CONST_DISCARD(char *, "global:require_membership_of")) != NULL)) {
+ if ((iniparser_getstr(*d, "global:require-membership-of") != NULL) ||
+ (iniparser_getstr(*d, "global:require_membership_of") != NULL)) {
ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
}