svn commit: samba r21933 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-03-22 18:09:21 +0000 (Thu, 22 Mar 2007)
New Revision: 21933

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

Log:
Change the write_sock() call in pam_winbind_request()
to not request a privileged pipe operation for everything
as this cannot be done from a process running under the
context of a user (e.g. screensaver).

Thanks to Danilo Almeida <dalmeida at centeris.com> for the help
in pointing out the change to write_sock().



Modified:
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
   branches/SAMBA_3_0_25/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	2007-03-22 17:37:01 UTC (rev 21932)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2007-03-22 18:09:21 UTC (rev 21933)
@@ -436,7 +436,7 @@
 	/* Fill in request and send down pipe */
 	init_request(request, req_type);
 	
-	if (write_sock(request, sizeof(*request), 0, 1) == -1) {
+	if (write_sock(request, sizeof(*request), 0, 0) == -1) {
 		_pam_log(pamh, ctrl, LOG_ERR, "pam_winbind_request: write to socket failed!");
 		close_sock();
 		return PAM_SERVICE_ERR;

Modified: branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c	2007-03-22 17:37:01 UTC (rev 21932)
+++ branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c	2007-03-22 18:09:21 UTC (rev 21933)
@@ -436,7 +436,7 @@
 	/* Fill in request and send down pipe */
 	init_request(request, req_type);
 	
-	if (write_sock(request, sizeof(*request), 0, 1) == -1) {
+	if (write_sock(request, sizeof(*request), 0, 0) == -1) {
 		_pam_log(pamh, ctrl, LOG_ERR, "pam_winbind_request: write to socket failed!");
 		close_sock();
 		return PAM_SERVICE_ERR;