svn commit: samba r18924 - in branches/SAMBA_3_0/source/nsswitch: .

gd at samba.org gd at samba.org
Tue Sep 26 16:35:35 GMT 2006


Author: gd
Date: 2006-09-26 16:35:34 +0000 (Tue, 26 Sep 2006)
New Revision: 18924

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18924

Log:
Minor cleanup.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-09-26 16:27:18 UTC (rev 18923)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-09-26 16:35:34 UTC (rev 18924)
@@ -119,33 +119,33 @@
 		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;
 	}
 



More information about the samba-cvs mailing list