Attachment 67208 Details for Bug 149021

[patch] Updated Patch to better identify whether a user is a winbind user or not

diff (text/plain), 4.07 KB, created by Guenther Deschner on 2006-02-09 12:03:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2006-02-09 12:03:31 UTC

Size: 4.07 KB

patch

obsolete

>Index: nsswitch/winbindd_util.c
>===================================================================
>--- nsswitch/winbindd_util.c	(revision 13410)
>+++ nsswitch/winbindd_util.c	(working copy)
>@@ -849,6 +849,37 @@
> 	return True;
> }
> 
>+/* Parse a string of the form DOMAIN\user into a domain and a user */
>+
>+BOOL parse_valid_domain_user(const char *domuser, fstring domain, fstring user)
>+{
>+	char *p = strchr(domuser,*lp_winbind_separator());
>+
>+	if ( !p ) {
>+
>+		if (!lp_winbind_use_default_domain() || 
>+		    !lp_winbind_trusted_domains_only()) {
>+			return False;
>+		}
>+		
>+		fstrcpy(user, domuser);
>+		
>+		if ( assume_domain(lp_workgroup())) {
>+			fstrcpy(domain, lp_workgroup());
>+		} else {
>+			fstrcpy( domain, get_global_sam_name() ); 
>+		}
>+	} 
>+	else {
>+		fstrcpy(user, p+1);
>+		fstrcpy(domain, domuser);
>+		domain[PTR_DIFF(p, domuser)] = 0;
>+	}
>+	
>+	strupper_m(domain);
>+	
>+	return True;
>+}
> BOOL parse_domain_user_talloc(TALLOC_CTX *mem_ctx, const char *domuser,
> 			      char **domain, char **user)
> {
>Index: nsswitch/winbindd_user.c
>===================================================================
>--- nsswitch/winbindd_user.c	(revision 13410)
>+++ nsswitch/winbindd_user.c	(working copy)
>@@ -335,8 +335,8 @@
> 	DEBUG(3, ("[%5lu]: getpwnam %s\n", (unsigned long)state->pid,
> 		  state->request.data.username));
> 
>-	if (!parse_domain_user(state->request.data.username, domname,
>-			       username)) {
>+	if (!parse_valid_domain_user(state->request.data.username, domname,
>+				     username)) {
> 		DEBUG(0, ("Could not parse domain user: %s\n",
> 			  state->request.data.username));
> 		request_error(state);
>Index: nsswitch/pam_winbind.c
>===================================================================
>--- nsswitch/pam_winbind.c	(revision 13410)
>+++ nsswitch/pam_winbind.c	(working copy)
>@@ -566,10 +569,38 @@
>  *	 0  = OK
>  * 	-1  = System error
>  */
>-static int valid_user(const char *user)
>+static int valid_user(const char *user, pam_handle_t *pamh, int ctrl)
> {
>-	if (getpwnam(user)) return 0;
>-	return 1;
>+	/* check not only if the user is available over NSS calls, also make
>+	 * sure it's really a winbind user, this is important when stacking PAM
>+	 * modules in the 'account' or 'password' facility. */
>+
>+	struct passwd *pwd = NULL;
>+	struct winbindd_request request;
>+	struct winbindd_response response;
>+	int ret;
>+
>+	ZERO_STRUCT(request);
>+	ZERO_STRUCT(response);
>+
>+	pwd = getpwnam(user);
>+	if (pwd == NULL) {
>+		return 1;
>+	}
>+
>+	fstrcpy(request.data.username, user);
>+
>+	ret = pam_winbind_request_log(pamh, ctrl, WINBINDD_GETPWNAM, &request, &response, user);
>+
>+	switch (ret) {
>+		case PAM_USER_UNKNOWN:
>+			return 1;
>+		case PAM_SUCCESS:
>+			return 0;
>+		default:
>+			break;
>+	}
>+	return -1;
> }
> 
> static char *_pam_delete(register char *xx)
>@@ -897,7 +972,7 @@
> 	}
> 
> 	/* Verify the username */
>-	retval = valid_user(username);
>+	retval = valid_user(username, pamh, ctrl);
> 	switch (retval) {
> 	case -1:
> 		/* some sort of system error. The log was already printed */
>@@ -1123,6 +1198,17 @@
> 		return retval;
> 	}
> 
>+	/* check if this is really a user in winbindd, not only in NSS */
>+	retval = valid_user(user, pamh, ctrl);
>+	switch (retval) {
>+		case 1:
>+			return PAM_USER_UNKNOWN;
>+		case -1:
>+			return PAM_SYSTEM_ERR;
>+		default:
>+			break;
>+	}
>+		
> 	/*
> 	 * obtain and verify the current password (OLDAUTHTOK) for
> 	 * the user.
>Index: nsswitch/winbindd_pam.c
>===================================================================
>--- nsswitch/winbindd_pam.c	(revision 13410)
>+++ nsswitch/winbindd_pam.c	(working copy)
>@@ -633,8 +633,17 @@
> 
> 	/* Parse domain and username */
> 	
>-	parse_domain_user(state->request.data.auth.user,
>-			  name_domain, name_user);
>+	if (!parse_valid_domain_user(state->request.data.auth.user,
>+				     name_domain, name_user)) {
>+		set_auth_errors(&state->response, NT_STATUS_NO_SUCH_USER);
>+		DEBUG(5, ("Plain text authentication for %s returned %s "
>+			  "(PAM: %d)\n",
>+			  state->request.data.auth.user, 
>+			  state->response.data.auth.nt_status_string,
>+			  state->response.data.auth.pam_error));
>+		request_error(state);
>+		return;
>+	}
> 
> 	domain = find_auth_domain(state, name_domain);
>

Actions: View | Diff

Attachments on bug 149021: 66977 | 67208 | 67689 | 67690