Attachment 1358 Details for Bug 2961 – Jumbo patch for pam_smbpass/*

[patch] Jumbo patch for pam_smbpass/*

my.diff (text/plain), 2.87 KB, created by Timur Bakeyev on 2005-08-05 19:51:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timur Bakeyev

Created: 2005-08-05 19:51:59 UTC

Size: 2.87 KB

patch

obsolete

>--- general.h.orig	Fri Aug  5 17:31:05 2005
>+++ general.h	Fri Aug  5 17:31:21 2005
>@@ -50,10 +50,6 @@
> #define set(x,ctrl)   (ctrl = ((ctrl)&smb_args[x].mask)|smb_args[x].flag)
> #define unset(x,ctrl) (ctrl &= ~(smb_args[x].flag))
> 
>-#ifndef __linux__
>-#define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n)
>-#endif
>-
> /* the generic mask */
> #define _ALL_ON_  (~0U)
> 
>--- pam_smb_auth.c.orig	Fri Aug  5 18:15:04 2005
>+++ pam_smb_auth.c	Fri Aug  5 18:15:14 2005
>@@ -162,7 +162,7 @@
> 
>     retval = PAM_SUCCESS;
> 
>-    pam_get_data(pamh, "smb_setcred_return", (const void **) &pretval);
>+    pam_get_data(pamh, "smb_setcred_return", (void **) &pretval);
>     if(pretval) {
> 	retval = *pretval;
> 	SAFE_FREE(pretval);
>--- pam_smb_passwd.c.orig	Fri Aug  5 18:15:41 2005
>+++ pam_smb_passwd.c	Fri Aug  5 18:16:09 2005
>@@ -224,7 +224,7 @@
>                                    (const void **)&pass_old );
>         } else {
>             retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK,
>-                                   (const void **)&pass_old );
>+                                   (void **)&pass_old );
>             if (retval == PAM_NO_MODULE_DATA) {
> 		pass_old = NULL;
>                 retval = PAM_SUCCESS;
>--- support.c.orig	Fri Aug  5 18:14:47 2005
>+++ support.c	Fri Aug  5 18:24:16 2005
>@@ -114,7 +114,7 @@
> 			struct pam_response *resp;
> 
> 			pmsg[0] = &msg[0];
>-			msg[0].msg = text;
>+			msg[0].msg = CONST_DISCARD(char *, text);
> 			msg[0].msg_style = type;
> 			resp = NULL;
> 
>@@ -384,7 +384,7 @@
>             if (newauth != NULL) {
> 
>                 /* any previous failures for this user ? */
>-                pam_get_data(pamh, data_name, (const void **) &old);
>+                pam_get_data(pamh, data_name, (void **) &old);
> 
>                 if (old != NULL) {
>                     newauth->count = old->count + 1;
>@@ -515,7 +515,7 @@
>     if (comment != NULL && off(SMB__QUIET, ctrl)) {
>         pmsg[0] = &msg[0];
>         msg[0].msg_style = PAM_TEXT_INFO;
>-        msg[0].msg = comment;
>+        msg[0].msg = CONST_DISCARD(char *, comment);
>         i = 1;
>     } else {
>         i = 0;
>@@ -523,12 +523,12 @@
> 
>     pmsg[i] = &msg[i];
>     msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
>-    msg[i++].msg = prompt1;
>+    msg[i++].msg = CONST_DISCARD(char *, prompt1);
> 
>     if (prompt2 != NULL) {
>         pmsg[i] = &msg[i];
>         msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
>-        msg[i++].msg = prompt2;
>+        msg[i++].msg = CONST_DISCARD(char *, prompt2);
>         expect = 2;
>     } else
>         expect = 1;
>@@ -594,7 +594,7 @@
> 
>         retval = pam_set_data( pamh, data_name, (void *) token, _cleanup );
>         if (retval != PAM_SUCCESS
>-            || (retval = pam_get_data( pamh, data_name, (const void **)&item ))
>+            || (retval = pam_get_data( pamh, data_name, (void **)&item ))
>                              != PAM_SUCCESS)
>         {
>             _log_err( LOG_CRIT, "error manipulating password data [%s]"

Actions: View

Attachments on bug 2961: 1358 | 1874