Attachment 269941 Details for Bug 308651 – Patch implementing this as optional behavior.

[patch] Patch implementing this as optional behavior.

pam-0.77-stack-drop-items.patch (text/plain), 7.21 KB, created by Tomas Mraz on 2007-11-27 17:45:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Mraz

Created: 2007-11-27 17:45:12 UTC

Size: 7.21 KB

patch

obsolete

>diff -up Linux-PAM-0.77/modules/pam_stack/pam_stack.c.drop-items Linux-PAM-0.77/modules/pam_stack/pam_stack.c
>--- Linux-PAM-0.77/modules/pam_stack/pam_stack.c.drop-items	2007-01-12 16:28:21.000000000 +0100
>+++ Linux-PAM-0.77/modules/pam_stack/pam_stack.c	2007-11-27 16:59:59.000000000 +0100
>@@ -121,7 +121,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int
>    to check for error return codes. */
> static void
> _pam_stack_copy(pam_handle_t *source, pam_handle_t *dest, unsigned int item,
>-		const char *recipient)
>+		int drop, const char *recipient)
> {
> 	const char *name = NULL;			/* name of the item */
> 	int copied = 0;					/* was it copied */
>@@ -136,6 +136,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->authtok = _pam_strdup(source->authtok);
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->authtok);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -149,6 +151,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				dest->pam_conversation = calloc(1, sizeof(struct pam_conv));
> 				*dest->pam_conversation = *source->pam_conversation;
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->authtok);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -158,6 +162,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				copied = 1;
> 				dest->fail_delay = source->fail_delay;
> 			} else {
>+				if (drop)
>+					dest->fail_delay.set = 0;
> 				reason = "source not set";
> 			}
> 			break;
>@@ -170,6 +176,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->oldauthtok = _pam_strdup(source->oldauthtok);
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->oldauthtok);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -182,6 +190,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->rhost = _pam_strdup(source->rhost);
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->rhost);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -194,6 +204,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->ruser = _pam_strdup(source->ruser);
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->ruser);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -206,6 +218,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->service_name = _pam_strdup(source->service_name);
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->service_name);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -218,6 +232,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->tty = _pam_strdup(source->tty);
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->tty);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -230,6 +246,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->user = _pam_strdup(source->user);
> 			} else {
>+				if (drop)
>+					_pam_drop(dest->user);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -242,6 +260,8 @@ _pam_stack_copy(pam_handle_t *source, pa
> 				}
> 				dest->prompt = _pam_strdup(source->prompt);
> 			} else {
>+				if(drop)
>+					_pam_drop(dest->prompt);
> 				reason = "source is NULL";
> 			}
> 			break;
>@@ -300,6 +320,7 @@ _pam_stack_dispatch(pam_handle_t *pamh, 
> 	const char *parent_service = NULL;
> 	int debug = 0, i = 0, ret = PAM_SUCCESS, final_ret = PAM_SUCCESS;
> 	struct stack_data *stack_data = NULL, *stack_this;
>+	int drop_items = 0;
> 
> 	/* Save the main service name. */
> 	ret = pam_get_item(pamh, PAM_SERVICE, (const void **) &parent_service);
>@@ -349,6 +370,9 @@ _pam_stack_dispatch(pam_handle_t *pamh, 
> 			_pam_drop(service);
> 			service = _pam_strdup(argv[i] + 8);
> 		}
>+		if(strncmp("drop_items", argv[i], 10) == 0) {
>+			drop_items = 1;
>+		}
> 	}
> 
> 	/* Sign-on message. */
>@@ -499,16 +523,16 @@ _pam_stack_dispatch(pam_handle_t *pamh, 
> 	_pam_drop(env);
> 
> 	/* Copy named PAM items to the child. */
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_AUTHTOK, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_CONV, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_FAIL_DELAY, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_OLDAUTHTOK, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_RHOST, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_RUSER, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_SERVICE, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_TTY, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_USER, debug ? "child" : NULL);
>-	_pam_stack_copy(pamh, stack_this->pamh, PAM_USER_PROMPT, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_AUTHTOK, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_CONV, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_FAIL_DELAY, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_OLDAUTHTOK, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_RHOST, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_RUSER, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_SERVICE, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_TTY, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_USER, drop_items, debug ? "child" : NULL);
>+	_pam_stack_copy(pamh, stack_this->pamh, PAM_USER_PROMPT, drop_items, debug ? "child" : NULL);
> 
> 	/* Pass the generic data pointer, too. */
> 	if(debug) {
>@@ -547,16 +571,16 @@ _pam_stack_dispatch(pam_handle_t *pamh, 
> 	_pam_drop(env);
> 
> 	/* Now the named data items. */
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_AUTHTOK, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_CONV, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_FAIL_DELAY, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_OLDAUTHTOK, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_RHOST, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_RUSER, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_SERVICE, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_TTY, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_USER, debug ? "parent" : NULL);
>-	_pam_stack_copy(stack_this->pamh, pamh, PAM_USER_PROMPT, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_AUTHTOK, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_CONV, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_FAIL_DELAY, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_OLDAUTHTOK, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_RHOST, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_RUSER, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_SERVICE, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_TTY, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_USER, drop_items, debug ? "parent" : NULL);
>+	_pam_stack_copy(stack_this->pamh, pamh, PAM_USER_PROMPT, drop_items, debug ? "parent" : NULL);
> 
> 	/* Wow, passing the extra data back is hard. */
> 	if(debug) {

Actions: View | Diff

Attachments on bug 308651: 208011 | 208021 | 208031 | 208071 | 269941