svn commit: samba r19351 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_23/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-10-16 23:13:56 +0000 (Mon, 16 Oct 2006)
New Revision: 19351

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

Log:
Also export the info3 profilepath via the PAM_WINBIND_PROFILEPATH data
field.

Guenther

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


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-10-16 23:09:15 UTC (rev 19350)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-10-16 23:13:56 UTC (rev 19351)
@@ -572,6 +572,18 @@
 		}
 	}
 
+	/* save the profile path for other PAM modules */
+	if (response.data.auth.info3.profile_path[0] != '\0') {
+
+		int ret2 = pam_set_data(pamh, PAM_WINBIND_PROFILEPATH, 
+					(void *) strdup(response.data.auth.info3.profile_path), 
+					_pam_winbind_cleanup_func);
+		if (ret2) {
+			_pam_log_debug(pamh, ctrl, LOG_DEBUG, "Could not set data: %s", 
+				       pam_strerror(pamh, ret2));
+		}
+	}
+
 	/* If winbindd returned a username, return the pointer to it here. */
 	if (user_ret && response.extra_data.data) {
 		/* We have to trust it's a null terminated string. */

Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.h	2006-10-16 23:09:15 UTC (rev 19350)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.h	2006-10-16 23:13:56 UTC (rev 19351)
@@ -100,6 +100,7 @@
 #define PAM_WINBIND_NEW_AUTHTOK_REQD "PAM_WINBIND_NEW_AUTHTOK_REQD"
 #define PAM_WINBIND_HOMEDIR "PAM_WINBIND_HOMEDIR"
 #define PAM_WINBIND_LOGONSCRIPT "PAM_WINBIND_LOGONSCRIPT"
+#define PAM_WINBIND_PROFILEPATH "PAM_WINBIND_PROFILEPATH"
 #define PAM_WINBIND_PWD_LAST_SET "PAM_WINBIND_PWD_LAST_SET"
 
 #define SECONDS_PER_DAY 86400

Modified: branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.c	2006-10-16 23:09:15 UTC (rev 19350)
+++ branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.c	2006-10-16 23:13:56 UTC (rev 19351)
@@ -508,6 +508,18 @@
 		}
 	}
 
+	/* save the profile path for other PAM modules */
+	if (response.data.auth.info3.profile_path[0] != '\0') {
+
+		int ret2 = pam_set_data(pamh, PAM_WINBIND_PROFILEPATH, 
+					(void *) strdup(response.data.auth.info3.profile_path), 
+					_pam_winbind_cleanup_func);
+		if (ret2) {
+			_pam_log_debug(ctrl, LOG_DEBUG, "Could not set data: %s", 
+				       pam_strerror(pamh, ret2));
+		}
+	}
+
 	return ret;
 }
 

Modified: branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.h
===================================================================
--- branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.h	2006-10-16 23:09:15 UTC (rev 19350)
+++ branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.h	2006-10-16 23:13:56 UTC (rev 19351)
@@ -109,6 +109,7 @@
 #define PAM_WINBIND_NEW_AUTHTOK_REQD "PAM_WINBIND_NEW_AUTHTOK_REQD"
 #define PAM_WINBIND_HOMEDIR "PAM_WINBIND_HOMEDIR"
 #define PAM_WINBIND_LOGONSCRIPT "PAM_WINBIND_LOGONSCRIPT"
+#define PAM_WINBIND_PROFILEPATH "PAM_WINBIND_PROFILEPATH"
 #define PAM_WINBIND_PWD_LAST_SET "PAM_WINBIND_PWD_LAST_SET"
 
 #define SECONDS_PER_DAY 86400