svn commit: samba r2779 - in branches/SAMBA_3_0/source/nsswitch: .
abartlet at samba.org
abartlet at samba.org
Sat Oct 2 11:11:49 GMT 2004
Author: abartlet
Date: 2004-10-02 11:11:49 +0000 (Sat, 02 Oct 2004)
New Revision: 2779
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/nsswitch&rev=2779&nolog=1
Log:
Some fixes to pam_winbind.c.:
Allow 'require_membership_of' and 'require-membership-of'.
Really use a different struct for the SID->Name lookup.
Andrew Bartlett
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 2004-10-02 09:14:43 UTC (rev 2778)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c 2004-10-02 11:11:49 UTC (rev 2779)
@@ -218,21 +218,21 @@
struct winbindd_request sid_request;
struct winbindd_response sid_response;
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
+ ZERO_STRUCT(sid_request);
+ ZERO_STRUCT(sid_response);
if (ctrl & WINBIND_DEBUG_ARG)
_pam_log(LOG_DEBUG, "no sid given, looking up: %s\n", member);
/* fortunatly winbindd can handle non-separated names */
- strcpy(request.data.name.name, member);
+ strcpy(sid_request.data.name.name, member);
- if (pam_winbind_request_log(WINBINDD_LOOKUPNAME, &request, &response, ctrl, user)) {
+ if (pam_winbind_request_log(WINBINDD_LOOKUPNAME, &sid_request, &sid_response, ctrl, user)) {
_pam_log(LOG_INFO, "could not lookup name: %s\n", member);
return PAM_AUTH_ERR;
}
- member = response.data.sid.sid;
+ member = sid_response.data.sid.sid;
}
strncpy(request.data.auth.require_membership_of_sid, member,
@@ -490,13 +490,14 @@
/* Retrieve membership-string here */
for ( i=0; i<argc; i++ ) {
- if (!strncmp(argv[i], "require_membership_of", strlen("require_membership_of"))) {
+ if ((strncmp(argv[i], "require_membership_of", strlen("require_membership_of")) == 0)
+ || (strncmp(argv[i], "require-membership-of", strlen("require-membership-of")) == 0)) {
char *p;
char *parm = strdup(argv[i]);
if ( (p = strchr( parm, '=' )) == NULL) {
- _pam_log(LOG_INFO, "no \"=\" delimiter for \"required_membership\" found\n");
+ _pam_log(LOG_INFO, "no \"=\" delimiter for \"require_membership_of\" found\n");
break;
}
More information about the samba-cvs
mailing list