Attachment 208071 Details for Bug 308651 – Correct patch

[patch] Correct patch

pam-0.77-stack-drop-items.patch (text/plain), 3.68 KB, created by Tomas Mraz on 2007-09-27 10:08:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Mraz

Created: 2007-09-27 10:08:07 UTC

Size: 3.68 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-09-27 12:01:44.000000000 +0200
>@@ -129,11 +129,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 	switch(item) {
> 		case PAM_AUTHTOK:
> 			name = "PAM_AUTHTOK";
>+			_pam_drop(dest->authtok);
> 			if(source->authtok) {
> 				copied = 1;
>-				if(dest->authtok) {
>-					_pam_drop(dest->authtok);
>-				}
> 				dest->authtok = _pam_strdup(source->authtok);
> 			} else {
> 				reason = "source is NULL";
>@@ -141,11 +139,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_CONV:
> 			name = "PAM_CONV";
>+			_pam_drop(dest->pam_conversation);
> 			if(source->pam_conversation) {
> 				copied = 1;
>-				if(dest->pam_conversation) {
>-					_pam_drop(dest->pam_conversation);
>-				}				
> 				dest->pam_conversation = calloc(1, sizeof(struct pam_conv));
> 				*dest->pam_conversation = *source->pam_conversation;
> 			} else {
>@@ -154,6 +150,7 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_FAIL_DELAY:
> 			name = "PAM_FAIL_DELAY";
>+			dest->fail_delay.set = 0;
> 			if(source->fail_delay.set) {
> 				copied = 1;
> 				dest->fail_delay = source->fail_delay;
>@@ -163,11 +160,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_OLDAUTHTOK:
> 			name = "PAM_OLDAUTHTOK";
>+			_pam_drop(dest->oldauthtok);
> 			if(source->oldauthtok) {
> 				copied = 1;
>-				if(dest->oldauthtok) {
>-					_pam_drop(dest->oldauthtok);
>-				}
> 				dest->oldauthtok = _pam_strdup(source->oldauthtok);
> 			} else {
> 				reason = "source is NULL";
>@@ -175,11 +170,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_RHOST:
> 			name = "PAM_RHOST";
>+			_pam_drop(dest->rhost);
> 			if(source->rhost) {
> 				copied = 1;
>-				if(dest->rhost) {
>-					_pam_drop(dest->rhost);
>-				}
> 				dest->rhost = _pam_strdup(source->rhost);
> 			} else {
> 				reason = "source is NULL";
>@@ -187,11 +180,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_RUSER:
> 			name = "PAM_RUSER";
>+			_pam_drop(dest->ruser);
> 			if(source->ruser) {
> 				copied = 1;
>-				if(dest->ruser) {
>-					_pam_drop(dest->ruser);
>-				}
> 				dest->ruser = _pam_strdup(source->ruser);
> 			} else {
> 				reason = "source is NULL";
>@@ -199,11 +190,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_SERVICE:
> 			name = "PAM_SERVICE";
>+			_pam_drop(dest->service_name);
> 			if(source->service_name) {
> 				copied = 1;
>-				if(dest->service_name) {
>-					_pam_drop(dest->service_name);
>-				}
> 				dest->service_name = _pam_strdup(source->service_name);
> 			} else {
> 				reason = "source is NULL";
>@@ -211,11 +200,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_TTY:
> 			name = "PAM_TTY";
>+			_pam_drop(dest->tty);
> 			if(source->tty) {
> 				copied = 1;
>-				if(dest->tty) {
>-					_pam_drop(dest->tty);
>-				}
> 				dest->tty = _pam_strdup(source->tty);
> 			} else {
> 				reason = "source is NULL";
>@@ -223,11 +210,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_USER:
> 			name = "PAM_USER";
>+			_pam_drop(dest->user);
> 			if(source->user) {
> 				copied = 1;
>-				if(dest->user) {
>-					_pam_drop(dest->user);
>-				}
> 				dest->user = _pam_strdup(source->user);
> 			} else {
> 				reason = "source is NULL";
>@@ -235,11 +220,9 @@ _pam_stack_copy(pam_handle_t *source, pa
> 			break;
> 		case PAM_USER_PROMPT:
> 			name = "PAM_USER_PROMPT";
>+			_pam_drop(dest->prompt);
> 			if(source->prompt) {
> 				copied = 1;
>-				if(dest->prompt) {
>-					_pam_drop(dest->prompt);
>-				}
> 				dest->prompt = _pam_strdup(source->prompt);
> 			} else {
> 				reason = "source is NULL";

Actions: View | Diff

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