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

[gd at samba.org]

Author: gd
Date: 2006-04-11 15:18:46 +0000 (Tue, 11 Apr 2006)
New Revision: 15040

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

Log:
Stripping the parametric options in pam_winbind and use
/etc/security/pam_winbind.conf as config file for the PAM module by
default.

Guenther


Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
   trunk/source/Makefile.in
   trunk/source/nsswitch/pam_winbind.c
   trunk/source/nsswitch/pam_winbind.h


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2006-04-11 15:11:27 UTC (rev 15039)
+++ branches/SAMBA_3_0/source/Makefile.in	2006-04-11 15:18:46 UTC (rev 15040)
@@ -512,8 +512,7 @@
 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
 
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
-		  lib/replace1.o $(SNPRINTF_OBJ) $(INIPARSER_OBJ) \
-		  dynconfig.o
+		  lib/replace1.o $(SNPRINTF_OBJ) $(INIPARSER_OBJ)
 
 PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@)
 

Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-04-11 15:11:27 UTC (rev 15039)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-04-11 15:18:46 UTC (rev 15040)
@@ -61,7 +61,7 @@
 	}
 
 	if (config_file == NULL) {
-		config_file = dyn_CONFIGFILE;
+		config_file = PAM_WINBIND_CONFIG_FILE;
 	}
 
 	*d = iniparser_load(CONST_DISCARD(char *, config_file));
@@ -69,24 +69,24 @@
 		return -1;
 	}
 
-	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:pam_winbind:debug"), False)) {
+	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:debug"), False)) {
 		ctrl |= WINBIND_DEBUG_ARG;
 	}
 
-	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:pam_winbind:cached_login"), False)) {
+	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:cached_login"), False)) {
 		ctrl |= WINBIND_CACHED_LOGIN;
 	}
 
-	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:pam_winbind:krb5_auth"), False) == True) {
+	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:krb5_auth"), False)) {
 		ctrl |= WINBIND_KRB5_AUTH;
 	}
 
-	if (iniparser_getstr(*d, CONST_DISCARD(char *,"global:pam_winbind:krb5_ccache_type")) != NULL) {
+	if (iniparser_getstr(*d, CONST_DISCARD(char *,"global:krb5_ccache_type")) != NULL) {
 		ctrl |= WINBIND_KRB5_CCACHE_TYPE;
 	}
 	
-	if ((iniparser_getstr(*d, CONST_DISCARD(char *, "global:pam_winbind:require-membership-of")) != NULL) ||
-	    (iniparser_getstr(*d, CONST_DISCARD(char *, "global:pam_winbind:require_membership_of")) != NULL)) {
+	if ((iniparser_getstr(*d, CONST_DISCARD(char *, "global:require-membership-of")) != NULL) ||
+	    (iniparser_getstr(*d, CONST_DISCARD(char *, "global:require_membership_of")) != NULL)) {
 		ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
 	}
 
@@ -794,7 +794,7 @@
 
 	if (d != NULL) {
 
-		if (!asprintf(&key, "global:pam_winbind:%s", item)) {
+		if (!asprintf(&key, "global:%s", item)) {
 			goto out;
 		}
 

Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.h	2006-04-11 15:11:27 UTC (rev 15039)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.h	2006-04-11 15:18:46 UTC (rev 15040)
@@ -26,6 +26,10 @@
 #define PAM_SM_ACCOUNT
 #define PAM_SM_PASSWORD
 
+#ifndef PAM_WINBIND_CONFIG_FILE
+#define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf"
+#endif
+
 #include <iniparser.h>
 
 #if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || defined(FREEBSD) || defined(AIX)
@@ -110,8 +114,6 @@
 
 #include "winbind_client.h"
 
-#include <dynconfig.h>
-
 #define PAM_WB_REMARK_DIRECT(h,x)\
 {\
 	const char *error_string = NULL; \

Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in	2006-04-11 15:11:27 UTC (rev 15039)
+++ trunk/source/Makefile.in	2006-04-11 15:18:46 UTC (rev 15040)
@@ -521,8 +521,7 @@
 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
 
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
-		  lib/replace1.o $(SNPRINTF_OBJ) $(INIPARSER_OBJ) \
-		  dynconfig.o
+		  lib/replace1.o $(SNPRINTF_OBJ) $(INIPARSER_OBJ)
 
 PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@)
 

Modified: trunk/source/nsswitch/pam_winbind.c
===================================================================
--- trunk/source/nsswitch/pam_winbind.c	2006-04-11 15:11:27 UTC (rev 15039)
+++ trunk/source/nsswitch/pam_winbind.c	2006-04-11 15:18:46 UTC (rev 15040)
@@ -61,7 +61,7 @@
 	}
 
 	if (config_file == NULL) {
-		config_file = dyn_CONFIGFILE;
+		config_file = PAM_WINBIND_CONFIG_FILE;
 	}
 
 	*d = iniparser_load(CONST_DISCARD(char *, config_file));
@@ -69,24 +69,24 @@
 		return -1;
 	}
 
-	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:pam_winbind:debug"), False)) {
+	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:debug"), False)) {
 		ctrl |= WINBIND_DEBUG_ARG;
 	}
 
-	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:pam_winbind:cached_login"), False)) {
+	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:cached_login"), False)) {
 		ctrl |= WINBIND_CACHED_LOGIN;
 	}
 
-	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:pam_winbind:krb5_auth"), False) == True) {
+	if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:krb5_auth"), False)) {
 		ctrl |= WINBIND_KRB5_AUTH;
 	}
 
-	if (iniparser_getstr(*d, CONST_DISCARD(char *,"global:pam_winbind:krb5_ccache_type")) != NULL) {
+	if (iniparser_getstr(*d, CONST_DISCARD(char *,"global:krb5_ccache_type")) != NULL) {
 		ctrl |= WINBIND_KRB5_CCACHE_TYPE;
 	}
 	
-	if ((iniparser_getstr(*d, CONST_DISCARD(char *, "global:pam_winbind:require-membership-of")) != NULL) ||
-	    (iniparser_getstr(*d, CONST_DISCARD(char *, "global:pam_winbind:require_membership_of")) != NULL)) {
+	if ((iniparser_getstr(*d, CONST_DISCARD(char *, "global:require-membership-of")) != NULL) ||
+	    (iniparser_getstr(*d, CONST_DISCARD(char *, "global:require_membership_of")) != NULL)) {
 		ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
 	}
 
@@ -794,7 +794,7 @@
 
 	if (d != NULL) {
 
-		if (!asprintf(&key, "global:pam_winbind:%s", item)) {
+		if (!asprintf(&key, "global:%s", item)) {
 			goto out;
 		}
 

Modified: trunk/source/nsswitch/pam_winbind.h
===================================================================
--- trunk/source/nsswitch/pam_winbind.h	2006-04-11 15:11:27 UTC (rev 15039)
+++ trunk/source/nsswitch/pam_winbind.h	2006-04-11 15:18:46 UTC (rev 15040)
@@ -26,6 +26,10 @@
 #define PAM_SM_ACCOUNT
 #define PAM_SM_PASSWORD
 
+#ifndef PAM_WINBIND_CONFIG_FILE
+#define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf"
+#endif
+
 #include <iniparser.h>
 
 #if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || defined(FREEBSD) || defined(AIX)
@@ -110,8 +114,6 @@
 
 #include "winbind_client.h"
 
-#include <dynconfig.h>
-
 #define PAM_WB_REMARK_DIRECT(h,x)\
 {\
 	const char *error_string = NULL; \