svn commit: samba r15528 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-05-10 21:12:10 +0000 (Wed, 10 May 2006)
New Revision: 15528

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

Log:
Make the existance of the /etc/security/pam_winbind.conf file
non-critical and fallback to only parse the argv options in that case.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
   trunk/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-05-10 14:38:02 UTC (rev 15527)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-05-10 21:12:10 UTC (rev 15528)
@@ -66,7 +66,7 @@
 
 	*d = iniparser_load(CONST_DISCARD(char *, config_file));
 	if (*d == NULL) {
-		return -1;
+		goto config_from_pam;
 	}
 
 	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:debug"), False)) {
@@ -807,7 +807,7 @@
 		goto out;
 	}
 
-	/* let the pam opt take precedence over the smb.conf option */
+	/* let the pam opt take precedence over the pam_winbind.conf option */
 
 	if (d != NULL) {
 
@@ -836,7 +836,9 @@
 		}
 	}
 
-	_pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
+	if (d != NULL) {
+		_pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
+	}
 out:
 	SAFE_FREE(parm);
 	return parm_opt;

Modified: trunk/source/nsswitch/pam_winbind.c
===================================================================
--- trunk/source/nsswitch/pam_winbind.c	2006-05-10 14:38:02 UTC (rev 15527)
+++ trunk/source/nsswitch/pam_winbind.c	2006-05-10 21:12:10 UTC (rev 15528)
@@ -66,7 +66,7 @@
 
 	*d = iniparser_load(CONST_DISCARD(char *, config_file));
 	if (*d == NULL) {
-		return -1;
+		goto config_from_pam;
 	}
 
 	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:debug"), False)) {
@@ -807,7 +807,7 @@
 		goto out;
 	}
 
-	/* let the pam opt take precedence over the smb.conf option */
+	/* let the pam opt take precedence over the pam_winbind.conf option */
 
 	if (d != NULL) {
 
@@ -836,7 +836,9 @@
 		}
 	}
 
-	_pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
+	if (d != NULL) {
+		_pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
+	}
 out:
 	SAFE_FREE(parm);
 	return parm_opt;